Merge branch 'lining' of http://124.70.43.205:3000/lining/hb_sis_zhfx into xingbiao

src/views/LightMatrix2/LightMatrix2.vue

@@ -32,27 +32,39 @@
           <div class="dot left bottom"></div>
           <div class="dot right top"></div>
           <div class="dot right bottom"></div>
-
-          <div
-            v-if="$store.state.themeName === 'light'"
-            class="item2"
-            v-for="(data, index) of panel2Data.datas"
-            :key="index"
-          >
+          <div v-if="$store.state.themeName === 'light'" style="display: flex; flex-direction: row;">
+            <div
+              class="item2"
+              v-for="(data, index) of panel2Data.datas"
+              :key="index"
+            >
+              <div
+                :class="
+                  data.num1 === 5
+                    ? 'item9'
+                    : data.num1 === 4
+                    ? 'item8'
+                    : data.num1 === 3
+                    ? 'item7'
+                    : data.num1 === 2
+                    ? 'item6'
+                    : data.num1 === 1
+                    ? 'item5'
+                    : ''
+                "
+              >
+                <div class="name">{{ data.test }}</div>
+                <div class="num2">{{ sourceMap[data.key] }}</div>
+                <div class="num1">×{{ data.num1 }}</div>
+                <div class="num3">{{ data.num3 }}</div>
+              </div>
+            </div>
+          </div>
+          <div v-if="$store.state.themeName === 'dark'" style="display: flex; flex-direction: row;">
             <div
-              :class="
-                data.num1 === 5
-                  ? 'item9'
-                  : data.num1 === 4
-                  ? 'item8'
-                  : data.num1 === 3
-                  ? 'item7'
-                  : data.num1 === 2
-                  ? 'item6'
-                  : data.num1 === 1
-                  ? 'item5'
-                  : ''
-              "
+              class="item2"
+              v-for="(data, index) of panel2Data.datas"
+              :key="index"
             >
               <div class="name">{{ data.test }}</div>
               <div class="num2">{{ sourceMap[data.key] }}</div>
@@ -60,18 +72,6 @@
               <div class="num3">{{ data.num3 }}</div>
             </div>
           </div>
-
-          <div
-            v-if="$store.state.themeName === 'dark'"
-            class="item2"
-            v-for="(data, index) of panel2Data.datas"
-            :key="index"
-          >
-            <div class="name">{{ data.test }}</div>
-            <div class="num2">{{ sourceMap[data.key] }}</div>
-            <div class="num1">×{{ data.num1 }}</div>
-            <div class="num3">{{ data.num3 }}</div>
-          </div>
         </div>
       </Col>
     </Row>
@@ -98,7 +98,9 @@
               >
                 <span class="sub-title">{{ data.text }}</span>
                 <span class="sub-count" :class="data.color">{{
-                  parseFloat(sourceMap.fczbmap[pItem[pIndex].wpId][data.key].toFixed(1))
+                  parseFloat(
+                    sourceMap.fczbmap[pItem[pIndex].wpId][data.key].toFixed(1)
+                  )
                 }}</span>
               </div>
             </div>
@@ -169,7 +171,7 @@
         </div>
       </div>
     </el-scrollbar>
-    <Dialog v-model="detialDisplay" :wpId='stationId' :wtId='windId'></Dialog>
+    <Dialog v-model="detialDisplay" :wpId="stationId" :wtId="windId"></Dialog>
   </div>
 </template>
 
@@ -201,8 +203,8 @@ export default {
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
       detialDisplay: false,
-      stationId: '',
-      windId: '',
+      stationId: "",
+      windId: "",
       panel1Data: {
         first: {
           icon: "fa fa-user",
@@ -492,9 +494,9 @@ export default {
 
     // 查看风机详情
     goDetails(item) {
-      this.detialDisplay = true
-        this.stationId = item.wpId
-        this.windId = item.wtId
+      this.detialDisplay = true;
+      this.stationId = item.wpId;
+      this.windId = item.wtId;
       // this.$router.push({
       //   path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`,
       // });
@@ -760,7 +762,7 @@ export default {
             flex: 1 0 auto;
             font-size: 14px;
             // font-family: "Bicubik";
-            font-weight: 500!important;
+            font-weight: 500 !important;
 
             &.black {
               color: #ffffff;