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

public/static/config/modeConfig.js

@@ -11,7 +11,7 @@ let websocketUrl = null;
 if (localTest) {
   // baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
   // baseURL = "http://192.168.10.18:8082/" // 联机调试 - 石林
-  baseURL = "http://10.155.32.4:9001/" // 联机调试 - 谢生杰
+  baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
   websocketUrl = (baseURL.replace(/http:\/\//g, "")) + "gyee-websocket";
 } else {
   baseURL = "http://10.155.32.4:8082/" // 正式环境

src/views/Decision/Decision2.vue

@@ -5,7 +5,7 @@
 				<div class="query-item">
 					<div class="lable">场站：</div>
 					<div class="search-input">
-						<el-select v-model="value1" @change="ChangZhanChange(value1)" clearable placeholder="请选择"
+						<el-select v-model="value1" @change="ChangZhanChange(value1)" multiple placeholder="请选择"
 							popper-class="select">
 							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
 							</el-option>

src/views/Decision/Decision2Xldb.vue

@@ -597,9 +597,9 @@
 				subUrl: "benchmarking/wplist",
 				success(res) {
 					that.value1.push(res.data[0].id)
+					that.AjaxCommon();
 				}
 			});
-			this.AjaxCommon();
 		},
 		methods: {
 			ChangZhanVal() {
@@ -687,7 +687,7 @@
 			},
 			AjaxCommon() {
 				var that = this;
-				console.log(that.value1)
+				console.log(JSON.stringify(that.value1))
 				that.API.requestData({ //五项损失率
 					method: "GET",
 					subUrl: "benchmarking/xldb",

src/views/HealthControl/Health4.vue

@@ -34,11 +34,10 @@ export default {
       wtId:"",
       menuDatas: [{
         icon: "svg-agc",
-        path: "/health/health4/healthLineChart",
-      },
-      {
-        icon: "svg-agc",
         path: "/health/health4/healthLineChart2",
+      },{
+        icon: "svg-agc",
+        path: "/health/health4/healthLineChart",
       }]
     };
   },