From 0c0fd75cf6a946d166758f7bd048436e125ab9e3 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 28 Feb 2023 13:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=8F=AF=E8=A7=86=E5=8C=96?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production.sit | 2 +-
.../modules/base/community/community.vue | 1946 ++++++-------
.../base/community/communityExportInfo.vue | 1629 ++++++-----
.../modules/base/community/communityTable.vue | 2507 +++++++++--------
src/views/modules/base/resi.vue | 2 +-
src/views/modules/base/smartImport.vue | 894 +++---
6 files changed, 3599 insertions(+), 3381 deletions(-)
diff --git a/.env.production.sit b/.env.production.sit
index 1d43d342a..18f137550 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -2,6 +2,6 @@ NODE_ENV=production
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = http://192.168.1.140/api
VUE_APP_API_SERVER = http://219.146.91.110:30801/api
-VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.com/linkdata/linkdata-gateway/route
+VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.com:30801/linkdata/linkdata-gateway/route
VUE_APP_NODE_ENV=prod:sit
VUE_APP_PUBLIC_PATH=epmet-oper
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index adba323f9..19b8419d9 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1,228 +1,260 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ data.label+'(' }}
- {{ data.showNum }}
- {{')' }}
-
- {{ data.showName }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue
index 0123805c7..5f75e590e 100644
--- a/src/views/modules/base/community/communityExportInfo.vue
+++ b/src/views/modules/base/community/communityExportInfo.vue
@@ -1,806 +1,871 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
- 预览
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 预览
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index ad96eefe5..4df613eba 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -1,204 +1,292 @@
-
-
-
-
-
-
新增小区
-
-
-
-
-
-
-
- 导入小区数据
-
-
-
-
-
-
- 导入楼栋数据
-
-
-
-
-
- 导入房屋数据
-
-
- 导入
-
-
-
-
导出
-
-
批量删除
-
-
-
-
-
-
- 下载小区模板
-
-
-
- 下载楼栋模板
-
-
- 下载房屋模板
-
-
- 补全一房一码信息
-
-
-
- 补全小程序小区码
-
-
- 智能填报
-
-
- 社区二维码
-
- 更多
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index d49dd13d4..0ed681b5d 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -853,7 +853,7 @@ export default {
);
conditions.push({
queryType: "daterange",
- columnValue: [dateEnd,dateStart],
+ columnValue: [dateEnd, dateStart],
columnName: "BIRTHDAY",
label: "出生日期",
tableName: "resident_base_info",
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
index e95c17fc9..ae4350037 100644
--- a/src/views/modules/base/smartImport.vue
+++ b/src/views/modules/base/smartImport.vue
@@ -1,472 +1,456 @@
-
-
-
-
-
- 表格导入
-
- 下载模板
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保 存
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取 消
- 确 定
-
-
-
-
+
+
+
+
+ 表格导入
+
+
+ 下载模板
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.field
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保 存
+
+
+
+
请先导入表格
+
+