修改矩阵页面文字溢出，修复矩阵预测功率数据错误，修改报警弹窗查询参数及显示字段

.env.development

@@ -1,11 +1,11 @@
 
-# VUE_APP_TEST=http://10.81.3.155:9002
-VUE_APP_TEST=http://192.168.1.106:9002
+VUE_APP_TEST=http://10.81.3.155:9002
+# VUE_APP_TEST=http://192.168.1.106:9002
 
 
 # VUE_APP_API=http://192.168.1.110:6060
 VUE_APP_API=http://10.81.3.153:6060
-# VUE_APP_API=http://192.168.1.102:6060
+# VUE_APP_API=http://192.168.1.106:6060
 
 
 VUE_APP_ADAPTERURL=http://10.81.3.155:8011

src/components/alarm/index.vue

@@ -2,7 +2,10 @@
   <el-dialog v-model="dialogVisible" width="80%" top="120px">
     <template #title>
       <div class="dialog-title">
-        <div class="title">设备报警信息</div>
+        <div class="title">
+            设备报警信息
+            <span style="font-size:12px">(3小时内)</span>
+        </div>
       </div>
     </template>
     <div class="dialog-body">
@@ -27,8 +30,12 @@
           >
             <template #default="{ row }">
               <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+              <span
+                v-else-if="item.code == 'endts' && item.title == '是否解除'"
+                >{{ row.endts ? "已解除" : "未解除" }}</span
+              >
               <span v-else-if="item.code == 'endts'">{{
-                row.endts ? "解除" : "未解除"
+                row.endts ? getTime(row.endts) : "--"
               }}</span>
               <span v-else>{{ row[item.code] }}</span>
             </template>
