Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang

src/views/components/resiSearch.vue

@@ -931,17 +931,20 @@ export default {
     if (this.columnName) this.handleChangeForm(this.columnName)
   },
   mounted(){
-    this.$EventBus.$on('handleClickResiTree', (val) => {
+    this.$EventBus.$on('handleClickResiTree', async (val) => {
            if(val.type === 'agency'){
               this.form.agencyId = val.id;
               this.optionsV = [];
-              this.getValiheList();
+              this.form.villageId = '';
+              this.form.buildId = '';
+             await this.getValiheList();
            }else if(val.type === 'neighborHood'){
             this.form.villageId = val.id;
-            this.handleChangeV(val.id)
+            await this.handleChangeV(val.id)
+            this.form.buildId = '';
            }else if(val.type === 'building'){
             this.form.buildId = val.id;
-            this.handleChangeB(val.id)
+            await this.handleChangeB(val.id)
            }
     })
   },

src/views/modules/base/diyInfo.vue

@@ -336,7 +336,7 @@ export default {
         }
       }
       if(this.virtualResi){
-        params.gridType = 'virtual'
+        params.searchForm.gridType = 'virtual'
       }
       await this.$http({
         method: 'POST',

src/views/modules/base/resi.vue

@@ -1300,13 +1300,52 @@ export default {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
     },
-    async handleNodeClick(obj) {
+    extractData(node) {
+      const result = [];
+      let currentNode = node;
+      while (currentNode) {
+        result.push({ id: currentNode.data.id, level: currentNode.data.level });
+        currentNode = currentNode.parent;
+      }
+      return result;
+    },
+
+    traverseTree(tree) {
+      const results = [];
+      tree.forEach(node => {
+        results.push(...this.extractData(node));
+        if (node.children && node.children.length > 0) {
+          results.push(...this.traverseTree(node.children));
+        }
+      });
+      return results;
+    },
+    async handleNodeClick(obj,node) {
       this.selObj = JSON.parse(JSON.stringify(obj));
       this.selTreeObj = obj;
       await nextTick(1000);
-      this.$nextTick(()=>{
+      this.$nextTick(async ()=>{
         if(obj.level === "building" || obj.level === "neighborHood"){
-          this.$EventBus.$emit('handleClickResiTree',{type:obj.level,id:obj.id})
+          const gridNode = this.traverseTree([node]);
+          const gridResult = gridNode.find(item => item.level === 'grid');
+          const neighborHoodResult = gridNode.find(item => item.level === "neighborHood");
+          const buildingResult = gridNode.find(item => item.level === "building");
+
+          const gridId = gridResult ? gridResult.id : null;
+          const neighborHoodId = neighborHoodResult ? neighborHoodResult.id : null;
+          const buildingId = buildingResult ? buildingResult.id : null;
+          if (gridId) {
+            await this.$EventBus.$emit('handleClickResiTree', { type: 'agency', id: gridId });
+          }
+          await nextTick(500);
+          if (neighborHoodId) {
+            await this.$EventBus.$emit('handleClickResiTree', { type: 'neighborHood', id: neighborHoodId });
+          }
+          await nextTick(500);
+          if (buildingId) {
+            await this.$EventBus.$emit('handleClickResiTree', { type: 'building', id: buildingId });
+          }
+
         }else{
           this.$EventBus.$emit('handleClickResiTree',{type:'agency',id:obj.id})
         }

src/views/modules/base/smartImport/cpts/executeTask.vue

@@ -30,7 +30,7 @@
           ></el-icon>
           操作说明
         </h4>
-        <p>1、导入数据多大，系统需要一定事件处理。</p>
+        <p>1、导入数据过大，系统需要一定事件处理。</p>
         <p>
           2、导入过程中可查看导入明细，如果发现导入数据问题较多，可以取消本次导入，重新整理数据后，重新创建任务导入。
         </p>

src/views/modules/base/smartImport/index.vue

@@ -56,7 +56,7 @@
           </el-table-column>
           <el-table-column prop="importFailNum" align="center" width="80" label="失败数目" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="operatorName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
+          <el-table-column prop="createdByName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
           </el-table-column>
           <el-table-column prop="completedTime" align="center" width="180" label="操作完成时间"
             :show-overflow-tooltip="true">

src/views/modules/workSys/role/roleForm.vue

@@ -136,8 +136,9 @@ export default {
         this.formData.id = roleId
         this.defaultRole = defaultRole
         this.loadFormData()
+      }else{
+        this.defaultRole = '0'
       }
-
       this.endLoading()