diff --git a/src/views/Exhibition/CIFM/components/BoardBar.vue b/src/views/Exhibition/CIFM/components/BoardBar.vue index 49d08ac..015ae57 100644 --- a/src/views/Exhibition/CIFM/components/BoardBar.vue +++ b/src/views/Exhibition/CIFM/components/BoardBar.vue @@ -54,7 +54,7 @@ let config = reactive({ evenRowBGC: 'transparent', wrap: [false, true, false, false, false], columnWidth: [80, 295, 145, 110, 110,85], - align: ['center', 'left', 'center', 'center', 'center', 'center'], + align: ['center', 'center', 'center', 'center', 'center', 'center'], rowNum: prop.rowNum, waitTime: 3000, }) diff --git a/src/views/Exhibition/CIFM/index.ts b/src/views/Exhibition/CIFM/index.ts new file mode 100644 index 0000000..08d6fc4 --- /dev/null +++ b/src/views/Exhibition/CIFM/index.ts @@ -0,0 +1,245 @@ +export function getTopDevice() { + return { + "code": 200, + "msg": "操作成功", + "data": { + "材料缝制设备": { + "value": [ + [ + "无梭机+裁切机", + "101", + "123m", + "95.0%", + "2" + ], + [ + "输送机", + "102", + "123m", + "80.0%", + "2" + ],[ + "厚料床垫锁边机", + "103", + "123m", + "80.0%", + "1" + ], + + ], + "chart": { + "series": [ + { + "data": [ + 50,100,70 + ], + "name": "计划完成" + }, + { + "data": [ + 70,70,80 + ], + "name": "实际完成" + } + ], + "xData": [ + "无移机+裁切机", + "输送机", + "厚料床热锁边利", + ] + } + }, + "包装设备": { + "value": [ + [ + "滚胶机", + "201", + "123min", + "95.0%", + "2" + ], + [ + "平面压板机", + "202", + "123min", + "95.0%", + "1" + ], + [ + "床垫翻转围边机1", + "203", + "123min", + "95.0%", + "2" + ], + [ + "输送线1", + "204", + "123min", + "95.0%", + "2" + ], + [ + "质检台1", + "205", + "123min", + "95.0%", + "2" + ], + [ + "储料架", + "206", + "123min", + "95.0%", + "0" + ], + [ + "输送线2", + "207", + "123min", + "95.0%", + "0" + ], + [ + "质检台2", + "208", + "123min", + "95.0%", + "2" + ], + [ + "输送线3", + "209", + "123min", + "95.0%", + "2" + ], + [ + "床垫翻转围边机2", + "210", + "123min", + "95.0%", + "0" + ], + [ + "质检台3", + "211", + "123min", + "95.0%", + "0" + ], + [ + "输送线4", + "212", + "123min", + "95.0%", + "2" + ], + [ + "床垫翻转围边机3", + "213", + "123min", + "95.0%", + "1" + ], + [ + "输送线5", + "214", + "123min", + "95.0%", + "0" + ], + [ + "床垫翻转围边机4", + "215", + "123min", + "95.0%", + "2" + ], + [ + "输送线6", + "216", + "123min", + "95.0%", + "0" + ], + [ + "床垫翻转围边机5", + "217", + "123min", + "95.0%", + "0" + ] + + ], + "chart": { + "series": [ + { + "data": [ + 45,100,80,45,80 + ], + "name": "计划完成" + }, + { + "data": [ + 70,70,80,70,80 + ], + "name": "实际完成" + } + ], + "xData": [ + "滚胶机", + "平面乐板机", + "床垫翻转围边机1", + "床垫翻转围边机2", + "质检台" + ] + } + + }, + "生产线设备": { + "value": [ + [ + "床垫压缩包装机", + "301", + "123m", + "95.0%", + "2" + ], + [ + "床垫薄膜包装机", + "302", + "123m", + "95.0%", + "2" + ], + ], + "chart": { + "series": [ + { + "data": [ + 50, + 100, + ], + "name": "计划完成" + }, + { + "data": [ + 70,70 + ], + "name": "实际完成" + } + ], + "xData": [ + "床垫压缩包装机", + "床垫薄膜包装机", + ] + } + }, + } + } +} + +export function getCismaList(type) { + return {"code":200,"msg":"操作成功","data":{"devnum":{"all":22,"wait":3,"off":7,"on":12}}} +} \ No newline at end of file diff --git a/src/views/Exhibition/CIFM/index.vue b/src/views/Exhibition/CIFM/index.vue index 7874586..3ae51f2 100644 --- a/src/views/Exhibition/CIFM/index.vue +++ b/src/views/Exhibition/CIFM/index.vue @@ -2,15 +2,16 @@
-
- - - + + +
@@ -23,14 +24,14 @@
- - + +
- + @@ -62,8 +63,7 @@ import BoardBar from "./components/BoardBar.vue"; import ringChart from "./components/ringChart.vue"; import StepItem from './components/StepItem.vue' -import { getTopDevice, getCismaList } from '@/http/cisma' -import {scDeviceList} from '@/http/Exhibition/SCISMA' +import { getTopDevice, getCismaList } from './index' import { connectWebsocket, closeWebsocket } from "@/utils/websocket" import { useI18n } from 'vue-i18n' @@ -76,17 +76,17 @@ let devnum = reactive({ }) let stepList = reactive([ { - name: '冲孔设备', + name: '材料缝制设备', total: 0, online: 0, }, { - name: '缝纫设备', + name: '生产线设备', total: 0, online: 0, }, { - name: '版房设备', + name: '包装设备', total: 0, online: 0, } @@ -136,16 +136,11 @@ let ringData = computed(() => { ] }) -function setData(data:any) { +function setData(data: any) { data.value = data.value.map((item, index) => { item.unshift(index + 1) return item }) - data.chart.xData = data.chart.xData.map((item) => { - let index = data.value.findIndex((i) => i[2] == item) - let label = data.value[index][1] - return label - }) data.chart.series = data.chart.series.map((item) => { item.type = 'bar' @@ -162,29 +157,30 @@ function setData(data:any) { let labelList = ref() async function getTopDeviceData() { - let res = await scDeviceList() as any + let res = await getTopDevice() as any if (res.code === 200) { // setfengren(res.data.缝纫设备) // setbanfang(res.data.版房设备) // setcaijian(res.data.裁剪设备) - fengren.value = setData(res.data.缝纫设备) - banfang.value = setData(res.data.版房设备) - chongkong.value = setData(res.data.冲孔设备) + chongkong.value = setData(res.data.材料缝制设备) + banfang.value = setData(res.data.包装设备) + fengren.value = setData(res.data.生产线设备) + labelList.value = []; - labelList.value.push(...fengren.value.value.map((item,i) => { - return { label: item[2],index:i,name:'fengren',status:item[5]} + labelList.value.push(...fengren.value.value.map((item, i) => { + return { label: item[2], index: i, name: 'fengren', status: item[5] } })) - labelList.value.push(...banfang.value.value.map((item,i) => { - return { label: item[2],index:i,name:'banfang',status:item[5]} + labelList.value.push(...banfang.value.value.map((item, i) => { + return { label: item[2], index: i, name: 'banfang', status: item[5] } })) - labelList.value.push(...chongkong.value.value.map((item,i) => { - return { label: item[2],index:i,name:'chongkong',status:item[5]} + labelList.value.push(...chongkong.value.value.map((item, i) => { + return { label: item[2], index: i, name: 'chongkong', status: item[5] } })) } } async function getCismaListData() { - let res = await getCismaList({s:'SC'}) as any + let res = await getCismaList({ s: 'SC' }) as any if (res.code === 200) { devnum.on = res.data.devnum.on devnum.off = res.data.devnum.off @@ -204,7 +200,7 @@ function getWebsocket(val) { let index = labelList.value.findIndex((item, index) => { return item['label'] == RackNumber }) - + if (index !== -1) { let name = labelList.value[index].name let i = labelList.value[index].index @@ -216,11 +212,11 @@ function getWebsocket(val) { } else if (name == 'chongkong') { chongkong.value.value[i][5] = WorkingState } - + devnum.on = labelList.value.filter((item) => item.status == '2').length - devnum.wait = labelList.value.filter((item) => item.status == '1'||item.status == '3').length + devnum.wait = labelList.value.filter((item) => item.status == '1' || item.status == '3').length devnum.off = labelList.value.filter((item) => item.status == '0').length - + } } @@ -234,12 +230,14 @@ function errWebsocket(val) { } onMounted(() => { - getTopDeviceData() - getCismaListData() - timer = setInterval(()=>{ + setTimeout(() => { getTopDeviceData() - },1000*30) - connectWebsocket(null, null, getWebsocket, errWebsocket) + getCismaListData() + }, 100) + // timer = setInterval(()=>{ + // getTopDeviceData() + // },1000*30) + // connectWebsocket(null, null, getWebsocket, errWebsocket) document.getElementById('app').style.backgroundColor = '#0E0E0E' })