diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss index 1bf746981..3a92756c9 100644 --- a/src/assets/scss/pages/smartImport.scss +++ b/src/assets/scss/pages/smartImport.scss @@ -96,7 +96,7 @@ } /deep/ .el-step__description{ width: 300px; - color: #cbcbcb; + color: #666666; } } diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 2c7b31816..f33746b63 100644 --- a/src/views/modules/base/resi.vue +++ b/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: { diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index 4a4fc18a6..6c50e0a90 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -21,7 +21,7 @@ 操作说明

1、可以到居民信息中查看本次导入的数据。

-

2、导入失效的数据,您可以下载失败文件修改后,重新创建任务导入。

+

2、您可以下载导入失败的数据,按错误提示更正后新建任务再次导入。

数据导入明细

@@ -41,19 +41,18 @@ @click="handelClickLook('fail')" >查看 - 下载结果说明下载导入失败数据 -
+
{{ file.name }} - + 删除
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue index a2373209e..52551d636 100644 --- a/src/views/modules/base/smartImport/cpts/executeTask.vue +++ b/src/views/modules/base/smartImport/cpts/executeTask.vue @@ -57,7 +57,7 @@ {{ item.name }} - 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: "业务记录",