@@ -62,8 +69,8 @@ export default {
         { title: "场站名称", code: "stationname", width: "200" },
         { title: "设备名称", code: "devicename", width: "180" },
         { title: "报警描述", code: "description" },
-        // { title: "级别", code: "rank", width: "120" },
         { title: "是否解除", code: "endts", width: "120" },
+        { title: "解除时间", code: "endts", width: "200" },
         { title: "是否确认", code: "confirmed", width: "120" },
       ],
       page: {
@@ -78,6 +85,9 @@ export default {
   },
   created() {},
   methods: {
+    getTime(endts) {
+      return dayjs(endts).format("YYYY-MM-DD HH:mm:ss");
+    },
     getRank(rank) {
       if (rank === 1) {
         return "低级";
@@ -102,9 +112,9 @@ export default {
       }
     },
     getTableData() {
-       this.BASE.showLoading();
+      this.BASE.showLoading();
       GetTableData({
-        begin: dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
+        begin: dayjs().add(-3, "hour").format("YYYY-MM-DD HH:mm:ss"),
         end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
         alarmType: this.wtype == -1 ? "windturbine" : "inverter",
         stationid: this.wpid,

src/views/HealthControl/energyEfficAnalyse/powerAnalyse/index.vue

@@ -226,8 +226,9 @@ export default {
       station: "",
       inverters: "",
       startdate: dayjs()
-        // .add(-1, "month")
-        .startOf("month")
+        .add(-1, "month")
+        // .startOf("month")
+        .startOf("day")
         .format("YYYY-MM-DD HH:mm:ss"),
       enddate: dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
       interval: 600,

src/views/HealthControl/energyEfficAnalyse/powerHotAnalyse/index.vue

@@ -335,8 +335,9 @@ export default {
       station: "",
       inverters: "",
       startdate: dayjs()
-        // .add(-1, "month")
-        .startOf("month")
+        .add(-1, "month")
+        // .startOf("month")
+        .startOf("day")
         .format("YYYY-MM-DD HH:mm:ss"),
       enddate: dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
       interval: 600,

src/views/stateMonitor/DetailMatrix/index.vue

@@ -3,7 +3,7 @@
     :class="$store.state.themeName === 'dark' ? 'dark-matrix' : 'light-matrix'"
   >
     <!-- 头部按钮选项 -->
-    <HeaderNav @typeFlag="typeFlag" :isAll="true" />
+    <HeaderNav :isAll="true" @firstRender="typeFlag" />
     <div class="matrix-body">
       <!-- 接入台数  欠发情况 -->
       <div class="body-title">
@@ -101,12 +101,7 @@
         </div>
       </div>
       <!-- 风电场/光电站列表 -->
-      <el-scrollbar
-        height="calc(100% - 72px)"
-        v-loading="loading"
-        element-loading-background="rgba(4, 12, 11, 0.8)"
-        element-loading-text="加载中..."
-      >
+      <el-scrollbar height="calc(100% - 72px)">
         <div class="matrix-box">
           <!-- 单个风场/电站 -->
           <div
@@ -665,19 +660,26 @@ export default {
 
   // 函数
   methods: {
-    handleMouse() {
-
-    },
+    handleMouse() {},
     deepClone,
     findUpColor,
     // 头部tab选择
-    typeFlag(activeTab, enterpriseIndex) {
+    typeFlag(activeTab) {
       this.activeTab = activeTab;
-      this.tabIndex = activeTab == "all" ? 0 : activeTab == "fc" ? -1 : -2;
-      this.enterpriseIndex = enterpriseIndex;
+      this.tabIndex = activeTab;
+      this.enterpriseIndex = "all";
+      this.requestData(true);
+      clearInterval(this.timmer);
+      this.timmer = null;
+      this.timmer = setInterval(() => {
+        this.requestData();
+      }, 5000);
     },
     // 请求服务
-    requestData() {
+    requestData(first) {
+      if (first) {
+        this.BASE.showLoading();
+      }
       api
         .matrixDetailPush({
           company:
@@ -688,6 +690,7 @@ export default {
         })
         .then((res) => {
           if (Object.values(res.data.data).length) {
+            this.BASE.closeLoading();
             let sourceMap = res.data.data;
             // sourceMap.powerVos.forEach((item, index) => {
             //   item["switch" + index] = true;
@@ -956,18 +959,6 @@ export default {
       this.$refs.child.openCurvDatas(y, 1, wpid);
     },
   },
-
-  created() {
-    let that = this;
-    that.$nextTick(() => {
-      this.loading = true;
-      that.requestData();
-      that.timmer = setInterval(() => {
-        that.requestData();
-      }, 5000);
-    });
-  },
-  mounted() {},
   unmounted() {
     clearInterval(this.timmer);
     this.timmer = null;
@@ -1828,14 +1819,14 @@ export default {
       .matrix-list {
         display: grid;
         justify-content: space-between;
-        grid-template-columns: repeat(auto-fill, 114px);
+        grid-template-columns: repeat(auto-fill, 142px);
         width: 100%;
         margin-top: 5px;
 
         .matrix-card {
           display: flex;
           flex-direction: column;
-          width: 114px;
+          width: 142px;
           height: 59px;
           margin-right: 2px;
           margin-bottom: 2px;
@@ -1849,7 +1840,7 @@ export default {
             height: 50px;
 
             .card-left {
-              width: 60px;
+              width: 55px;
               height: 100%;
               display: flex;
               flex-direction: column;
@@ -1874,9 +1865,10 @@ export default {
             }
 
             .card-right {
+              width: calc(100% - 1px - 55px);
               display: flex;
               flex-direction: column;
-              padding: 0px 4px;
+              padding-left: 10px;
               position: relative;
 
               .right-item {

src/views/stateMonitor/LightMatrix/index.vue

@@ -321,7 +321,7 @@
             @click="handleIndicatorClick(item.czlx, item.wpid)"
           >
             预测功率<span>{{
-              item.ycgl ? (item.ycgl / 1000).toFixed(2) : "0.00"
+              item.ycgl ? (item.ycgl).toFixed(2) : "0.00"
             }}</span></el-col
           >
           <el-col

src/views/stateMonitor/alarmCenter/commonAlarm/index.vue

@@ -139,8 +139,12 @@
           >
             <template #default="{ row }">
               <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+              <span
+                v-else-if="item.code == 'endts' && item.title == '是否解除'"
+                >{{ row.endts ? "已解除" : "未解除" }}</span
+              >
               <span v-else-if="item.code == 'endts'">{{
-                row.endts ? "解除" : "未解除"
+                row.endts ? getTime(row.endts) : "--"
               }}</span>
               <span v-else>{{ row[item.code] }}</span>
             </template>
@@ -197,8 +201,8 @@ export default {
         { title: "场站名称", code: "stationname", width: "220" },
         { title: "设备名称", code: "devicename", width: "200" },
         { title: "报警描述", code: "description" },
-        // { title: "级别", code: "rank", width: "180" },
         { title: "是否解除", code: "endts", width: "180" },
+        { title: "解除时间", code: "endts", width: "200" },
         { title: "是否确认", code: "confirmed", width: "180" },
       ],
       tableHeader1: [
@@ -217,6 +221,9 @@ export default {
     this.GetWpOptions();
   },
   methods: {
+    getTime(endts) {
+      return dayjs(endts).format("YYYY-MM-DD HH:mm:ss");
+    },
     getRank(rank) {
       if (rank === 1) {
         return "低级";

src/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation/index.vue

@@ -95,7 +95,7 @@
         </el-date-picker>
       </div>
       <div class="btns">
-        <el-button round size="mini" class="buttons" @click="getAlarm"
+        <el-button round size="mini" class="buttons" @click="getAlarm(true)"
           >搜索</el-button
         >
       </div>
@@ -113,8 +113,12 @@
         >
           <template #default="{ row }">
             <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+            <span
+              v-else-if="item.code == 'endts' && item.title == '是否解除'"
+              >{{ row.endts ? "已解除" : "未解除" }}</span
+            >
             <span v-else-if="item.code == 'endts'">{{
-              row.endts ? "解除" : "未解除"
+              row.endts ? getTime(row.endts) : "--"
             }}</span>
             <span v-else>{{ row[item.code] }}</span>
           </template>
@@ -178,8 +182,8 @@ export default {
         { title: "时间", code: "ts", width: "160" },
         { title: "场站名称", code: "stationname", width: "150" },
         { title: "报警描述", code: "description" },
-        // { title: "级别", code: "rank", width: "110" },
         { title: "是否解除", code: "endts", width: "110" },
+        { title: "解除时间", code: "endts", width: "160" },
         { title: "是否确认", code: "confirmed", width: "110" },
       ],
     };
@@ -193,6 +197,9 @@ export default {
     },
   },
   methods: {
+    getTime(endts) {
+      return dayjs(endts).format("YYYY-MM-DD HH:mm:ss");
+    },
     // 时间选择器第一个禁用
     disabledDate(time) {
       if (this.end) {
@@ -233,11 +240,12 @@ export default {
         .startOf("day")
         .format("YYYY-MM-DD HH:mm:ss");
       this.end = dayjs().format("YYYY-MM-DD HH:mm:ss");
-      //   this.drawer = true;
-      //   console.log(id);
-      this.getAlarm();
+      this.getAlarm(true);
     },
-    getAlarm() {
+    getAlarm(flag) {
+      if (flag) {
+        this.page.currentPage = 1;
+      }
       let params = {
         begin: this.begin,
         end: this.end,

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrix/index.vue

@@ -85,7 +85,7 @@
           >
             <div class="percent">{{ item.text }}</div>
             <div class="nums">
-              {{ matrixOther[item.code] }}
+              {{ matrixOther[item.code] ? matrixOther[item.code] : "0.00" }}
             </div>
           </div>
         </div>
@@ -99,6 +99,7 @@
         padding: 5px;
         border-radius: 0 0 5px 5px;
       "
+      v-if="Object.keys(showMatrixList).length"
     >
       <div
         class="matrixs"
@@ -215,6 +216,31 @@
         </div>
       </div>
     </div>
+    <div
+      v-else
+      style="
+        height: calc(100% - 78px);
+        overflow-y: auto;
+        background-color: rgba(0, 0, 0, 0.45);
+        padding: 5px;
+        border-radius: 0 0 5px 5px;
+        position: relative;
+      "
+    >
+      <el-empty
+        description="暂无数据"
+        style="
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%, -50%);
+        "
+      >
+        <template #image>
+          <span></span>
+        </template>
+      </el-empty>
+    </div>
   </div>
   <el-dialog
     class="dialogs"
@@ -553,10 +579,11 @@ export default {
     deepClone,
     findUpColor,
     renderData(company, wpid, name, tab) {
+      this.BASE.showLoading();
       this.tab = tab;
       if (wpid) {
         this.stationCode = wpid;
-        this.getSingleMatrix();
+        this.getSingleMatrix(true);
       } else {
         clearInterval(this.timer);
         this.timer = null;
@@ -565,17 +592,28 @@ export default {
       }
     },
     // 获取单场站矩阵数据
-    getSingleMatrix() {
+    getSingleMatrix(first) {
+      if (first) {
+        this.BASE.showLoading();
+      }
       if (this.stationCode) {
         api
           .matrixSinglePushFL({ wpid: this.stationCode, type: this.tab })
           .then(({ data }) => {
-            this.matrixState = data.mxzt;
-            this.matrixOther = data.qtsj;
-            this.singleMatrixInfo = data.ZQ;
-            if (this.current) {
-              this.handleClick(this.current);
+            if (
+              Object.keys(data).indexOf(`${this.tab.toLowerCase()}zqsl`) !=
+                -1 &&
+              data.qtsj.czid == this.stationCode
+            ) {
+              this.BASE.closeLoading();
+              this.matrixState = data.mxzt;
+              this.matrixOther = data.qtsj;
+              this.singleMatrixInfo = data.ZQ;
+              if (this.current) {
+                this.handleClick(this.current);
+              }
             }
+            // this.BASE.closeLoading();
           });
       }
     },
@@ -1322,7 +1360,7 @@ p {
       .line-namebox {
         padding: 0 10px;
         min-height: 66px;
-        flex: 0 0 auto;
+        width: 72px;
         font-size: 12px;
         color: #b3b3b3;
         border: 1px solid #fff;
@@ -1342,9 +1380,11 @@ p {
       }
 
       .line-list {
-        display: flex;
+        width: calc(100% - 72px);
+        display: grid;
+        grid-template-columns: repeat(auto-fill, 124px);
         margin: 0 10px;
-        flex-wrap: wrap;
+        justify-content: space-between;
       }
     }
 
@@ -1354,12 +1394,13 @@ p {
       align-items: center;
       flex-wrap: wrap;
       margin-top: 5px;
-
+      width: 124px;
+      height: 59px;
       .matrix-card {
         display: flex;
         flex-direction: column;
-        width: 114px;
-        height: 59px;
+        width: 100%;
+        height: 100%;
         margin-right: 2px;
         margin-bottom: 2px;
 
@@ -1371,7 +1412,7 @@ p {
           height: 100%;
 
           .card-left {
-            width: 45px;
+            width: 50px;
             height: 100%;
             display: flex;
             flex-direction: column;
@@ -1399,8 +1440,9 @@ p {
           .card-right {
             display: flex;
             flex-direction: column;
-            padding: 0px 4px;
+            padding-left: 12px;
             position: relative;
+            width: calc(100% - 1px - 50px);
             .right-item {
               display: flex;
               flex-direction: row;

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMatrixMonitor/index.vue

@@ -93,7 +93,7 @@
                   ? item.code == "speed"
                     ? singleMatrixInfo[item.code]?.toFixed(2)
                     : (singleMatrixInfo[item.code] / 1000)?.toFixed(2)
-                  : 0
+                  : "0.00"
               }}
             </div>
           </div>
@@ -1567,7 +1567,7 @@ p {
         justify-content: space-between;
         grid-template-columns: repeat(auto-fill, 142px);
         width: 100%;
-        // margin: 0 10px;
+        margin: 0 10px;
         // flex-wrap: wrap;
       }
     }
@@ -1624,7 +1624,7 @@ p {
             width: calc(100% - 1px - 50px);
             display: flex;
             flex-direction: column;
-            padding: 0px 4px;
+            padding-left: 12px;
             position: relative;
             .right-item {
               display: flex;

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/index.vue

@@ -93,8 +93,12 @@
         >
           <template #default="{ row }">
             <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+            <span
+              v-else-if="item.code == 'endts' && item.title == '是否解除'"
+              >{{ row.endts ? "已解除" : "未解除" }}</span
+            >
             <span v-else-if="item.code == 'endts'">{{
-              row.endts ? "解除" : "未解除"
+              row.endts ? getTime(row.endts) : "--"
             }}</span>
             <span v-else>{{ row[item.code] }}</span>
           </template>
@@ -169,8 +173,8 @@ export default {
         { title: "时间", code: "ts", width: "160" },
         { title: "场站名称", code: "stationname", width: "150" },
         { title: "报警描述", code: "description" },
-        // { title: "级别", code: "rank", width: "110" },
         { title: "是否解除", code: "endts", width: "110" },
+        { title: "解除时间", code: "endts", width: "160" },
         { title: "是否确认", code: "confirmed", width: "110" },
       ],
     };
@@ -184,6 +188,9 @@ export default {
     },
   },
   methods: {
+    getTime(endts) {
+      return dayjs(endts).format("YYYY-MM-DD HH:mm:ss");
+    },
     // 时间选择器第一个禁用
     disabledDate(time) {
       if (this.end) {

src/views/stateMonitor/factoryMonitor/windPowerPlant/matrixMonitor/index.vue

@@ -92,7 +92,7 @@
                 singleMatrixInfo[item.code]
                   ? item.code == "speed"
                     ? singleMatrixInfo[item.code]?.toFixed(2)
-                    : (singleMatrixInfo[item.code] / 1000)?.toFixed(2)
+                    : (singleMatrixInfo[item.code] / item.ratio)?.toFixed(2)
                   : 0
               }}
             </div>
@@ -478,7 +478,7 @@ export default {
       //   右侧标签
       unpaidList: [
         { text: "风速(m/s)", code: "speed" },
-        { text: "预测功率(MW)", code: "ycgl" },
+        { text: "预测功率(MW)", code: "ycgl", ratio: 1 },
         { text: "保证功率(MW)", code: "bzgl", ratio: 1000 },
         // { text: "理论功率(MW)", code: "llgl", ratio: 1000 },
         { text: "实际功率(MW)", code: "sjgl", ratio: 1000 },