From 628f543f30e3779e1d3d0bf068d187ce822409f6 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 16 Feb 2022 16:56:53 +0800 Subject: [PATCH 01/40] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=8E=89?= =?UTF-8?q?=E7=9A=84cokkie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/tinymce/index.vue | 2 +- src/views/main-content.vue | 6 +++--- src/views/main-shuju/main-content.vue | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/components/tinymce/index.vue b/src/views/components/tinymce/index.vue index 8403b43cb..73c48e26a 100644 --- a/src/views/components/tinymce/index.vue +++ b/src/views/components/tinymce/index.vue @@ -137,7 +137,7 @@ export default { }) }, getUserToken () { - let token = Cookie.get('token') + let token = localStorage.getItem('token') // console.log('获取token', token) // return this.$store.getters['user/isLogin'] return token diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 890964127..08c7e2491 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -87,7 +87,7 @@ export default { // this.$nextTick(() => { // this.sendMessage() // }) - this.token = Cookie.get("token"); + this.token = localStorage.getItem("token"); this.customerId = localStorage.getItem("customerId"); }, methods: { @@ -100,7 +100,7 @@ export default { this.iframeUrl = url + "?token=" + - Cookie.get("token") + + localStorage.getItem("token") + "&customerId=" + localStorage.getItem("customerId"); return isURL(url); @@ -169,7 +169,7 @@ export default { console.log("iframe", iframe); // iframe.postMessage({ - // token: Cookie.get('token'), + // token: localStorage.getItem('token'), // customerId: localStorage.getItem('customerId') // }, '*') iframe.postMessage({ name: "lalalal" }, "*"); diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue index b2da8855f..e78235c60 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -24,7 +24,7 @@ export default { // this.$nextTick(() => { // this.sendMessage() // }) - this.token = Cookie.get('token') + this.token = localStorage.getItem('token') this.customerId = localStorage.getItem('customerId') }, methods: { @@ -34,7 +34,7 @@ export default { // tabs, 是否通过iframe展示 tabIsIframe (url) { // this.appendIframe(url) - this.iframeUrl = url + '?token=' + Cookie.get('token') + '&customerId=' + localStorage.getItem('customerId') + this.iframeUrl = url + '?token=' + localStorage.getItem('token') + '&customerId=' + localStorage.getItem('customerId') return isURL(url) }, // tabs, 选中tab @@ -85,7 +85,7 @@ export default { console.log('iframe', iframe) // iframe.postMessage({ - // token: Cookie.get('token'), + // token: localStorage.getItem('token'), // customerId: localStorage.getItem('customerId') // }, '*') iframe.postMessage({ name: 'lalalal' }, '*') From bd1b591cda6fef6338c7e694a4c876b12d71e3e2 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 17 May 2022 15:26:55 +0800 Subject: [PATCH 02/40] =?UTF-8?q?=E8=BF=81=E5=85=A5=E6=AD=BB=E4=BA=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E6=96=B0=E5=A2=9E=E6=AD=BB=E4=BA=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/change/resideath.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue index cf791d50b..6a07e6f1e 100644 --- a/src/views/modules/plugins/change/resideath.vue +++ b/src/views/modules/plugins/change/resideath.vue @@ -86,7 +86,7 @@ 迁入死亡人口 + class="div-table-button--detail">新增死亡人口 - + - -
- - - - -
+ +
+ + + + +
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- -
+ - - - - - - -
- - + + + + +
+ + - - - - - - - - - - - - - - - - - -
- - - + + + + +
+ + + @@ -349,7 +380,7 @@ export default { _form = { ...obj } // return _form } - const itemTypes = ['daterange', 'timerange'] + const itemTypes = ['cascader', 'daterange', 'timerange'] arr.forEach(item => { if (item.multiSelect || itemTypes.includes(item.itemType)) { if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',') @@ -382,7 +413,7 @@ export default { } let form = initForm(this.formInfo, this.formList) let rules = initRules(this.formList) - let tempFormList = [ ...this.formList ] + let tempFormList = [...this.formList] let constForm = { ...form } @@ -526,13 +557,13 @@ export default { } }) }, - getTreeData(data){ + getTreeData (data) { if (!Array.isArray(data)) return [] let arr = data.map(item => { let _item = {} if (item.children) { if (item.children.length === 0) _item = { ...item, children: undefined } - else _item = { ...item, children: this.getTreeData(item.children)} + else _item = { ...item, children: this.getTreeData(item.children) } } else { _item = { ...item } } @@ -614,9 +645,9 @@ export default { this.getHouseList() }, // 为了实现根据房屋类型改版是否租户的需求 - handleChangeH(val){ + handleChangeH (val) { let item = this.optionsH.find(item => item.value === val); - if(item && item.type == '1'){ + if (item && item.type == '1') { this.form.IS_TENANT = '1' console.log('item-----', item) } else this.form.IS_TENANT = '0' @@ -625,7 +656,7 @@ export default { let arr = [] this.addList.forEach(item => { // console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm()) - arr.push([ ...this.$refs['baseForms' + item.row][0].handleForm() ]) + arr.push([...this.$refs['baseForms' + item.row][0].handleForm()]) }) if (arr.length === 0) return arr let arr2 = arr.reduce(function (a, b) { return a.concat(b) }) @@ -808,17 +839,16 @@ export default { From ab6e512aa251dd6483ae917b0e6902b86f9e3aef Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Jun 2022 17:36:28 +0800 Subject: [PATCH 12/40] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/visual/communityGovern/fivelayers/mapIndex.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 21db55adf..0529b496f 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -1250,8 +1250,9 @@ const vueGis = { coverageTypes: this.coverageTypes, categoryKeys: this.categoryKeys, search: this.search, - - isPage: false + pageNo: 1, + pageSize: 2000, + isPage: true }; const { data, code, msg } = await requestPost(url, params); From 81e4df7224cba0c66be0e889694735b8303a8948 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 30 Jun 2022 15:01:51 +0800 Subject: [PATCH 13/40] bug --- src/views/modules/plugins/change/resideath.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue index cf791d50b..df96eb706 100644 --- a/src/views/modules/plugins/change/resideath.vue +++ b/src/views/modules/plugins/change/resideath.vue @@ -442,7 +442,14 @@ export default { userId: this.rowData.icResiUserId, joinReason: this.blacklistReason, welfareFlag: this.welfareFlag, - deathDate: this.deathDate + deathDate: this.deathDate + } + if (this.deathDate === '') { + this.$message({ + message: '请选择死亡日期', + type:'warning' + }) + return false } this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => { if (res.code !== 0) { From b20ce235ee4faa2506d94d41102a261a85700099 Mon Sep 17 00:00:00 2001 From: YUJT Date: Tue, 5 Jul 2022 15:59:03 +0800 Subject: [PATCH 14/40] append --- src/views/modules/visual/components/screen-map/index.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index f13b09158..21c95ff9e 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -189,13 +189,8 @@ const vueGis = { ], //icon图标样式 iconUrlArray: [], -<<<<<<< HEAD - iconTextColor: "#ffffff", - distanceMax: null, //显示的坐标距离中心点的范围 -======= iconTextColor: '#ffffff', distanceMax: null,//显示的坐标距离中心点的范围 ->>>>>>> feature/dev_party_mange input_lat: null, input_lon: null, @@ -925,8 +920,4 @@ export default vueGis; // color: rgba(1, 17, 104, 1); color: #fff; } -<<<<<<< HEAD -======= - ->>>>>>> feature/dev_party_mange From 5af5cb9e7e70363d16106edc127924b093f11c6f Mon Sep 17 00:00:00 2001 From: HAHA Date: Mon, 25 Jul 2022 14:26:01 +0800 Subject: [PATCH 15/40] =?UTF-8?q?=E5=85=A8=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 4415 ++++++++--------- 1 file changed, 2058 insertions(+), 2357 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index d2da6092b..63e85731d 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1,2252 +1,2071 @@ \ No newline at end of file From 6f5328d0087033f0a9180e52d43ea7392615f42b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 09:27:18 +0800 Subject: [PATCH 16/40] worklog --- .../worklog/icworklog-add-or-update.vue | 187 ++++++++++++++++++ src/views/modules/worklog/icworklog.vue | 81 ++++++++ .../worklog/icworklogfile-add-or-update.vue | 159 +++++++++++++++ src/views/modules/worklog/icworklogfile.vue | 77 ++++++++ 4 files changed, 504 insertions(+) create mode 100644 src/views/modules/worklog/icworklog-add-or-update.vue create mode 100644 src/views/modules/worklog/icworklog.vue create mode 100644 src/views/modules/worklog/icworklogfile-add-or-update.vue create mode 100644 src/views/modules/worklog/icworklogfile.vue diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue new file mode 100644 index 000000000..76aaa9e53 --- /dev/null +++ b/src/views/modules/worklog/icworklog-add-or-update.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue new file mode 100644 index 000000000..045c46275 --- /dev/null +++ b/src/views/modules/worklog/icworklog.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/views/modules/worklog/icworklogfile-add-or-update.vue b/src/views/modules/worklog/icworklogfile-add-or-update.vue new file mode 100644 index 000000000..93835243f --- /dev/null +++ b/src/views/modules/worklog/icworklogfile-add-or-update.vue @@ -0,0 +1,159 @@ + + + diff --git a/src/views/modules/worklog/icworklogfile.vue b/src/views/modules/worklog/icworklogfile.vue new file mode 100644 index 000000000..1fa295987 --- /dev/null +++ b/src/views/modules/worklog/icworklogfile.vue @@ -0,0 +1,77 @@ + + + From 2d9fec1c4c90dda75a051182003c0933f4544183 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 09:31:35 +0800 Subject: [PATCH 17/40] bug --- src/views/modules/worklog/icworklog.vue | 2 +- src/views/modules/worklog/icworklogfile.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue index 045c46275..96d04c7e8 100644 --- a/src/views/modules/worklog/icworklog.vue +++ b/src/views/modules/worklog/icworklog.vue @@ -58,7 +58,7 @@ + + diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue index 96d04c7e8..a2c6392ed 100644 --- a/src/views/modules/worklog/icworklog.vue +++ b/src/views/modules/worklog/icworklog.vue @@ -1,39 +1,100 @@ + + From 81c292ad92ee6de8139927bd165ba63d9a359f9c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 10 Aug 2022 10:54:50 +0800 Subject: [PATCH 29/40] dd --- src/views/modules/shequzhili/statics/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue index 5897a5d08..90e0a32e0 100644 --- a/src/views/modules/shequzhili/statics/index.vue +++ b/src/views/modules/shequzhili/statics/index.vue @@ -55,7 +55,7 @@ size="small" :loading="exportLoading">导出 + :height="tableHeight"> @@ -173,8 +173,8 @@ export default { computed: { ...mapGetters(["clientHeight", "iframeHeight"]), tableHeight() { - const h = this.clientHeight - 360 + this.iframeHeigh; - const _h = this.clientHeight - 360; + const h = this.clientHeight - 330 + this.iframeHeigh; + const _h = this.clientHeight - 330; return this.$store.state.inIframe ? h : _h; }, }, From f2122883efc2287cd2258bf6a848061e11e4e39e Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 10 Aug 2022 14:00:44 +0800 Subject: [PATCH 30/40] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B9=9F=E4=B8=8D?= =?UTF-8?q?=E7=9F=A5=E9=81=93=E6=9C=89=E7=94=A8=E7=BE=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/buildTable.vue | 13 +- .../modules/base/community/communityTable.vue | 12 +- .../modules/base/community/roomTable.vue | 947 +++++++++--------- src/views/modules/cpts/baobiao/index.vue | 2 +- 4 files changed, 492 insertions(+), 482 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 9ccf0f897..53dbad392 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -256,7 +256,18 @@ export default { methods: { reportForm(){ let paramMap = { - neighborHoodId: this.agencyObj.id + pageSize: this.pageSize, + pageNo: this.pageNo, + level: this.agencyObj.level, + id: this.agencyObj.id, + ownerName: this.ownerName, + ownerPhone: this.ownerPhone, + rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + sortType: this.sortType, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, }; this.$refs.baobiao.init({ elseParams: { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index b1d6f8eca..1c326ec10 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -287,8 +287,18 @@ export default { methods: { reportForm(){ let paramMap = { + pageSize: this.pageSize, + pageNo: this.pageNo, level: this.agencyObj.level, - id: this.agencyObj.id + id: this.agencyObj.id, + ownerName: this.ownerName, + ownerPhone: this.ownerPhone, + rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + sortType: this.sortType, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, }; this.$refs.baobiao.init({ elseParams: { diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 511bd5619..15c62a15e 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -1,193 +1,215 @@ - + + diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue index 00f16d600..b208eda98 100644 --- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue +++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue @@ -282,7 +282,7 @@ + - + + item.level === 1) + let level2 = nodes.filter(item => item.level === 2) + console.log('level2----1', level2) + level1.forEach(item => { + console.log('level2----2', level2) + if (item.hasChildren) { + for (let i = level2.length - 1; i >= 0; i--) { + if (level2[i].parent.value === item.value) level2.splice(i, 1) + } + } + }) + this.formData.firstIdList = level1.map(item => item.value) + this.formData.secondIdList = level2.map(item => item.value) + }, handleSelectionChange (val) { this.multipleSelection = []; val.forEach(element => { @@ -692,6 +746,23 @@ export default { this.$message.error(msg); } }, + async getCateOptions() { + const url = "/gov/issue/issueprojectcategorydict/list"; + + const { data, code, msg } = await requestPost(url, {}); + + if (code === 0) { + // this.cateOptions = data.map((item) => { + // item.subCategory.forEach((subitem) => { + // delete subitem.subCategory; + // }); + // return item; + // }); + this.cateOptions = this.deepTree(data, 'subCategory') + } else { + this.$message.error(msg); + } + }, handleSizeChange (val) { @@ -715,12 +786,27 @@ export default { startTime: '', endTime: '', status: '', + firstIdList: [], + secondIdList: [], } + this.eventTypeCheck = [] + - - // this.pageNo = 1 + this.pageNo = 1 + this.getTableData(); // this.loadTable() }, + deepTree(arr, child) { + if (Array.isArray(arr) && arr.length > 0) { + return arr.map(item => { + // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId + return { + ...item, + [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null + } + }) + } + } }, }; @@ -729,4 +815,10 @@ export default { @import "@/assets/scss/buttonstyle.scss"; @import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/shequzhili/event-info.scss"; +.div_search { + .item_width_2 { + width: 200px; + } +} +