upright
/
duoji-frontend
mirror of https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

台湾特殊化处理

Browse Source
taiwan-tingli
yiming 4 years ago
parent 7408c87193
commit 441b39d860
17 changed files with 213 additions and 280 deletions
Show Stats Download Patch File Download Diff File

8
src/App.vue
Unescape Escape View File

@ -7,17 +7,17 @@
</template>
<script>
import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
import zhTW from 'ant-design-vue/lib/locale-provider/zh_TW'
import moment from 'moment'
import 'moment/locale/zh-cn'
import 'moment/locale/zh-tw'
import { mapActions } from 'vuex';
moment.locale('zh-cn')
moment.locale('zh-tw')
export default {
name: 'App',
data () {
return {
isRouterAlive: true,
locale: zhCN
locale: zhTW
}
},
provide(){ //提供

4
src/layouts/PageHeader.vue
Unescape Escape View File

@ -16,7 +16,7 @@
<a-icon type="bell" style="font-size:20px;cursor:pointer"/>
</a-badge>
<a-popover id="popover" v-model="visible" placement="bottom" trigger="click">
<a href="javascript:;" style="margin:0 10px">
<!-- <a href="javascript:;" style="margin:0 10px">
{{
userInfo.name ? userInfo.name : "userName"
}}
@ -28,7 +28,7 @@
@click="visible = false;$router.push({name: 'center'})"
>个人中心</a>
<a href="javascript:;" @click="logout">退出登录</a>
</div>
</div> -->
</a-popover>
</div>
</div>

78
src/router/index.js
Unescape Escape View File

@ -25,54 +25,17 @@ VueRouter.prototype.push = function push(location) {
const routes = [{
path: '/',
redirect: {
name: 'realTimeMonitoring'
name: 'checkManage'
},
component: () => import('@/views/index'),
children: [
{
path: 'videoWall',
name: 'videoWall',
meta: {
icon: 'desktop',
name: '视频墙'
},
component: () => import('@/views/videoWall/index'),
},
{
path: 'realTimeMonitoring',
name: 'realTimeMonitoring',
meta: {
icon: 'desktop',
name: '实时视频流'
},
component: () => import('@/views/realTimeMonitoring/index'),
},
{
path: 'historyMonitoring',
name: 'historyMonitoring',
meta: {
icon: 'line-chart',
name: '历史数据'
},
component: () => import('@/views/historyMonitoring/index')
},
{
path: 'alarmLog',
name: 'alarmLog',
meta: {
icon: 'exception',
name: '告警日志'
},
component: () => import('@/views/alarmVideos/alarmLog')
},
{
path: 'checkManage',
name: 'checkManage',
meta: {
icon: 'form',
name: '盘点管理',
name: '盤點管理',
},
component: () => import('@/views/checkManage/index'),
},
@ -80,7 +43,7 @@ const routes = [{
path: 'checkOperation',
name: 'checkOperation',
meta: {
name: '盘点操作'
name: '盤點操作'
},
component: () => import('@/views/checkManage/checkOperation'),
},
@ -89,7 +52,7 @@ const routes = [{
name: 'checkHistory',
meta: {
icon: 'form',
name: '盘点历史',
name: '盤點歷史',
},
component: () => import('@/views/historyCheck/index'),
},
@ -107,7 +70,7 @@ const routes = [{
name: 'cameraManage',
meta: {
icon: 'video-camera',
name: '球机管理'
name: '球機管理'
},
component: () => import('@/views/cameraManage/index')
},
@ -115,7 +78,7 @@ const routes = [{
path: 'cameraManage/model',
name: 'cameraManageModel',
meta: {
name: '球机管理测试or配置'
name: '球機管理測試or配置'
},
component: () => import('@/views/cameraManage/model')
},
@ -124,19 +87,19 @@ const routes = [{
name: 'productSpecManage',
meta: {
icon: 'pushpin',
name: '品规管理'
name: '品規管理'
},
component: () => import('@/views/productSpecManage/index')
},
{
path: 'repertoryManage',
name: 'repertoryManage',
meta: {
icon: 'wallet',
name: '库存管理'
},
component: () => import('@/views/repertoryManage/index')
},
// {
// path: 'repertoryManage',
// name: 'repertoryManage',
// meta: {
// icon: 'wallet',
// name: '庫存管理'
// },
// component: () => import('@/views/repertoryManage/index')
// },
{
path: 'cameraManage/ioTable',
@ -150,7 +113,7 @@ const routes = [{
path: 'center',
name: 'center',
meta: {
name: '个人中心'
name: '個人中心'
},
component: () => import('@/views/center')
},
@ -158,10 +121,11 @@ const routes = [{
path: 'plcStatus',
name: 'plcStatus',
meta: {
name: 'PLC状态'
name: 'PLC狀態'
},
component: () => import('@/views/plcStatus')
}
},
]
},
{

2
src/store/modules/styles.js
Unescape Escape View File

@ -11,7 +11,7 @@ const store = {
"primary-color":"rgba(184, 68, 13, 1)"
},
"title":{
"text":"垛机智能视觉系统",
"text":"垛機智能視覺系統",
"style":{
"color":"rgba(255, 255, 255, 1)",
"background-color":"rgba(163, 60, 12, 1)",

36
src/views/cameraManage/index.vue
Unescape Escape View File

@ -2,14 +2,14 @@
<div>
<div class="button-box">
<a-button type="primary" class="add" @click="showModel('add','')">
新增球机
新增球機
</a-button>
<a-button type="primary" class="plc" @click="goIo">
<!-- <a-button type="primary" class="plc" @click="goIo">
PLC IO表配置
</a-button>
<a-button type="primary" class="add" @click="videoConfig">
视频流配置
</a-button>
視頻流配置
</a-button> -->
</div>
<a-table
style="margin-top:40px"
@ -23,20 +23,20 @@
<!-- <a @click="showModel('test',record)">
测试
</a> -->
<a-divider type="vertical"/>
<!-- <a-divider type="vertical"/>
<a @click="showModel('config',record)">
配置
</a>
<a-divider type="vertical"/>
<a-divider type="vertical"/> -->
<a @click="showModel('edit',record)">
编辑
編輯
</a>
<a-divider type="vertical"/>
<a-popconfirm
title="是否删除?"
title="是否刪除?"
@confirm="() => delDosage(record)"
>
<a>删除</a>
<a>刪除</a>
</a-popconfirm>
</span>
</a-table>
@ -55,19 +55,19 @@
import Model from "./model.vue"
const columns = [
{
title: '球机名称',
title: '球機名稱',
dataIndex: 'name',
},
{
title: '球机IP',
title: '球機IP',
dataIndex: 'ip',
},
{
title: '视频流IP',
title: '視頻流IP',
dataIndex: 'rtcServer',
},
{
title: '修改时间',
title: '修改時間',
dataIndex: 'updateTime',
},
{
@ -85,7 +85,7 @@ export default {
pagination:{
total:0,
defaultPageSize:10, // 默认每页显示数量
showTotal: total => `共 ${total} 条数据`, // 显示总数
showTotal: total => `共 ${total} 條數據`, // 显示总数
showSizeChanger:true, // 显示可改变每页数量
pageSizeOptions: ['10', '20', '30'],
onShowSizeChange:(current, pageSize)=>this.pageSize = pageSize // 改变每页数量时更新显示
@ -159,7 +159,7 @@ export default {
data: {}
}).then(res => {
if(res.code==200){
this.$message.success('删除球机成功');
this.$message.success('刪除球機成功');
this.handleGetCameraList()
}
}).catch(err => {
@ -172,9 +172,9 @@ export default {
videoConfig(){
const that = this
this.$confirm({
title: "生成全部视频流",
content: "确认生成全部视频流？",
okText: '确认',
title: "生成全部視頻流",
content: "確認生成全部視頻流？",
okText: '確認',
onOk() {
return new Promise((resolve, reject) => {
that.downConfig();

14
src/views/cameraManage/model.vue
Unescape Escape View File

@ -3,11 +3,11 @@
<template v-if="type=='add' || type=='edit'">
<a-modal
v-model="isShow"
:title="[type =='add' ? '新增球机':'编辑球机']"
:title="[type =='add' ? '新增球機':'編輯球機']"
:closable="closable"
@ok="handleOk"
@cancel="handleCancel"
ok-text="确认"
ok-text="確認"
cancel-text="取消"
class="add-edit-model"
>
@ -15,17 +15,17 @@
:form="form"
:wrapper-col="formItemAcrossLayout.wrapperCol"
>
<a-form-item label="球机名称" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="球機名稱" :label-col="formItemVerticalLayout.labelCol">
<a-input
v-decorator="['name', { rules: [{ required: true, message: '请输入球机名称!' }] }]"
v-decorator="['name', { rules: [{ required: true, message: '請輸入球機名稱!' }] }]"
/>
</a-form-item>
<a-form-item label="球机IP" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="球機IP" :label-col="formItemVerticalLayout.labelCol">
<a-input
v-decorator="['ip', { rules: [{ required: true, message: '请输入球机ip!' }] }]"
v-decorator="['ip', { rules: [{ required: true, message: '請輸入球機ip!' }] }]"
/>
</a-form-item>
<a-form-item label="视频流IP" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="視頻流IP" :label-col="formItemVerticalLayout.labelCol">
<a-input
v-decorator="['rtcServer']"
/>

8
src/views/center.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template>
<div class="center bg-white">
<div class="center-table">
<a-row>
<!-- <a-row>
<a-col span="4">登录账户</a-col>
<a-col span="8">{{userInfo.account || '-'}}</a-col>
@ -15,12 +15,12 @@
<a-col span="4">邮箱</a-col>
<a-col span="8">{{userInfo.email || '-'}}</a-col>
</a-row>
</a-row> -->
</div>
<a-row>
<a-col span="24" align="center">
<!-- <a-col span="24" align="center">
<a-button class="mt16" @click="editPwd">修改密码</a-button>
</a-col>
</a-col> -->
</a-row>
</div>
</template>

55
src/views/checkManage/checkOperation.vue
Unescape Escape View File

@ -8,7 +8,7 @@
<ul>
<li>
<span class="img-box-title">
核对状态:
核對狀態:
</span>
<span class="img-box-value">
{{ statusMap[checkObj.status] }}
@ -31,34 +31,12 @@
</viewer>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片
style="display: flex;align-items: center;justify-content: center;width:100px;height:400px;">
暫無圖片
</div>
<p>盘点图</p>
</div>
<div class="img-box">
<viewer v-if="checkObj.preoperationPic" style="height:300px;">
<img :src="imgUrl+checkObj.preoperationPic"/>
</viewer>
<div v-else style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片
</div>
<p>操作前照片</p>
</div>
<div class="img-box">
<viewer v-if="checkObj.overoperationPic" style="width:100%;height:300px;">
<img :src="imgUrl+checkObj.overoperationPic"/>
</viewer>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片
</div>
<p>操作后照片</p>
<p>盤點圖</p>
</div>
</div>
</div>
<div class="bottom-btn" >
@ -119,40 +97,33 @@ export default {
imgUrl: '',
params:[
{
label:'盘点批次号',
label:'盤點批次號',
key: 'lotnum'
},
{
label:'随行工单号',
label:'隨行工單號',
key: 'orderNum'
},
{
label:'盘点任务号',
label:'盤點任務號',
key: 'checkNum'
},
{
label:'货物系统条码号',
key: 'wmsCode'
},
{
label:'货物扫描条码号',
key: 'code'
},
{
label:'托盘系统条码号',
label:'托盤系統條碼號',
key: 'wmsTrayCode'
},
{
label:'托盘扫描条码号',
label:'托盤掃描條碼號',
key: 'trayCode'
},
{
label:'盘点时间',
label:'盤點時間',
key: 'exportTime'
},
],
statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"核对正确"}
statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"核對正確"}
}
},

16
src/views/checkManage/index.vue
Unescape Escape View File

@ -1,21 +1,19 @@
<template>
<div class="check-page">
<a-button type="primary" @click="exportStock" class="export-all">
导出全部巷道
</a-button>
<div class="title-info">
<span class="explain">颜色说明：</span>
<span class="explain">顏色說明</span>
<span class="info-text">
<a-tag color="#d81e06" style="width:30px;height:20px;margin-right:6px"></a-tag>
盘点错误
盤點錯誤
</span>
<span class="info-text">
<a-tag color="#1afa29" style="width:30px;height:20px;margin-right:6px"></a-tag>
盘点正确
盤點正確
</span>
<span class="info-text">
<a-tag color="#bfbfbf" style="width:30px;height:20px;margin-right:6px"></a-tag>
未盘点
未盤點
</span>
</div>
@ -31,7 +29,7 @@
<!--左货架DOM-->
<div class="center-box">
<span class="shelf-number">
左货架号: {{leftShelveId.shelveId}}
左貨架號: {{leftShelveId.shelveId}}
</span>
<a-radio-group v-model="size" style="margin:10px 0" @change="getStockRowColumn"
@ -55,7 +53,7 @@
<!--单伸类型右货架DOM-->
<div class="center-box">
<span class="shelf-number">
右货架号: {{rightShelveId.shelveId}}
右貨架號: {{rightShelveId.shelveId}}
</span>
<a-radio-group v-model="size2" style="margin:10px 0" @change="getStockRowColumn"

18
src/views/checkManage/model.vue
Unescape Escape View File

@ -2,11 +2,11 @@
<div v-if="isShow">
<a-modal
v-model="isShow"
title="复核调整"
title="複核調整"
:closable="closable"
@ok="handleOk"
@cancel="handleCancel"
ok-text="确认"
ok-text="確認"
cancel-text="取消"
class="p-model"
>
@ -14,12 +14,12 @@
:form="form"
:wrapper-col="formItemAcrossLayout.wrapperCol"
>
<a-form-item label="品规"
<a-form-item label="品規"
:label-col="formItemAcrossLayout.labelCol"
>
<a-input
@input="onInput"
v-decorator="['category', {rules: [{ required: true, message: '请输入品规名称!' }] }]"
v-decorator="['category', {rules: [{ required: true, message: '請輸入品規名稱!' }] }]"
/>
<happy-scroll class="search-list" v-if="searchListShow">
@ -30,11 +30,11 @@
</happy-scroll>
</a-form-item>
<a-form-item label="数量"
<a-form-item label="數量"
:label-col="formItemAcrossLayout.labelCol"
>
<a-input
v-decorator="['count', {rules: [{ required: true, message: '请输入数量!' }] }]"
v-decorator="['count', {rules: [{ required: true, message: '請輸入數量!' }] }]"
/>
</a-form-item>
</a-form>
@ -90,7 +90,7 @@ export default {
};
},
mounted() {
console.log('mounted执行了')
},
methods: {
handleOk() {
@ -110,7 +110,7 @@ export default {
}).then(res => {
if (res.code == 200) {
this.$emit('sure', false, this.i)
this.$message.success('复核成功');
this.$message.success('複核成功');
}
}).catch(err => {
@ -120,7 +120,7 @@ export default {
this.confirmLoading = false;
}, 500);
} else {
this.$message.error('该货位暂时没有记录');
this.$message.error('該貨位暫時沒有記錄');
}
},
handleCancel() {

44
src/views/historyCheck/index.vue
Unescape Escape View File

@ -14,29 +14,29 @@
</a-col>
<a-col :span="2">
<a-form-item label="左右货架">
<a-form-item label="左右貨架">
<a-select @change="leftRightChange" style="width: 80px" v-model="queryParam.leftRight">
<a-select-option value="0">
未选择
未選擇
</a-select-option>
<a-select-option value="1">
左侧
左側
</a-select-option>
<a-select-option value="2">
右侧
右側
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="2">
<a-form-item label="内外货架" v-if="queryParam.side >= 0">
<a-form-item label="內外貨架" v-if="queryParam.side >= 0">
<a-select style="width: 80px" :key="queryParam.side" >
<a-select-option key="0">
未选择
未選擇
</a-select-option>
<a-select-option key="1">
内
內
</a-select-option>
<a-select-option key="2">
外
@ -48,22 +48,22 @@
</a-col>
<a-col :span="2" style="text-align: left">
<a-form-item label="行号">
<a-input v-model="queryParam.row" placeholder="请输入" style="width:70px;" type="number"/>
<a-form-item label="行號">
<a-input v-model="queryParam.row" placeholder="請輸入" style="width:70px;" type="number"/>
</a-form-item>
</a-col>
<a-col :span="2" style="text-align: left">
<a-form-item label="列号">
<a-input v-model="queryParam.column" placeholder="请输入" style="width:70px;" type="number"/>
<a-form-item label="列號">
<a-input v-model="queryParam.column" placeholder="請輸入" style="width:70px;" type="number"/>
</a-form-item>
</a-col>
<a-col :span="4" style="text-align: left">
<a-form-item label="盘点号">
<a-input v-model="queryParam.lotnum" placeholder="请输入" style="width:270px;"/>
<a-form-item label="盤點號">
<a-input v-model="queryParam.lotnum" placeholder="請輸入" style="width:270px;"/>
</a-form-item>
</a-col>
<a-col :span="4">
<a-form-item label="时间">
<a-form-item label="時間">
<a-range-picker
@change="onTimeChange"
v-model="time"
@ -124,7 +124,7 @@ export default {
name: "historyCheck",
data() {
return {
statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"核对正确"},
statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"核對正確"},
queryParam: {
lotnum: '',
shelveId:'',
@ -141,7 +141,7 @@ export default {
pagination:{
total: 0,
defaultPageSize: 10, // 默认每页显示数量
showTotal: total => `共 ${total} 条数据`,// 显示总数
showTotal: total => `共 ${total} 條數據`,// 显示总数
showSizeChanger: true, // 显示可改变每页数量
pageSizeOptions: ['10', '20', '30'],
onShowSizeChange: (current, pageSize) => this.pageSize = pageSize // 改变每页数量时更新显示
@ -149,24 +149,24 @@ export default {
imgUrl: imgUrl,
columns: [
{
title: "盘点批次号",
title: "盤點批次號",
dataIndex: "lotnum",
},
{
title: "货位({货架}-{行}-{列})",
title: "貨位({貨架}-{行}-{列})",
// dataIndex: "goodsLocation",
scopedSlots: {customRender: 'goodsLocation'},
},
{
title: "系统托盘条码号",
title: "系統托盤條碼號",
dataIndex: "wmsTrayCode",
},
{
title: "扫描托盘条码号",
title: "掃描托盤條碼號",
dataIndex: "trayCode",
},
{
title: "盘点状态",
title: "盤點狀態",
scopedSlots: {customRender: 'status'},
},
{
@ -175,7 +175,7 @@ export default {
width:320,
},
{
title: "时间",
title: "時間",
dataIndex: "createTime",
},

18
src/views/plcStatus.vue
Unescape Escape View File

@ -8,10 +8,10 @@
@change="handleGetCameraIoList"
>
<span slot="status" slot-scope="text">
{{text == false ? text ='连接异常':text ='没有PLC连接异常'}}
{{text == false ? text ='連接異常':text ='正常'}}
</span>
<span slot="action" slot-scope="text, record">
<a @click="reconnection(record)">重新连接</a>
<a @click="reconnection(record)">重新連接</a>
</span>
</a-table>
</div>
@ -21,7 +21,7 @@
<script>
const columns = [
{
title: '序号',
title: '序號',
// dataIndex: 'id',
customRender: (text, record, index) => {
return (
@ -30,16 +30,16 @@ const columns = [
}
},
{
title: 'PLCID',
title: '標識',
dataIndex: 'plcId',
},
{
title: '状态',
title: '狀態',
dataIndex: 'status',
scopedSlots: {customRender: 'status'}
},
{
title: '异常时间',
title: '異常時間',
dataIndex: 'time',
},
{
@ -58,7 +58,7 @@ export default {
total: 0,
current: 1,
defaultPageSize: 10, // 默认每页显示数量
showTotal: total => `共 ${total} 条数据`, // 显示总数
showTotal: total => `共 ${total} 條數據`, // 显示总数
showSizeChanger: true, // 显示可改变每页数量
pageSizeOptions: ['10', '20', '30'],
onShowSizeChange: (current, pageSize) => this.pageSize = pageSize // 改变每页数量时更新显示
@ -110,10 +110,10 @@ export default {
params: {id: id}
}).then(res => {
if (res.code == 200) {
this.$message.success('连接成功');
this.$message.success('連接成功');
this.request()
} else {
this.$message.error('连接失败');
this.$message.error('連接失敗');
}
}).catch(err => {

20
src/views/productSpecManage/index.vue
Unescape Escape View File

@ -15,11 +15,11 @@
style="margin-right:15px"
>
<a-button type="primary" >
导入
導入
</a-button>
</a-upload>
<a-button type="" @click="categoryExportModel">
模板下载
模板下載
</a-button>
</div>
<a-table
@ -33,14 +33,14 @@
<span slot="action" slot-scope="text, record">
<a-divider type="vertical"/>
<a @click="showModel('edit',record)">
编辑
編輯
</a>
<a-divider type="vertical"/>
<a-popconfirm
title="是否删除?"
title="是否刪除?"
@confirm="() => delDosage(record)"
>
<a>删除</a>
<a>刪除</a>
</a-popconfirm>
</span>
</a-table>
@ -60,7 +60,7 @@ import Model from "./model.vue"
import {importCategoryExcelUrl} from "@/api/importExcel";
const columns = [
{
title: '序号',
title: '序號',
// dataIndex: 'id',
customRender: (text, record, index) => {
return (
@ -69,15 +69,15 @@ const columns = [
}
},
{
title: '品类',
title: '品類',
dataIndex: 'name',
},
{
title: '条码',
title: '條碼',
dataIndex: 'code',
},
{
title: '修改时间',
title: '修改時間',
dataIndex: 'updateTime',
},
{
@ -96,7 +96,7 @@ export default {
total:0,
current:1,
defaultPageSize:10, // 默认每页显示数量
showTotal: total => `共 ${total} 条数据`, // 显示总数
showTotal: total => `共 ${total} 條數據`, // 显示总数
showSizeChanger:true, // 显示可改变每页数量
pageSizeOptions: ['10', '20', '30'],
onShowSizeChange:(current, pageSize)=>this.pageSize = pageSize // 改变每页数量时更新显示

16
src/views/productSpecManage/model.vue
Unescape Escape View File

@ -3,11 +3,11 @@
<template v-if="type=='add' || type=='edit'">
<a-modal
v-model="isShow"
:title="[type =='add' ? '新增品规':'编辑品规']"
:title="[type =='add' ? '新增品規':'編輯品规']"
:closable="closable"
@ok="handleOk"
@cancel="handleCancel"
ok-text="确认"
ok-text="確認"
cancel-text="取消"
class="p-model"
>
@ -15,21 +15,21 @@
:form="form"
:wrapper-col="formItemAcrossLayout.wrapperCol"
>
<a-form-item label="名称"
<a-form-item label="名稱"
:label-col="formItemVerticalLayout.labelCol"
>
<a-input
v-decorator="['name', { rules: [{ required: true, message: '请输入品规名称!' }] }]"
v-decorator="['name', { rules: [{ required: true, message: '請輸入品規名稱!' }] }]"
/>
</a-form-item>
<a-form-item label="条码"
<a-form-item label="條碼"
:label-col="formItemVerticalLayout.labelCol"
>
<a-input
v-decorator="['code', { rules: [{ required: true, message: '请输入条码!' }] }]"
v-decorator="['code', { rules: [{ required: true, message: '請輸入條碼!' }] }]"
/>
</a-form-item>
</a-form>
@ -92,7 +92,7 @@ export default {
};
},
mounted() {
console.log('mounted执行了')
console.log('mounted')
},
methods: {
handleOk() {
@ -120,7 +120,7 @@ export default {
}).then(res => {
if (res.code == 200) {
this.$emit('sure', false)
this.$message.success('编辑品规成功');
this.$message.success('編輯品规成功');
}
}).catch(err => {

46
src/views/roadwayManage/index.vue
Unescape Escape View File

@ -2,10 +2,10 @@
<div>
<div class="button-box">
<a-button type="primary" class="open" @click="confirmLight('open')">
打开光源
打開光源
</a-button>
<a-button type="primary" class="close" @click="confirmLight('close')">
关闭光源
關閉光源
</a-button>
<a-button type="primary" @click="showModel('add','')">
新增巷道
@ -22,10 +22,10 @@
@change="handleGetStreetList"
>
<span slot="leftType" slot-scope="text">
{{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
{{ text === null ? '-' : text === 0 ? '單伸' : '雙伸' }}
</span>
<span slot="rightType" slot-scope="text">
{{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
{{ text === null ? '-' : text === 0 ? '單伸' : '雙伸' }}
</span>
<span slot="plc" slot-scope="text" v-if="text.plcIp">
{{ text.plcIp }}:{{text.plcPort}}
@ -56,14 +56,14 @@
</span>
<span slot="action" slot-scope="text, record">
<a @click="showModel('edit',record)">
编辑
編輯
</a>
<a-divider type="vertical"/>
<a-popconfirm
title="是否删除?"
title="是否刪除?"
@confirm="() => delDosage(record)"
>
<a>删除</a>
<a>刪除</a>
</a-popconfirm>
</span>
</a-table>
@ -83,11 +83,11 @@
import Model from "./model.vue"
const columns = [
{
title: '巷道名称',
title: '巷道名稱',
dataIndex: 'name',
},
{
title: '巷道标识',
title: '巷道標識',
dataIndex: 'plcId',
},
{
@ -103,25 +103,25 @@ const columns = [
scopedSlots: { customRender: 'RFID' }
},
{
title: '扫码枪',
title: '掃碼槍',
scopedSlots: { customRender: 'sensorGun' }
},
{
title: '左货架类型',
title: '左貨架類型',
dataIndex: 'leftType',
scopedSlots: { customRender: 'leftType' }
},
{
title: '右货架类型',
title: '右貨架類型',
dataIndex: 'rightType',//若这里保留，slot插槽的text即代表rightType，否则text.rightType才代表rightType本身
scopedSlots: {customRender: 'rightType'}
},
{
title: '对应球机',
title: '對應球機',
scopedSlots: { customRender: 'actions' }
},
{
title: '修改时间',
title: '修改時間',
dataIndex: 'updateTime',
},
{
@ -139,7 +139,7 @@ export default {
pagination:{
total:0,
defaultPageSize:10, // 默认每页显示数量
showTotal: total => `共 ${total} 条数据`, // 显示总数
showTotal: total => `共 ${total} 條數據`, // 显示总数
showSizeChanger:true, // 显示可改变每页数量
pageSizeOptions: ['10', '20', '30'],
onShowSizeChange:(current, pageSize)=>this.pageSize = pageSize // 改变每页数量时更新显示
@ -188,7 +188,7 @@ export default {
if(type=='add'){
this.modelTitle = "新增巷道"
}else if(type=='edit'){
this.modelTitle = "编辑巷道"
this.modelTitle = "編輯巷道"
this.modelData = data
}
},
@ -209,7 +209,7 @@ export default {
data: {}
}).then(res => {
if(res.code==200){
this.$message.success('删除巷道成功');
this.$message.success('刪除巷道成功');
this.handleGetStreetList()
}
}).catch(err => {
@ -220,9 +220,9 @@ export default {
const that = this
if(type == "open"){
this.$confirm({
title: "打开光源",
content: "确认打开光源？",
okText: '确认',
title: "打開光源",
content: "確認打開光源？",
okText: '確認',
onOk() {
return new Promise((resolve, reject) => {
that.openLight();
@ -233,9 +233,9 @@ export default {
});
}else{
this.$confirm({
title: "关闭光源",
content: "确认关闭光源？",
okText: '确认',
title: "關閉光源",
content: "確認關閉光源？",
okText: '確認',
onOk() {
return new Promise((resolve, reject) => {
that.closeLight();

108
src/views/roadwayManage/model.vue
Unescape Escape View File

@ -6,7 +6,7 @@
:closable="closable"
@ok="handleOk"
@cancel="handleCancel"
ok-text="确认"
ok-text="確認"
cancel-text="取消"
class="p-model"
>
@ -15,14 +15,14 @@
:wrapper-col="formItemAcrossLayout.wrapperCol"
>
<div class="across-layout">
<a-form-item label="巷道名称" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="巷道名稱" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['name', { rules: [{ required: true, message: '请输入巷道名称!' }] }]"
v-decorator="['name', { rules: [{ required: true, message: '請輸入巷道名稱!' }] }]"
/>
</a-form-item>
<a-form-item label="巷道标识" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="巷道標識" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['plcId', { rules: [{ required: true, message: '请输入巷道标识!' }] }]"
v-decorator="['plcId', { rules: [{ required: true, message: '請輸入巷道標識!' }] }]"
/>
</a-form-item>
</div>
@ -65,66 +65,66 @@
<a-divider></a-divider>
<div class="leftType">
<h3>左货架</h3>
<h3>左貨架</h3>
<a-form-item label="类型" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="類型" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'leftType',
{ rules: [{ required: true, message: '请选择类型!' }] },
{ rules: [{ required: true, message: '請選擇類型!' }] },
]"
placeholder="选择类型"
placeholder="選擇類型"
@change="handleSelectChangeLeft"
>
<a-select-option value="0">
单伸
單伸
</a-select-option>
<a-select-option value="1">
双伸
雙伸
</a-select-option>
</a-select>
</a-form-item>
<div class="across-layout">
<a-form-item label="货架规格" :label-col="{ span:7}">
<a-form-item label="貨架規格" :label-col="{ span:7}">
<a-input
v-decorator="['leftRow', { rules: [{ required: true, message: '请输入行数!' }] }]"
v-decorator="['leftRow', { rules: [{ required: true, message: '請輸入行數!' }] }]"
suffix="行"
/>
</a-form-item>
<a-form-item label="" :wrapper-col="{span:20}">
<a-input
v-decorator="['leftColumn', { rules: [{ required: true, message: '请输入列数!' }] }]"
v-decorator="['leftColumn', { rules: [{ required: true, message: '請輸入列數!' }] }]"
suffix="列"
/>
</a-form-item>
</div>
<div class="across-layout" v-if="leftType =='0'">
<a-form-item label="货架号" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="貨架號" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftShelveId', { rules: [{ required: true, message: '请输入货架号!' }] }]"
v-decorator="['leftShelveId', { rules: [{ required: true, message: '請輸入貨架號!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout" v-if="leftType =='1'">
<a-form-item label="内货架号" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="內貨架號" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
v-decorator="['leftInsideShelveId', { rules: [{ required: true, message: '請輸入內貨架號!' }] }]"
/>
</a-form-item>
<a-form-item label="外货架号" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="外貨架號" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
v-decorator="['leftOutsideShelveId', { rules: [{ required: true, message: '請輸入外貨架號!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout">
<a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="掃碼槍IP" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftSensorGunIp']"
/>
</a-form-item>
<a-form-item label="扫码枪PORT" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="掃碼槍PORT" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['leftSensorGunPort']"
/>
@ -134,64 +134,64 @@
</div>
<div class="leftType">
<h3>右货架</h3>
<a-form-item label="类型" :label-col="formItemVerticalLayout.labelCol">
<h3>右貨架</h3>
<a-form-item label="類型" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'rightType',
{ rules: [{ required: true, message: '请选择类型!' }] },
{ rules: [{ required: true, message: '請選擇類型!' }] },
]"
placeholder="选择类型"
placeholder="選擇類型"
@change="handleSelectChangeRight"
>
<a-select-option value="0">
单伸
單伸
</a-select-option>
<a-select-option value="1">
双伸
雙伸
</a-select-option>
</a-select>
</a-form-item>
<div class="across-layout">
<a-form-item label="货架规格" :label-col="{ span:7}">
<a-form-item label="貨架規格" :label-col="{ span:7}">
<a-input
v-decorator="['rightRow', { rules: [{ required: true, message: '请输入行!' }] }]"
v-decorator="['rightRow', { rules: [{ required: true, message: '請輸入行數!' }] }]"
suffix="行"
/>
</a-form-item>
<a-form-item label="" :wrapper-col="{span:20}">
<a-input
v-decorator="['rightColumn', { rules: [{ required: true, message: '请输入列!' }] }]"
v-decorator="['rightColumn', { rules: [{ required: true, message: '請輸入列數!' }] }]"
suffix="列"
/>
</a-form-item>
</div>
<div class="across-layout" v-if="rightType =='0'">
<a-form-item label="货架号" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="貨架號" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightShelveId', { rules: [{ required: true, message: '请输入货架号!' }] }]"
v-decorator="['rightShelveId', { rules: [{ required: true, message: '請輸入貨架號!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout" v-if="rightType =='1'">
<a-form-item label="内货架号" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="內貨架號" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
v-decorator="['rightInsideShelveId', { rules: [{ required: true, message: '請輸入內貨架號!' }] }]"
/>
</a-form-item>
<a-form-item label="外货架号" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="外貨架號" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
v-decorator="['rightOutsideShelveId', { rules: [{ required: true, message: '請輸入外貨架號!' }] }]"
/>
</a-form-item>
</div>
<div class="across-layout">
<a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="掃碼槍IP" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightSensorGunIp']"
/>
</a-form-item>
<a-form-item label="扫码枪PORT" :label-col="formItemAcrossLayout.labelCol">
<a-form-item label="掃碼槍PORT" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['rightSensorGunPort']"
/>
@ -200,12 +200,12 @@
<a-divider></a-divider>
</div>
<div v-if="cameraList.length>0">
<a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="球機1" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera1Id',
]"
placeholder="选择球机"
placeholder="選擇球機"
@dropdownVisibleChange="handleSelectCamera"
>
<a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
@ -213,12 +213,12 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="球機2" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera2Id',
]"
placeholder="选择球机"
placeholder="選擇球機"
>
<a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
{{item.name}}
@ -227,12 +227,12 @@
</a-form-item>
</div>
<div v-else>
<a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="球機1" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera1Name',
]"
placeholder="选择球机"
placeholder="選擇球機"
@dropdownVisibleChange="handleSelectCamera"
>
<a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
@ -240,12 +240,12 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol">
<a-form-item label="球機2" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera2Name',
]"
placeholder="选择球机"
placeholder="選擇球機"
>
<a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
{{item.name}}
@ -339,7 +339,7 @@ export default {
};
},
mounted() {
console.log('mounted执行了')
console.log('mounted')
},
methods: {
handleOk() {
@ -367,21 +367,21 @@ export default {
}).catch(err => {
});
}else if(this.title=='编辑巷道'){
}else if(this.title=='編輯巷道'){
values.id = this.id
switch (values.leftType) {
case '单伸':
case '單伸':
values.leftType='0'
break;
case '双伸':
case '雙伸':
values.leftType='1'
break;
}
switch (values.rightType) {
case '单伸':
case '單伸':
values.rightType='0'
break;
case '双伸':
case '雙伸':
values.rightType='1'
break;
}
@ -395,7 +395,7 @@ export default {
}).then(res => {
if(res.code==200){
this.$emit('sure',false)
this.$message.success('编辑巷道成功');
this.$message.success('編輯巷道成功');
}
}).catch(err => {

2
src/views/updateStyles/index.vue
Unescape Escape View File

@ -72,7 +72,7 @@ export default {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
this.updateStyles(this.formData);
this.$message.success('刷新后生效')
this.$message.success('刷新後生效')
} else {
console.log('error submit!!');
return false;

Write Preview
Loading…
Cancel
Save