070发现的问题解决

.env.development

@@ -1,7 +1,7 @@
 # VUE_APP_BASE_API = http://192.168.11.250:18600
 # VUE_APP_Economy = http://192.168.11.250:6060
 # VUE_APP_BASE_API = http://192.168.1.101:6060
-VUE_APP_Economy = http://10.1.110.20:6060
+VUE_APP_Economy = http://192.168.1.109:6060
 
 # 服务名，调用后台微服务
 VUE_APP_SERVER_NAME = /nem-api

src/api/monthlyPerformanceAnalysis.js

@@ -407,7 +407,7 @@ export function getApiEconReport(params) {
 export function getApiStationMonthAnalyse(params) {
   return request({
     baseURL: process.env.VUE_APP_Economy,
-    url: `/stationAnalysis/month?companys=${params.companys}&type=${params.type}&beginDate=${params.beginDate}&endDate=${params.endDate}`,
+    url: `/stationAnalysis/month?companys=${params.companys}&type=${params.type}&beginDate=${params.beginDate}`,
     method: "GET",
   });
 }

src/assets/css/common.css

@@ -85,7 +85,8 @@
   right: 0;
 }
 
-.el-input__inner {
+.el-input__inner,
+.el-textarea__inner {
   background: rgba(67, 81, 107, 0.2) !important;
   border-radius: 12.5px !important;
   border: 1px solid #2a374f !important;
@@ -415,6 +416,15 @@ background-color: rgba(30,90,163, .5);
   color: #b3b3b3;
   width: 150px;
 }
+.el-textarea .el-textarea__inner {
+  width: 200px;
+  background: rgba(67, 81, 107, 0.2);
+  border: 1px solid #2a374f;
+  border-radius: 12.5px;
+  font-size: 13px;
+  color: #b3b3b3;
+  max-height: 150px;
+}
 
 .el-select .el-input__icon {
   height: 40px;

src/views/layout/economicsOperation/analyse/stationMonthAnalyse/index.vue

@@ -35,26 +35,13 @@
           </div>
           <div class="date-wrapper">
             <div class="date-item-wrapper">
-              开始月份
+              选择月份
               <div class="date-item-date">
                 <el-date-picker
                   size="mini"
-                  v-model="starTime"
-                  type="date"
-                  value-format="YYYY-MM-DD"
-                  placeholder="选择月份"
-                >
-                </el-date-picker>
-              </div>
-            </div>
-            <div class="date-item-wrapper">
-              结束月份
-              <div class="date-item-date">
-                <el-date-picker
-                  size="mini"
-                  v-model="endTime"
-                  type="date"
-                  value-format="YYYY-MM-DD"
+                  v-model="month"
+                  type="month"
+                  value-format="YYYY-MM"
                   placeholder="选择月份"
                 >
                 </el-date-picker>
@@ -178,8 +165,7 @@ export default {
       companyOptions: [],
       stationVal: "",
       stationOptions: [],
-      starTime: "",
-      endTime: "",
+      month: "",
       stationAnalyseData: [],
       stationLineData: [],
       tableHeader: [
@@ -268,10 +254,7 @@ export default {
         },
       ],
       tabEvent: -2,
-      tabOptions: [
-        { id: -1, name: "风电" },
-        { id: -2, name: "光伏" },
-      ],
+      tabOptions: [{ id: -2, name: "光伏" }],
       dialogCurveVisible: false,
       dialogTitle: "场站月度分析报告",
     };
@@ -280,8 +263,7 @@ export default {
     EconomyReport,
   },
   created() {
-    this.starTime = dayjs().startOf("month").format("YYYY-MM-DD");
-    this.endTime = dayjs().format("YYYY-MM-DD");
+    this.month = dayjs().startOf("month").format("YYYY-MM");
     this.getCompanyData();
   },
   methods: {
@@ -308,8 +290,7 @@ export default {
       let params = {
         type: this.tabEvent,
         companys: this.companyVal,
-        beginDate: this.starTime,
-        endDate: this.endTime,
+        beginDate: this.month,
       };
       const { data } = await getApiStationMonthAnalyse(params);
       this.stationAnalyseData = data;

src/views/layout/economicsOperation/benchmarkingManagement/brandBenchmarking/index.vue

@@ -131,7 +131,7 @@
         <!-- <el-button round size="mini" class="buttons">导出</el-button> -->
       </div>
     </div>
-    <div class="bodys" v-if="!displayDetail">
+    <div class="bodys">
       <div class="line">
         <div class="leftContent"><span>品牌对标</span></div>
         <div class="rightContent"></div>
@@ -147,13 +147,14 @@
           stripe
           @selection-change="handleCurrentChange"
         >
-          <el-table-column type="selection" width="55" align="center">
+          <el-table-column type="selection" width="45" align="center">
           </el-table-column>
           <el-table-column
             align="center"
             prop="name"
             label="名称"
-            width="150"
+            show-overflow-tooltip
+            width="75"
             sortable
           >
           </el-table-column>
@@ -170,7 +171,7 @@
             prop="fdlpm"
             label="发电量排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -178,7 +179,7 @@
             prop="fdl"
             label="发电量"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -186,7 +187,7 @@
             prop="gzssdlpm"
             label="故障损失排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -194,7 +195,7 @@
             prop="gzssdl"
             label="故障损失"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -202,7 +203,7 @@
             prop="jxssdlpm"
             label="检修损失排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -210,7 +211,7 @@
             prop="jxssdl"
             label="检修损失"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -218,7 +219,7 @@
             prop="xnssdlpm"
             label="性能损失排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -226,7 +227,7 @@
             prop="xnssdl"
             label="性能损失"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -234,7 +235,7 @@
             prop="xdssdlpm"
             label="限电损失排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -242,7 +243,7 @@
             prop="xdssdl"
             label="限电损失"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -250,7 +251,7 @@
             prop="slssdlpm"
             label="受累损失排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -258,7 +259,7 @@
             prop="slssdl"
             label="受累损失"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -266,7 +267,7 @@
             prop="fnlylpm"
             :label="(tabIndex === -1 ? '风能' : '光能') + '利用率排名'"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -274,7 +275,7 @@
             prop="fnlyl"
             :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -282,7 +283,7 @@
             prop="gzsslpm"
             label="故障损失率排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -290,7 +291,7 @@
             prop="gzssl"
             label="故障损失率(%)"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -298,7 +299,7 @@
             prop="jxsslpm"
             label="检修损失率排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -306,7 +307,7 @@
             prop="jxssl"
             label="检修损失率(%)"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -314,7 +315,7 @@
             prop="qflpm"
             :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -322,7 +323,7 @@
             prop="qfl"
             :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -330,7 +331,7 @@
             prop="xnsslpm"
             label="性能损失率排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -338,7 +339,7 @@
             prop="xnssl"
             label="性能损失率(%)"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -346,7 +347,7 @@
             prop="slsslpm"
             label="受累损失率排名"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
           <el-table-column
@@ -354,22 +355,13 @@
             prop="slssl"
             label="受累损失率(%)"
             sortable
-            width="63"
+            width="70"
           >
           </el-table-column>
-          <el-table-column align="center" prop="" label="操作">
-            <template v-slot="scope">
-              <span
-                @click="goDetail(scope.row)"
-                style="cursor: pointer; color: #1c99ff"
-                >详情</span
-              >
-            </template>
-          </el-table-column>
         </el-table>
       </div>
     </div>
-    <div class="echarts" v-if="!displayDetail">
+    <div class="echarts">
       <div class="pie-echarts">
         <div class="chart-name">
           <div class="point left bottom"></div>
@@ -399,139 +391,6 @@
         ></BarCharts>
       </div>
     </div>
-    <div v-if="displayDetail">
-      <el-table
-        :data="detailTable"
-        ref="multipleTable"
-        size="mini"
-        height="88vh"
-        :cell-style="{ padding: '0px' }"
-        :row-style="{ height: '0' }"
-        stripe
-        @selection-change="handleCurrentChange"
-      >
-        <el-table-column type="selection" width="55" align="center">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="name"
-          :label="tabIndex == -2 ? '逆变器名称' : '风机名称'"
-          width="150"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="zhpm" label="综合排名" sortable>
-        </el-table-column>
-        <el-table-column align="center" prop="gzssdl" label="故障损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxssdlpm"
-          label="检修损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="jxssdl" label="检修损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnssdlpm"
-          label="性能损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="xnssdl" label="性能损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xdssdlpm"
-          label="限电损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="xdssdl" label="限电损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slssdlpm"
-          label="受累损失排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="slssdl" label="受累损失" sortable>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="gzsslpm"
-          label="故障损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="gzssl"
-          label="故障损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxsslpm"
-          label="检修损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="jxssl"
-          label="检修损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="qflpm"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="qfl"
-          :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnsslpm"
-          label="性能损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="xnssl"
-          label="性能损失率(%)"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slsslpm"
-          label="受累损失率排名"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="slssl"
-          label="受累损失率(%)"
-          sortable
-        >
-        </el-table-column>
-      </el-table>
-    </div>
 
     <el-dialog
       class="dialogs"
@@ -772,23 +631,6 @@ export default {
       });
       this.chooseList = arr;
     },
-    goDetail(row) {
-      this.displayDetail = true;
-      details({
-        id: row.id,
-        beginDate: this.starTime,
-        endDate: this.endTime,
-        target: "",
-        sort: "",
-      }).then((res) => {
-        if (res.data) {
-          this.detailTable = res.data;
-        }
-      });
-    },
-    goBack() {
-      this.displayDetail = false;
-    },
     dbfx() {
       if (this.chooseList.length <= 5) {
         this.dialogVisible = true;

src/views/layout/economicsOperation/benchmarkingManagement/companyBenchmarking/index.vue

@@ -22,7 +22,7 @@
         v-model="company"
         multiple
         collapse-tags
-        placeholder="请选择"
+        placeholder="江苏区域"
         @change="handleCompanyChange(company)"
       >
         <el-option
@@ -107,7 +107,7 @@
           size="mini"
           :height="echartsHeight"
           :cell-style="{ padding: '6px' }"
-           :header-cell-style="{ 'text-align': 'center' }"
+          :header-cell-style="{ 'text-align': 'center' }"
           :row-style="{ height: '0' }"
           stripe
           @selection-change="handleCurrentChange"
@@ -136,7 +136,7 @@
             prop="fdlpm"
             label="发电量排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -144,7 +144,7 @@
             prop="fdl"
             label="发电量"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -152,7 +152,7 @@
             prop="gzssdlpm"
             label="故障损失排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -160,7 +160,7 @@
             prop="gzssdl"
             label="故障损失"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -168,7 +168,7 @@
             prop="jxssdlpm"
             label="检修损失排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -176,7 +176,7 @@
             prop="jxssdl"
             label="检修损失"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -184,7 +184,7 @@
             prop="xnssdlpm"
             label="性能损失排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -192,7 +192,7 @@
             prop="xnssdl"
             label="性能损失"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -200,7 +200,7 @@
             prop="xdssdlpm"
             label="限电损失排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -208,7 +208,7 @@
             prop="xdssdl"
             label="限电损失"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -216,7 +216,7 @@
             prop="slssdlpm"
             label="受累损失排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -224,7 +224,7 @@
             prop="slssdl"
             label="受累损失"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -232,7 +232,7 @@
             prop="fnlylpm"
             :label="(tabIndex === -1 ? '风能' : '光能') + '利用率排名'"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -240,7 +240,7 @@
             prop="fnlyl"
             :label="(tabIndex === -1 ? '风能' : '光能') + '利用率(%)'"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -248,7 +248,7 @@
             prop="gzsslpm"
             label="故障损失率排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -256,7 +256,7 @@
             prop="gzssl"
             label="故障损失率(%)"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -264,7 +264,7 @@
             prop="jxsslpm"
             label="检修损失率排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -272,7 +272,7 @@
             prop="jxssl"
             label="检修损失率(%)"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -280,7 +280,7 @@
             prop="qflpm"
             :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率排名'"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -288,7 +288,7 @@
             prop="qfl"
             :label="'弃' + (tabIndex === -1 ? '风' : '光') + '率(%)'"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -296,7 +296,7 @@
             prop="xnsslpm"
             label="性能损失率排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -304,7 +304,7 @@
             prop="xnssl"
             label="性能损失率(%)"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -312,7 +312,7 @@
             prop="slsslpm"
             label="受累损失率排名"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column
@@ -320,7 +320,7 @@
             prop="slssl"
             label="受累损失率(%)"
             sortable
-           width="68"
+            width="68"
           >
           </el-table-column>
           <el-table-column align="center" prop="" label="操作" width="68">
@@ -549,7 +549,7 @@ export default {
   },
   data() {
     return {
-      company: "",
+      company: [],
       companyOptions: [],
       stationObj: [],
       stationList: [],
@@ -621,7 +621,7 @@ export default {
     initialization() {
       GetOrganization({ type: this.tabIndex }).then((res) => {
         if (res.data) {
-          this.company = [res.data[0].id];
+          this.company = [];
           this.companyOptions = res.data;
           this.gerGsdb();
         }
@@ -630,7 +630,7 @@ export default {
 
     gerGsdb() {
       gsdb({
-        companys: this.company.join(","),
+        companys: this.company.length ? this.company.join(",") : "JS_RGN",
         type: this.tabIndex,
         beginDate: this.starTime,
         endDate: this.endTime,
@@ -682,8 +682,14 @@ export default {
       });
     },
     handleCompanyChange(val) {
-      this.company = val;
-      this.gerGsdb();
+      let comp = val.indexOf("JS_RGN");
+      if (comp == -1) {
+        this.company = val;
+        this.gerGsdb();
+      } else {
+        this.company = [];
+        this.gerGsdb();
+      }
     },
 
     handleCurrentChange(val) {

src/views/layout/economicsOperation/benchmarkingManagement/performanceRankingList/decision1Mx.vue

@@ -139,7 +139,16 @@
         >
           <el-table-column align="center" prop="" label="" width="1000">
           </el-table-column>
-          <el-table-column align="center" prop="name" label="名称" width="180">
+          <el-table-column
+            show-overflow-tooltip
+            align="center"
+            prop="name"
+            label="名称"
+            width="80"
+          >
+            <template v-slot="{ row }">
+              <span @click.stop="handleNameClick(row)">{{ row.name }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -267,6 +276,7 @@ export default {
         { id: "2", name: "项目" },
         { id: "3", name: "线路" },
       ],
+      typeIndexFlag: false,
       tableData: [],
       showDisplay: true,
       height: "858px",
@@ -375,8 +385,25 @@ export default {
     this.initialization();
   },
   methods: {
+    handleNameClick(row) {
+      if (this.typeIndex == 4) {
+        return;
+      } else {
+        this.typeIndexFlag = true;
+        if (this.typeIndex == "1") {
+          this.stationObj = row.id;
+          this.getProject(this.stationObj);
+        } else if (this.typeIndex == "2") {
+          this.projectObj = row.id;
+          this.getLineList(this.projectObj);
+        } else if (this.typeIndex == "2") {
+          this.lineObj = row.id;
+        }
+        this.typeIndex = "4";
+        this.getPerformance();
+      }
+    },
     onHeaderClick(column) {
-      console.log(column);
       this.target = column.property;
       this.sortList.forEach((item) => {
         if (item.id === column.property) {
@@ -465,6 +492,18 @@ export default {
       this.initialization();
     },
     typeClick(data) {
+      if (this.typeIndexFlag) {
+        if (data == "1") {
+          this.stationObj = "";
+          this.projectObj = "";
+          this.lineObj = "";
+        } else if (data == "2") {
+          this.projectObj = "";
+          this.lineObj = "";
+        } else if (data == "3") {
+          this.lineObj = "";
+        }
+      }
       this.typeIndex = data;
       this.getPerformance();
     },
@@ -538,6 +577,8 @@ export default {
               legend: legend,
               data: arr1,
             };
+          } else {
+            (this.bardata = []), (this.lineData = []);
           }
           if (this.lineData.length > 22) {
             this.height = this.lineData.length * 37 + 53 + "px";

src/views/layout/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -151,6 +151,9 @@
             show-overflow-tooltip
             label="名称"
           >
+            <template v-slot="{ row }">
+              <span @click.stop="handleNameClick(row)">{{ row.name }}</span>
+            </template>
           </el-table-column>
           <el-table-column align="center" prop="llfdl" label="理论发电量">
           </el-table-column>
@@ -257,6 +260,7 @@ export default {
         { id: "2", name: "项目" },
         { id: "3", name: "线路" },
       ],
+      typeIndexFlag: false,
       tableData: [],
       showDisplay: true,
       height: "880px",
@@ -323,6 +327,24 @@ export default {
     this.initialization();
   },
   methods: {
+    handleNameClick(row) {
+      if (this.typeIndex == 4) {
+        return;
+      } else {
+        this.typeIndexFlag = true;
+        if (this.typeIndex == "1") {
+          this.stationObj = row.id;
+          this.getProject(this.stationObj);
+        } else if (this.typeIndex == "2") {
+          this.projectObj = row.id;
+          this.getLineList(this.projectObj);
+        } else if (this.typeIndex == "2") {
+          this.lineObj = row.id;
+        }
+        this.typeIndex = "4";
+        this.getPerformance();
+      }
+    },
     onHeaderClick(column) {
       console.log(column);
       this.target = column.property;
@@ -411,6 +433,18 @@ export default {
       this.initialization();
     },
     typeClick(data) {
+      if (this.typeIndexFlag) {
+        if (data == "1") {
+          this.stationObj = "";
+          this.projectObj = "";
+          this.lineObj = "";
+        } else if (data == "2") {
+          this.projectObj = "";
+          this.lineObj = "";
+        } else if (data == "3") {
+          this.lineObj = "";
+        }
+      }
       this.typeIndex = data;
       this.getPerformance();
     },

src/views/layout/economicsOperation/homePage/components/card.vue

@@ -522,7 +522,7 @@ export default {
           li {
             display: flex;
             justify-content: space-between;
-            margin-bottom: 12px;
+            margin-bottom: 10px;
             font-size: 14px;
             width: 100%;
             .maintenance-item {

src/views/layout/economicsOperation/homePage/components/pieChart.vue

@@ -140,7 +140,6 @@ export default {
     initChart() {
       let that = this;
       const chart = echarts.init(this.$el);
-      console.log(11);
       let option = {
         color: this.color,
         legend: {

src/views/layout/economicsOperation/insert/cleanInsert/components/operation.vue

@@ -49,7 +49,7 @@
               <el-option
                 v-for="item in squareOption"
                 :key="item.squareId"
-                :label="item.squareId"
+                :label="item.parentCode"
                 :value="item.squareId"
               ></el-option>
             </el-select>
@@ -99,6 +99,8 @@
               style="width: 200px"
               class="inputs"
               size="mini"
+              type="textarea"
+              autosize
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -108,6 +110,8 @@
               style="width: 200px"
               class="inputs"
               size="mini"
+              type="textarea"
+              autosize
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -144,6 +148,59 @@ export default {
     },
   },
   data() {
+    var validatePlanEnddate = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请选择"));
+      } else if (this.form.begindate !== "") {
+        let time = dayjs(value).valueOf();
+        let time1 = dayjs(this.form.begindate).valueOf();
+        if (time < time1) {
+          callback(new Error("计划结束时间不得早于开始时间"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
+    var validateActualEnddate = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请选择"));
+      } else if (this.form.begindate !== "") {
+        let time = dayjs(value).valueOf();
+        let time1 = dayjs(this.form.begindate).valueOf();
+        if (time < time1) {
+          callback(new Error("实际结束时间不得早于开始时间"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
+    var validateBegindate = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请选择"));
+      } else if (this.form.planEnddate !== "") {
+        let time1 = dayjs(this.form.planEnddate).valueOf();
+        let time = dayjs(value).valueOf();
+        if (time > time1) {
+          callback(new Error("开始时间不得晚于计划结束时间"));
+        } else {
+          callback();
+        }
+      } else if (this.form.actualEnddate !== "") {
+        let time = dayjs(value).valueOf();
+        let time2 = dayjs(this.form.actualEnddate).valueOf();
+        if (time > time2) {
+          callback(new Error("开始时间不得晚于实际结束时间"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
     return {
       dialogCurveVisible: false,
       dialogTitle: "新增",
@@ -165,16 +222,61 @@ export default {
           { required: true, trigger: "blur", message: "请选择" },
         ],
         squareId: [{ required: true, trigger: "blur", message: "请选择" }],
-        begindate: [{ required: true, trigger: "blur", message: "请选择" }],
-        planEnddate: [{ required: true, trigger: "blur", message: "请选择" }],
-        actualEnddate: [{ required: true, trigger: "blur", message: "请选择" }],
+        begindate: [{ validator: validateBegindate, trigger: "blur" }],
+        planEnddate: [{ validator: validatePlanEnddate, trigger: "blur" }],
+        actualEnddate: [{ validator: validateActualEnddate, trigger: "blur" }],
         toolMaterials: [{ required: true, trigger: "blur", message: "请选择" }],
         cleaningSteps: [{ required: true, trigger: "blur", message: "请选择" }],
       },
+
       isAdd: true,
     };
   },
-  created() {},
+  watch: {
+    // "form.begindate": {
+    //   handler(val) {
+    //     let time = dayjs(val).valueOf();
+    //     let time1 = dayjs(this.form.planEnddate).valueOf();
+    //     let time2 = dayjs(this.form.actualEnddate).valueOf();
+    //     if (time > time1 || time > time2) {
+    //       this.$message({
+    //         type: "warning",
+    //         message:
+    //           "开始时间不得晚于" +
+    //           (time > time1 ? "计划结束时间" : "实际结束时间") +
+    //           "，请重新选择！",
+    //         duration: 1500,
+    //       });
+    //     }
+    //   },
+    // },
+    // "form.planEnddate": {
+    //   handler(val) {
+    //     let time = dayjs(val).valueOf();
+    //     let time1 = dayjs(this.form.begindate).valueOf();
+    //     if (time < time1) {
+    //       this.$message({
+    //         type: "warning",
+    //         message: "计划结束时间不得早于开始时间，请重新选择！",
+    //         duration: 1500,
+    //       });
+    //     }
+    //   },
+    // },
+    // "form.actualEnddate": {
+    //   handler(val) {
+    //     let time = dayjs(val).valueOf();
+    //     let time1 = dayjs(this.form.begindate).valueOf();
+    //     if (time < time1) {
+    //       this.$message({
+    //         type: "warning",
+    //         message: "实际结束时间不得早于开始时间，请重新选择！",
+    //         duration: 1500,
+    //       });
+    //     }
+    //   },
+    // },
+  },
   methods: {
     openDialog(row) {
       if (!row) {

src/views/layout/economicsOperation/insert/cleanInsert/index.vue

@@ -258,12 +258,12 @@ export default {
       this.$refs["operation"].form.begindate = dayjs().format(
         "YYYY-MM-DD HH:mm:ss"
       );
-      this.$refs["operation"].form.planEnddate = dayjs().format(
-        "YYYY-MM-DD HH:mm:ss"
-      );
-      this.$refs["operation"].form.actualEnddate = dayjs().format(
-        "YYYY-MM-DD HH:mm:ss"
-      );
+    //   this.$refs["operation"].form.planEnddate = dayjs().format(
+    //     "YYYY-MM-DD HH:mm:ss"
+    //   );
+    //   this.$refs["operation"].form.actualEnddate = dayjs().format(
+    //     "YYYY-MM-DD HH:mm:ss"
+    //   );
       this.$refs["operation"].openDialog();
     },
     //编辑

src/views/layout/economicsOperation/insert/faultInsert/components/operation.vue

@@ -99,6 +99,8 @@
               style="width: 200px"
               class="inputs"
               size="mini"
+              autosize
+              type="textarea"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -108,6 +110,8 @@
               style="width: 200px"
               class="inputs"
               size="mini"
+              autosize
+              type="textarea"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -132,7 +136,7 @@
 <script>
 import { FaultOperation } from "@/api/insert.js";
 import { GetwtByWp } from "@/api/headerNav.js";
-
+import dayjs from "dayjs";
 export default {
   name: "operation",
   components: {},
@@ -143,6 +147,59 @@ export default {
     },
   },
   data() {
+    var validatePlanEnddate = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请选择"));
+      } else if (this.form.begindate !== "") {
+        let time = dayjs(value).valueOf();
+        let time1 = dayjs(this.form.begindate).valueOf();
+        if (time < time1) {
+          callback(new Error("计划结束时间不得早于开始时间"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
+    var validateActualEnddate = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请选择"));
+      } else if (this.form.begindate !== "") {
+        let time = dayjs(value).valueOf();
+        let time1 = dayjs(this.form.begindate).valueOf();
+        if (time < time1) {
+          callback(new Error("实际结束时间不得早于开始时间"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
+    var validateBegindate = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请选择"));
+      } else if (this.form.planEnddate !== "") {
+        let time1 = dayjs(this.form.planEnddate).valueOf();
+        let time = dayjs(value).valueOf();
+        if (time > time1) {
+          callback(new Error("开始时间不得晚于计划结束时间"));
+        } else {
+          callback();
+        }
+      } else if (this.form.actualEnddate !== "") {
+        let time = dayjs(value).valueOf();
+        let time2 = dayjs(this.form.actualEnddate).valueOf();
+        if (time > time2) {
+          callback(new Error("开始时间不得晚于实际结束时间"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
     return {
       dialogCurveVisible: false,
       dialogTitle: "新增",
@@ -164,16 +221,19 @@ export default {
           { required: true, trigger: "blur", message: "请选择" },
         ],
         equipmentId: [{ required: true, trigger: "blur", message: "请选择" }],
-        begindate: [{ required: true, trigger: "blur", message: "请选择" }],
-        planEnddate: [{ required: true, trigger: "blur", message: "请选择" }],
-        actualEnddate: [{ required: true, trigger: "blur", message: "请选择" }],
-        faultDescription: [{ required: true, trigger: "blur", message: "请选择" }],
-        processingProcess: [{ required: true, trigger: "blur", message: "请选择" }],
+        begindate: [{ validator: validateBegindate, trigger: "blur" }],
+        planEnddate: [{ validator: validatePlanEnddate, trigger: "blur" }],
+        actualEnddate: [{ validator: validateActualEnddate, trigger: "blur" }],
+        faultDescription: [
+          { required: true, trigger: "blur", message: "请选择" },
+        ],
+        processingProcess: [
+          { required: true, trigger: "blur", message: "请选择" },
+        ],
       },
       isAdd: true,
     };
   },
-  created() {},
   methods: {
     openDialog(row) {
       if (!row) {

src/views/layout/economicsOperation/insert/faultInsert/index.vue

@@ -177,7 +177,7 @@ export default {
       stationLineData: [],
       tableHeader: [
         { title: "场站", code: "windpowerstationName" },
-        { title: "设备", code: "equipmentId" },
+        { title: "设备", code: "equipmentName" },
         { title: "开始时间", code: "begindate" },
         { title: "计划结束时间", code: "planEnddate" },
         { title: "实际结束时间", code: "actualEnddate" },
@@ -256,17 +256,17 @@ export default {
       this.$refs["operation"].form.begindate = dayjs().format(
         "YYYY-MM-DD HH:mm:ss"
       );
-      this.$refs["operation"].form.planEnddate = dayjs().format(
-        "YYYY-MM-DD HH:mm:ss"
-      );
-      this.$refs["operation"].form.actualEnddate = dayjs().format(
-        "YYYY-MM-DD HH:mm:ss"
-      );
+      //   this.$refs["operation"].form.planEnddate = dayjs().format(
+      //     "YYYY-MM-DD HH:mm:ss"
+      //   );
+      //   this.$refs["operation"].form.actualEnddate = dayjs().format(
+      //     "YYYY-MM-DD HH:mm:ss"
+      //   );
       this.$refs["operation"].openDialog();
     },
     //编辑
     handleEdit(row) {
-        this.$refs["operation"].getEquipment(row.windpowerstationId);
+      this.$refs["operation"].getEquipment(row.windpowerstationId);
       this.$refs["operation"].openDialog(row);
     },
     //删除