yangxiao 3 роки тому
батько
коміт
09c870af52

+ 1 - 1
src/views/NewPages/alarm-center-1.vue

@@ -236,7 +236,7 @@ export default {
     },
     async searchData() {
       const { data } = await this.API.requestData({
-        baseURL: "http://192.168.10.18:8075/",
+        baseURL: "http://192.168.1.18:8075/",
         subUrl: "alarm/count/query/new",
         data: {
           stationid: this.wpvalue,

+ 2 - 2
src/views/NewPages/alarm-center-2.vue

@@ -198,7 +198,7 @@ export default {
     },
     async searchTree() {
       const { data } = await this.API.requestData({
-        baseURL: "http://192.168.10.18:8075/",
+        baseURL: "http://192.168.1.18:8075/",
         subUrl: "Stoptype/treeType",
       });
       console.warn(data);
@@ -225,7 +225,7 @@ export default {
     },
     async searchData() {
       const { data } = await this.API.requestData({
-        baseURL: "http://192.168.10.18:8075/",
+        baseURL: "http://192.168.1.18:8075/",
         subUrl: "shutdown/list",
         data: {
           stId: this.wpvalue,

+ 6 - 0
src/views/allLifeManage/tab3.vue

@@ -203,6 +203,12 @@ export default {
           baseURL:"http://192.168.10.18:9988/",
           subUrl: "equoperationrecord/list",
           data: {
+            // wtid: that.wtId,
+            // starttime: that.starttime,
+            // endtime: that.endtime,
+            // type: that.type,
+            // pagenum:1,
+            // pagesize:50000
             wtid: that.wtId,
             starttime: that.starttime,
             endtime: that.endtime,

+ 4 - 4
src/views/layout/Menu.vue

@@ -120,22 +120,22 @@ export default {
                   path: "/new/alarmcenter",
                 },
                 {
-                  text: "预警管理1",
+                  text: "预警分析",
                   icon: "svg-wind-site",
                   path: "/new/alarmcenter1",
                 },
                 {
-                  text: "预警管理2",
+                  text: "故障分析",
                   icon: "svg-wind-site",
                   path: "/new/alarmcenter2",
                 },
                 {
-                  text: "预警管理3",
+                  text: "停机事件管理",
                   icon: "svg-wind-site",
                   path: "/new/tjsj",
                 },
                 {
-                  text: "预警管理4",
+                  text: "限电管理",
                   icon: "svg-wind-site",
                   path: "/new/xdgl",
                 },

+ 21 - 23
src/views/warn/tjsj.vue

@@ -80,6 +80,7 @@ export default {
       value1: "",
       value2: "",
       wpId: "",
+      wpArray: [],
       wpName: "",
       wtId: "",
       type: "",
@@ -156,7 +157,7 @@ export default {
   },
   created() {
     // this.requestSafeList();
-    this.value1 = this.getTime(1);
+    this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
 		this.value2 = this.getTime(2);
     this.getWp();
     this.requestSafeList();
@@ -182,9 +183,8 @@ export default {
       let that = this;
       that.API.requestData({
         baseURL: "http://10.155.32.4:9001",
-          subUrl: "benchmarking/wplist",
+        subUrl: "benchmarking/wplist",
         success (res) {
-          console.log(11)
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
           that.wpName = res.data[0].wpName;
@@ -207,9 +207,6 @@ export default {
           success (res) {
             that.wtArray = res.data;
             // that.wtId = res.data[0].id;
-            if (!reGetWp) {
-              that.getTabData();
-            }
           }
         });
       }
@@ -246,30 +243,31 @@ export default {
 
       this.API.requestData({
         method: "POST",
-        baseURL: "http://192.168.10.18:8082",
         subUrl: "/event/getShutdownevent",
         data,
         success(res) {
           if (res.code == 200) {
             that.tableData.data = [];
-            let data = res.data.list;
-            console.log(data);
-            for (var i = 0; i < data.length; i++) {
-              let obj = {
-                wpName: data[i].wpName,
-                wtName: data[i].wtName,
-                stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
-                
-                stopHours: data[i].stopHours,
-                statusName: data[i].statusName,
-                warnDesc: data[i].warnDesc,
-                lossPower: data[i].lossPower,
-                handleWay: data[i].handleWay,
+            if(res.data.list.length){
+              let data = res.data.list;
+              for (var i = 0; i < data.length; i++) {
+                let obj = {
+                  wpName: data[i].wpName,
+                  wtName: data[i].wtName,
+                  stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+                  
+                  stopHours: data[i].stopHours,
+                  statusName: data[i].statusName,
+                  warnDesc: data[i].warnDesc,
+                  lossPower: data[i].lossPower,
+                  handleWay: data[i].handleWay,
 
-              };
-              if(data[i].startTime) obj.startTime=new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss");
-              that.tableData.data.push(obj);
+                };
+                if(data[i].startTime) obj.startTime=new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss");
+                that.tableData.data.push(obj);
+              }
             }
+            
           }
         },
       });

+ 17 - 17
src/views/warn/xdgl.vue

@@ -64,6 +64,7 @@ export default {
       value1: "",
       value2: "",
       wpId: "",
+      wpArray: [],
       tableData: {
         column: [
           {
@@ -121,7 +122,7 @@ export default {
   },
   created() {
     // this.requestSafeList();
-    this.value1 = this.getTime(1);
+    this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
 		this.value2 = this.getTime(2);
     this.getWp();
     this.requestSafeList();
@@ -149,7 +150,6 @@ export default {
         baseURL: "http://10.155.32.4:9001",
           subUrl: "benchmarking/wplist",
         success (res) {
-          console.log(11)
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
           that.wpName = res.data[0].wpId;
@@ -190,26 +190,26 @@ export default {
 
       this.API.requestData({
         method: "POST",
-        baseURL: "http://192.168.10.18:8082",
         subUrl: "/brownouts/getBrownoutsList",
         data,
         success(res) {
           if (res.code == 200) {
             that.tableData.data = [];
-            let data = res.data.list;
-            console.log(data);
-            for (var i = 0; i < data.length; i++) {
-              let obj = {
-                id: i+1,
-                stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
-                startTime: new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss"),
-                stopTypeId: data[i].stopTypeId,
-                stopHours: data[i].stopHours,
-                lossPower: data[i].lossPower,
-                description: data[i].description,
-                wts: data[i].wts,
-              };
-              that.tableData.data.push(obj);
+            if(res.data.list.length){
+              let data = res.data.list;
+              for (var i = 0; i < data.length; i++) {
+                let obj = {
+                  id: i+1,
+                  stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+                  startTime: new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss"),
+                  stopTypeId: data[i].stopTypeId,
+                  stopHours: data[i].stopHours,
+                  lossPower: data[i].lossPower,
+                  description: data[i].description,
+                  wts: data[i].wts,
+                };
+                that.tableData.data.push(obj);
+              }
             }
           }
         },