elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

小区管理导入逻辑调整

shibei_master
jiangyy 4 years ago
parent
3b6889da2a
commit
ecc481d268
3 changed files with 100 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      src/views/modules/base/community/buildTable.vue
  2. 57
      src/views/modules/base/community/communityTable.vue
  3. 32
      src/views/modules/base/community/roomTable.vue

51
src/views/modules/base/community/buildTable.vue
View File

@ -34,15 +34,18 @@
<el-button style="float:left" <el-button style="float:left"
type="yellow" type="yellow"
size="small" size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
<el-button style="float:left" <el-button style="float:left"
type="green" type="green"
size="small" size="small"
icon="el-icon-plus"
@click="handleAdd">新增楼宇</el-button> @click="handleAdd">新增楼宇</el-button>
<el-button style=";margin-left:10px" <el-button style=";margin-left:10px"
type="blue" type="blue"
size="small" size="small"
icon="el-icon-download"
@click="handleExportModule('building')">下载楼宇模板</el-button> @click="handleExportModule('building')">下载楼宇模板</el-button>
<el-upload style="" <el-upload style=""
@ -55,11 +58,14 @@
:http-request="(()=>{uploadFile( 'building')})"> :http-request="(()=>{uploadFile( 'building')})">
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
size="small" size="small"
icon="el-icon-upload2"
:loading="importBuildingLoading"
type="red">导入楼宇数据</el-button> type="red">导入楼宇数据</el-button>
</el-upload> </el-upload>
<el-button style=";margin-left:10px" <el-button style=";margin-left:10px"
type="blue" type="blue"
size="small" size="small"
icon="el-icon-download"
@click="handleExportModule('room')">下载房屋模板</el-button> @click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload style="" <el-upload style=""
@ -72,6 +78,8 @@
:http-request="(()=>{uploadFile( 'room')})"> :http-request="(()=>{uploadFile( 'room')})">
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
size="small" size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button> type="red">导入房屋数据</el-button>
</el-upload> </el-upload>
</div> </div>
@ -172,7 +180,8 @@ let loading // 加载动画
export default { export default {
data () { data () {
return { return {
loading: false, importBuildingLoading: false,
importRoomLoading: false,
total: 0, total: 0,
pageSize: 20, pageSize: 20,
pageNo: 0, pageNo: 0,
@ -429,10 +438,14 @@ export default {
async uploadFile (type) { async uploadFile (type) {
if (this.fileName == "") { if (this.fileName == "") {
this.$message.warning('请选择要上传的文件！')
return false return false
} }
this.loading = true this.$message({
showClose: true,
message: '导入中，请到系统管理-导入记录中查看进度',
duration: 0
})
//清空上传列表 //清空上传列表
@ -451,33 +464,37 @@ export default {
this.$refs['upload_building'].clearFiles() this.$refs['upload_building'].clearFiles()
// url = 'http://192.168.51.26:8080/api/gov/org/building/buildingimport' // url = 'http://192.168.51.26:8080/api/gov/org/building/buildingimport'
url = '/gov/org/building/buildingimport' url = '/gov/org/building/buildingimport'
this.importBuildingLoading = true
} else if (type === 'room') { } else if (type === 'room') {
this.$refs['upload_room'].clearFiles() this.$refs['upload_room'].clearFiles()
// url = 'http://192.168.51.26:8080/api/gov/org/house/houseimport' // url = 'http://192.168.51.26:8080/api/gov/org/house/houseimport'
url = '/gov/org/house/houseimport' url = '/gov/org/house/houseimport'
this.importRoomLoading = true
} }
this.startLoading()
window.app.ajax.post2(url, fileFormData, window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => { (data, rspMsg) => {
this.endLoading()
if (data.code === 0 || data.code > 8000) { 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) => { (rspMsg, data) => {
this.endLoading() if (type === 'building') {
this.$message.error(rspMsg) this.importBuildingLoading = false
} else if (type === 'room') {
this.importRoomLoading = false
}
}, { headers: { 'Content-Type': 'multipart/form-data' } }) }, { headers: { 'Content-Type': 'multipart/form-data' } })
}, },

57
src/views/modules/base/community/communityTable.vue
View File

@ -34,16 +34,19 @@
<el-button style="" <el-button style=""
type="yellow" type="yellow"
size="small" size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
<el-button style="" <el-button style=""
type="green" type="green"
size="small" size="small"
icon="el-icon-plus"
@click="handleAdd">新增小区</el-button> @click="handleAdd">新增小区</el-button>
<div class="btn_upload" <div class="btn_upload"
v-if="agencyObj.level==='community'||agencyObj.level==='grid'"> v-if="agencyObj.level==='community'||agencyObj.level==='grid'">
<el-button style="" <el-button style=""
type="blue" type="blue"
size="small" size="small"
icon="el-icon-download"
@click="handleExportModule('community')">下载小区模板</el-button> @click="handleExportModule('community')">下载小区模板</el-button>
<el-upload ref="upload_community" <el-upload ref="upload_community"
@ -56,12 +59,15 @@
:http-request="(()=>{uploadFile( 'community')})"> :http-request="(()=>{uploadFile( 'community')})">
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
size="small" size="small"
icon="el-icon-upload2"
:loading="importCommunityLoading"
type="red">导入小区数据</el-button> type="red">导入小区数据</el-button>
</el-upload> </el-upload>
<el-button style=";margin-left:10px" <el-button style=";margin-left:10px"
type="blue" type="blue"
size="small" size="small"
icon="el-icon-download"
@click="handleExportModule('building')">下载楼宇模板</el-button> @click="handleExportModule('building')">下载楼宇模板</el-button>
<el-upload style="" <el-upload style=""
@ -74,11 +80,14 @@
:http-request="(()=>{uploadFile( 'building')})"> :http-request="(()=>{uploadFile( 'building')})">
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
size="small" size="small"
icon="el-icon-upload2"
:loading="importBuildingLoading"
type="red">导入楼宇数据</el-button> type="red">导入楼宇数据</el-button>
</el-upload> </el-upload>
<el-button style=";margin-left:10px" <el-button style=";margin-left:10px"
type="blue" type="blue"
size="small" size="small"
icon="el-icon-download"
@click="handleExportModule('room')">下载房屋模板</el-button> @click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload style="" <el-upload style=""
@ -91,6 +100,8 @@
:http-request="(()=>{uploadFile( 'room')})"> :http-request="(()=>{uploadFile( 'room')})">
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
size="small" size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button> type="red">导入房屋数据</el-button>
</el-upload> </el-upload>
</div> </div>
@ -192,7 +203,9 @@ let loading // 加载动画
export default { export default {
data () { data () {
return { return {
loading: false, importBuildingLoading: false,
importRoomLoading: false,
importCommunityLoading: false,
total: 0, total: 0,
pageSize: 20, pageSize: 20,
pageNo: 0, pageNo: 0,
@ -457,10 +470,16 @@ export default {
async uploadFile (type) { async uploadFile (type) {
if (this.fileName == "") { if (this.fileName == "") {
this.$message.warning('请选择要上传的文件！')
return false return false
} }
this.loading = true
this.$message({
showClose: true,
message: '导入中，请到系统管理-导入记录中查看进度',
duration: 0
})
//清空上传列表 //清空上传列表
let url = '' let url = ''
@ -471,6 +490,7 @@ export default {
fileFormData.append('orgType', this.agencyObj.level === 'grid' ? 'grid' : 'agency');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名 fileFormData.append('orgType', this.agencyObj.level === 'grid' ? 'grid' : 'agency');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
if (type === 'community') { if (type === 'community') {
this.importCommunityLoading = true
this.$refs['upload_community'].clearFiles() this.$refs['upload_community'].clearFiles()
url = '/gov/org/icneighborhood/neighborhoodimport' url = '/gov/org/icneighborhood/neighborhoodimport'
@ -478,27 +498,44 @@ export default {
} else if (type === 'building') { } else if (type === 'building') {
this.$refs['upload_building'].clearFiles() this.$refs['upload_building'].clearFiles()
url = '/gov/org/building/buildingimport' url = '/gov/org/building/buildingimport'
this.importBuildingLoading = true
} else if (type === 'room') { } else if (type === 'room') {
this.$refs['upload_room'].clearFiles() this.$refs['upload_room'].clearFiles()
url = '/gov/org/house/houseimport' url = '/gov/org/house/houseimport'
this.importRoomLoading = true
} }
this.startLoading()
window.app.ajax.post2(url, fileFormData, window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => { (data, rspMsg) => {
this.endLoading()
if (data.code === 0 || data.code > 8000) { 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) => { (rspMsg, data) => {
this.endLoading() if (type === 'community') {
this.$message.error(rspMsg) 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' } }) }, { headers: { 'Content-Type': 'multipart/form-data' } })

32
src/views/modules/base/community/roomTable.vue
View File

@ -34,14 +34,17 @@
<el-button style="float:left" <el-button style="float:left"
type="yellow" type="yellow"
size="small" size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
<el-button style="float:left" <el-button style="float:left"
type="green" type="green"
icon="el-icon-plus"
size="small" size="small"
@click="handleAdd">新增房屋</el-button> @click="handleAdd">新增房屋</el-button>
<el-button style="float:left" <el-button style="float:left"
type="blue" type="blue"
size="small" size="small"
icon="el-icon-download"
@click="handleExportModule">下载房屋模板</el-button> @click="handleExportModule">下载房屋模板</el-button>
<el-upload ref="upload" <el-upload ref="upload"
:multiple='false' :multiple='false'
@ -54,6 +57,8 @@
:http-request="uploadFile"> :http-request="uploadFile">
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
size="small" size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button> type="red">导入房屋数据</el-button>
</el-upload> </el-upload>
</div> </div>
@ -165,7 +170,7 @@ let loading // 加载动画
export default { export default {
data () { data () {
return { return {
loading: false, importRoomLoading: false,
total: 0, total: 0,
pageSize: 20, pageSize: 20,
pageNo: 0, pageNo: 0,
@ -407,13 +412,19 @@ export default {
}, },
async uploadFile () { async uploadFile () {
this.loading = true
if (this.fileName == "") { if (this.fileName == "") {
this.$message.warning('请选择要上传的文件！') this.$message.warning('请选择要上传的文件！')
return false return false
} }
this.$message({
showClose: true,
message: '导入中，请到系统管理-导入记录中查看进度',
duration: 0
})
//清空上传列表 //清空上传列表
this.$refs['upload'].clearFiles() this.$refs['upload'].clearFiles()
@ -424,24 +435,19 @@ export default {
fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名 fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
fileFormData.append('orgType', this.agencyObj.level);//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, window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => { (data, rspMsg) => {
this.endLoading()
if (data.code === 0 || data.code > 8000) { 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) => { (rspMsg, data) => {
this.endLoading() this.importRoomLoading = false
this.$message.error(rspMsg)
}, { headers: { 'Content-Type': 'multipart/form-data' } }) }, { headers: { 'Content-Type': 'multipart/form-data' } })

Write Preview
Loading…
Cancel
Save