root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 内包间A1优化

Browse Source
This commit is contained in:
yanps
2024-01-06 18:18:39 +08:00
parent 7850601b6c
commit ad01512522
9 changed files with 119 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
acs/nladmin-ui/dist.rar
View File

Binary file not shown.

1
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -644,6 +644,7 @@ export default {
})
getDicts().then(data => {
this.dicts = data
console.log(this.dict.label.task_status[3])
})
},
methods: {

35
acs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -223,7 +223,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 { getDicts } from '@/api/system/dict'
import { LogicFlow } from '@logicflow/core'
import { registerCustomElement } from '@/views/system/logicflow/editor/components/node'
@@ -231,6 +231,7 @@ let data = {}
let lf = ''
export default {
name: 'MonitorDevice',
dicts: ['material'],
data() {
return {
stageParam: 'stage_code', // 舞台参数
@@ -342,6 +343,11 @@ export default {
lf.render(data)
this.initStageData()
},
created() {
getDicts().then(data => {
this.dicts = data
})
},
initStageData() {
// 获取舞台编码
paramCrud.getValueByCode(this.stageParam).then(res => {
@@ -672,73 +678,73 @@ export default {
const obj = { name: '光电信号2', value: data[val] }
this.arr.push(obj)
} else if (val === 'material1') {
const obj = { name: '物料1', value: data[val] }
const obj = { name: '物料1', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty1') {
const obj = { name: '数量1', value: data[val] }
this.arr.push(obj)
} else if (val === 'material2') {
const obj = { name: '物料2', value: data[val] }
const obj = { name: '物料2', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty2') {
const obj = { name: '数量2', value: data[val] }
this.arr.push(obj)
} else if (val === 'material3') {
const obj = { name: '物料3', value: data[val] }
const obj = { name: '物料3', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty3') {
const obj = { name: '数量3', value: data[val] }
this.arr.push(obj)
} else if (val === 'material4') {
const obj = { name: '物料4', value: data[val] }
const obj = { name: '物料4', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty4') {
const obj = { name: '数量4', value: data[val] }
this.arr.push(obj)
} else if (val === 'material5') {
const obj = { name: '物料5', value: data[val] }
const obj = { name: '物料5', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty5') {
const obj = { name: '数量5', value: data[val] }
this.arr.push(obj)
} else if (val === 'material6') {
const obj = { name: '物料6', value: data[val] }
const obj = { name: '物料6', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty6') {
const obj = { name: '数量6', value: data[val] }
this.arr.push(obj)
} else if (val === 'material7') {
const obj = { name: '物料7', value: data[val] }
const obj = { name: '物料7', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty7') {
const obj = { name: '数量7', value: data[val] }
this.arr.push(obj)
} else if (val === 'material8') {
const obj = { name: '物料8', value: data[val] }
const obj = { name: '物料8', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty8') {
const obj = { name: '数量8', value: data[val] }
this.arr.push(obj)
} else if (val === 'material9') {
const obj = { name: '物料9', value: data[val] }
const obj = { name: '物料9', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty9') {
const obj = { name: '数量9', value: data[val] }
this.arr.push(obj)
} else if (val === 'material10') {
const obj = { name: '物料10', value: data[val] }
const obj = { name: '物料10', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty10') {
const obj = { name: '数量10', value: data[val] }
this.arr.push(obj)
} else if (val === 'material11') {
const obj = { name: '物料11', value: data[val] }
const obj = { name: '物料11', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty11') {
const obj = { name: '数量11', value: data[val] }
this.arr.push(obj)
} else if (val === 'material12') {
const obj = { name: '物料12', value: data[val] }
const obj = { name: '物料12', value: this.dict.label.material[data[val]] }
this.arr.push(obj)
} else if (val === 'z_qty12') {
const obj = { name: '数量12', value: data[val] }
@@ -752,6 +758,9 @@ export default {
} else if (val === 'now_steps_type') {
const obj = { name: '烘箱执行信号', value: data[val] }
this.arr.push(obj)
} else if (val === 'version') {
const obj = { name: '轴代数', value: data[val] }
this.arr.push(obj)
}
}
}