修改配电样式

ems-ui/src/assets/images/mgr/backA.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 2</title>
+    <defs>
+        <radialGradient cx="42.2859694%" cy="39.0871392%" fx="42.2859694%" fy="39.0871392%" r="43.9955419%" id="radialGradient-1">
+            <stop stop-color="#9CC1FF" offset="0.0813517537%"></stop>
+            <stop stop-color="#2980FF" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.400754656">
+        <g id="首页" transform="translate(-667.000000, -306.000000)" fill="url(#radialGradient-1)">
+            <g id="编组-2备份-2" transform="translate(632.000000, 218.000000)">
+                <g id="编组-2" transform="translate(35.000000, 88.000000)">
+                    <rect id="矩形" x="0" y="0" width="80" height="80" rx="40"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

ems-ui/src/assets/images/mgr/backB.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 8</title>
+    <defs>
+        <radialGradient cx="38.6365869%" cy="34.678997%" fx="38.6365869%" fy="34.678997%" r="92.4571214%" id="radialGradient-1">
+            <stop stop-color="#FFC6B0" offset="0%"></stop>
+            <stop stop-color="#FF8750" offset="99.9222335%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.400754656">
+        <g id="首页" transform="translate(-783.000000, -306.000000)" fill="url(#radialGradient-1)">
+            <g id="编组-2备份-2" transform="translate(632.000000, 218.000000)">
+                <g id="编组-8" transform="translate(151.000000, 88.000000)">
+                    <rect id="矩形" x="0" y="0" width="80" height="80" rx="40"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

ems-ui/src/assets/images/mgr/backC.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 9</title>
+    <defs>
+        <radialGradient cx="34.5129726%" cy="32.4657254%" fx="34.5129726%" fy="32.4657254%" r="68.9071842%" id="radialGradient-1">
+            <stop stop-color="#FFDFA0" offset="0%"></stop>
+            <stop stop-color="#FFB51F" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.400754656">
+        <g id="首页" transform="translate(-898.000000, -306.000000)" fill="url(#radialGradient-1)">
+            <g id="编组-2备份-2" transform="translate(632.000000, 218.000000)">
+                <g id="编组-9" transform="translate(266.000000, 88.000000)">
+                    <rect id="矩形" x="0" y="0" width="80" height="80" rx="40"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

ems-ui/src/assets/images/mgr/humidity.svg

@@ -1 +1,12 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1724832849510" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="27772" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M856.4 0S723.1 126.3 723.1 200c0 73.6 59.7 133.3 133.3 133.3S989.7 273.6 989.7 200 856.4 0 856.4 0z m0 288.8c-49.1 0-88.9-39.8-88.9-88.9s88.9-133.3 88.9-133.3 88.9 84.2 88.9 133.3-39.9 88.9-88.9 88.9zM412 0S34.3 427.1 34.3 638.8 203.4 1022 412 1022s377.7-171.6 377.7-383.2S412 0 412 0z m0 955.4c-171.8 0-311-141.9-311-317S412 88.9 412 88.9s311 374.4 311 549.5c0.1 175-139.2 317-311 317z" fill="#00A7EF" p-id="27773"></path><path d="M412 933.1c-159.5 0-288.8-128.4-288.8-286.8s150.1-78.2 288.8 0c139.3 78.5 288.8-158.4 288.8 0S571.5 933.1 412 933.1z" fill="#00A7EF" p-id="27774"></path></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>w_湿度</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="首页" transform="translate(-582.000000, -135.000000)" fill-rule="nonzero">
+            <g id="w_湿度" transform="translate(582.000000, 135.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="30" height="30"></rect>
+                <path d="M15.79125,2.8275 L15.22875,2.19 L14.66625,2.8275 C14.295,3.2475 5.61,13.16625 5.61,18.28875 C5.61,23.59125 9.92625,27.9075 15.22875,27.9075 C20.53125,27.9075 24.8475,23.59125 24.8475,18.28875 C24.8475,13.16625 16.1625,3.2475 15.79125,2.8275 L15.79125,2.8275 Z M15.22875,4.47 C17.9325,7.6575 23.3475,14.7675 23.3475,18.28875 C23.3475,18.45 23.34,18.6075 23.3325,18.76875 C20.5725,20.39625 19.305,19.72875 15.22875,17.1825 C12.46875,15.4575 9.7125,14.415 8.02125,15.04875 C9.67875,11.4225 13.21125,6.85125 15.22875,4.47 Z" id="形状" fill="#425584"></path>
+            </g>
+        </g>
+    </g>
+</svg>

