青海集中功率预测检修计划页面bug调整

ipfcst-console/src/main/frontend/views/console/overHaulPlan/index.vue

@@ -181,6 +181,7 @@ export default {
       total: 0,
       elCapacity: 0,
       startTimeShow: false,
+      stationCapMap: new Map([]),
       //表单验证规则
       rules: {
         name: [
@@ -223,6 +224,11 @@ export default {
     get() {
       Promise.all([this.getStationList()]).then((res) => {
         this.stationList = res[0]
+        for (let i = 0; i < res[0].length; i++) {
+
+          this.stationCapMap.set(res[0][i].stationCode, res[0][i].capacity)
+        }
+
       })
     },
     getStationList() {
@@ -230,6 +236,7 @@ export default {
       return new Promise(function (resolve, reject) {
         a.get('/electricField/getElectricField').then(res => {
           resolve(res.data)
+
         }).catch((error) => {
           this.$message.error('获取场站下拉框出错' + error)
         })
@@ -240,11 +247,7 @@ export default {
       this.loading = true
       this.saveLoding = false
       this.$axios.get("/overHaulPlan/" + this.currentPage + '/' + this.pageSize).then(response => {
-        if (response.data.content == "") {
-          this.showTable = false
-        } else {
-          this.showTable = true
-        }
+
         this.tableData = response.data.content
         this.total = response.data.count
 
@@ -285,38 +288,38 @@ export default {
       if (v3) {
         // 假期修改
         for (let i = 0; i < v5.length; i++) {
-          if (v1[0] >= v5[i].startTime && v1[0] <= v5[i].endTime) {
+          if (v1[0] >= v5[i].startTime && v1[0] <= v5[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
-          if (v1[1] >= v5[i].startTime && v1[1] <= v5[i].endTime) {
+          if (v1[1] >= v5[i].startTime && v1[1] <= v5[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
-          if (v1[0] <= v5[i].startTime && v1[1] >= v5[i].endTime) {
+          if (v1[0] <= v5[i].startTime && v1[1] >= v5[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
-          if (v1[0] >= v5[i].startTime && v1[1] <= v5[i].endTime) {
+          if (v1[0] >= v5[i].startTime && v1[1] <= v5[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
         }
       } else {
         for (let i = 0; i < v2.length; i++) {
-          if (v1[0] >= v2[i].startTime && v1[0] <= v2[i].endTime) {
+          if (v1[0] >= v2[i].startTime && v1[0] <= v2[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
-          if (v1[1] >= v2[i].startTime && v1[1] <= v2[i].endTime) {
+          if (v1[1] >= v2[i].startTime && v1[1] <= v2[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
-          if (v1[0] <= v2[i].startTime && v1[1] >= v2[i].endTime) {
+          if (v1[0] <= v2[i].startTime && v1[1] >= v2[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
-          if (v1[0] >= v2[i].startTime && v1[1] <= v2[i].endTime) {
+          if (v1[0] >= v2[i].startTime && v1[1] <= v2[i].endTime && v5[i].stationCode == v4.stationCode) {
             result = true
             break
           }
@@ -325,9 +328,10 @@ export default {
       return result
     },
     checkCap(stationCode, cap) {
-      this.$axios.get("/electricField/getElectricField/" + stationCode).then(response => {
-        this.elCapacity = response.data.capacity
-      })
+      console.log(stationCode)
+      console.log(cap)
+      this.elCapacity = this.stationCapMap.get(stationCode)
+      console.log(this.elCapacity)
       if (cap <= this.elCapacity) {
         return true
       } else {