diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss index 370c50fe..d6f0a6d1 100644 --- a/src/assets/scss/modules/search.scss +++ b/src/assets/scss/modules/search.scss @@ -228,7 +228,7 @@ } .notice-list { // @include toe; - width: 92%; + width: calc(100% - 70px); // height: 24px; // overflow: hidden; a { diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index ddf1da35..4c578bcd 100644 --- a/src/assets/scss/modules/visual/personCategory.scss +++ b/src/assets/scss/modules/visual/personCategory.scss @@ -89,7 +89,7 @@ } .item_right { - width: 160px; + width: 110px; display: flex; flex-direction: column; align-items: space-between; diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss index fa0354ca..24428cdd 100644 --- a/src/assets/scss/people-info.scss +++ b/src/assets/scss/people-info.scss @@ -8,11 +8,20 @@ .wrap { position: relative; - margin: 120px auto; - padding: 20px; - width: 1000px; + margin: 5vh auto; + height: 90vh; + width: 1040px; background-color: #fff; + .wrap2 { + box-sizing: border-box; + padding: 20px; + height: 90vh; + width: 1040px; + overflow-y: auto; + overflow-x: hidden; + } + .title { padding: 10px; font-size: 22px; @@ -33,6 +42,7 @@ .btn-close { position: absolute; + z-index: 2; top: -30px; right: -30px; cursor: pointer; diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 63dce11e..b65d924a 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -48,6 +48,7 @@ @selection-change="selectionChange"> { console.log('res----dddd', res) // this.download(res.data, title + '.xls') diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index a3a53089..425ff0ad 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -66,7 +66,6 @@ > {{importBtnTitle}} - {{ exportBtnTitle }} @@ -382,28 +381,68 @@ export default { this.uploading = true this.unloadPencent = Number(file.percentage.toFixed(0)) }, + download (data, fileName) { + console.log('data', data) + if (!data) { + return + } + + var csvData = new Blob([data]) + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(csvData, fileName) + } + // for Non-IE (chrome, firefox etc.) + else { + var a = document.createElement('a') + document.body.appendChild(a) + a.style = 'display: none' + var url = window.URL.createObjectURL(csvData) + a.href = url + a.download = fileName + a.click() + a.remove() + window.URL.revokeObjectURL(url) + } + }, async handleExportModule () { let url = "/resi/partymember/icpartymemberstyle/import/template-download" let params = {} - await this.$http - .post(url, params) + // app.ajax.exportFilePost( + // url, + // params, + // (data, rspMsg) => { + + // this.download(data, 'a.xls') + // }, + // (rspMsg, data) => { + // this.$message.error(rspMsg); + // } + // ); + await this.$http({ + method: 'POST', + url, + responseType: 'blob', + data: params + }) .then(res => { - // this.download(res.data, title + '.xls') + console.log('res-------dd', 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.download(res.data, fileName) + // 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对象 } else this.$message.error('下载失败') }) .catch(err => { diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index b0de99cb..8bc0bcba 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -2,24 +2,25 @@
- 新增 + 新增
-
+
-
+
- 修改 - 删除 + 修改 + 删除
{{ item.centerName }}
@@ -49,107 +50,89 @@ >
--> -
- - - - +
+ + + + - + - +
-
- +
+
- - + + - - + + - - + +
@@ -170,7 +153,7 @@ let loading; // 加载动画 export default { components: { editForm, orderForm, orderList }, - data() { + data () { return { openSearch: false, @@ -187,23 +170,23 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 520; }, ...mapGetters(["clientHeight"]), }, watch: { - currentIndex() { + currentIndex () { this.setMap(); }, }, - async mounted() { + async mounted () { await this.loadAgency(); await this.getTableData(); }, methods: { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap() { + initMap () { // 定义地图中心点坐标 var center = new window.TMap.LatLng(36.0722275, 120.38945519); // 定义map变量，调用 TMap.Map() 构造函数创建地图 @@ -223,7 +206,7 @@ export default { infoWindowList = Array(10); }, - setMarker(lat, lng, centerName) { + setMarker (lat, lng, centerName) { markers.setGeometries([]); markers.add([ { @@ -237,11 +220,11 @@ export default { ]); }, - setCenter(lat, lng) { + setCenter (lat, lng) { map.setCenter(new window.TMap.LatLng(lat, lng)); }, - setMap() { + setMap () { const { tableData, currentIndex } = this; let item = tableData[currentIndex]; if (item) { @@ -250,24 +233,24 @@ export default { } }, - handleClose() { + handleClose () { this.formShow = false; }, - handleCloseForm2() { + handleCloseForm2 () { this.form2Show = false; }, - handleCloseOrderList() { + handleCloseOrderList () { this.orderListShow = false; }, - async handleAdd() { + async handleAdd () { this.formShow = true; await nextTick(); console.log(this.$refs); this.$refs.eleEditForm.initForm("add"); }, - async handleWatch() { + async handleWatch () { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm( @@ -276,7 +259,7 @@ export default { ); }, - async handleEdit() { + async handleEdit () { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm( @@ -285,12 +268,12 @@ export default { ); }, - handleEditSuccess() { + handleEditSuccess () { this.handleClose(); this.getTableData(); }, - async handleOrder(index) { + async handleOrder (index) { this.form2Show = true; await nextTick(); this.$refs.eleOrderForm.initForm( @@ -300,18 +283,18 @@ export default { ); }, - handleOrderSuccess() { + handleOrderSuccess () { this.handleCloseForm2(); }, - async handleOrderList(index) { + async handleOrderList (index) { this.orderListShow = true; await nextTick(0); console.log(this.$refs); this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index); }, - async handleDel() { + async handleDel () { if (!confirm("删除后不可恢复，确定删除？")) return; const item = this.tableData[this.currentIndex]; @@ -327,7 +310,7 @@ export default { } }, - async getTableData() { + async getTableData () { const oldLen = this.tableData.length; const url = "/gov/org/icpartyservicecenter/partyservicecenterlist"; const { data, code, msg } = await requestPost(url, { @@ -348,7 +331,7 @@ export default { }, //加载组织 - async loadAgency() { + async loadAgency () { const url = "/epmetuser/customerstaff/staffbasicinfo"; let params = {}; @@ -414,29 +397,15 @@ export default { position: absolute; top: 5px; right: 5px; - // width: 120px; - - a { - display: inline-block; - margin-left: 1px; - font-size: 14px; - color: rgb(235, 192, 4); - width: 40px; - line-height: 30px; - text-align: center; - cursor: pointer; - &:nth-child(2) { - color: #aaa; - &:hover { - // text-decoration: underline; - color: #666; - } - } - - &:hover { - // text-decoration: underline; - color: rgb(250, 208, 23); - } + font-size: 14px; + color: #00a7a9; + width: 50px; + line-height: 30px; + text-align: center; + cursor: pointer; + &:hover { + // text-decoration: underline; + color: #00a7a9; } } diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 859982f6..90604829 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -131,12 +131,10 @@ - 查询 + 查询 - 重置 + 重置
@@ -145,7 +143,7 @@
- 新增需求 + 新增
{ // this.download(res.data, title + '.xls') if (res.headers["content-disposition"]) { diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index 191bdc54..f4fe8a58 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -1,9 +1,7 @@