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

Merge branch 'dev-20220218' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-20220218

shibei_master
dai 4 years ago
parent
f4b45b06fc 29a4ddd55a
commit
1c8e09eed6
9 changed files with 197 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .env.production.uat
  2. 3
      public/index.html
  3. 2
      src/utils/request.js
  4. 51
      src/views/modules/base/community/buildTable.vue
  5. 57
      src/views/modules/base/community/communityTable.vue
  6. 32
      src/views/modules/base/community/roomTable.vue
  7. 70
      src/views/modules/base/resi.vue
  8. 69
      src/views/modules/communityParty/elegant/index.vue
  9. 8
      src/views/modules/visual/communityGovern/typePieOption.js

3
.env.production.uat
View File

@ -1,4 +1,5 @@
NODE_ENV=production
VUE_APP_API_SERVER = http://120.27.18.76/api
# VUE_APP_API_SERVER = http://120.27.18.76/api
VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
VUE_APP_NODE_ENV=prod:uat
VUE_APP_PUBLIC_PATH=epmet-oper

3
public/index.html
View File

@ -57,7 +57,8 @@
<!-- 验收测试环境 aliyun -->
<% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %>
<script>
window.SITE_CONFIG['apiURL'] = 'http://120.27.18.76/api'
// window.SITE_CONFIG['apiURL'] = 'http://120.27.18.76/api'
window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
</script>
<% } %>
<!-- 生产环境 -->

2
src/utils/request.js
View File

@ -7,7 +7,7 @@ import isPlainObject from 'lodash/isPlainObject'
const http = axios.create({
baseURL: window.SITE_CONFIG['apiURL'],
timeout: 1000 * 180,
timeout: 1000 * 900,
withCredentials: true
})

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

@ -34,15 +34,18 @@
<el-button style="float:left"
type="yellow"
size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button>
<el-button style="float:left"
type="green"
size="small"
icon="el-icon-plus"
@click="handleAdd">新增楼宇</el-button>
<el-button style=";margin-left:10px"
type="blue"
size="small"
icon="el-icon-download"
@click="handleExportModule('building')">下载楼宇模板</el-button>
<el-upload style=""
@ -55,11 +58,14 @@
:http-request="(()=>{uploadFile( 'building')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importBuildingLoading"
type="red">导入楼宇数据</el-button>
</el-upload>
<el-button style=";margin-left:10px"
type="blue"
size="small"
icon="el-icon-download"
@click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload style=""
@ -72,6 +78,8 @@
:http-request="(()=>{uploadFile( 'room')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button>
</el-upload>
</div>
@ -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' } })
},

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

@ -34,16 +34,19 @@
<el-button style=""
type="yellow"
size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button>
<el-button style=""
type="green"
size="small"
icon="el-icon-plus"
@click="handleAdd">新增小区</el-button>
<div class="btn_upload"
v-if="agencyObj.level==='community'||agencyObj.level==='grid'">
<el-button style=""
type="blue"
size="small"
icon="el-icon-download"
@click="handleExportModule('community')">下载小区模板</el-button>
<el-upload ref="upload_community"
@ -56,12 +59,15 @@
:http-request="(()=>{uploadFile( 'community')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importCommunityLoading"
type="red">导入小区数据</el-button>
</el-upload>
<el-button style=";margin-left:10px"
type="blue"
size="small"
icon="el-icon-download"
@click="handleExportModule('building')">下载楼宇模板</el-button>
<el-upload style=""
@ -74,11 +80,14 @@
:http-request="(()=>{uploadFile( 'building')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importBuildingLoading"
type="red">导入楼宇数据</el-button>
</el-upload>
<el-button style=";margin-left:10px"
type="blue"
size="small"
icon="el-icon-download"
@click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload style=""
@ -91,6 +100,8 @@
:http-request="(()=>{uploadFile( 'room')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button>
</el-upload>
</div>
@ -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' } })

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

@ -34,14 +34,17 @@
<el-button style="float:left"
type="yellow"
size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button>
<el-button style="float:left"
type="green"
icon="el-icon-plus"
size="small"
@click="handleAdd">新增房屋</el-button>
<el-button style="float:left"
type="blue"
size="small"
icon="el-icon-download"
@click="handleExportModule">下载房屋模板</el-button>
<el-upload ref="upload"
:multiple='false'
@ -54,6 +57,8 @@
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button>
</el-upload>
</div>
@ -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' } })

70
src/views/modules/base/resi.vue
View File

