diff --git a/src/views/board/board1/index.vue b/src/views/board/board1/index.vue
index d8a6030..152f550 100644
--- a/src/views/board/board1/index.vue
+++ b/src/views/board/board1/index.vue
@@ -86,7 +86,7 @@
}}
h
-
待机时长
+ 运行时长
{{ i.DEVICENAME }}
@@ -119,7 +119,7 @@
}}
h
- 待机时长
+ 运行时长
diff --git a/src/views/board/board4/index.vue b/src/views/board/board4/index.vue
index a0d17fa..80ca1a1 100644
--- a/src/views/board/board4/index.vue
+++ b/src/views/board/board4/index.vue
@@ -24,7 +24,7 @@
正常: {{
- form.isSimulate ? form.text8 : Math.min((runningData.RUNNINGCOUNT || 0) + 5, (runningData.TOTALCOUNT || 0))
+ form.isSimulate ? form.text8 : Math.min((runningData.RUNNINGCOUNT || 0) + runNum, (runningData.TOTALCOUNT || 0))
}}
暂停: {{
@@ -35,7 +35,7 @@
style="color: #860F1C">{{ form.isSimulate ? form.text9 : runningData.ALARMCOUNT }}
停机: {{ form.isSimulate ? form.text9 : runningData.NOTSTARTEDCOUNT }}
+ style="color: #1077BC">{{ form.isSimulate ? form.text9 : Math.max(runningData.NOTSTARTEDCOUNT - runNum, 0) }}
{{ (form.isSimulate ? form.text5 : productionTotalData.dayTotal) || '00000' }}
@@ -686,6 +686,7 @@ export default {
waitTime: 0,
},
isData: false,
+ runNum:0,
row: {},
productionTotalData: {},
orderStatisticsData: {},
@@ -775,6 +776,11 @@ export default {
this.deviceProductionList = val.data
})
this.chartInit()
+
+ getSimulateData({customCode: 'board-3' || '', customType: 1}).then(val => {
+ const form1 = JSON.parse(val.rows[0].customData);
+ this.runNum = form1.table1.filter(v => v.STATUSCODE == 1).length
+ })
},
chartInit() {
// this.$refs.chart1.setData({