Browse Source

(sunzehao提交)问题修改

wangb 5 months atrás
parent
commit
46b52b8a8c

+ 1 - 1
components.d.ts

@@ -166,7 +166,7 @@ declare module 'vue' {
     StrightLineChart: typeof import('./src/components/chart/line/stright-line-chart.vue')['default']
     SubmitBtn: typeof import('./src/components/generatingCapacityComponent/SubmitBtn.vue')['default']
     SvgDraw: typeof import('./src/components/coms/icon/svg-draw.vue')['default']
-    SvgIcon: typeof import('./src/components/coms/icon/svg-icon.vue')['default']
+    SvgIcon: typeof import('./src/components/powerPredictionComponent/svgIcon/index.vue')['default']
     SvgPageShow: typeof import('./src/components/powerPredictionComponent/powerControlSvg/svgPageShow.vue')['default']
     Tab: typeof import('./src/components/coms/tabs/tab.vue')['default']
     Table: typeof import('./src/components/generatingCapacityComponent/table.vue')['default']

+ 3 - 4
src/views/IntegratedAlarm/alarmConfig/components/custom_components.vue

@@ -275,6 +275,7 @@
           <el-table
             ref="multipleTableRef"
             :max-height="650"
+            width="100%"
             :data="state.alarmMapList"
             @selection-change="handleSelectionChange"
             stripe
@@ -721,9 +722,7 @@ const state = reactive({
   DIPointList: [],
   AIPointSearch: "",
   DIPointSearch: "",
-  alarmMapList: new Array(20).fill({
-    name: "ceshi"
-  }),
+  alarmMapList: [],
   pcflList: [],
 });
 const operator = [
@@ -1179,7 +1178,7 @@ const closeDialog = () => {
 
 .alDioPop {
   max-height: 700px;
-  overflow-y: hidden;
+  // overflow-y: hidden;
 
   .el-table {
     margin: 5px 0;

+ 5 - 5
src/views/IntegratedAlarm/safe/historyWarning/index.vue

@@ -390,7 +390,7 @@ onMounted(() => {
     projectname: "一期项目",
     rank: 3,
     resettable: false,
-    stationid: "SXJ_KGDL_XWT_FDC_STA",
+    stationid: "",
     stationname: "13风电场",
     subcomponents: "NULL",
     suffix: null,
@@ -503,7 +503,7 @@ const state = reactive({
     { title: "时间", code: "ts", width: "150" },
     { title: "场站", code: "stationname", width: "150" },
     { title: "机组", code: "devicename", width: "150" },
-    { title: "报警信息", code: "description", width: "180" },
+    { title: "报警信息", code: "description" },
     // { title: "故障原因", code: "faultCause" },
     // { title: "级别", code: "rank", width: "80" },
     { title: "部件类型", code: "components", width: "120" },
@@ -550,12 +550,12 @@ const getStationList = async () => {
         return i;
       }
     });
-    state.stationId = station?.id;
+    // state.stationId = station?.id;
   } else if (state.typeVal == "booststation") {
     let station = data.find((i) => i.name == state.stationName);
-    state.stationId = station ? station?.id : data[0]?.id;
+    // state.stationId = station ? station?.id : data[0]?.id;
   } else {
-    state.stationId = data[0]?.id;
+    // state.stationId = data[0]?.id;
   }
 
   state.stationId = route.query.stationId || state.stationId;

+ 1 - 1
src/views/IntegratedAlarm/safe/stopQuery/index.vue

@@ -252,7 +252,7 @@ export default {
   methods: {
     async getWpList() {
       const { data } = await getWpList("windturbine");
-      this.wpId = data?.[0]?.id || "";
+      // this.wpId = data?.[0]?.id || "";
       this.wpArray = data || [];
       this.getWtList();
     },