4-29 项目

src/assets/js/benchmarkingSys/propertBenchmark.js

@@ -127,26 +127,6 @@ export default {
     handleEdit(a, b) {
       this.wpId = [];
       this.lineDataOption = [];
-      if (this.multipleSelection.length == 2) {
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          this.wpId.push(this.multipleSelection[i].wpId);
-          this.wpName.push(this.multipleSelection[i].wpName);
-          this.lineDataOption.push({
-            id: this.multipleSelection[i].wpId,
-            name: this.multipleSelection[i].wpName,
-          });
-        }
-        this.$router.push({
-          path: "/propertBenchmarkParticulars",
-          query: {
-            wpId: this.wpId,
-            beginDate: this.beginDate,
-            endDate: this.endDate,
-            wpName: this.wpName,
-            select: this.lineDataOption,
-          },
-        });
-      } else {
         this.lineDataOption.push({ id: b.wpId, name: b.wpName });
         this.$router.push({
           path: "/propertBenchmarkParticulars",
@@ -158,7 +138,6 @@ export default {
             select: this.lineDataOption,
           },
         });
-      }
     },
     /**
      * 查询检查
@@ -232,16 +211,6 @@ export default {
           this.selectrowdate[1].jxssl,
           this.selectrowdate[1].gzssl
         );
-        // for (let i = 0; i < this.multipleSelection.length; i++) {
-        //   this.sortInOrde2.push({
-        //     product: this.multipleSelection[i].wpName,
-        //     "限电损失电量单位:万KWh": this.multipleSelection[i].xdss,
-        //     "故障损失电量单位:万KWh": this.multipleSelection[i].gzss,
-        //     "检修损失电量单位:万KWh": this.multipleSelection[i].jxssl,
-        //     "性能损失电量单位:万KWh": this.multipleSelection[i].xnssl,
-        //     "受累损失电量单位:万KWh": this.multipleSelection[i].slss,
-        //   });
-        // }
         this.getTableData.push({
           index: "发电量",
           data1: this.selectrowdate[0].fdl,

src/assets/js/benchmarkingSys/propertBenchmarkParticulars.js

@@ -40,6 +40,8 @@ export default {
       fdcND: [],
       fdcND1: "",
       fdcND2: "",
+      wp_n_1: {},
+      wp_n_2: {},
       wpIdslist: {
         name: "",
         id: "",
@@ -118,6 +120,9 @@ export default {
      */
     queryApDataMx() {
       this.dialogTableVisible = true;
+      this.wp_n_1 = {};
+      this.wp_n_2 = {};
+      this.getTableData = [];
       if (
         this.multipleSelection1.length + this.multipleSelection2.length ==
         2
@@ -130,6 +135,9 @@ export default {
         return;
       }
       if (this.multipleSelection.length == 2) {
+        
+        this.wp_n_1 = this.multipleSelection[0];
+        this.wp_n_2 = this.multipleSelection[1];
         this.pjName1 = this.multipleSelection[0].wtName;
         this.pjName2 = this.multipleSelection[1].wtName;
         this.fdcND1 =
@@ -163,16 +171,16 @@ export default {
           this.multipleSelection[1].jxssl,
           this.multipleSelection[1].gzssl
         );
-        for (let i = 0; i < this.multipleSelection.length; i++) {
-          this.sortInOrde2.push({
-            product: this.multipleSelection[i].wtName+" "+this.BASE.getBzDate(this.multipleSelection[i].recordDate,0),
-            "限电损失电量单位:万KWh": this.multipleSelection[i].xdss,
-            "故障损失电量单位:万KWh": this.multipleSelection[i].gzss,
-            "检修损失电量单位:万KWh": this.multipleSelection[i].jxssl,
-            "性能损失电量单位:万KWh": this.multipleSelection[i].xnssl,
-            "受累损失电量单位:万KWh": this.multipleSelection[i].slss,
-          });
-        }
+        // for (let i = 0; i < this.multipleSelection.length; i++) {
+        //   this.sortInOrde2.push({
+        //     product: this.multipleSelection[i].wtName+" "+this.BASE.getBzDate(this.multipleSelection[i].recordDate,0),
+        //     "限电损失电量单位:万KWh": this.multipleSelection[i].xdss,
+        //     "故障损失电量单位:万KWh": this.multipleSelection[i].gzss,
+        //     "检修损失电量单位:万KWh": this.multipleSelection[i].jxssl,
+        //     "性能损失电量单位:万KWh": this.multipleSelection[i].xnssl,
+        //     "受累损失电量单位:万KWh": this.multipleSelection[i].slss,
+        //   });
+        // }
         this.getTableData.push({
           index: "发电量",
           data1: this.multipleSelection[0].scadafdl,
@@ -246,7 +254,8 @@ export default {
       }
       this.$nextTick(function () {
         this.ECZM.leida_tc("leiDaTu3" , this.sortInOrder,this.pjName1,this.sortInOrderTop,this.pjName2);
-        this.ECZM.bar_tc_2("leiDaTu4",this.sortInOrde2);
+        this.ECZM.bar_tc("leiDaTu4" , this.wp_n_1 , this.wp_n_2 ,this.wp_n_1.wtId , this.wp_n_2.wtId);
+      
       });
     },
     /**

src/router/index.js

@@ -42,12 +42,12 @@ const routes = [
   {
     path: '/404', // 页面不存在的情况下会跳到404页面
     meta: {
-      requireAuth: true, // 添加该字段，表示进入这个路由是需要登录的
+      requireAuth: true, // 添加该字段，表示进入这个路由是需要登录的  /进路由勾子函数beforeEach
     },
     name: 'error404',
     component: error404,
   },
-  { // 健康评价报告 - 临时
+  { // 健康评价报告 - 临时  /部署单页面
     path:'/healthAssessmentDetailed2',
     component: r => require.ensure([], () => r(require('@views/healthManagement/healthAssessmentDetailed')), 'healthManagement')
   },
@@ -55,7 +55,7 @@ const routes = [
 
 const router = new VueRouter({
   mode: 'history',
-  // base: '/report/',
+  // base: '/report/', / 部署单页面 404 history  带井号解决（去掉history 放web-inf）
   base: '/',
   routes
 })

src/views/benchmarkingSys/propertBenchmarkParticulars.vue

@@ -547,33 +547,28 @@
       </el-card>
       <el-dialog
         class="el-dialog_body"
-        width="60%"
+        width="65%"
         title="对标信息分析"
         :visible.sync="dialogTableVisible"
         :modal-append-to-body="false"
         append-to-body
       >
-        <div class="margin">
-          <div class="dialogLeftData">
-            <div id="leiDaTu3" class="echart"></div>
-            <div id="leiDaTu4" class="echart"></div>
-          </div>
-          <div class="dialogRightData">
-            <el-table
-              :data="getTableData"
-              height="618"
-              :row-style="{ height: '10px' }"
-              border
-              :header-cell-style="headStyle"
-              :cell-style="{ textAlign: 'center', padding: '7px' }"
-              style="width: 100%; font-size: 10px"
-            >
+
+      <el-row>
+          <el-col :span="12">
+            <div id="leiDaTu3" style="width: 600px; height: 350px"></div>
+            <div id="leiDaTu4" style="width: 600px; height: 350px"></div>
+          </el-col>
+          <el-col :span="12">
+            <el-table :data="getTableData">
               <el-table-column prop="index" label="指标"> </el-table-column>
-              <el-table-column prop="data1" :label="pjName1"> </el-table-column>
-              <el-table-column prop="data2" :label="pjName2"> </el-table-column>
+              <el-table-column prop="data1" :label="pjName1">
+              </el-table-column>
+              <el-table-column prop="data2" :label="pjName2">
+              </el-table-column>
             </el-table>
-          </div>
-        </div>
+          </el-col>
+        </el-row>
       </el-dialog>
     </div>
   </div>