@ -457,38 +457,56 @@ export default {
async uploadHttpRequest (file) {
this.importLoading = true
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中，请到系统管理-导入记录中查看进度',
duration: 0
})
const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
formData.append('file', file.file) //添加文件对象
await axios({
url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
method: 'post',
data: formData,
timeout: '900000',
responseType: 'blob'
})
.then((res) => {
if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
var url = window.URL.createObjectURL(blob)
var aLink = document.createElement('a')
aLink.style.display = 'none'
aLink.href = url
aLink.setAttribute('download', fileName)
document.body.appendChild(aLink)
aLink.click()
document.body.removeChild(aLink) //下载完成移除元素
window.URL.revokeObjectURL(url) //释放掉blob对象
}
this.getTableData()
})
.catch(err => {
await this.$http
.post('/epmetuser/icresiuser/importExcel', formData).then(res => {
console.log('res-up', res)
if (res.data.code == 0 && res.data.msg == 'success') {
this.$message.success('导入成功')
this.getTableData()
} else this.$message.error(res.data.msg)
}).catch(err => {
console.log('失败', err)
file.onError() //上传失败的文件会从文件列表中删除
this.$message.error('导入失败')
})
// await axios({
// url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
// method: 'post',
// data: formData,
// timeout: '300000',
// responseType: 'blob'
// })
// .then((res) => {
// console.log('res-up', res)
// // if (res.headers["content-disposition"]) {
// // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
// // console.log('filename', fileName)
// // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
// // var url = window.URL.createObjectURL(blob)
// // var aLink = document.createElement('a')
// // aLink.style.display = 'none'
// // aLink.href = url
// // aLink.setAttribute('download', fileName)
// // document.body.appendChild(aLink)
// // aLink.click()
// // document.body.removeChild(aLink) //下载完成移除元素
// // window.URL.revokeObjectURL(url) //释放掉blob对象
// // }
// this.getTableData()
// })
// .catch(err => {
// console.log('失败', err)
// file.onError() //上传失败的文件会从文件列表中删除
// this.$message.error('导入失败')
// })
this.importLoading = false
this.importBtnTitle = '导入人员数据'
this.$refs.upload.clearFiles()

69
src/views/modules/communityParty/elegant/index.vue
View File

@ -374,36 +374,55 @@ export default {
async uploadHttpRequest(file) {
this.importLoading = true
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中，请到系统管理-导入记录中查看进度',
duration: 0
})
const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
formData.append('file', file.file) //添加文件对象
await axios({
url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',
method: 'post',
data: formData,
responseType: 'blob'
})
.then((res) => {
// this.importLoading = false
// this.importBtnTitle = '导入人员数据'
// let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
// console.log('filename', fileName)
// let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
// var url = window.URL.createObjectURL(blob)
// var aLink = document.createElement('a')
// aLink.style.display = 'none'
// aLink.href = url
// aLink.setAttribute('download', fileName)
// document.body.appendChild(aLink)
// aLink.click()
// document.body.removeChild(aLink) //下载完成移除元素
// window.URL.revokeObjectURL(url) //释放掉blob对象
this.getTableData()
})
.catch( err => {
this.$http
.post('/resi/partymember/icpartymemberstyle/import', formData).then(res => {
console.log('res-up', res)
if (res.data.code == 0 && res.data.msg == 'success') {
this.$message.success('导入成功')
this.getTableData()
} else {
this.$message.error(res.data.msg)
}
}).catch(err => {
console.log('失败', err)
file.onError() //上传失败的文件会从文件列表中删除
this.$message.error('导入失败')
})
})
// await axios({
// url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',
// method: 'post',
// data: formData,
// responseType: 'blob'
// })
// .then((res) => {
// // this.importLoading = false
// // this.importBtnTitle = '导入人员数据'
// // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
// // console.log('filename', fileName)
// // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
// // var url = window.URL.createObjectURL(blob)
// // var aLink = document.createElement('a')
// // aLink.style.display = 'none'
// // aLink.href = url
// // aLink.setAttribute('download', fileName)
// // document.body.appendChild(aLink)
// // aLink.click()
// // document.body.removeChild(aLink) //下载完成移除元素
// // window.URL.revokeObjectURL(url) //释放掉blob对象
// this.getTableData()
// })
// .catch( err => {
// console.log('失败', err)
// file.onError() //上传失败的文件会从文件列表中删除
// this.$message.error('导入失败')
// })
this.importLoading = false
this.importBtnTitle = '导入人员数据'
this.$refs.upload.clearFiles()

8
src/views/modules/visual/communityGovern/typePieOption.js
View File

@ -77,7 +77,7 @@ const center= ['50%', '250px']
// height: '80%',
selectedMode: 'single',
left: 'center',
width: 400,
width: 480,
label: {
// show: false,
position: 'outside',
@ -88,14 +88,14 @@ const center= ['50%', '250px']
edgeDistance: 1,
lineHeight: 15,
color: '#fff',
fontSize: 12,
fontSize: 10,
// distanceToLabelLine: -60,
rich: {
name: {
padding: [0, 6, 0, 6]
},
a: {
fontSize: 30,
fontSize: 25,
color: '#fff',
padding: [0, 6, 6, 6]
},
@ -111,7 +111,7 @@ const center= ['50%', '250px']
labelLine: {
show: false,
smooth: 0.2,
length: 30,
length: 50,
length2: 0,
maxSurfaceAngle: 80
},

Write Preview
Loading…
Cancel
Save