Merge remote-tracking branch 'origin/master'

src/views/monitor.vue

@@ -36,7 +36,7 @@
 							</div>
 						</div>
 						<el-collapse accordion>
-							<el-collapse-item v-for="(item,index) in region">
+							<el-collapse-item v-for="(item,index) in region" :key="index">
 								<template slot="title">
 									<div class="d-l-con sj-collapse" @click="">
 										<div class="d-l-l-text">
@@ -56,7 +56,7 @@
 										<h4 class="text-gray">暂无信息</h4>
 									</div>
 								</div>
-								
+
 							</el-collapse-item>
 						</el-collapse>
 
@@ -429,7 +429,7 @@
 						id: '',
 						num: 18,
 						child:''
-						
+
 					},
 					{
 						name: '伊通县',

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-         // target: `http://127.0.0.1:3031`,
-         target: `http://117.78.49.164:3031`,
+         target: `http://127.0.0.1:3031`,
+         // target: `http://117.78.49.164:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''