Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into sl

src/views/LightMatrix1/LightMatrix1.vue

@@ -13,35 +13,35 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
           </div>
-          <div class="item write" @click="changeShow('jrfj_FDC')">
+          <div class="item write curStyle" @click="changeShow('jrfj_FDC')">
             <div>接入风机</div>
             <div>{{ sourceMap.fcjrnum || "---" }}</div>
           </div>
-          <div class="item blue" @click="changeShow('yx_FDC', 1)">
+          <div class="item blue curStyle" @click="changeShow('yx_FDC', 1)">
             <div>· 运行</div>
             <div>{{ sourceMap.fcyxnum || "---" }}</div>
           </div>
-          <div class="item green" @click="changeShow('dj_FDC', 0)">
+          <div class="item green curStyle" @click="changeShow('dj_FDC', 0)">
             <div>· 待机</div>
             <div>{{ sourceMap.fcdjnum || "---" }}</div>
           </div>
-          <div class="item pink" @click="changeShow('xd_FDC', 5)">
+          <div class="item pink curStyle" @click="changeShow('xd_FDC', 5)">
             <div>· 限电</div>
             <div>{{ sourceMap.fcxdnum || "---" }}</div>
           </div>
-          <div class="item red" @click="changeShow('gz_FDC', 2)">
+          <div class="item red curStyle" @click="changeShow('gz_FDC', 2)">
             <div>· 故障</div>
             <div>{{ sourceMap.fcgznum || "---" }}</div>
           </div>
-          <div class="item orange" @click="changeShow('jx_FDC', 4)">
+          <div class="item orange curStyle" @click="changeShow('jx_FDC', 4)">
             <div>· 检修</div>
             <div>{{ sourceMap.fcwhnum || "---" }}</div>
           </div>
-          <div class="item write" @click="changeShow('sl_FDC', 6)">
+          <div class="item write curStyle" @click="changeShow('sl_FDC', 6)">
             <div>· 受累</div>
             <div>{{ sourceMap.fcslnum || "---" }}</div>
           </div>
-          <div class="item gray" @click="changeShow('lx_FDC', 3)">
+          <div class="item gray curStyle" @click="changeShow('lx_FDC', 3)">
             <div>· 离线</div>
             <div>{{ sourceMap.fclxnum || "---" }}</div>
           </div>
@@ -62,35 +62,35 @@
               ></SvgIcon>
             </span>
           </div>
-          <div class="item write" @click="changeShow('jrfj1_GDC')">
+          <div class="item write curStyle" @click="changeShow('jrfj1_GDC')">
             <div>逆变器</div>
             <div>{{ sourceMap.gfjrnum || "---" }}</div>
           </div>
-          <div class="item blue" @click="changeShow('yx1_GDC', 1)">
+          <div class="item blue curStyle" @click="changeShow('yx1_GDC', 1)">
             <div>· 运行</div>
             <div>{{ sourceMap.gfyxnum || "---" }}</div>
           </div>
-          <div class="item green" @click="changeShow('dj1_GDC', 0)">
+          <div class="item greenv curStyle" @click="changeShow('dj1_GDC', 0)">
             <div>· 待机</div>
             <div>{{ sourceMap.gfdjnum || "---" }}</div>
           </div>
-          <div class="item pink" @click="changeShow('xd1_GDC', 5)">
+          <div class="item pink curStyle" @click="changeShow('xd1_GDC', 5)">
             <div>· 限电</div>
             <div>{{ sourceMap.gfxdnum || "---" }}</div>
           </div>
-          <div class="item red" @click="changeShow('gz1_GDC', 2)">
+          <div class="item red curStyle" @click="changeShow('gz1_GDC', 2)">
             <div>· 故障</div>
             <div>{{ sourceMap.gfgznum || "---" }}</div>
           </div>
-          <div class="item orange" @click="changeShow('jx1_GDC', 4)">
+          <div class="item orange curStyle" @click="changeShow('jx1_GDC', 4)">
             <div>· 检修</div>
             <div>{{ sourceMap.gfwhnum || "---" }}</div>
           </div>
-          <div class="item write" @click="changeShow('sl1_GDC', 6)">
+          <div class="item write curStyle" @click="changeShow('sl1_GDC', 6)">
             <div>· 受累</div>
             <div>{{ sourceMap.gfslnum || "---" }}</div>
           </div>
-          <div class="item gray" @click="changeShow('lx1_GDC', 3)">
+          <div class="item gray curStyle" @click="changeShow('lx1_GDC', 3)">
             <div>· 离线</div>
             <div>{{ sourceMap.gflxnum || "---" }}</div>
           </div>
@@ -253,25 +253,18 @@ export default {
       switch (fjzt) {
         case 0:
           return "green";
-          break;
         case 1:
           return "blue";
-          break;
         case 2:
           return "red";
-          break;
         case 3:
           return "gray";
-          break;
         case 4:
           return "orange";
-          break;
         case 5:
           return "pink";
-          break;
         case 6:
           return "pink";
-          break;
       }
     },
 
@@ -346,7 +339,7 @@ export default {
     goDetails(item) {
       if (item.wpId.indexOf("FDC") !== -1) {
         this.$router.push({
-          path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`
+          path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`,
         });
       } else {
         // this.$router.push({
@@ -664,5 +657,8 @@ export default {
       }
     }
   }
+  .curStyle {
+    cursor: pointer;
+  }
 }
 </style>

src/views/LightMatrix2/LightMatrix2.vue

@@ -12,7 +12,12 @@
               <svg-icon svgid="svg-wind-site"></svg-icon>
             </span>
           </div>
-          <div class="item" :class="data.color" v-for="(data, index) of panel1Data.datas" :key="index">
+          <div
+            class="item"
+            :class="data.color"
+            v-for="(data, index) of panel1Data.datas"
+            :key="index"
+          >
             <div>{{ data.test }}</div>
             <div>{{ sourceMap[data.key] }}</div>
           </div>
@@ -24,7 +29,11 @@
           <div class="dot left bottom"></div>
           <div class="dot right top"></div>
           <div class="dot right bottom"></div>
-          <div class="item2" v-for="(data, index) of panel2Data.datas" :key="index">
+          <div
+            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>
@@ -42,14 +51,26 @@
                 <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
               </i>
               <span>{{ sourceMap.fczbmap[pItem[pIndex].wpId].name }}</span>
-              <div class="sub-title-item" v-for="(data, index) in tables[0].subTitleDatas" :key="index">
+              <div
+                class="sub-title-item"
+                v-for="(data, index) in tables[0].subTitleDatas"
+                :key="index"
+              >
                 <span class="sub-title">{{ data.text }}</span>
-                <span class="sub-count" :class="data.color">{{ sourceMap.fczbmap[pItem[pIndex].wpId][data.key] }}</span>
+                <span class="sub-count" :class="data.color">{{
+                  sourceMap.fczbmap[pItem[pIndex].wpId][data.key]
+                }}</span>
               </div>
             </div>
           </div>
           <div class="panel-body">
-            <div class="card" v-for="(cItem, cIndex) in pItem" :key="cIndex" :class="cItem.color" @click="goDetails(cItem)">
+            <div
+              class="card"
+              v-for="(cItem, cIndex) in pItem"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
               <div class="card-panel">
                 <div class="card-left">
                   <div class="tag">{{ cItem.wtnum }}</div>
@@ -279,30 +300,27 @@ export default {
       switch (fjzt) {
         case 0:
           return "green";
-          break;
         case 1:
           return "blue";
-          break;
         case 2:
           return "red";
-          break;
         case 3:
           return "gray";
-          break;
         case 4:
           return "orange";
-          break;
         case 5:
           return "pink";
-          break;
         case 6:
           return "pink";
-          break;
       }
     },
 
     calcGfStr(calcStr) {
-      return parseInt(this.sourceMap[calcStr[0]]) + parseInt(this.sourceMap[calcStr[1]]) + "";
+      return (
+        parseInt(this.sourceMap[calcStr[0]]) +
+        parseInt(this.sourceMap[calcStr[1]]) +
+        ""
+      );
     },
 
     // 请求服务
@@ -595,8 +613,9 @@ export default {
         margin-right: 4px;
         flex: 1 0 110px;
       }