ems-ui/src/assets/images/mgr/line.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="270px" height="28px" viewBox="0 0 270 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>xxhdpi/路径 2</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="首页" transform="translate(-387.000000, -335.000000)" fill="#A9CCFF" fill-rule="nonzero">
+            <path id="路径-2" d="M396.319627,335.5 L396.319627,344.5 L392.319,344.499 L392.319,357.219 L647.5,357.219 L647.5,353.219029 L656.5,357.719029 L647.5,362.219029 L647.5,358.219 L391.319627,358.219029 L391.319,344.499 L387.319627,344.5 L387.319627,335.5 L396.319627,335.5 Z" transform="translate(523.909814, 348.859515) scale(1, -1) translate(-523.909814, -348.859515) "></path>
+        </g>
+    </g>
+</svg>

ems-ui/src/assets/images/mgr/line2.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="43px" height="10px" viewBox="0 0 43 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>xxhdpi/路径 2备份</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="首页" transform="translate(-1012.000000, -335.000000)" fill="#A9CCFF" fill-rule="nonzero">
+            <path id="路径-2备份" d="M1045.4464,334.602729 L1054.49996,338.993976 L1045.55483,343.602076 L1045.506,339.602 L1012.50602,339.999964 L1012.49398,339.000036 L1045.494,338.602 L1045.4464,334.602729 Z" transform="translate(1033.000000, 339.500000) scale(1, -1) translate(-1033.000000, -339.500000) "></path>
+        </g>
+    </g>
+</svg>

ems-ui/src/assets/images/mgr/temperature.svg

@@ -1 +1,12 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1724832632828" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17384" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M572.586667 583.68V162.304a150.801067 150.801067 0 0 0-301.568 0V583.509333a242.961067 242.961067 0 1 0 301.499733 0z m-150.766934 382.976a192.580267 192.580267 0 0 1-110.353066-350.6176 25.053867 25.053867 0 0 0 10.5472-23.4496 105.472 105.472 0 0 1-0.7168-11.434667V162.304a100.522667 100.522667 0 0 1 201.045333 0v418.850133a105.472 105.472 0 0 1-0.682667 11.434667 25.053867 25.053867 0 0 0 10.5472 23.4496 192.580267 192.580267 0 0 1-110.3872 350.446933zM654.5408 246.0672h167.5264a25.122133 25.122133 0 0 0 0-50.244267h-167.5264a25.122133 25.122133 0 1 0 0 50.244267zM822.0672 338.2272h-167.5264a25.122133 25.122133 0 1 0 0 50.244267h167.5264a25.122133 25.122133 0 0 0 0-50.244267z" p-id="17385" fill="#00A7EF"></path><path d="M822.0672 480.631467h-167.5264a25.122133 25.122133 0 1 0 0 50.244266h167.5264a25.122133 25.122133 0 0 0 0-50.244266zM447.146667 651.741867v-464.213334a25.156267 25.156267 0 0 0-50.2784 0v464.213334a92.16 92.16 0 1 0 50.2784 0z m-25.156267 130.4576a41.8816 41.8816 0 1 1 41.915733-41.8816 41.915733 41.915733 0 0 1-42.0864 41.8816z" p-id="17386" fill="#00A7EF"></path></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>温度</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="首页" transform="translate(-381.000000, -135.000000)" fill-rule="nonzero">
+            <g id="温度" transform="translate(381.000000, 135.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="30" height="30"></rect>
+                <path d="M15.9110449,18.4669336 L15.9110449,10.419873 C15.9110449,9.93067383 15.5126367,9.53226562 15.0234375,9.53226562 L14.953125,9.53226562 C14.4756445,9.53226562 14.0918848,9.91895508 14.0918848,10.3935059 L14.0918848,18.4669336 C12.7677832,18.8507227 11.7981738,20.0341699 11.7981738,21.4461328 C11.7981738,23.1715723 13.2306445,24.5688867 15.0029297,24.5688867 C16.7722852,24.5688867 18.2047852,23.1686426 18.2047852,21.4461328 C18.2018555,20.0341699 17.2322168,18.8536523 15.9110449,18.4669336 Z M20.6244434,14.9018555 C20.4252246,14.737793 20.3080664,14.5151953 20.3080664,14.2866797 L20.3080664,5.18794922 C20.3080664,2.3259668 17.9264648,0 15,0 C12.0735352,0 9.69193359,2.3259375 9.69193359,5.18797852 L9.69193359,14.0288965 C9.69193359,14.4126562 9.53373047,14.7671191 9.26129883,14.9985352 C7.34255859,16.6185059 6.24401367,18.9708105 6.24401367,21.4490918 C6.24401367,26.1624902 10.1723438,30 15.0029297,30 C19.8335156,30 23.7618164,26.1654199 23.7618164,21.4490918 C23.7588867,18.9122168 22.6164551,16.5247559 20.6244434,14.9018555 Z M15,27.2844727 C11.6897754,27.2844727 9.00058594,24.6655664 9.00058594,21.4461621 C9.00058594,19.439502 10.0493262,17.5939746 11.8040039,16.5130371 L12.2288086,16.2522949 C12.3664746,16.1673633 12.4514063,16.0150488 12.4514063,15.853916 L12.4514063,5.18797852 C12.4514063,3.82286133 13.5968262,2.71262695 15.0029297,2.71262695 C16.4090332,2.71262695 17.5544238,3.82286133 17.5544238,5.18797852 L17.5544238,15.853916 C17.5544238,16.0150488 17.6393848,16.1673926 17.7770801,16.2523242 L18.2018262,16.5130371 C19.9565332,17.5939746 21.0023438,19.4365723 21.0023438,21.4461621 C20.9994141,24.6655664 18.3072949,27.2844727 15,27.2844727 L15,27.2844727 Z" id="形状" fill="#405383"></path>
+            </g>
+        </g>
+    </g>
+</svg>

