Merge branch 'fix_bug' into dev

src/assets/scss/pages/smartImport.scss

@@ -96,7 +96,7 @@
       }
       /deep/ .el-step__description{
         width: 300px;
-        color: #cbcbcb;
+        color: #666666;
       }
       
   }

src/views/modules/base/resi.vue

@@ -1208,12 +1208,7 @@ export default {
         this.autoOpenArr.push(data.id);
         if (!isRefresh && data) {
           this.selTreeObj = data;
-          if (!this.selTreeObj.latitude) {
-            this.selTreeObj.latitude = this.centerPoint[0];
-          }
-          if (!this.selTreeObj.longitude) {
-            this.selTreeObj.longitude = this.centerPoint[1];
-          }
+         
         }
       } else {
         this.$message.error(msg);
@@ -1225,7 +1220,7 @@ export default {
     },
     async handleNodeClick(obj) {
       this.selObj = JSON.parse(JSON.stringify(obj));
-      this.getTreeObj(obj);
+      this.selTreeObj = obj;
       await nextTick(1000);
       this.searchAgencyObj = {};
       if (obj.level === "building") {
@@ -1242,17 +1237,7 @@ export default {
         this.handleSearchFrom("type");
       }
     },
-    //解析树数据
-    getTreeObj(obj) {
-      if (!obj.latitude) {
-        obj.latitude = this.centerPoint[0];
-      }
-
-      if (!obj.longitude) {
-        obj.longitude = this.centerPoint[1];
-      }
-      this.selTreeObj = obj;
-    },
+   
   },
   watch: {
     $route: {

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

@@ -21,7 +21,7 @@
           操作说明
         </h4>
         <p>1、可以到居民信息中查看本次导入的数据。</p>
-        <p>2、导入失效的数据,您可以下载失败文件修改后,重新创建任务导入。</p>
+        <p>2、您可以下载导入失败的数据，按错误提示更正后新建任务再次导入。</p>
       </div>
     </div>
     <h3 class="title-small">数据导入明细</h3>
@@ -41,19 +41,18 @@
           @click="handelClickLook('fail')"
           >查看</el-button
         >
-        <!--     -->
         <i class="el-icon-download" style="margin-left: 16px;"></i>
         <a
         v-if="resultDescFile"
         :href="resultDescFile"
               target="_blank"
               style="color: #ff4d4f; cursor: pointer"
-              >下载结果说明</a
+              >下载导入失败数据</a
             >
       </el-col>
     </el-row>
     <el-dialog
-      title="列表"
+      title="导入结果明细"
       :visible.sync="showTable"
       width="50%"
       v-if="showTable"

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

@@ -97,12 +97,12 @@
           ref="upload"
         >
           <i class="el-icon-upload" style="font-size: 58px; color: #c5c9d1"></i>
-          <div class="el-upload__text" v-html="$t('upload.text')"></div>
+          <div class="el-upload__text" v-html="$t('upload.text')" ></div>
         </el-upload>
         <section  v-else class="uploadList">
           <div v-for="file in fileList" :key="file.id" :file="file" style="display: flex; align-items: center">
             <span>{{ file.name }}</span>
-            <i class="el-icon-close" @click="removeFile(file)" style="cursor: pointer;"></i>
+            <el-button type="text"  @click="removeFile(file)" style="margin-left: 16px;"> 删除</el-button>
           </div>
         </section>
       </div>

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

@@ -57,7 +57,7 @@
       </el-col>
     </el-row>
     <el-dialog
-      title="列表"
+      title="导入结果明细"
       :visible.sync="showTable"
       width="50%"
       v-if="showTable"

src/views/modules/portrayal/jumin/index.vue

@@ -21,7 +21,7 @@
             :class="{ item: true, active: index == active }"
             v-for="(item, index) in menuList"
             @click="handelCLickMenu(item.id, index)"
-            v-show="item.filledQty != 0"
+            v-show="item.filledQty != 0 || item.id == 'ext'"
           >
             <span>{{ item.name }}</span
             ><span
@@ -1136,9 +1136,9 @@ export default {
               .reverse();
             let arr = this.menuList.filter(
               (item) =>
-                item.filledQty > 0 &&
-                item.name !== "基本信息" &&
-                item.name !== "拓展信息"
+                item.filledQty > 0 ||(
+                item.name == "拓展信息" ||
+                item.name == "基本信息")
             );
             this.expandList = this.originalExpandList.filter((itemA) => {
               return arr.some((itemB) => itemB.name === itemA.title);
@@ -1164,15 +1164,7 @@ export default {
               })
             );
 
-            // this.expandList.forEach((item) => {
-            //   const rows = [];
-            //   const chunkSize = 3;
-            //   for (let i = 0; i < item.children.length; i += chunkSize) {
-            //     rows.push(item.children.slice(i, i + chunkSize));
-            //   }
-            //   item.rows = rows;
-            // });
-            console.log(this.expandList);
+            
             this.menuList.push(
               {
                 name: "业务记录",