Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/K-FileUpload/index.vue

@@ -274,8 +274,14 @@ export default {
         var name = file.name;
         let index = this.fileValueList.findIndex(x=>x.name==file.name);
         this.fileValueList[index]
-        console.log("process.env.VUE_APP_BASE_API",process.env.VUE_APP_BASE_API,process)
-        var url = process.env.VUE_APP_BASE_API + this.fileValueList[index].url;
+        var url = this.fileValueList[index].url;
+        if(process.env.VUE_APP_BASE_API!=='/')
+        {
+          url=process.env.VUE_APP_BASE_API+this.fileValueList[index].url;
+        }
+        // console.log("process.env.VUE_APP_BASE_API",process.env.VUE_APP_BASE_API,process)
+        
+        // console.log("process.env.VUE_APP_BASE_API url",url)
         const a = document.createElement("a");
         a.setAttribute("download", name);
         a.setAttribute("target", "_blank");

src/views/system/bind/index.vue

@@ -207,7 +207,8 @@ export default {
         orgName: null,
         orgPath: null,
         collectionAreaName: null,
-        checkId: null
+        checkId: null,
+        checkSub:true
       },
       // 表单参数
       form: {},
@@ -241,8 +242,8 @@ export default {
     };
   },
   created() {
-    this.getList();
     this.getDeptTree();
+    // this.getList();
   },
   watch: {
     // 根据名称筛选部门树
@@ -295,9 +296,9 @@ closeOptions(){
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions, ' this.deptOptions')
         this.defaultKeys.push(response.data[0].id);
         this.queryParams.orgId = response.data[0].id;
+        console.log( this.queryParams.orgId+"%%%%%%%%%%%%%%%")
         this.handleQuery();
       });
     },

src/views/system/check/index.vue

@@ -168,6 +168,7 @@ export default {
         areaId: null,
         orgId: null,
         updateId: null,
+        checkSub:true
       },
       // 表单参数
       form: {},
@@ -198,11 +199,11 @@ export default {
     };
   },
   created() {
-    this.getList();
     this.getDeptTree();
     listArea().then(response => {
       this.areaList = response.rows;
     })
+  
   },
   watch: {
     // 根据名称筛选部门树

src/views/system/device/index.vue

@@ -269,7 +269,8 @@ export default {
         checkTime: null,
         maintenanceTerm: null,
         hostId: null,
-        channel: null
+        channel: null,
+        checkSub:true
       },
       // 表单参数
       form: {
@@ -360,7 +361,7 @@ export default {
         this.defaultKeys.push(response.data[0].id);
         this.queryParams.orgId = response.data[0].id;
         this.selectOrgId = response.data[0].id;
-        console.log(this.form, '5555555')
+    
         this.handleQuery();
       });
     },

src/views/system/role/authUser.vue

@@ -32,7 +32,7 @@
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户名称1" prop="username" :show-overflow-tooltip="true" />
+      <el-table-column label="用户名称" prop="username" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="name" :show-overflow-tooltip="true" />
 
       <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />