电度大屏完善

src/views/statisticView/SwitchingRoom.vue

@@ -18,7 +18,7 @@
     </div>
     <div class="sb">
       <a-row type="flex" justify="space-between" :gutter="[20,20]">
-        <a-col :span="6">
+<!--        <a-col :span="6">
           <div class="sb-info">
             <div class="sb-info-title">
               <span>{{ dataInfo.lineName }}</span>
@@ -82,7 +82,7 @@
               </div>
             </div>
           </div>
-        </a-col>
+        </a-col>-->
         <!-- <a-col :span="6" v-for="item in 7" :key="item" @click="handleView">
           <div class="sb-info">
             <div class="sb-info-title">
@@ -124,7 +124,7 @@
             </div>
           </div>
         </a-col> -->
-        <a-col :span="6" v-for="(item,i) in dataInfo.dataList" :key="i">
+        <a-col :span="6" v-for="(item,i) in dataInfo.dataList" :key="i" @click="handleView()">
           <div class="sb-info">
             <div class="sb-info-title">
               <!-- <span>2G06</span> -->
@@ -134,23 +134,26 @@
               <div>高压</div>
               <div class="arrow">
                 <div>
-                  <div>电压：{{ item.dianya }}kV</div>
+                  <div>Ua(KV)：{{ item.dianya }}</div>
                   <div><img src="../../assets/bgView/jiantouBlue.png" width="65px" alt=""></div>
                 </div>
                 <div style="color:rgba(40, 233, 108, 1)">
-                  <div>电流：{{ item.dianliu }}A</div>
+                  <div>Ia(A)：{{ item.dianliu }}</div>
                   <div><img src="../../assets/bgView/jiantouGreen.png" width="65px" alt=""></div>
                 </div>
-                <div style="color:rgba(255, 216, 0, 1)">
+                <!--                <div style="color:rgba(255, 216, 0, 1)">
                   <div>有功电度：{{ item.yggl }}kW</div>
                   <div><img src="../../assets/bgView/jiantouYellow.png" width="65px" alt=""></div>
-                </div>
+                </div>-->
                 <div v-if="item.wendu" style="color:rgba(255, 216, 0, 1)">
                   <div>温度：{{ item.wendu }}℃</div>
                   <div><img src="../../assets/bgView/jiantoured.png" width="65px" alt=""></div>
                 </div>
               </div>
-              <div><img src="../../assets/bgView/dianrong.png" width="153px" height="100px" alt=""></div>
+              <div v-if="item.imgType === 1"><img src="../../assets/bgView/dianrong.png" width="153px" height="100px" alt=""></div>
+              <div v-if="item.imgType === 2"><img src="../../assets/bgView/dianji.png" width="153px" height="100px" alt=""></div>
+              <div v-if="item.imgType === 3"><img src="../../assets/bgView/bianyaqi.png" width="153px" height="100px" alt=""></div>
+              <div v-if="item.imgType === 4"><img src="../../assets/bgView/img.png" width="153px" height="100px" alt=""></div>
             </div>
           </div>
         </a-col>
@@ -209,24 +212,34 @@ export default {
         console.log(res.data)
         this.dataInfo = res.data
         this.dataInfo.dataList.forEach(item => {
-          item.dianya = item.measureList.find(li => li.type === 5).result
-          item.dianliu = item.measureList.find(li => li.type === 1).result
-          item.yggl = item.measureList.find(li => li.type === 12).result
+          // 截取名称字符串，去掉威胜多功能表
+          item.sbName = item.sbName.replace('威胜多功能表', '')
+          const dianya = item.measureList.find(li => li.type === 5)
+          const dianliu = item.measureList.find(li => li.type === 1)
+          const yggl = item.measureList.find(li => li.type === 12)
+          item.dianya = dianya == null ? '##' : dianya.result
+          item.dianliu = dianya == null ? '##' : dianliu.result
+          item.yggl = dianya == null ? '##' : yggl.result
           item.wendu = item.measureList.find(li => li.type === 16) ? item.measureList.find(li => li.type === 16).result : null
         })
         console.log(this.dataInfo)
       })
     },
     handleView () {
-      this.$router.push('/TransformerDetailBigScreen')
+      const a = document.createElement('a')
+      a.href = '/TransformerDetailBigScreen'
+      a.target = '_blank'
+      a.click()
     },
     handleDayView () {
       const a = document.createElement('a')
       a.href = '/DayStatistics'
+      a.target = '_blank'
       a.click()
     },
     handleMonthView () {
       const a = document.createElement('a')
+      a.target = '_blank'
       a.href = '/MonthStatistics'
       a.click()
     }
@@ -317,7 +330,7 @@ padding: 80px 67px;
   background: url(../../assets/bgView/sbInfoBg.png) no-repeat;
   position: relative;
   .sb-info-title{
-    width: 208px;
+    // width: 208px;
     font-size: 13px;
     font-weight: bold;
     color: RGBA(192, 231, 247, 1);

src/views/statisticView/TransformerDetail.vue

@@ -6,7 +6,7 @@
         <span class="top-left"></span><span class="top-right"></span><span class="bottom-left"></span><span class="bottom-right"></span>
         <div style="font-size: 40px;font-weight: bold; margin-bottom:50px;"><span style="padding-right:30px;">2G04</span><span> 变压器详细信息</span></div>
         <div style="text-align:center;">
-          <img src="../../assets/bgView/luogan.png" width="400px" alt="">
+          <img src="../../assets/bgView/dianji.png" width="400px" alt="">
         </div>
         <div style="padding-top:70px">
           <a-row type="flex" justify="space-around" :gutter="[0,25]">
@@ -31,7 +31,7 @@
           <a-row type="flex" justify="start" :gutter="[0,80]">
             <a-col v-for="i in 4" :key="i" :span="12">
               <div class="detail-item">
-                <img src="../../assets/bgView/dianyaqi.png" alt="" width="162px" >
+                <img src="../../assets/bgView/bianyaqi.png" alt="" width="162px" >
                 <div class="detail-item-info">
                   <div style="display:flex;align-items: center;">
                     <div>产品名称</div>