ems-ui/src/assets/images/mgr/transformer.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1724834911172" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2368" width="256" height="256" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M316 288c-15.5 0-28 12.5-28 28v392c0 15.5 12.5 28 28 28s28-12.5 28-28V316c0-15.5-12.5-28-28-28zM512 288c-15.5 0-28 12.5-28 28v392c0 15.5 12.5 28 28 28s28-12.5 28-28V316c0-15.5-12.5-28-28-28zM708 288c-15.5 0-28 12.5-28 28v392c0 15.5 12.5 28 28 28s28-12.5 28-28V316c0-15.5-12.5-28-28-28z" p-id="2369" fill="#707070"></path><path d="M904 288V176c0-30.9-25.1-56-56-56h-56V92c0-15.5-12.5-28-28-28s-28 12.5-28 28v28H624V92c0-15.5-12.5-28-28-28s-28 12.5-28 28v28H456V92c0-15.5-12.5-28-28-28s-28 12.5-28 28v28H288V92c0-15.5-12.5-28-28-28s-28 12.5-28 28v28h-56c-30.9 0-56 25.1-56 56v112c-30.9 0-56 25.1-56 56v336c0 30.9 25.1 56 56 56v112c0 30.9 25.1 56 56 56h56c0 30.9 25.1 56 56 56h168c30.9 0 56-25.1 56-56h56c0 30.9 25.1 56 56 56h168c30.9 0 56-25.1 56-56 30.9 0 56-25.1 56-56V736c30.9 0 56-25.1 56-56V344c0-30.9-25.1-56-56-56z m0 392h-56v168h-56v56H624v-56H456v56H288v-56H176V680h-56V344h56V176h672v168h56v336z" p-id="2370" fill="#707070"></path></svg>

ems-ui/src/views/mgr/components/alarm.vue

@@ -4,11 +4,11 @@
     <div class="alarm-body">
       <vue-seamless-scroll :data="listData" class="seamless-warp" :class-option="classOption">
         <div class="seamless-item" v-for="(item,index) in listData" :key="index">
-          <div >{{item.name}}</div>
-          <div >{{item.type}}</div>
-          <div >{{item.createTime}}</div>
-          <div >
-            <el-button type="text" size="mini" @click="handlerAlarm(item)">处理</el-button>
+          <div>{{item.name}}</div>
+          <div>{{item.type}}</div>
+          <div>{{item.createTime}}</div>
+          <div>
+            <el-button  class="dealBtn" size="mini" @click="handlerAlarm(item)">处理</el-button>
           </div>
         </div>
       </vue-seamless-scroll>
@@ -52,8 +52,8 @@ export default {
   },
   mounted() {},
   methods: {
-    handlerAlarm(row){
-      this.$emit('handlerAlarm',row)
+    handlerAlarm(row) {
+      this.$emit('handlerAlarm', row)
     }
   }
 }
