Merge remote-tracking branch 'origin/master'

src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API,
   // baseURL: 'http://192.168.202.34:30000/prod-api',
   // 超时
-  timeout: 10000
+  timeout: 30000
 })
 
 // request拦截器

src/views/plan/workorder/index.vue

@@ -1049,6 +1049,7 @@ export default {
 
           this.open = true;
           this.title = "修改生产工单";
+          this.showDetail = true;
         }
       })
 

src/views/system/datasource/index.vue

@@ -385,11 +385,12 @@ export default {
     },
     /**测试数据库链接**/
     handleTestDB:function(row) {
+       this.loading = true;
        const datasourceId = row.id;
       changeDBStatus(datasourceId).then(response => {
-        debugger
         this.$modal.msgSuccess(response.msg);
         this.getList();
+         this.loading = false;
       });
     },
   }