问题修改

.env.development

@@ -12,12 +12,12 @@ VUE_APP_DIALOG_NUM = 8
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
 # VUE_APP_ALARM=http://123.60.219.66:48080
-# VUE_APP_ALARM=https://10.220.1.5:6015
-VUE_APP_ALARM=/api6015
+VUE_APP_ALARM=https://10.220.1.5:6015
+# VUE_APP_ALARM=/api6015
 
 
-VUE_APP_API=/api6060
-# VUE_APP_API=https://10.220.1.5:6060
+# VUE_APP_API=/api6060
+VUE_APP_API=https://10.220.1.5:6060
 # VUE_APP_API=http://10.220.1.244:6060
 
 

src/api/zhbj/index.js

@@ -278,6 +278,14 @@ export const GetAlarmIdCustomNew = (params) => {
     method: "get",
   });
 };
+// 获取报警描述列表
+export const GetQuerywtalarmdesclistnew = (params) => {
+  return request({
+    url: `alarm/querywtalarmdesclistnew?components=${params.components}&modelId=${params.modelId}&wpId=${params.wpId}`,
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+  });
+};
 //报警修改日志
 export const fetchruleventLogs = (pagenum, pagesize, ruleName, ruleType) => {
   return request({

src/components/chart/pie/radar-pie-chart.vue

@@ -66,10 +66,10 @@
                 let that = this
                 let option = {
                     color: [
-                        "#3e73e9",
-                        "#4fa6e8",
                         "#70d0f4",
                         "#ffc149",
+                        "#3e73e9",
+                        "#4fa6e8",
                         "#ff7a87",
                         "#70d0f4",
                         "#cff4d8",

src/components/windDetail/index.vue

@@ -171,12 +171,26 @@
             液压
           </div>
           <div
-            class="title-item part-right"
+            class="title-item"
             :class="{ active: current === 'jc' }"
             @click="handleClick('jc')"
           >
             机舱信息
           </div>
+          <div
+            class="title-item"
+            :class="{ active: current === 'blq' }"
+            @click="handleClick('blq')"
+          >
+            变流器
+          </div>
+          <div
+            class="title-item part-right"
+            :class="{ active: current === 'dw' }"
+            @click="handleClick('dw')"
+          >
+            电网
+          </div>
           <!-- <div
             class="title-item part-right"
             :class="{ active: current === 'qt' }"
@@ -242,6 +256,18 @@
             :style="{ width: flag ? '650px' : '800px' }"
             src="@assets/imgs/qt_b.png"
           />
+          <img
+            v-if="current === 'blq'"
+            class="wind-part"
+            :style="{ width: flag ? '650px' : '800px' }"
+            src="@assets/imgs/blq.png"
+          />
+          <img
+            v-if="current === 'dw'"
+            class="wind-part"
+            :style="{ width: flag ? '650px' : '800px' }"
+            src="@assets/imgs/dw.png"
+          />
         </div>
       </div>
       <div class="problemsAI" style="color: #fff">

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -109,11 +109,31 @@
               </el-option>
             </el-select>
           </div> -->
-          <el-input
+          <div class="search-content">
+            <el-select
+              class="multSelectTages"
+              size="mini"
+              v-model="state.alarmIds"
+              style="width: 300px"
+              multiple
+              collapse-tags
+              placeholder="全部描述"
+              filterable
+            >
+              <el-option
+                v-for="item in state.alarmIdList"
+                :key="item.id"
+                :label="item.description"
+                :value="item.alarmId"
+              >
+              </el-option>
+            </el-select>
+          </div>
+          <!-- <el-input
             v-model="state.alarmIds"
             placeholder="请输入..."
             size="mini"
-          ></el-input>
+          ></el-input> -->
         </div>
         <div class="search-item">
           <span class="label">日期：</span>
@@ -308,6 +328,7 @@ import {
   fetchModel,
   fetchRelatePartAndAlarmType,
   GetAlarmId,
+  GetQuerywtalarmdesclistnew,
   getWpList,
 } from "@/api/zhbj/index.js";
 import dayjs from "dayjs";
@@ -413,6 +434,7 @@ const getequipmentmodel_list = async () => {
 const getfetchRelatePart = async () => {
   const { data } = await fetchRelatePartAndAlarmType();
   state.fetchListAll = data;
+  getAlarmId();
 };
 //型号列表
 const modelList = [
@@ -677,13 +699,27 @@ function getAlarmId() {
   //     //     : data.slice(0, 5).map((item) => item.alarmId);
   //     getTableList();
   //   });
-  state.alarmIdList = [
-    {
-      alarmId: "10",
-      description: "发电机转速大于900，并且 任意齿轮箱轴温度每分钟上升超过1.5",
-    },
-  ];
-  getTableList();
+  //   state.alarmIdList = [
+  //     {
+  //       alarmId: "10",
+  //       description: "发电机转速大于900，并且 任意齿轮箱轴温度每分钟上升超过1.5",
+  //     },
+  //   ];
+  //   getTableList();
+  GetQuerywtalarmdesclistnew({
+    components: state.components,
+    modelId: state.modelId,
+    wpId: state.changZhan,
+  }).then(({ data }) => {
+    state.alarmIdList = data;
+    // state.alarmIds = [];
+    state.alarmIds =
+      data.length <= 5
+        ? data.map((item) => item.alarmId)
+        : data.slice(0, 5).map((item) => item.alarmId);
+
+    getTableList();
+  });
 }
 
 // 分页导航

src/views/SandTable/SandTable.vue

@@ -890,11 +890,22 @@ export default {
     //获取停机表格信息
     getShutDownevenList(types, modelIds, size) {
       let that = this;
+      let dateTime = [
+        dayjs().date() !== 1
+          ? `${dayjs().format("YYYY-MM")}-01 00:00:00`
+          : dayjs()
+              .startOf("month")
+              .subtract(1, "day")
+              .format("YYYY-MM-DD HH:mm:ss"),
+        dayjs().format("YYYY-MM-DD HH:mm:ss"),
+      ];
       let params = {
         wpId: "NX_FGS_HA_FDC_STA",
         modelId: modelIds,
-        begin: dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"),
-        end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        // begin: dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"),
+        // end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        begin: dateTime[0],
+        end: dateTime[1],
         pageNum: 1,
         pageSize: size,
         type: types,
@@ -976,7 +987,11 @@ export default {
                 name: it.typeName,
                 value: value,
               };
-              result.push(obj);
+              if (it.typeName === "发电机" || it.typeName === "其他") {
+                result.unshift(obj);
+              } else {
+                result.push(obj);
+              }
             }
           });
           if (modelIds === "WT2000D121H85") {
@@ -1031,7 +1046,6 @@ export default {
                 name: it.name,
                 value: value,
               };
-              result.push(obj);
             }
             // let obj = {
             //   name: it.name,

src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue

@@ -135,12 +135,7 @@
                 :total="lossDataParams.total"
                 :page-size="20"
                 :current-page="lossDataParams.pageNum"
-                @current-change="
-                  (page) => {
-                    lossDataParams.pageNum = page;
-                    getXdLossData(lossDataParams);
-                  }
-                "
+                @current-change="handleCurrentChange"
               />
             </el-tab-pane>
           </el-tabs>
@@ -266,6 +261,11 @@ const xAxisData = ref([]);
 const chartRef = ref(); //chart 的ref
 const seriesData = ref([]);
 const dataSet = ref("");
+
+const handleCurrentChange = (val) => {
+  lossDataParams.value.pageNum = val;
+  getXdLossData(lossDataParams);
+};
 const funChartSelect = async (batch) => {
   return false;
 };
@@ -310,7 +310,7 @@ const getXdLossData = (params) => {
     )
     .then((res) => {
       xdLossTableData.value = res.records;
-      lossDataParams.value.pageNum = 1;
+      //   lossDataParams.value.pageNum = 1;
       lossDataParams.value.total = res.total;
     });
 };