Merge branch 'develop' into single-develop

src/views/ems/dzjk/sbjk/bmsdcc/index.vue

@@ -4,12 +4,15 @@
       <el-card shadow="always"
                class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
                :class="{
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
+        'timing-card-container':!['0','2'].includes(baseInfo.workStatus),
+        'warning-card-container':baseInfo.workStatus === '2',
         'running-card-container':baseInfo.workStatus === '0'
       }">
         <div slot="header">
           <span
-              class="large-title">{{ baseInfo.parentDeviceName ? `${baseInfo.parentDeviceName} -> ` : '' }}{{ baseInfo.deviceName }}</span>
+              class="large-title">{{
+              baseInfo.parentDeviceName ? `${baseInfo.parentDeviceName} -> ` : ''
+            }}{{ baseInfo.deviceName }}</span>
           <div class="info">
             <div>数据更新时间：{{ baseInfo.dataUpdateTime || '-' }}</div>
           </div>
@@ -80,7 +83,9 @@
           >
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.avgData }}</span>
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.avgData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -88,7 +93,9 @@
               label="单体最小值">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.minData }}</span>
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.minData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -100,7 +107,9 @@
               label="单体最大值">
             <template slot-scope="scope">
               <span class="pointer "
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.maxData }}</span>
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.maxData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/views/ems/dzjk/sbjk/bmszl/index.vue

@@ -2,7 +2,8 @@
   <div v-loading="loading">
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmszlContainer'" style="margin-bottom:25px;">
       <el-card :class="{
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
+        'timing-card-container':!['0','2'].includes(baseInfo.workStatus),
+        'warning-card-container':baseInfo.workStatus === '2',
         'running-card-container':baseInfo.workStatus === '0'
       }" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
                shadow="always">
@@ -97,7 +98,9 @@
               prop="maxVoltage">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最高单体电压',scope.row.clusterId,'CLUSTER')">{{ scope.row.maxCellVoltage }} V</span>
+                    @click="showChart('最高单体电压',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.maxCellVoltage
+                }} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -109,7 +112,9 @@
               prop="minVoltage">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最低单体电压',scope.row.clusterId,'CLUSTER')">{{ scope.row.minCellVoltage }} V</span>
+                    @click="showChart('最低单体电压',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.minCellVoltage
+                }} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -120,7 +125,9 @@
               label="单体最高温度">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最高单体温度',scope.row.clusterId,'CLUSTER')">{{ scope.row.maxCellTemp }} &#8451;</span>
+                    @click="showChart('最高单体温度',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.maxCellTemp
+                }} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -132,7 +139,9 @@
               prop="minTemperature">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart('最低单体温度',scope.row.clusterId,'CLUSTER')">{{ scope.row.minCellTemp }} &#8451;</span>
+                    @click="showChart('最低单体温度',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.minCellTemp
+                }} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column

src/views/ems/dzjk/sbjk/pcs/index.vue

@@ -9,9 +9,9 @@
     >
       <el-card
           :class="{
-          'warning-card-container': pcsItem.workStatus === '2',
+          'timing-card-container':!['0','2'].includes(pcsItem.workStatus),
-          'timing-card-container': pcsItem.workStatus === '1',
+          'warning-card-container':pcsItem.workStatus === '2',
-          'running-card-container': !['1', '2'].includes(pcsItem.workStatus),
+          'running-card-container':pcsItem.workStatus === '0'
         }"
           class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
           shadow="always"