问题修改并提交

src/components/generatingCapacityComponent/table.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="economicTable" ref="tableRef" style="height: 95vh">
+    <div class="economicTable" ref="tableRef" :style="{height: showHeight}">
         <div class="tableData_tit">
             <p :style="theme ? 'color:#5473E8' : 'color:#979797'">{{ tableName }}</p>
             <el-divider />
@@ -48,6 +48,12 @@
                     return [];
                 },
             },
+            showHeight: {
+                type: String,
+                default: () => {
+                    return "95vh";
+                },
+            },
             height: {
                 type: String,
                 default: () => {

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -392,11 +392,14 @@
                 fillFjzt: "all", // 风机/电站状态
                 mapping: {
                     0: "svg-standby",
-                    1: "svg-manual",
+                    // 1: "svg-manual",
+                    1: "svg-intranet-involvement",
                     2: "svg-normal-power",
+                    // 3: "svg-drop-output",
                     3: "svg-environment",
                     4: "svg-gz-downtime",
                     5: "svg-unknown",
+                    // 5: "svg-field-involved",
                     6: "svg-jx-downtime",
                     7: "svg-field-involved",
                     8: "svg-limit-power",
@@ -2285,6 +2288,44 @@
                                 }
                             }
                         }
+
+                        &.pansy {
+                            border: 1px solid #40E0D0;
+                            color: #a7a7a7;
+
+                            .info {
+                                border-bottom: 1px solid #40E0D0;
+                                background-color: rgba(64, 224,205, 0.2);
+
+                                .dashed {
+                                    width: 1px;
+                                    height: 100%;
+                                    background-image: linear-gradient(#40E0D0 0%,
+                                            #40E0D0 40%,
+                                            transparent 50%);
+                                    background-size: 1px 9px;
+                                }
+                            }
+                        }
+
+                        &.peachpuff {
+                            border: 1px solid #ffbe98;
+                            color: #a7a7a7;
+
+                            .info {
+                                border-bottom: 1px solid #ffbe98;
+                                background-color: rgba(255, 218, 185, 0.2);
+
+                                .dashed {
+                                    width: 1px;
+                                    height: 100%;
+                                    background-image: linear-gradient(#ffbe98 0%,
+                                            #ffbe98 40%,
+                                            transparent 50%);
+                                    background-size: 1px 9px;
+                                }
+                            }
+                        }
                     }
                 }
             }

src/views/IntegratedAlarm/alarmConfig/customConfig/index.vue

@@ -5,9 +5,9 @@
         <el-button class="buttons" size="mini" round @click="handleInsert">
           新增记录
         </el-button>
-        <el-button class="buttons" size="mini" round @click="export2Excel">
+        <!-- <el-button class="buttons" size="mini" round @click="export2Excel">
           批量导出</el-button
-        >
+        > -->
         <el-button class="buttons" size="mini" round @click="outExe">
           模板下载</el-button
         >
