Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

src/api/api.js

@@ -265,25 +265,25 @@ export const getDIPointByModelId = query => {
 //******************************end*******************************************// 
 //******************************预警统计*******************************************//
 export const statistics_querymap = params => {
-    return request.get(`/alarm/count/querymap`, { params: params })
-        // return request.get(`/alarm/count/querymap?stationid=XS_FDC&datebegin=2021-10-12&dateend=2021-11-13`)
+    return request.get(`/alarm/count/querymap2`, { params: params })
+        // return request.get(`/alarm/count/querymap2?stationid=XS_FDC&datebegin=2021-10-12&dateend=2021-11-13`)
 };
 export const statistics_querybyname = params => {
-    return request.get('/alarm/count/querybyname', { params: params })
+    return request.get('/alarm/count/querybyname2', { params: params })
 };
 export const statistics_lineandproject = params => {
-    return request.get('/alarm/count/lineandproject', { params: params })
+    return request.get('/alarm/count/lineandproject2', { params: params })
 };
 //******************************end*******************************************//
 
 //******************************预警分析*******************************************//
 export const warning_query_new = params => {
-    return request.get(`/alarm/count/query/new`, { params: params })
+    return request.get(`/alarm/count/query/new2`, { params: params })
 };
 export const warning_detail = params => {
     return request.get('/analysis/detail', { params: params })
 };
 // export const statistics_lineandproject = params => {
-//     return request.get('/alarm/count/lineandproject', { params: params })
+//     return request.get('/alarm/count/lineandproject2', { params: params })
 // };
 //******************************end*******************************************//

src/router/index.js

@@ -361,13 +361,13 @@ const routes = [{
 	path: "/decision/nhycfsdl",
 	name: "nhycfsdl",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/nhycfsdl.vue"),
+		import( /* webpackChunkName: "nhycfsdl" */ "../views/report/nhycfsdl.vue"),
 },
 {
 	path: "/decision/xzycfsdl",
 	name: "xzycfsdl",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xzycfsdl.vue"),
+		import( /* webpackChunkName: "xzycfsdl" */ "../views/report/xzycfsdl.vue"),
 }
 	/***********************************************************经济运行************************************************************* */
 	/***********************************************************智慧检修************************************************************* */
@@ -541,7 +541,7 @@ const routes = [{
 	path: "/health/kkxfx/bjgltjb",
 	name: "bjgltjb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/bjgltjb.vue"),
+		import( /* webpackChunkName: "bjgltjb" */ "../views/report/bjgltjb.vue"),
 },
 {
 	path: "/health/fzyfx/windAnalysis", // 风资源分析
@@ -601,127 +601,127 @@ const routes = [{
 	path: "/others/tjfx",
 	name: "tjfx",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/tjfx.vue"),
+		import( /* webpackChunkName: "tjfx" */ "../views/report/tjfx.vue"),
 },
 {
 	path: "/others/bdzcx",
 	name: "bdzcx",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/bdzcx.vue"),
+		import( /* webpackChunkName: "bdzcx" */ "../views/report/bdzcx.vue"),
 },
 {
 	path: "/others/oafd",
 	name: "oafd",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/oafd.vue"),
+		import( /* webpackChunkName: "oafd" */ "../views/report/oafd.vue"),
 },
 {
 	path: "/others/oagf",
 	name: "oagf",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/oagf.vue"),
+		import( /* webpackChunkName: "oagf" */ "../views/report/oagf.vue"),
 },
 {
 	path: "/others/missfdrb",
 	name: "missfdrb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/missfdrb.vue"),
+		import( /* webpackChunkName: "missfdrb" */ "../views/report/missfdrb.vue"),
 },
 {
 	path: "/others/missgfrb",
 	name: "missgfrb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/missgfrb.vue"),
+		import( /* webpackChunkName: "missgfrb" */ "../views/report/missgfrb.vue"),
 },
 {
 	path: "/others/xnyfdscyb",
 	name: "xnyfdscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xnyfdscyb.vue"),
+		import( /* webpackChunkName: "xnyfdscyb" */ "../views/report/xnyfdscyb.vue"),
 },
 {
 	path: "/others/mhsscyb",
 	name: "mhsscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/mhsscyb.vue"),
+		import( /* webpackChunkName: "mhsscyb" */ "../views/report/mhsscyb.vue"),
 },
 {
 	path: "/others/nssscyb",
 	name: "nssscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/nssscyb.vue"),
+		import( /* webpackChunkName: "nssscyb" */ "../views/report/nssscyb.vue"),
 },
 {
 	path: "/others/qsscyb",
 	name: "qsscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/qsscyb.vue"),
+		import( /* webpackChunkName: "qsscyb" */ "../views/report/qsscyb.vue"),
 },
 {
 	path: "/others/sbqscyb",
 	name: "sbqscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/sbqscyb.vue"),
