diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 07c7eb0d..bc1bbb95 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -34,15 +34,18 @@
导出
新增楼宇
下载楼宇模板
导入楼宇数据
下载房屋模板
导入房屋数据
@@ -172,7 +180,8 @@ let loading // 加载动画
export default {
data () {
return {
- loading: false,
+ importBuildingLoading: false,
+ importRoomLoading: false,
total: 0,
pageSize: 20,
pageNo: 0,
@@ -429,10 +438,14 @@ export default {
async uploadFile (type) {
if (this.fileName == "") {
-
+ this.$message.warning('请选择要上传的文件！')
return false
}
- this.loading = true
+ this.$message({
+ showClose: true,
+ message: '导入中，请到系统管理-导入记录中查看进度',
+ duration: 0
+ })
//清空上传列表
@@ -451,33 +464,37 @@ export default {
this.$refs['upload_building'].clearFiles()
// url = 'http://192.168.51.26:8080/api/gov/org/building/buildingimport'
url = '/gov/org/building/buildingimport'
-
+ this.importBuildingLoading = true
} else if (type === 'room') {
this.$refs['upload_room'].clearFiles()
// url = 'http://192.168.51.26:8080/api/gov/org/house/houseimport'
url = '/gov/org/house/houseimport'
-
+ this.importRoomLoading = true
}
- this.startLoading()
+
window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => {
- this.endLoading()
+
if (data.code === 0 || data.code > 8000) {
- // this.$message({
- // type: "success",
- // message: "导入成功"
- // });
- // this.$message.success(rspMsg)
- // this.$emit('refreshTree')
- // this.loadTable()
}
- this.showMessage(rspMsg)
+ this.$emit('refreshTree')
+ this.loadTable()
+ if (type === 'building') {
+ this.importBuildingLoading = false
+
+ } else if (type === 'room') {
+ this.importRoomLoading = false
+ }
},
(rspMsg, data) => {
- this.endLoading()
- this.$message.error(rspMsg)
+ if (type === 'building') {
+ this.importBuildingLoading = false
+
+ } else if (type === 'room') {
+ this.importRoomLoading = false
+ }
}, { headers: { 'Content-Type': 'multipart/form-data' } })
},
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index c33c0246..04007c1e 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -34,16 +34,19 @@
导出
新增小区
下载小区模板
导入小区数据
下载楼宇模板
导入楼宇数据
下载房屋模板
导入房屋数据
@@ -192,7 +203,9 @@ let loading // 加载动画
export default {
data () {
return {
- loading: false,
+ importBuildingLoading: false,
+ importRoomLoading: false,
+ importCommunityLoading: false,
total: 0,
pageSize: 20,
pageNo: 0,
@@ -457,10 +470,16 @@ export default {
async uploadFile (type) {
if (this.fileName == "") {
-
+ this.$message.warning('请选择要上传的文件！')
return false
}
- this.loading = true
+
+ this.$message({
+ showClose: true,
+ message: '导入中，请到系统管理-导入记录中查看进度',
+ duration: 0
+ })
+
//清空上传列表
let url = ''
@@ -471,6 +490,7 @@ export default {
fileFormData.append('orgType', this.agencyObj.level === 'grid' ? 'grid' : 'agency');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
if (type === 'community') {
+ this.importCommunityLoading = true
this.$refs['upload_community'].clearFiles()
url = '/gov/org/icneighborhood/neighborhoodimport'
@@ -478,27 +498,44 @@ export default {
} else if (type === 'building') {
this.$refs['upload_building'].clearFiles()
url = '/gov/org/building/buildingimport'
-
+ this.importBuildingLoading = true
} else if (type === 'room') {
this.$refs['upload_room'].clearFiles()
url = '/gov/org/house/houseimport'
-
+ this.importRoomLoading = true
}
- this.startLoading()
+
window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => {
- this.endLoading()
+
if (data.code === 0 || data.code > 8000) {
+ }
+ this.$emit('refreshTree')
+ this.loadTable()
+ // this.showMessage(rspMsg)
+ if (type === 'community') {
+ this.importCommunityLoading = false
+ } else if (type === 'building') {
+ this.importBuildingLoading = false
+ } else if (type === 'room') {
+ this.importRoomLoading = false
}
- this.showMessage(rspMsg)
},
(rspMsg, data) => {
- this.endLoading()
- this.$message.error(rspMsg)
+ if (type === 'community') {
+ this.importCommunityLoading = false
+
+ } else if (type === 'building') {
+ this.importBuildingLoading = false
+
+ } else if (type === 'room') {
+ this.importRoomLoading = false
+ }
+ // this.$message.error(rspMsg)
}, { headers: { 'Content-Type': 'multipart/form-data' } })
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index ac654ced..21bd0f91 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -34,14 +34,17 @@
导出
新增房屋
下载房屋模板
导入房屋数据
@@ -165,7 +170,7 @@ let loading // 加载动画
export default {
data () {
return {
- loading: false,
+ importRoomLoading: false,
total: 0,
pageSize: 20,
pageNo: 0,
@@ -407,13 +412,19 @@ export default {
},
async uploadFile () {
- this.loading = true
+
if (this.fileName == "") {
this.$message.warning('请选择要上传的文件！')
return false
}
+ this.$message({
+ showClose: true,
+ message: '导入中，请到系统管理-导入记录中查看进度',
+ duration: 0
+ })
+
//清空上传列表
this.$refs['upload'].clearFiles()
@@ -424,24 +435,19 @@ export default {
fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
- this.startLoading()
+ this.importRoomLoading = true
window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => {
- this.endLoading()
+
if (data.code === 0 || data.code > 8000) {
- // this.$message({
- // type: "success",
- // message: "导入成功"
- // });
- // this.$emit('refreshTree')
- // this.loadTable()
}
- this.showMessage(rspMsg)
+ this.$emit('refreshTree')
+ this.loadTable()
+ this.importRoomLoading = false
},
(rspMsg, data) => {
- this.endLoading()
- this.$message.error(rspMsg)
+ this.importRoomLoading = false
}, { headers: { 'Content-Type': 'multipart/form-data' } })