增加光伏逆变器图片，增加获取设备型号和厂商的接口

src/api/factoryMonitor/index.js

@@ -65,6 +65,14 @@ export function GetWtMonitorInfo(data) {
     method: "get",
   });
 }
+//设备详情-其他信息
+export function GetWtOtherInfo(data) {
+  return request({
+    baseURL: process.env.VUE_APP_API,
+    url: `/matrix/sbxx?wtid=${data.wtid}`,
+    method: "get",
+  });
+}
 //设备详情-遥测遥信
 export function GetWtTelemeteryInfo(data) {
   return request({

src/components/coms/table/table-qc.vue

@@ -48,13 +48,17 @@
       :total="data.total"
     ></el-pagination>
     <el-dialog
-      :title="dialogTitle"
       v-model="dialogShow"
       width="70%"
       top="40px"
       custom-class="modal"
       :close-on-click-modal="true"
     >
+      <template #title>
+        <div class="dialog-title">
+          <div class="title">{{ dialogTitle }}</div>
+        </div>
+      </template>
       <div class="chart" id="chartDiv" height="500px"></div>
     </el-dialog>
   </table>

src/components/lightDetial/index.vue

@@ -1,79 +1,106 @@
 <template>
   <div style="height: 100%">
-    <div
-      class="wt-top"
-      :class="colorFlag ? colorList1[wtInfo.status] : colorList[wtInfo.status]"
-    >
-      <div class="wt-text">设备名称：{{ wtname }}</div>
-      <div class="wt-info">厂商名称：厂商名称</div>
-      <div class="wt-xh" @click="handleXhClick(wtInfo)">设备型号：设备型号</div>
-      <div class="wt-alarm" @click="handleAlarm(wtInfo)">
-        <i
-          class="svg-icon svg-icon-sm"
+    <div class="gf-wrapper">
+      <div class="gf-img">
+        <div
+          class="wt-top"
           :class="
-            'svg-icon-' +
-            (colorFlag ? colorList1[wtInfo.status] : colorList[wtInfo.status])
+            colorFlag ? colorList1[wtInfo.status] : colorList[wtInfo.status]
           "
         >
-          <svgIcon svgid="svg-station-surveillance"></svgIcon>
-        </i>
-        <span>设备报警</span>
-      </div>
-    </div>
-    <div class="part-info">
-      <div class="part-body">
-        <div class="monitoring-item">
-          <div class="point point-left bottom"></div>
-          <div class="point point-right bottom"></div>
-          遥信值
-        </div>
-        <div class="part-item">
-          <div
-            class="part"
-            :class="{ active: index % 2 === 1 }"
-            v-for="(val, index) in currentPartD"
-            :key="index"
-          >
-            <div class="table-item" v-for="(item, ind) in val" :key="ind">
-              <div>{{ item.name }}</div>
-              <div
-                class="table-value"
-                :class="item.value == 1 ? 'round-red' : 'round'"
-              ></div>
-            </div>
+          <div class="wt-text">设备名称：{{ wtname }}</div>
+          <div class="wt-alarm" @click="handleAlarm(wtInfo)">
+            <i
+              class="svg-icon svg-icon-sm"
+              :class="
+                'svg-icon-' +
+                (colorFlag
+                  ? colorList1[wtInfo.status]
+                  : colorList[wtInfo.status])
+              "
+            >
+              <svgIcon svgid="svg-station-surveillance"></svgIcon>
+            </i>
+            <span>设备报警</span>
+          </div>
+          <div class="wt-info">厂商名称：{{ otherInfo?.manufacturer }}</div>
+          <div class="wt-xh" @click="handleXhClick(wtInfo)">
+            设备型号：{{ otherInfo?.model }}
           </div>
         </div>
+        <img
+          class="img"
+          style="width: 95%"
+          v-if="otherInfo.squareid == 'JZ'"
+          src="@/assets/imgs/JZ.png"
+          alt=""
+        />
+        <img
+          class="img"
+          v-if="otherInfo.squareid == 'ZC'"
+          src="@/assets/imgs/ZC.png"
+          alt=""
+        />
       </div>
-      <div class="part-body">
-        <div class="monitoring-item">
-          <div class="point point-left bottom"></div>
-          <div class="point point-right bottom"></div>
-          遥测值
+      <div class="part-info">
+        <div class="part-body yaoxin">
+          <div class="monitoring-item">
+            <div class="point point-left bottom"></div>
+            <div class="point point-right bottom"></div>
+            遥信值
+          </div>
+          <div class="part-item">
+            <div
+              class="part"
+              :class="{ active: index % 2 === 1 }"
+              v-for="(val, index) in currentPartD"
+              :key="index"
+            >
+              <div class="table-item" v-for="(item, ind) in val" :key="ind">
+                <div>{{ item.name }}</div>
+                <div
+                  class="table-value"
+                  :class="item.value == 1 ? 'round-red' : 'round'"
+                ></div>
+              </div>
+            </div>
+          </div>
         </div>
-        <div class="part-item">
-          <div
-            class="part"
-            :class="{ active: index % 2 === 1 }"
-            v-for="(val, index) in currentPartA"
-            :key="index"
-          >
-            <div class="table-item" v-for="(item, ind) in val" :key="ind">
-              <div>{{ item.name }}</div>
-              <div class="table-value">
-                {{ Number(item.value).toFixed(2) }}
-                <div class="unit">{{ item.valueUnit }}</div>
+        <div class="part-body yaoce">
+          <div class="monitoring-item">
+            <div class="point point-left bottom"></div>
+            <div class="point point-right bottom"></div>
+            遥测值
+          </div>
+          <div class="part-item">
+            <div
+              class="part"
+              :class="{ active: index % 2 === 1 }"
+              v-for="(val, index) in currentPartA"
+              :key="index"
+            >
+              <div class="table-item" v-for="(item, ind) in val" :key="ind">
+                <div>{{ item.name }}</div>
+                <div class="table-value">
+                  {{ Number(item.value).toFixed(2) }}
+                  <div class="unit">{{ item.valueUnit }}</div>
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
+
     <alarmDialog ref="alarmDialog" />
     <powerAndSpeed ref="powerAndSpeed" :tabEvent="-2" />
   </div>
 </template>
 <script>
-import { GetWtTelemeteryInfo } from "@/api/factoryMonitor/index.js";
+import {
+  GetWtTelemeteryInfo,
+  GetWtOtherInfo,
+} from "@/api/factoryMonitor/index.js";
 import { GetWtPoints, GetPointsData } from "@/api/points/index.js";
 import svgIcon from "@/components/coms/icon/svg-icon.vue";
 import powerAndSpeed from "@/components/powerAndSpeedSearch/index.vue";
@@ -138,6 +165,7 @@ export default {
       timer: "",
       colorFlag: false,
       wpid: "",
+      otherInfo: {},
     };
   },
   mounted() {
@@ -196,10 +224,19 @@ export default {
         this.wpid = wt.wpid;
         this.wtname = wt.wtname;
         this.getPartInfo(wt.wtid);
+        this.getWtOtherInfo(wt.wtid);
       } else {
         this.clear();
       }
     },
+    // 设备其他信息
+    getWtOtherInfo(val) {
+      GetWtOtherInfo({ wtid: val }).then((res) => {
+        if (res.code == 200) {
+          this.otherInfo = res.data;
+        }
+      });
+    },
     // 统一编码
     getPartInfo(wtid) {
       if (this.wtInfo.wtType == -2) {
@@ -338,16 +375,18 @@ export default {
 </script>
 <style lang="less" scoped>
 .wt-top {
-  height: 60px;
-  background: rgba(96, 103, 105, 0.2);
+  //   height: 60px;
+  width: 100%;
+  //   background: rgba(96, 103, 105, 0.2);
   border-radius: 5px;
   display: flex;
-  align-items: center;
-  padding-left: 20px;
+  flex-direction: column;
   color: #fff;
   font-size: 16px;
-  .wt-text {
-    margin-right: 50px;
+  .wt-row {
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
   }
   .wt-alarm {
     cursor: pointer;
@@ -358,8 +397,6 @@ export default {
   .wt-info,
   .wt-xh {
     color: #959595;
-
-    margin-right: 50px;
   }
   .wt-xh {
     &:hover,
@@ -389,131 +426,156 @@ export default {
     color: #606769;
   }
 }
-.part-info {
+.gf-wrapper {
   width: 100%;
-  height: calc(100% - 60px);
+  height: 100%;
   display: flex;
-  flex-direction: column-reverse;
 
-  .part-body {
-    width: 100%;
-    height: 50%;
-    overflow: auto;
-    padding-bottom: 20px;
-    // background: rgba(11, 12, 12, 0.45);
-    background: rgba(96, 103, 105, 0.2);
-    border-radius: 5px;
-    margin-top: 10px;
+  .gf-img {
+    width: 400px;
+    height: 100%;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
+    padding: 20px;
+    padding-top: 20px;
+    padding-bottom: 150px;
     align-items: center;
-    padding: 10px 0;
-    .monitoring-item {
-      position: relative;
-      width: 98%;
-      height: 42px;
-      border-bottom: 1px solid #363b46;
+    margin-right: 10px;
+    background: rgba(96, 103, 105, 0.2);
+    img {
+      width: 80%;
+    }
+  }
+  .part-info {
+    width: calc(100% - 400px - 10px);
+    height: 100%;
+    display: flex;
+    flex-direction: column-reverse;
+
+    .part-body {
+      width: 100%;
+      height: 50%;
+      overflow: auto;
+      padding-bottom: 20px;
+      // background: rgba(11, 12, 12, 0.45);
+      background: rgba(96, 103, 105, 0.2);
+      border-radius: 5px;
+      margin-bottom: 10px;
       display: flex;
+      flex-direction: column;
       align-items: center;
-      padding-left: 20px;
-      font-size: 16px;
-      font-family: Microsoft YaHei;
-      font-weight: 400;
-      color: #ffffff;
-    }
+      padding: 10px 0;
+      .monitoring-item {
+        position: relative;
+        width: 98%;
+        height: 42px;
+        border-bottom: 1px solid #363b46;
+        display: flex;
+        align-items: center;
+        padding-left: 20px;
+        font-size: 16px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #ffffff;
+      }
 
-    .point {
-      width: 8px;
-      height: 1px;
-      background-color: #ffffff;
-      position: absolute;
+      .point {
+        width: 8px;
+        height: 1px;
+        background-color: #ffffff;
+        position: absolute;
 
-      &.point-left {
-        left: 0;
-      }
+        &.point-left {
+          left: 0;
+        }
 
-      &.point-right {
-        right: 0;
-      }
+        &.point-right {
+          right: 0;
+        }
 
-      &.top {
-        top: -1px;
-      }
+        &.top {
+          top: -1px;
+        }
 
-      &.bottom {
-        bottom: -1px;
+        &.bottom {
+          bottom: -1px;
+        }
+      }
+      .part-item {
+        width: 100%;
+        height: calc(100% - 42px);
+        overflow-y: auto;
       }
-    }
-    .part-item {
-      width: 100%;
-      height: calc(100% - 42px);
-      overflow-y: auto;
-    }
-
-    .part {
-      width: 100%;
-      display: flex;
-      flex-direction: row;
-      margin-top: 5px;
-      font-size: 13px;
-      font-family: Source Han Sans SC;
-      font-weight: 400;
-      color: #959595;
-      padding: 0 10px;
 
-      .table-item {
-        width: 25%;
-        font-size: 12px;
+      .part {
+        width: 100%;
         display: flex;
         flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-        height: 33px;
-        font-size: 12px;
-        font-family: Microsoft YaHei;
+        margin-top: 5px;
+        font-size: 13px;
+        font-family: Source Han Sans SC;
         font-weight: 400;
-        color: #b3b3b3;
-        padding: 0 0px;
+        color: #959595;
+        padding: 0 10px;
 
-        .table-value {
+        .table-item {
+          width: 25%;
+          font-size: 12px;
           display: flex;
           flex-direction: row;
-          align-items: baseline;
-          font-family: Arial;
+          align-items: center;
+          justify-content: space-between;
+          height: 33px;
+          font-size: 12px;
+          font-family: Microsoft YaHei;
           font-weight: 400;
-          color: #05bb4c;
-          margin-right: 25px;
-          .unit {
-            font-size: 12px;
-            font-family: Source Han Sans SC;
+          color: #b3b3b3;
+          padding: 0 0px;
+
+          .table-value {
+            display: flex;
+            flex-direction: row;
+            align-items: baseline;
+            font-family: Arial;
             font-weight: 400;
-            color: #606769;
-            margin-left: 5px;
-            width: 40px;
-          }
+            color: #05bb4c;
+            margin-right: 25px;
+            .unit {
+              font-size: 12px;
+              font-family: Source Han Sans SC;
+              font-weight: 400;
+              color: #606769;
+              margin-left: 5px;
+              width: 40px;
+            }
 
-          &.round {
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            background-color: #05bb4c;
-            margin-right: 90px;
-          }
+            &.round {
+              width: 8px;
+              height: 8px;
+              border-radius: 50%;
+              background-color: #05bb4c;
+              margin-right: 90px;
+            }
 
-          &.round-red {
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            background-color: red;
-            margin-right: 90px;
+            &.round-red {
+              width: 8px;
+              height: 8px;
+              border-radius: 50%;
+              background-color: red;
+              margin-right: 90px;
+            }
           }
         }
-      }
 
-      &.active {
-        background-color: rgba(83, 89, 104, 0.15);
+        &.active {
+          background-color: rgba(83, 89, 104, 0.15);
+        }
       }
     }
+    .yaoxin {
+      margin-bottom: 0;
+    }
   }
 }
 </style>

src/components/windDetail/index.vue

@@ -5,11 +5,11 @@
         <div class="info-wrapper">
           <div class="ps-info">
             <div class="ps-title">厂商名称:</div>
-            <div class="ps-name">厂商名称</div>
+            <div class="ps-name">{{ otherInfo?.manufacturer }}</div>
           </div>
           <div class="ps-info" @click="handleXhClick(windInfo)">
             <div class="ps-title">设备型号:</div>
-            <div class="ps-name">设备型号</div>
+            <div class="ps-name">{{ otherInfo?.model }}</div>
           </div>
         </div>
         <div class="info-wrapper">
@@ -291,6 +291,7 @@ import powerAndSpeed from "@/components/powerAndSpeedSearch/index.vue";
 import {
   GetWtMonitorInfo,
   GetWtTelemeteryInfo,
+  GetWtOtherInfo,
 } from "@/api/factoryMonitor/index.js";
 import svgIcon from "@/components/coms/icon/svg-icon.vue";
 import alarmDialog from "@/components/alarm";
@@ -304,6 +305,7 @@ export default {
       wpid: "",
       windInfo: {},
       monitorInfo: {},
+      otherInfo: {},
       partAInfo: [],
       partDInfo: [],
       partAInfos: [],
@@ -430,6 +432,7 @@ export default {
         this.wpid = val.wpid;
         this.current = "fdj";
         this.getWtMonitorInfo(val);
+        this.getWtOtherInfo(val);
         this.handleClick("fdj");
       } else {
         this.cancle();
@@ -450,6 +453,14 @@ export default {
         this.monitorInfo = {};
       }
     },
+    // 设备其他信息
+    getWtOtherInfo(val) {
+      GetWtOtherInfo({ wtid: val.wtid }).then((res) => {
+        if (res.code == 200) {
+          this.otherInfo = res.data;
+        }
+      });
+    },
     // 查看各部位编码
     handleClick(val) {
       this.current = val;
@@ -615,7 +626,7 @@ export default {
   width: 100%;
   height: 100%;
   .edge {
-    width: 350px;
+    width: 400px;
     display: flex;
     height: 100%;
     flex-direction: column;
@@ -817,7 +828,7 @@ export default {
   }
 
   .parts {
-    width: calc(100% - 350px - 20px);
+    width: calc(100% - 400px - 20px);
     margin-left: 20px;
     height: 100%;
     display: flex;

src/views/economicsOperation/thematicAnalysis/comprehensiveAnalysis/index.vue

@@ -467,9 +467,9 @@ export default {
     tabClick(data) {
       this.tabIndex = data;
       if (data == -2) {
-        this.company = "SXJ_KGDL_GFFD_ZGS";
+        this.companyVal = "SXJ_KGDL_GFFD_ZGS";
       } else {
-        this.company = this.companyOptions[0].id;
+        this.companyVal = this.companyOptions[0].id;
       }
       this.seachData();
     },

src/views/stateMonitor/DetailMatrix/index.vue

@@ -139,12 +139,18 @@
                   @click="handleIndicatorClick(value.czlx, value.wpid)"
                 >
                   <span>{{
-                    item.type === value.czlx ? item.text1 : item.text
+                    item.type == value.czlx ? item.text1 : item.text
                   }}</span>
                   <span class="sub-value" :style="{ color: item.color }">
                     {{
                       indexs >= 8
-                        ? value[item.key]
+                        ? item.key1
+                          ? value[item.key1]
+                            ? item.ratio
+                              ? (value[item.key1] / item.ratio).toFixed(2)
+                              : value[item.key1].toFixed(2)
+                            : "0.00"
+                          : value[item.key]
                           ? item.ratio
                             ? (value[item.key] / item.ratio).toFixed(2)
                             : value[item.key].toFixed(2)
@@ -573,6 +579,9 @@ export default {
           color: "#9CA5A8",
           key: "bzgl",
           ratio: 1000,
+          text1: "理论功率",
+          key1: "llgl",
+          type: "-2",
         },
         // {
         //   text: "理论功率",
@@ -955,6 +964,8 @@ export default {
       if (czlx == "-2") {
         y[0].statiomName = "光照强度";
         y[0].sts = "SSPJGZD";
+        y[2].statiomName = "理论功率";
+        y[2].sts = "SSZNHGLZS";
       }
       this.$refs.child.openCurvDatas(y, 1, wpid);
     },

src/views/stateMonitor/LightMatrix/index.vue

@@ -321,10 +321,11 @@
             @click="handleIndicatorClick(item.czlx, item.wpid)"
           >
             预测功率<span>{{
-              item.ycgl ? (item.ycgl).toFixed(2) : "0.00"
+              item.ycgl ? item.ycgl.toFixed(2) : "0.00"
             }}</span></el-col
           >
           <el-col
+            v-if="item.czlx == -1"
             style="cursor: pointer"
             @click="handleIndicatorClick(item.czlx, item.wpid)"
           >
@@ -332,14 +333,15 @@
               item.bzgl ? (item.bzgl / 1000).toFixed(2) : "0.00"
             }}</span></el-col
           >
-          <!-- <el-col
+          <el-col
             style="cursor: pointer"
+            v-if="item.czlx == -2"
             @click="handleIndicatorClick(item.czlx, item.wpid)"
           >
             理论功率<span>{{
               item.llgl ? (item.llgl / 1000).toFixed(2) : "0.00"
             }}</span></el-col
-          > -->
+          >
           <el-col
             style="cursor: pointer"
             @click="handleIndicatorClick(item.czlx, item.wpid)"
@@ -554,6 +556,8 @@ export default {
       if (czlx == "-2") {
         y[0].statiomName = "光照强度";
         y[0].sts = "SSPJGZD";
+        y[2].statiomName = "理论功率";
+        y[2].sts = "SSZNHGLZS";
       }
       this.$refs.child.openCurvDatas(y, 1, wpid);
     },