@@ -369,8 +369,8 @@ const state = reactive({
     { title: "场站", code: "stationName", width: "100" },
     { title: "机型", code: "modelId" },
     { title: "规则名称", code: "name", width: "150" },
-    { title: "表达式", code: "expression", width: "150" },
-    { title: "描述", code: "description", width: "150" },
+    { title: "表达式", code: "expressionXv", width: "50" },
+    { title: "描述", code: "descriptionXv", width: "50" },
     { title: "所属部件", code: "relatedPartsName" },
     // { title: "级别", code: "rank" },
     { title: "类型", code: "category" },
@@ -1890,6 +1890,19 @@ const getWpArray = async () => {
 const getData = async () => {
   const { data } = await custombj_fetchTableData(query);
   if (data) {
+    data.records.forEach(it => {
+        if (it.expression.length>5) {
+            it.expressionXv = it.expression.substring(0,5) + '...'
+        } else {
+            it.expressionXv = it.expression + '...'
+        }
+        if (it.description.length>5) {
+            it.descriptionXv = it.description.substring(0,5) + '...'
+        } else {
+            it.descriptionXv = it.description + '...'
+        }
+        
+    })
     state.tableData = data.records;
     total.value = data.total;
   }

src/views/SandTable/SandTable.vue

@@ -10,7 +10,7 @@
              <!-- v-if="showPanel" -->
             <!-- 第一机组 -->
             <div class="sand-table-left">
-                <PanelSand class="left-panel" title="停机信息">
+                <PanelSand class="left-panel" title="停机信息(中车)">
                     <template v-slot:tools>
                         <div class="exchange" @click="changeBjSwitch('left')">
                             <span :class="bjSwitch ? 'gray' : 'white'">故障</span>
@@ -20,7 +20,7 @@
                     </template>
                     <RankTable :data="selsZC" @rowClick="clickStopRow('left')" height="20vh"></RankTable>
                 </PanelSand>
-                <PanelSandToolbar class="right-panel mg-t-16" title="预警情况">
+                <PanelSandToolbar class="right-panel mg-t-16" title="预警情况(中车)">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="warnSwitch === 'z' ? 'white' : 'gray'" @click="changeWarnSwitch('z')">周</span>
@@ -41,7 +41,7 @@
                         <RadarPieChart height="18vh" :list="warnChartDataZC" :title="warnPC ? '预警频次情况' : '预警时长情况'" />
                     </template>
                 </PanelSandToolbar>
-                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况" @click="clickTime('WT2000D121H85')" style="cursor: pointer">
+                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况(中车)" @click="clickTime('WT2000D121H85')" style="cursor: pointer">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="probSwitch === 'z' ? 'white' : 'gray'" @click.stop="changeProbSwitch('z')">周</span>
@@ -68,7 +68,7 @@
              v-if="showPanel" -->
              <!-- 第二机组 -->
             <div class="sand-table-right">
-                <PanelSand class="left-panel" title="停机信息">
+                <PanelSand class="left-panel" title="停机信息(联合动力)">
                     <template v-slot:tools>
                         <div class="exchange" @click="changeBjSwitch('right')">
                             <span :class="bjSwitch2 ? 'gray' : 'white'">故障</span>
@@ -78,7 +78,7 @@
                     </template>
                     <RankTable :data="selsLH" @rowClick="clickStopRow('right')" height="20vh"></RankTable>
                 </PanelSand>
-                <PanelSandToolbar class="right-panel mg-t-16" title="预警情况">
+                <PanelSandToolbar class="right-panel mg-t-16" title="预警情况(联合动力)">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="warnSwitch2 === 'z' ? 'white' : 'gray'" @click="changeWarnSwitch2('z')">周</span>
@@ -99,7 +99,7 @@
                         <RadarPieChart height="18vh" :list="warnChartDataLH" :title="warnPC2 ? '预警频次情况' : '预警时长情况'" />
                     </template>
                 </PanelSandToolbar>
-                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况" @click="clickTime('UP2000-130')">
+                <PanelSandToolbar class="right-panel mg-t-16" title="故障情况(联合动力)" @click="clickTime('UP2000-130')">
                     <template v-slot:tools>
                         <div class="exchange">
                             <span :class="probSwitch2 === 'z' ? 'white' : 'gray'" @click.stop="changeProbSwitch2('z')">周</span>
@@ -916,7 +916,7 @@
 
                 let option = {
                     title: {
-                    text: "故障次数时长",
+                    text: "故障次数时长(中车)",
                     left: "5px",
                     top: "5px",
                     textStyle: {
@@ -941,8 +941,8 @@
                     selected: legendState,
                     },
                     grid: {
-                    left: "2%",
-                    right: "4%",
+                    left: "3%",
+                    right: "5%",
                     bottom: "5%",
                     height: "110px",
                     containLabel: true,
@@ -968,6 +968,7 @@
                         },
                         },
                         name: "单位：次",
+                        nameLocation: "end",
                         axisLine: {
                         lineStyle: {
                             color: "#fff",
@@ -1029,7 +1030,7 @@
 
                 let option = {
                     title: {
-                    text: "故障次数时长",
+                    text: "故障次数时长(联合动力)",
                     left: "5px",
                     top: "5px",
                     textStyle: {
@@ -1054,8 +1055,8 @@
                     selected: legendState,
                     },
                     grid: {
-                    left: "2%",
-                    right: "4%",
+                    left: "3%",
+                    right: "5%",
                     bottom: "5%",
                     height: "110px",
                     containLabel: true,

src/views/economicsOperation/stationAnalyse/angleAnalysis/components/current-scatter-chart.vue

@@ -101,7 +101,7 @@ export default {
 
     initChart(markItem = {}) {
       const that = this;
-      document.getElementById(this.id).removeAttribute("_echarts_instance_");
+    //   document.getElementById(this.id).removeAttribute("_echarts_instance_");
       that.chart = null;
       const theme = sessionStorage.getItem("theme") === "true" ? true : false;
 

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

@@ -123,11 +123,11 @@
                 :loading="tableLoading"
                 :column="xdLossTableDataColumn"
                 :height="tableHeight"
+                showHeight="'80vh'"
                 :tableId="tableShowId"
                 tableName="限电损失"
                 fromTableId="8"
                 :showHj="false"
-                style="position: relative; top: -10px"
               >
               </table-cop>
               <el-pagination