+      
       .card {
-		  cursor: pointer;
+        cursor: pointer;
         margin-right: 4px;
         margin-top: 4px;
         flex: 1 0 110px;

src/views/LightMatrix3/LightMatrix3.vue

@@ -14,36 +14,52 @@
             </span>
           </div>
           <div class="panel-item-gf-right">
-              <div class="panel-item-gf-up">{{ panelData.first.text  }}</div>
-              <div class="panel-item-gf-down">{{  sourceMap[panelData.first.key] || "---" }}</div>
+            <div class="panel-item-gf-up">{{ panelData.first.text }}</div>
+            <div class="panel-item-gf-down">
+              {{ sourceMap[panelData.first.key] || "---" }}
+            </div>
           </div>
         </div>
         <div class="header-info">
-          <div class="panel-item" v-for="(data, index) of panelData.datas" :key="index" :class="data.color">
+          <div
+            class="panel-item"
+            v-for="(data, index) of panelData.datas"
+            :key="index"
+            :class="data.color"
+          >
             <div class="panel-item-left">
               <div class="panel-item-li">
                 <span>{{ data.name }}</span>
               </div>
               <div class="panel-item-li">
-                <span v-if="data.calcStr && sourceMap">{{ calcGfStr(data.calcStr) || "---" }}</span>
+                <span v-if="data.calcStr && sourceMap">{{
+                  calcGfStr(data.calcStr) || "---"
+                }}</span>
                 <span v-else>{{ sourceMap[data.key] || "---" }}</span>
               </div>
             </div>
             <div class="panel-item-right">
               <div class="panel-item-ri">
                 <span>
-                  <i class="svg-icon svg-icon-sm" :class="'svg-icon-' + data.color">
+                  <i
+                    class="svg-icon svg-icon-sm"
+                    :class="'svg-icon-' + data.color"
+                  >
                     <SvgIcon :svgid="data.nameIcon"></SvgIcon>
                   </i>
-                  {{ data.text1 }}</span>
+                  {{ data.text1 }}</span
+                >
                 <span>{{ sourceMap[data.key1] || "---" }}</span>
               </div>
               <div class="panel-item-ri">
                 <span>
-                  <i class="svg-icon svg-icon-sm" :class="'svg-icon-' + data.color">
+                  <i
+                    class="svg-icon svg-icon-sm"
+                    :class="'svg-icon-' + data.color"
+                  >
                     <SvgIcon :svgid="data.numIcon"></SvgIcon>
                   </i>
-                {{ data.text2 }}
+                  {{ data.text2 }}
                 </span>
                 <span>{{ sourceMap[data.key2] || "---" }}</span>
               </div>
@@ -61,43 +77,84 @@
                 <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
               </i>
               <span>{{ sourceMap.fczbmap[pItem[pIndex].wpId].name }}</span>
-              <div class="sub-title-item" v-for="(data, index) of tables[0].subTitleDatas" :key="index">
+              <div
+                class="sub-title-item"
+                v-for="(data, index) of tables[0].subTitleDatas"
+                :key="index"
+              >
                 <span class="sub-title">{{ data.text }}</span>
-                <span class="sub-count" :class="data.color">{{ sourceMap.fczbmap[pItem[pIndex].wpId][data.key] }}</span>
+                <span class="sub-count" :class="data.color">{{
+                  sourceMap.fczbmap[pItem[pIndex].wpId][data.key]
+                }}</span>
               </div>
             </div>
           </div>
           <div class="panel-body">
-            <div class="card" v-for="(cItem, cIndex) in pItem" :key="cIndex" :class="cItem.color" @click="goDetails(cItem)">
+            <div
+              class="card"
+              v-for="(cItem, cIndex) in pItem"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
               <div class="card-panel">
                 <div class="card-left">
                   <div class="tag">{{ cItem.wtnum }}</div>
                   <div class="icon">
-                    <span class="svg-icon svg-icon-sm" :class="cItem.color == 'black' ? 'svg-icon-black' : cItem.color == 'gray' ? 'svg-icon-gray' : 'svg-icon-write'">
+                    <span
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color == 'black'
+                          ? 'svg-icon-black'
+                          : cItem.color == 'gray'
+                          ? 'svg-icon-gray'
+                          : 'svg-icon-write'
+                      "
+                    >
                       <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
                     </span>
                   </div>
                 </div>
                 <div class="card-right">
                   <div class="num">
-                    <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
                       <SvgIcon svgid="svg-P"></SvgIcon>
                     </i>
                     <span>{{ cItem.fs }}</span>
                   </div>
                   <div class="num">
-                    <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
                       <SvgIcon svgid="svg-W"></SvgIcon>
                     </i>
                     <span>{{ cItem.gl }}</span>
                   </div>
                   <div class="num">
-                    <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
                       <SvgIcon svgid="svg-R"></SvgIcon>
                     </i>
                     <span>{{ cItem.fdjzs.toFixed(2) }}</span>
                   </div>
-             
                 </div>
               </div>
             </div>
@@ -353,7 +410,11 @@ export default {
     },
 
     calcGfStr(calcStr) {
-      return parseInt(this.sourceMap[calcStr[0]]) + parseInt(this.sourceMap[calcStr[1]]) + "";
+      return (
+        parseInt(this.sourceMap[calcStr[0]]) +
+        parseInt(this.sourceMap[calcStr[1]]) +
+        ""
+      );
     },
 
     // 请求服务