diff --git a/src/store/module/MicroExhibition.ts b/src/store/module/MicroExhibition.ts index 0d1d560..0226a2f 100644 --- a/src/store/module/MicroExhibition.ts +++ b/src/store/module/MicroExhibition.ts @@ -125,5 +125,38 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, { }) this.zuoyi = data; }, + changestatus(data) { + let map = { + '1171512':'zuoyi', + '1170304':'zuoyi', + '1171902':'zuoyi', + '10201557':'zuoyi', + '116023#':'tuoxie', + '104019420':'banfang', + '104019428':'banfang', + '1131514':'banfang', + '10404393':'banfang', + '10410207':'banfang', + '10102109':'fengzhong', + 'RP2011001':'fengzhong', + 'RP2011157':'fengzhong', + 'RPO00000OLS':'fengzhong', + '10102154':'fengzhong', + '1050910':'caijian', + '1190269':'caijian', + } + let {RackNumber,WorkingState} = data + let key = map[RackNumber] + this[key].value.forEach((item)=>{ + let index = item.findIndex((item2)=>{ + return item2==RackNumber + }) + if(index!=-1){ + item[item.length-1] = WorkingState + } + }) + + } + }, }); diff --git a/src/views/MicroExhibition/components/BoardBar.vue b/src/views/MicroExhibition/components/BoardBar.vue index cfad563..5b87f3a 100644 --- a/src/views/MicroExhibition/components/BoardBar.vue +++ b/src/views/MicroExhibition/components/BoardBar.vue @@ -53,12 +53,10 @@ let config = reactive({ align: ['center', 'center', 'center', 'center', 'center', 'center'], rowNum: 2, waitTime: 3000, - data: [ - ] }) const handleData = () => { - config.data = prop.data.map((items: any) => { + let updateList = prop.data.map((items: any) => { return items.map((item: any, index: number) => { if (index == (items.length - 1)) { return statusHtml(status_color[item]) @@ -66,6 +64,7 @@ const handleData = () => { return item }) }) + devList.value.updateRows(updateList,config) } watch(()=>prop.data, (newVal, oldVal) => { handleData() diff --git a/src/views/MicroExhibition/components/DevCard.vue b/src/views/MicroExhibition/components/DevCard.vue index cb88a3b..be3356c 100644 --- a/src/views/MicroExhibition/components/DevCard.vue +++ b/src/views/MicroExhibition/components/DevCard.vue @@ -8,10 +8,10 @@
{{ item }}
-
-
{{ index == last_index?'':item}}
+
+
{{ index == (items.length - 1)?'':item}}
@@ -25,12 +25,8 @@ const prop = defineProps({ type: Array, default: ['机架号', '状态', '布料层数', '裁片数量'] }, - last_index: { - type: Number, - default: 3 - }, dev_value: { - type: [Array], + type: Array, default: [ [102014422, '待机', '40层', '0'] ] diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue index a8d167b..629c645 100644 --- a/src/views/MicroExhibition/index.vue +++ b/src/views/MicroExhibition/index.vue @@ -10,7 +10,7 @@
- + @@ -48,7 +48,7 @@
- + @@ -57,7 +57,7 @@
- + @@ -132,7 +132,7 @@ let dev_value = [ async function getTopDeviceData() { let res = await getTopDevice() as any if (res.code === 200) { - store.setbanfang(res.data.板房设备) + store.setbanfang(res.data.版房设备) store.setcaijian(res.data.裁剪设备) store.setfengzhong(res.data.缝中设备) store.settuoxie(res.data.拖鞋自动生产线) @@ -157,7 +157,7 @@ function getWebsocket(val){ store.setDevnum(data.msg) } if(data.type=='WorkingState'){ - store.setDevnum(data.msg) + store.changestatus(data.msg) } }catch(err){