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

src/views/Decision/Decision1.vue

@@ -203,6 +203,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -221,6 +222,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -241,6 +243,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/lineList",
 					data: {
 						projects: val
@@ -295,6 +298,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/fjjxb",
 					data: {
 						wpids: that.value1,

src/views/Decision/Decision1Mx.vue

@@ -248,32 +248,13 @@
 			this.value5 = this.getTime(2);
 			this.AjaxCommon();
 
-
-			// var that = this;
-			// that.API.requestData({
-			// 	method: "GET",
-			// 	subUrl: "benchmarking/fjjxb",
-			// 	data: {
-			// 		wpids: that.value1,
-			// 		projectids: that.value2,
-			// 		lineids: that.value3,
-			// 		beginDate: that.value4,
-			// 		endDate: that.value5,
-			// 		type: that.TypeClass,
-			// 		target: 'llfdl',//当前点击的名称
-			// 		sort: 1//1或2
-			// 	},
-			// 	success(res) {
-			// 		console.log(JSON.stringify(res))
-			// 	}
-			// });
-			// http://10.155.32.33:9001/
 		},
 		methods: {
 			ChangZhanVal() {
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -292,6 +273,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -312,6 +294,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/lineList",
 					data: {
 						projects: val
@@ -366,6 +349,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/fjjxbmx",
 					data: {
 						wpids: that.value1,

src/views/Decision/Decision2.vue

@@ -349,6 +349,7 @@
 								// var that = this;
 								that.API.requestData({
 									method: "GET",
+									baseURL : "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -604,6 +605,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -622,6 +624,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -642,6 +645,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/lineList",
 					data: {
 						projects: val
@@ -685,6 +689,7 @@
 				var that = this;
 				that.API.requestData({ //五项损失率
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wxssl",
 					data: {
 						wpids: that.value1,

src/views/Decision/Decision2Cjdb.vue

@@ -321,6 +321,7 @@
 								that.detailShow = 2;
 								that.API.requestData({
 									method: "GET",
+									baseURL : "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -569,6 +570,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -609,6 +611,7 @@
 				var that = this;
 				that.API.requestData({ //五项损失率
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/cjdb",
 					data: {
 						wpids: that.value1,

src/views/Decision/Decision2Cndb.vue

@@ -306,6 +306,7 @@
 								// var that = this;
 								that.API.requestData({
 									method: "GET",
+									baseURL : "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -551,6 +552,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -592,6 +594,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/cndb",
 					data: {
 						wpid: that.value1,

src/views/Decision/Decision2Xldb.vue

@@ -342,6 +342,7 @@
 								that.detailShow = 2;
 								that.API.requestData({
 									method: "GET",
+									baseURL : "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -594,6 +595,7 @@
 			this.value5 = this.getTime(2);
 			that.API.requestData({
 				method: "GET",
+				baseURL : "http://10.155.32.4:9001/",
 				subUrl: "benchmarking/wplist",
 				success(res) {
 					that.value1.push(res.data[0].id)
@@ -606,6 +608,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.oneData = res.data[0].id
@@ -626,6 +629,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -646,6 +650,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/lineList",
 					data: {
 						projects: val
@@ -690,6 +695,7 @@
 				console.log(JSON.stringify(that.value1))
 				that.API.requestData({ //五项损失率
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/xldb",
 					data: {
 						wpids: that.value1,

src/views/Decision/Decision2Xmdb.vue

@@ -332,6 +332,7 @@
 								// var that = this;
 								that.API.requestData({
 									method: "GET",
+									baseURL : "http://10.155.32.4:9001/",
 									subUrl: "benchmarking/details",
 									data: {
 										id: dataId,
@@ -585,6 +586,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/wplist",
 					success(res) {
 						that.ChangZhan = res.data;
@@ -602,6 +604,7 @@
 				var that = this;
 				that.API.requestData({
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/projectList",
 					data: {
 						wpids: val
@@ -645,6 +648,7 @@
 				var that = this;
 				that.API.requestData({ //五项损失率
 					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/xmdb",
 					data: {
 						wpids: that.value1,