Merge remote-tracking branch 'remotes/origin/wangbo'

public/static/config/modeConfig.js

@@ -21,7 +21,8 @@ const showModuleName = 0;
 if (localTest) {
     // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
     // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
-    baseURL = "http://192.168.10.8:8082/" // 联机调试 - 王昌盛
+    // baseURL = "http://192.168.10.8:8082/" // 联机调试 - 王昌盛
+    baseURL = "http:192.168.10.13:8082/" // 联机调试 - 王波
 
     tilesUrl = "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII";
 } else {

src/views/report/misimport.vue

@@ -22,7 +22,7 @@
           </el-upload>
         </div>
         <div class="query-actions">
-          <el-upload class="upload-demo" ref="upload" action="http://10.155.32.4:8082/misreport/import/data"
+          <el-upload class="upload-demo" ref="upload" action="http://10.155.32.4:8082/misreport/import/datagz"
             :on-preview="handlePreview" :on-success="onSuccess" :on-remove="handleRemove" :before-remove="beforeRemove"
             :on-exceed="handleExceed" :auto-upload="true" :limit="1" :before-upload="beforeAvatarUpload"
             @on-error="onError" accept=".xls,.xlsx" :file-list="fileList" :show-file-list="false">