问题修改

src/views/IntegratedAlarm/DetailMatrix/index.vue

@@ -822,10 +822,11 @@
 
 
         mounted() {
-            this.requestData(true);
-            this.timmer = setInterval(() => {
-                this.requestData(true);
-            }, 5000);
+            this.changeData(true, dataJson.data)
+            // this.requestData(true);
+            // this.timmer = setInterval(() => {
+            //     this.requestData(true);
+            // }, 5000);
         },
         unmounted() {
             clearInterval(this.timmer);

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>
@@ -540,7 +540,7 @@
                         code: "code"
                     },
                     {
-                        name: "停机结束时间",
+                        name: "停机开始时间",
                         code: "stopTime"
                     },
                     {
@@ -555,10 +555,10 @@
                         name: "故障信息",
                         code: "faultView"
                     },
-                    {
-                        name: "当前状态",
-                        code: "status"
-                    }
+                    // {
+                    //     name: "当前状态",
+                    //     code: "status"
+                    // }
                 ],
                 tableData: [
                     {

src/views/economicsOperation/nxfHomePage/index.vue

@@ -6,7 +6,7 @@
                 <div class="homeLeaf">
                     <Row type="flex" class="plan" style="height:21%">
                         <Col :span="24">
-                        <com-panel title="发电量" sub-title="（单位：万kWh）" bodyPadd="50px"
+                        <com-panel title="发电量" sub-title="单位:万kWh" bodyPadd="50px"
                             style="position: relative;height: 100%">
                             <div v-for="it in ForecastPower" :key="it" class="powerName">
                                 <span :style="{top: it.top}">{{it.name}}</span>
@@ -20,7 +20,7 @@
                     </Row>
                     <Row type="flex" class="plan" style="height:79%">
                         <Col :span="24">
-                        <com-panel title="主要经济指标同期对比" sub-title="（电量单位：万kWh）" style="position: relative;height: 100%">
+                        <com-panel title="主要经济指标同期对比" sub-title="单位:万kWh" style="position: relative;height: 100%">
                             <operationTable :data="zbtqdb" height="100%"></operationTable>
                         </com-panel>
                         </Col>
@@ -29,7 +29,9 @@
                 <div class="homeCenter">
                     <Row type="flex" style="height:23%;">
                         <Col :span="24" style="background: #142446 !important;">
-                        <power-plan :data="planData" :title="planBtnName" />
+                        <com-panel title="发电量完成率" sub-title="单位:万kWh" style="position: relative;height: 100%">
+                            <power-plan :data="planData" :title="planBtnName" />
+                        </com-panel>
                         </Col>
                     </Row>
                     <Row type="flex" style="height:25%">
@@ -66,9 +68,9 @@
                             {{ item.text }}
                         </div>
                     </div>
-                    <Row type="flex" class="rightplan" v-for="it in rightTableData" :key="it.name" style="height:48.5%">
+                    <Row type="flex" class="rightplan" v-for="it in rightTableData" :key="it.name" style="height:50%">
                         <Col :span="24">
-                        <com-panel :title="it.name" sub-title="（电量单位：万kWh）" style="position: relative;height: 100%">
+                        <com-panel :title="it.name"  style="position: relative;height: 100%">
                             <operationTable :data="it.data" height="100%"></operationTable>
                         </com-panel>
                         </Col>
@@ -124,8 +126,14 @@
                     id: "week",
                     text: "周",
                 }, ],
-                rightTableData: [
-                    
+                rightTableData: [{
+                        name: '风能利用率年排名',
+                        data: []
+                    },
+                    {
+                        name: '设备可利用率年排名',
+                        data: []
+                    }
                 ],
                 ForecastPower: [],
                 fnlyl: dataJson.data.fnlyl,
@@ -282,37 +290,7 @@
         width: 100%;
         height: 100%;
 
-        .tabs {
-            display: flex;
-            color: #fff;
-            margin-bottom: 1.111vh;
-            font-size: 12px;
-            display: flex;
-            justify-content: end;
-
-            .tab-item {
-                padding: 0.37vh 1.852vh;
-                cursor: pointer;
-
-                &.active {
-                    color: #fff;
-                    position: relative;
-                    background-image: linear-gradient(to top, fade(#2169c3, 50%), fade(#2169c3, 0));
-
-                    &::after {
-                        content: "";
-                        position: absolute;
-                        width: 100%;
-                        height: 0.463vh;
-                        border: 0.093vh solid #2169c3;
-                        border-top: 0;
-                        left: 0;
-                        bottom: 0;
-                        box-sizing: border-box;
-                    }
-                }
-            }
-        }
+       
 
         .homeMain {
             width: 100%;
@@ -359,10 +337,46 @@
             .homeRight {
                 width: 25%;
                 height: 100%;
+                position: relative;
 
                 .rightplan {
                     margin-bottom: 15px;
                 }
+
+                 .tabs {
+                    position: absolute;
+                    right: 0;
+                    z-index: 11111;
+                    display: flex;
+                    color: #fff;
+                    margin-bottom: 1.111vh;
+                    font-size: 12px;
+                    display: flex;
+                    justify-content: end;
+
+                    .tab-item {
+                        padding: 0.37vh 1.852vh;
+                        cursor: pointer;
+
+                        &.active {
+                            color: #fff;
+                            position: relative;
+                            background-image: linear-gradient(to top, fade(#2169c3, 50%), fade(#2169c3, 0));
+
+                            &::after {
+                                content: "";
+                                position: absolute;
+                                width: 100%;
+                                height: 0.463vh;
+                                border: 0.093vh solid #2169c3;
+                                border-top: 0;
+                                left: 0;
+                                bottom: 0;
+                                box-sizing: border-box;
+                            }
+                        }
+                    }
+                }
             }
         }