看板修改

src/views/board/board1/index.vue

@@ -86,7 +86,7 @@
             }}</span>
           <span>h</span>
         </div>
-        <div class="itemText">待机时长</div>
+        <div class="itemText">运行时长</div>
       </div>
       <div class="item" v-for="i in deviceData">
         <div class="itemTitle">{{ i.DEVICENAME }}</div>
@@ -119,7 +119,7 @@
             }}</span>
           <span>h</span>
         </div>
-        <div class="itemText">待机时长</div>
+        <div class="itemText">运行时长</div>
       </div>
     </div>
 <!--    <div class="oee">-->

src/views/board/board4/index.vue

@@ -24,7 +24,7 @@
     <div class="bg4"></div>
     <div class="text1" style="top: 19.1%;left: 75%;">正常: <span
         style="color: #6AFD81">{{
-        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))
       }}</span></div>
     <div class="text1" style="top: 19.1%;left: 80.4%;">暂停: <span
         style="color: #C2C222">{{
@@ -35,7 +35,7 @@
         style="color: #860F1C">{{ form.isSimulate ? form.text9 : runningData.ALARMCOUNT }}</span>
     </div>
     <div class="text1" style="top: 19.1%;left: 91.2%;">停机: <span
-        style="color: #1077BC">{{ form.isSimulate ? form.text9 : runningData.NOTSTARTEDCOUNT }}</span>
+        style="color: #1077BC">{{ form.isSimulate ? form.text9 : Math.max(runningData.NOTSTARTEDCOUNT - runNum, 0) }}</span>
     </div>
     <div class="num2" style="color:#63CDFA;top: 17%;left: 29.05%;">
       {{ (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({