@@ -62,27 +62,34 @@ export default {
 .alarm {
   margin-top: 10px;
   .alarm-title {
-    background: #f2f2f2;
-    padding: 5px;
+    background: #f4f5fa;
+    padding: 8px 10px;
+    font-weight: 600;
     font-size: 14px;
+    color: #212121;
   }
   .alarm-body {
     border: 1px solid #f0f1f2;
     .seamless-warp {
       overflow: hidden;
       height: 200px;
-      .seamless-item{
+      .seamless-item {
         display: flex;
         align-items: center;
         justify-content: space-between;
         padding: 5px 10px;
         border-bottom: 1px solid #f0f1f2;
-        >div{
+        > div {
           font-size: 13px;
-          &:first-of-type{
-            color: #D9001B;
+          &:nth-child(-n+2) {
+            color: #d9001b;
           }
         }
+        .dealBtn{
+          color: rgba(71, 158, 241, 1);
+          border-color: rgba(71, 158, 241, 1);
+          padding: 4px 8px;
+        }
       }
     }
   }

ems-ui/src/views/mgr/components/panel.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="panel">
-    <div class="panel-title">{{title}}</div>
+    <div class="panel-title" :style="{'background':background}">{{title}}</div>
     <div class="panel-body">
       <slot></slot>
     </div>
@@ -9,10 +9,10 @@
 <script>
 export default {
   name: 'Panel',
-  props: ['title'],
+  props: ['title','background'],
   data() {
     return {}
-  },
+  }
 }
 </script>
 <style lang='scss' scoped>
@@ -20,11 +20,23 @@ export default {
   display: flex;
   flex-direction: column;
   .panel-title {
-    background: #f2f2f2;
-    padding: 10px;
-    text-align: center;
-    font-size: 14px;
-    font-weight: bold;
+    background: linear-gradient(180deg, #f1f5ff 0%, #ffffff 100%);
+    border-radius: 8px 8px 0px 0px;
+    border: 3px solid #ffffff;
+    padding: 20px;
+    font-weight: 500;
+    font-size: 20px;
+    color: #212121;
+    position: relative;
+    &::after{
+      content: '';
+      position: absolute;
+      bottom: 0;
+      left: 20px;
+      right: 20px;
+      height: 1px;
+      background: #E8E8E8;
+    }
   }
   .panel-body {
     flex: 1;

ems-ui/src/views/mgr/powerdist.vue

@@ -5,19 +5,31 @@
       <div class="powerdist-env">
         <div>
           <img src="@/assets/images/mgr/temperature.svg" alt="">
-          <span>温度：62.5°C</span>
+          <div>
+            <span>温度</span>
+            <span>62.5°C</span>
+          </div>
         </div>
         <div>
           <img src="@/assets/images/mgr/humidity.svg" alt="">
-          <span>湿度：77.88RH</span>
+          <div>
+            <span>湿度</span>
+            <span>77.88RH</span>
+          </div>
         </div>
         <div>
           <img src="@/assets/images/mgr/smoke.svg" alt="">
-          <span>烟感：正常</span>
+          <div>
+            <span>烟感</span>
+            <span>正常</span>
+          </div>
         </div>
         <div>
           <img src="@/assets/images/mgr/water.svg" alt="">
-          <span>水侵：正常</span>
+          <div>
+            <span>水侵</span>
+            <span>正常</span>
+          </div>
         </div>
       </div>
     </div>
@@ -30,17 +42,18 @@
             <el-option label="变压器3" :value="3"></el-option> -->
           </el-select>
           <div class="transformer-info">
-            <div class="info-header">
+            <!-- <div class="info-header">
               <span>A相</span>
               <span>B相</span>
               <span>C相</span>
-            </div>
+            </div> -->
+            <img src="@/assets/images/mgr/line.svg" class="lineImg" alt="">
             <div class="arrowImg">
               <span>10kV</span>
               <img src="@/assets/images/mgr/arrow.svg" alt="">
             </div>
-            <img class="transformerImg" src="@/assets/images/mgr/transformer.svg" alt="">
-            <div class="info-right">
+            <img class="transformerImg" src="@/assets/images/mgr/transformer.png" alt="">
+            <!-- <div class="info-right">
               <div>
                 <img src="@/assets/images/mgr/temperature.svg" alt="">
                 <span>温度：62.5°C</span>
@@ -49,9 +62,9 @@
                 <img src="@/assets/images/mgr/overhold.svg" alt="">
                 <span>负载率：72.5%</span>
               </div>
-            </div>
+            </div> -->
           </div>
-          <el-descriptions title="设备参数" :column="2" size="mini" border>
+          <el-descriptions class="custom-desc" title="设备参数" :column="2" size="mini" border>
             <el-descriptions-item label="产品型号">S11-M-400/10</el-descriptions-item>
             <el-descriptions-item label="额定容量">400kVA</el-descriptions-item>
             <el-descriptions-item label="额定电压">10±5%/0.4kV</el-descriptions-item>
@@ -62,7 +75,7 @@
           <alarm :alarmData="transformerAlarmData" />
         </div>
       </Panel>
-      <Panel title="配电柜">
+      <Panel title="配电柜" background="linear-gradient( 180deg, #F1FEFF 0%, #FFFFFF 100%)">
         <div class="power">
           <el-select v-model="powerCode" size="mini" @change="powerChange">
             <el-option v-for="item in powerList" :key="item.boxCode" :label="item.location" :value="item.boxCode"></el-option>
@@ -85,36 +98,36 @@
             <div class="power-data-title">实时数据</div>
             <div class="power-data-body">
               <div>
-                <div class="data-num">{{powerInfo.power||'--'}}</div>
                 <div class="data-name">功率因素</div>
+                <div class="data-num">{{powerInfo.power||'--'}}</div>
               </div>
               <div>
                 <div class="power-data-row">
                   <div>
-                    <span class="data-num">{{powerInfo.voltageA||'--'}}V</span>
                     <span class="data-name">A相电压</span>
+                    <span class="data-num">{{powerInfo.voltageA||'--'}}V</span>
                   </div>
                   <div>
-                    <span class="data-num">{{powerInfo.voltageB||'--'}}V</span>
                     <span class="data-name">B相电压</span>
+                    <span class="data-num">{{powerInfo.voltageB||'--'}}V</span>
                   </div>
                   <div>
-                    <span class="data-num">{{powerInfo.voltageC||'--'}}V</span>
                     <span class="data-name">C相电压</span>
+                    <span class="data-num">{{powerInfo.voltageC||'--'}}V</span>
                   </div>
                 </div>
                 <div class="power-data-row">
                   <div>
-                    <span class="data-num">233.2V</span>
                     <span class="data-name">AB线电压</span>
+                    <span class="data-num">233.2V</span>
                   </div>
                   <div>
-                    <span class="data-num">233.2V</span>
                     <span class="data-name">BC相电压</span>
+                    <span class="data-num">233.2V</span>
                   </div>
                   <div>
-                    <span class="data-num">233.2V</span>
                     <span class="data-name">AC相电压</span>
+                    <span class="data-num">233.2V</span>
                   </div>
                 </div>
               </div>
@@ -124,16 +137,17 @@
         </div>
 
       </Panel>
-      <Panel title="空开">
+      <Panel title="空开" background="linear-gradient( 180deg, #FFFBF1 0%, #FFFFFF 100%)">
         <div class="switch">
+          <img class="rightArrow" src="@/assets/images/mgr/line2.svg" alt="">
           <el-table :data="eqptList" style="width: 100%">
-            <el-table-column prop="eqptSpec" align="center" show-overflow-tooltip label="支路">
+            <el-table-column prop="eqptSpec"  show-overflow-tooltip label="支路">
             </el-table-column>
-            <el-table-column prop="current" align="center" width="90" label="额定电流">
+            <el-table-column prop="current" align="center" width="100" label="额定电流">
             </el-table-column>
-            <el-table-column prop="ratedCurrent" align="center" width="90" label="实时电流">
+            <el-table-column prop="ratedCurrent" align="center" width="100" label="实时电流">
             </el-table-column>
-            <el-table-column align="center" label="" width="50">
+            <el-table-column align="center" label="开关" width="60">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.status" size="mini">
                 </el-switch>
@@ -268,19 +282,39 @@ export default {
   display: flex;
   flex-direction: column;
   .powerdist-header {
-    background: #fff;
+    background: linear-gradient(180deg, #f1f5ff 0%, #ffffff 100%);
+    border-radius: 8px;
+    border: 3px solid #ffffff;
     padding: 20px;
+    > div:first-child {
+      font-weight: 500;
+      font-size: 20px;
+      color: #212121;
+    }
     .powerdist-env {
       display: flex;
       color: #515a6e;
       font-size: 14px;
-      margin-left: 80px;
+      justify-content: space-evenly;
       > div {
         display: flex;
-        align-items: center;
-        margin-left: 70px;
+        align-items: flex-end;
         img {
           margin-right: 5px;
+          height: 30px;
+        }
+        > div {
+          display: flex;
+          flex-direction: column;
+          font-weight: 500;
+          font-size: 18px;
+          color: #405383;
+          span:first-child {
+            font-weight: 400;
+            font-size: 14px;
+            color: #848ea6;
+            margin-bottom: 5px;
+          }
         }
       }
     }
@@ -305,11 +339,16 @@ export default {
       .transformerImg {
         height: 150px;
       }
+      .lineImg{
+        position: absolute;
+        width: 275px;
+        right: -38px;
+        top: -20px;
+      }
       .arrowImg {
         position: absolute;
         left: 5%;
-        top: 50%;
-        transform: translateY(-50%);
+        top: 25%;
         img {
           width: 80px;
         }
@@ -343,44 +382,66 @@ export default {
         }
       }
     }
-    ::v-deep .el-descriptions__header {
-      margin-bottom: 5px;
+    .custom-desc {
+      ::v-deep .el-descriptions__header {
+        margin-bottom: 5px;
+        font-weight: 600;
+        font-size: 14px;
+        color: #212121;
+      }
+      ::v-deep .el-descriptions-item__label {
+        background: #f4f5fa;
+        font-weight: 400;
+        font-size: 12px;
+        color: #212121;
+      }
     }
+
     .power {
       padding: 10px;
       .power-info {
         display: flex;
         justify-content: space-between;
-        margin-top: 30px;
+        margin-top: 10px;
         padding: 0 10px;
         > div {
-          color: #333333;
-          border: 2px solid #d7d7d7;
+          flex: 1;
+          background: url('~@/assets/images/mgr/backA.svg') no-repeat;
+          background-position: center;
+          background-size: 70%;
           display: flex;
           flex-direction: column;
           justify-content: center;
-          border-radius: 50%;
           height: 100px;
-          width: 100px;
           text-align: center;
-          font-weight: bold;
-          font-size: 16px;
-          &:not(:first-of-type) {
-            margin-left: 20px;
+          font-weight: 400;
+          font-size: 12px;
+          color: #6a6a6a;
+          &:nth-child(2) {
+            background: url('~@/assets/images/mgr/backB.svg') no-repeat;
+            background-position: center;
+            background-size: 70%;
+          }
+          &:nth-child(3) {
+            background: url('~@/assets/images/mgr/backC.svg') no-repeat;
+            background-position: center;
+            background-size: 70%;
           }
           span:last-of-type {
             margin-top: 5px;
-            color: #7f7f7f;
-            font-size: 18px;
+            font-size: 13px;
+            color: #212121;
           }
         }
       }
       .power-data {
         margin-top: 20px;
         .power-data-title {
-          background: #f2f2f2;
-          padding: 5px;
+          background: #f4f5fa;
+          padding: 8px 10px;
+          font-weight: 600;
           font-size: 14px;
+          color: #212121;
         }
         .power-data-body {
           border: 1px solid #f0f1f2;
@@ -402,19 +463,28 @@ export default {
             }
           }
           .data-name {
-            margin-top: 5px;
+            font-weight: 400;
             font-size: 13px;
-            color: #5a5a5a;
+            color: #212121;
           }
           .data-num {
-            font-size: 15px;
-            font-weight: 500;
+            margin-top: 4px;
+            font-weight: 400;
+            font-size: 13px;
+            color: #6a6a6a;
           }
         }
       }
     }
     .switch {
       padding: 10px;
+      position: relative;
+      .rightArrow{
+        position: absolute;
+        top: 65px;
+        left: -20px;
+        z-index: 999;
+      }
     }
   }
 }

ems-ui/src/views/task/report/index.vue

@@ -92,7 +92,7 @@
           <dict-tag :options="dict.type.inspection_result" :value="scope.row.resultStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="结果描述" align="center" prop="resultMsg" />
+      <!-- <el-table-column label="结果描述" align="center" prop="resultMsg" /> -->
       <el-table-column label="完成时间" align="center" prop="finishTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>