+		import( /* webpackChunkName: "sbqscyb" */ "../views/report/sbqscyb.vue"),
 },
 {
 	path: "/others/xsscyb",
 	name: "xsscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xsscyb.vue"),
+		import( /* webpackChunkName: "xsscyb" */ "../views/report/xsscyb.vue"),
 },
 {
 	path: "/others/xnygfscyb",
 	name: "xnygfscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xnygfscyb.vue"),
+		import( /* webpackChunkName: "xnygfscyb" */ "../views/report/xnygfscyb.vue"),
 },
 {
 	path: "/others/dwkscyb",
 	name: "dwkscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/dwkscyb.vue"),
+		import( /* webpackChunkName: "dwkscyb" */ "../views/report/dwkscyb.vue"),
 },
 {
 	path: "/others/plscyb",
 	name: "plscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/plscyb.vue"),
+		import( /* webpackChunkName: "plscyb" */ "../views/report/plscyb.vue"),
 },
 {
 	path: "/others/xhscyb",
 	name: "xhscyb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xhscyb.vue"),
+		import( /* webpackChunkName: "xhscyb" */ "../views/report/xhscyb.vue"),
 },
 {
 	path: "/others/fdczzdy",
 	name: "fdczzdy",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/fdczzdy.vue"),
+		import( /* webpackChunkName: "fdczzdy" */ "../views/report/fdczzdy.vue"),
 },
 {
 	path: "/others/fdxmzdy",
 	name: "fdxmzdy",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/fdxmzdy.vue"),
+		import( /* webpackChunkName: "fdxmzdy" */ "../views/report/fdxmzdy.vue"),
 },
 {
 	path: "/others/gfczzdy",
 	name: "gfczzdy",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/gfczzdy.vue"),
+		import( /* webpackChunkName: "gfczzdy" */ "../views/report/gfczzdy.vue"),
 },
 {
 	path: "/others/gfxmzdy",
 	name: "gfxmzdy",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/gfxmzdy.vue"),
+		import( /* webpackChunkName: "gfxmzdy" */ "../views/report/gfxmzdy.vue"),
 },
 {
 	path: "/others/xnyrb",
 	name: "xnyrb",
 	component: () =>
-		import( /* webpackChunkName: "historysearch" */ "../views/report/xnyrb.vue"),
+		import( /* webpackChunkName: "xnyrb" */ "../views/report/xnyrb.vue"),
 },
 {
 	path: "/others/weather",

src/views/MalfunctionWarning/MalfunctionWarning.vue

@@ -525,7 +525,8 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/coordinate/algorithm",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/coordinate/algorithm",
         data: {
           type: 0,
         },
@@ -560,7 +561,8 @@ export default {
       const that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8075/fault/history/list",
+        baseURL: "http://192.168.1.18:8075/",
+        subUrl: "fault/history/list",
         data: {
           pagenum: "1",
           pagesize: 10000,
@@ -574,7 +576,6 @@ export default {
         },
         success(res) {
           if (res) {
-            console.log(res);
             let arr = [];
             res.forEach((item, index) => {});
 
@@ -655,7 +656,8 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8075/fault/history/",
+        baseURL: "http://192.168.1.18:8075/",
+        subUrl: "fault/history/",
         data: {
           ids: result.join(","),
         },
@@ -733,7 +735,8 @@ export default {
       that.resultList = [];
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/coordinate/",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/coordinate/",
         success(res) {
           if (res) {
             let dataList = [];
@@ -765,7 +768,8 @@ export default {
       });
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/coordinate/progress",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/coordinate/progress",
         success(res) {
           that.showTraining = true;
           if (res) {
@@ -808,7 +812,8 @@ export default {
     //   let that = this;
     //   this.API.requestData({
     //     method: "GET",
-    //     subUrl: "http://192.168.10.18:8080/api/coordinate/history",
+    //     baseURL: "http://192.168.10.18:8080/",
+    //     subUrl: "api/coordinate/history",
     //     success(res) {
     //       if (res) {
     //         res.forEach((item) => {

src/views/MalfunctionWarning/components/dataClassify.vue

@@ -373,7 +373,8 @@ export default {
       let that = this;
       that.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8011/ts/history/snap",
+        baseURL: "http://192.168.10.18:8011/",
+        subUrl: "ts/history/snap",
         data: {
           uniformCode: requestList[zindex].code,
           startTs:

src/views/MalfunctionWarning/components/records.vue

@@ -246,7 +246,8 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/coordinate/history",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/coordinate/history",
         success(res) {
           if (res.length > 0) {
             res.forEach((item) => {
@@ -267,7 +268,8 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/supervised/history",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/supervised/history",
         success(res) {
           if (res) {
             res.forEach((item) => {
@@ -363,7 +365,8 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/coordinate/history/remove/",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/coordinate/history/remove/",
         data: {
           names: val,
         },
@@ -388,7 +391,8 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8075/fault/history/",
+        baseURL: "http://192.168.11.18:8075/",
+        subUrl: "fault/history/",
         data: {
           ids: result.join(","),
         },

src/views/MalfunctionWarning/components/trainingResults.vue

@@ -279,7 +279,8 @@ export default {
       let that = this;
       that.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8011/ts/history/snap",
+        baseURL: "http://192.168.10.18:8011/",
+        subUrl: "ts/history/snap",
         data: {
           uniformCode: dataLsit[index].code,
           startTs:

src/views/MalfunctionWarning/supervised.vue

@@ -336,7 +336,8 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/coordinate/algorithm",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/coordinate/algorithm",
         data: {
           type: 1,
         },
@@ -427,7 +428,8 @@ export default {
       that.resultList = [];
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/supervised/",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/supervised/",
         success(res) {
           if (res.value.length > 0) {
             let arr = JSON.parse(res.value);
@@ -446,7 +448,8 @@ export default {
       });
       this.API.requestData({
         method: "GET",
-        subUrl: "http://192.168.10.18:8080/api/supervised/progress",
+        baseURL: "http://192.168.10.18:8080/",
+        subUrl: "api/supervised/progress",
         success(res) {
           that.showTraining = true;
           if (res) {

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

@@ -572,7 +572,7 @@ export default {
     async searchData() {
       const { data } = await this.API.requestData({
         baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/query/new",
+        subUrl: "alarm/count/query/new2",
         data: {
           stationid: this.wpvalue,
           startdate: new Date(this.startdate).formatDate("yyyy-MM-dd"),

src/views/alarmCenter/boosterAlarm.vue

@@ -154,7 +154,7 @@ export default {
         timeout: 30000,
         method: "GET",
         baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/history/page",
+        subUrl: "alarm/history/page2",
         data: {
           category1: "SYZ",
           stationid: this.stationId,

src/views/alarmCenter/customAlarm.vue

@@ -190,7 +190,7 @@ export default {
         timeout: 30000,
         method: "GET",
         baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/history/page",
+        subUrl: "alarm/history/page2",
         data: {
           category1: "custom",
           stationid: this.stationId,

src/views/alarmCenter/customStatistics.vue

@@ -144,7 +144,7 @@ export default {
         timeout: 30000,
         method: "GET",
         baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/querymap",
+        subUrl: "alarm/count/querymap2",
         data: {
           stationid: this.stationId,
           datebegin: this.startDate,
@@ -170,7 +170,7 @@ export default {
         timeout: 30000,
         method: "GET",
         baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/querybyname",
+        subUrl: "alarm/count/querybyname2",
         data: {
           stationid: this.stationId,
           datebegin: this.startDate,

src/views/alarmCenter/scadaAlarm.vue

@@ -304,7 +304,7 @@ export default {
         timeout: 30000,
         method: "GET",
         baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/history/page",
+        subUrl: "alarm/history/page2",
         data: {
           category1: "windturbine",
           stationid: this.stationId,

src/views/allLifeManage/tab2.vue

@@ -308,7 +308,7 @@ export default {
       } else {
         that.API.requestData({
           method: "GET",
-          baseURL:"http://192.168.10.18:9988/",
+          baseURL:"http://192.168.1.18:9988/",
           subUrl: "windturbine/list",
           data: {
             wtid:that.wtId

src/views/allLifeManage/tab3.vue

@@ -200,7 +200,7 @@ export default {
       } else {
         that.API.requestData({
           method: "GET",
-          baseURL: "http://192.168.10.18:9988/",
+          baseURL: "http://192.168.1.18:9988/",
           subUrl: "equoperationrecord/list",
           data: {
             wtid: that.wtId,

src/views/sampleDatabase/analysis/index.vue

@@ -264,7 +264,7 @@ export default {
         let that = this;
         await this.API.requestData({
           method: "GET",
-          subUrl: "http://192.168.10.18:8075/alarm/history/page",
+          subUrl: "alarm/history/page2",
           data: {
             pagenum: 1,
             pagesize: 20000,

src/views/sampleDatabase/warning/index.vue

@@ -518,7 +518,7 @@ export default {
       that.API.requestData({
         showLoading: true,
         baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/query/new",
+        subUrl: "alarm/count/query/new2",
         data,
         success(res) {
           if (res.code == 200) {

src/views/warn/gfgj.vue

@@ -175,7 +175,7 @@
 					timeout: 30000,
 					method: "GET",
 					baseURL: "http://192.168.1.18:8075/",
-					subUrl: "alarm/history/page",
+					subUrl: "alarm/history/page2",
 					data: {
 						category1: "GF",
 						stationid: this.wpId,