diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-15.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-15.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-18.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-18.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-20.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-20.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-15.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-15.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-18.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-18.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-20.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-20.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs2/nladmin-ui/dist (2).zip b/acs2/nladmin-ui/dist (2).zip new file mode 100644 index 000000000..7431eb8e4 Binary files /dev/null and b/acs2/nladmin-ui/dist (2).zip differ diff --git a/acs2/nladmin-ui/dist.zip b/acs2/nladmin-ui/dist.zip new file mode 100644 index 000000000..df068c6bb Binary files /dev/null and b/acs2/nladmin-ui/dist.zip differ diff --git a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue index 492c3ea73..c39409845 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -220,6 +220,29 @@ {{ $t('auto.common.Confirm') }} + + + + + + + + + + + + + + {{ $t('auto.common.false') }} + {{ $t('auto.common.true') }} + + + + + @@ -229,6 +252,7 @@ import deviceCrud from '@/api/acs/device/device' import { getDeviceByCodes } from '@/api/acs/device/deviceStageMonitor' import '@logicflow/core/dist/style/index.css' import '@logicflow/extension/lib/style/index.css' +import paramCrud from '@/api/system/param' import { LogicFlow } from '@logicflow/core' import { registerCustomElement } from '@/views/system/logicflow/editor/components/node' @@ -265,6 +289,7 @@ export default { hasGoodStatus: null, barcode: '', hand_barcode: '', + hand_material_barcode: '', suspended: null, material_type: '', requireSucess: '', @@ -416,6 +441,8 @@ export default { this.dialogFormVisible8 = true } else if (clickObj.data.driver_type === 'pull_head_manipulator') { this.dialogFormVisible9 = true + } else if (clickObj.data.driver_type === 'conveyor_with_scanner_weight') { + this.dialogFormVisible10 = true } else { this.dialogFormVisible = true } @@ -446,7 +473,7 @@ export default { } this.arr = [] // 清空 if (item.device_code && item.data) { - // console.log('item', item) + console.log('item', item) this.arr = [ { name: i18n.t('monitor.click.equipment_number'), value: item.device_code }, { name: i18n.t('monitor.click.device_name'), value: item.device_name } @@ -626,7 +653,7 @@ export default { const obj = { name: i18n.t('monitor.click.inventory_quantity'), value: data[val] } this.arr.push(obj) } else if (val === 'hand_barcode') { - const obj = { name: 'barcode', value: data[val] } + const obj = { name: 'hand_barcode', value: data[val] } this.arr.push(obj) } else if (val === 'x') { const obj = { name: 'X', value: data[val] } @@ -715,6 +742,7 @@ export default { this.dialogFormVisible7 = false this.dialogFormVisible8 = false this.dialogFormVisible9 = false + this.dialogFormVisible10 = false this.initStageData() }).catch(err => { this.dialogFormVisible = false @@ -724,6 +752,7 @@ export default { this.dialogFormVisible7 = false this.dialogFormVisible8 = false this.dialogFormVisible9 = false + this.dialogFormVisible10 = false console.log(err.response.data.message) }) }, @@ -736,6 +765,20 @@ export default { this.dialogFormVisible1 = false console.log(err.response.data.message) }) + }, + initStageData() { + // 获取舞台编码 + if (this.stage_code !== '') { + crudStage.getNewStageDataByCode(this.stage_code).then(res => { // 通过舞台编码获取舞台数据并且赋值到lf对象 + data = JSON.parse(res.stage_data) + lf.render(data) + this.initStatus() // 初始化状态 + }) + } + // this.timer = setInterval(() => { // 定时刷新设备的状态信息 + // console.log('定时器启动') + // this.initStatus() + // }, 2000) } } } @@ -780,22 +823,24 @@ body { background: #e5e5e5; } -::v-deep.el-radio-button{ +::v-deep.el-radio-button { margin-right: 15px; - border-radius:4px; + border-radius: 4px; +} + +.el-radio-button__inner { + width: 90px; + height: 30px; + background: #F7F8FA; + color: #333; + border: 0 !important; +} + +.el-radio-button__orig-radio:checked + .el-radio-button__inner { + color: #fff; + background-color: blue; + border-color: blue; + box-shadow: -1px 0 0 0 blue; } - .el-radio-button__inner { - width: 90px; - height: 30px; - background: #F7F8FA; - color:#333; - border: 0 !important; - } - .el-radio-button__orig-radio:checked + .el-radio-button__inner { - color: #fff; - background-color: blue; - border-color: blue; - box-shadow: -1px 0 0 0 blue; - }