From 213df6f0f340f81890ab745d03820e1d080d1858 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 18 May 2022 20:07:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/icon-voice.png | Bin 0 -> 945 bytes .../scss/modules/management/list-main.scss | 16 +- .../scss/modules/shequzhili/event-info.scss | 368 +++++++++ .../modules/shequzhili/event/cpts/add.vue | 612 +++++++++++++++ .../shequzhili/event/cpts/event-info.vue | 329 ++++++++ .../shequzhili/event/cpts/event-info1.vue | 152 ++++ .../shequzhili/event/cpts/issue-info.vue | 288 +++++++ .../shequzhili/event/cpts/issue-suggest.vue | 154 ++++ .../event/cpts/process-form-replay.vue | 137 ++++ .../shequzhili/event/cpts/process-form.vue | 248 ++++++ .../event/cpts/project-evaluation.vue | 154 ++++ .../shequzhili/event/cpts/project-info.vue | 703 ------------------ .../modules/shequzhili/event/eventList.vue | 644 +++++++++------- 13 files changed, 2813 insertions(+), 992 deletions(-) create mode 100644 src/assets/img/icon-voice.png create mode 100644 src/assets/scss/modules/shequzhili/event-info.scss create mode 100644 src/views/modules/shequzhili/event/cpts/add.vue create mode 100644 src/views/modules/shequzhili/event/cpts/event-info.vue create mode 100644 src/views/modules/shequzhili/event/cpts/event-info1.vue create mode 100644 src/views/modules/shequzhili/event/cpts/issue-info.vue create mode 100644 src/views/modules/shequzhili/event/cpts/issue-suggest.vue create mode 100644 src/views/modules/shequzhili/event/cpts/process-form-replay.vue create mode 100644 src/views/modules/shequzhili/event/cpts/process-form.vue create mode 100644 src/views/modules/shequzhili/event/cpts/project-evaluation.vue delete mode 100644 src/views/modules/shequzhili/event/cpts/project-info.vue diff --git a/src/assets/img/icon-voice.png b/src/assets/img/icon-voice.png new file mode 100644 index 0000000000000000000000000000000000000000..73e2416ef1a6a56ccbabfeaa2f50ee308ce3317e GIT binary patch literal 945 zcmV;i15W&jP)>rN;p*<+tBE1MTt%o2%53(V1z|8FI>|j2hFDC7+3ow((be2k`P__5# zh^;kU>^M%ZZQI`ic#4RojWN!efUfKITbA`XfENMmr~_oBzpM!uKB$yB2H<3PZCTbE zxm@mA++dZ0N~t3NPBj1(f3ylvDfI<_A!hDM+E+^b44@mp8D>6Q6VP?tJ(gwNZW3H* zCJFd0fDsY7;QRh?d>^g#Q4#qJz<)t9kIMZe1+~@(MC4ox0S5q7+*eh^UDw@d zSyrfGI}sf*#$=ZPDy71z|8c7Tqj;E@u8cyk3gI|HH)* z;CTRHl2pav$jHbO9UUG2mZ6B=G{#&_1yE~!T0}BLlsCo<#pBTPyn96S5)nDZnCVmi zJp!W9BQd zERNU7bdn^Isn0O;d<^hI0AbvvS7u_B;s<7aEz$1Eu3xcGr`hUa!)sV#lrhF%R;b6u z#(GPo(scman$+%U4huwd*%@S$znJ=tt_ZW&-yMB{%5x=)=qMn$TXfG5BCjh(!;Q0n9>l#?K)}tbFCfr9vdVJpxr<$de>c}5? zO`_UY6?-*ZT(4TqI5c^l_Z$)Z8SVKsGast8|GE^68)(+ClZfstE-t span, + > div { + display: block; + // max-width: 300px; + } + + &::before { + content: ""; + display: block; + position: absolute; + top: 9px; + left: 0; + width: 7px; + height: 7px; + background: #0c81fe; + border-radius: 3px; + margin-right: 10px; + } + } +} + +.m-case { + height: 600px; + padding: 20px 0 20px 0; + overflow-y: auto; +} + +.m-row { + display: flex; + justify-content: space-between; +} + +.m-hint { + position: relative; + height: 300px; + + // 暂无数据 + img { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + } +} + +.m-line { + min-width: 400px; + + .stat { + margin: 20px 0 10px; + display: flex; + .stat-item { + width: 33%; + text-align: center; + + div { + font-size: 17px; + font-family: Source Han Serif SC; + font-weight: 500; + color: rgba(#000, 0.5); + line-height: 24px; + &.z-weak { + font-size: 12px; + font-family: Source Han Serif SC; + font-weight: 500; + color: rgba(#000, 0.5); + line-height: 24px; + } + } + } + } +} + +.m-tb { + padding-left: 62px; + padding-right: 40px; +} + + + +.m-process { + margin-top: 30px; + margin-left: 15px; + // min-width: 400px; + + .process-title { + margin-bottom: 25px; + margin-left: -5px; + font-size: 16px; + font-family: PingFang SC; + font-weight: bold; + color: #333; + line-height: 18px; + } + + .list { + position: relative; + box-sizing: border-box; + margin-top: 30px/2; + margin-left: 50px/2; + padding: 0 0 0 30px/2; + width: 680px/2; + border-left: 3px solid #0c81fe; + padding-right: 10px; + + &::before { + content: ""; + position: absolute; + z-index: 1; + display: block; + top: -2px/2; + left: -2px/2; + width: 5px/2; + height: 20px/2; + background-color: #333; + } + + .item { + position: relative; + z-index: 2; + margin-bottom: 8px; + padding-bottom: 8px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #333; + line-height: 24px; + padding-left: 20px; + padding-top: 1px; + + &::before { + content: ""; + display: block; + position: absolute; + top: -5px; + left: -11px; + width: 18px; + height: 18px; + background: #0c81fe; + border: 4px solid lighten(#0c81fe, 15); + border-radius: 100%; + } + + &.z-on { + &::before { + background: #e08400; + border-color: lighten(#e08400, 15); + } + } + + &:last-child { + margin-bottom: 0; + padding-bottom: 0; + border-bottom: none; + } + + .item-row { + margin-top: -10px; + margin-bottom: 10px; + display: flex; + } + + .name { + position: relative; + padding: 0 10px; + font-size: 12px; + font-family: PingFang SC; + font-weight: 500; + color: #fff; + line-height: 22px; + height: 22px; + border-radius: 10px 0 10px 0; + background-color: #0c81fe; + // background-color: #e08400; + } + + .date { + margin-left: 10px; + font-size: 12px; + font-family: PingFang SC; + font-weight: 500; + color: #7ca1d2; + line-height: 25px; + } + + .detail { + @include cs; + font-size: 14px; + line-height: 20px; + margin-bottom: 5px; + display: flex; + + .detail-field { + width: 80px; + text-align: justify; + text-align-last: justify; + } + .detail-value { + // width: 78%; + .detail-link { + display: inline; + } + } + } + + .attachement-list { + padding-left: 80px; + a { + display: block; + cursor: pointer; + color: #4df0ff; + font-size: 14px; + + i { + color: #333; + } + } + } + } + } +} + +.m-top { + display: flex; +} + +.m-chart { + min-height: 200px; +} diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue new file mode 100644 index 00000000..7d166d42 --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -0,0 +1,612 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue new file mode 100644 index 00000000..548cb667 --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -0,0 +1,329 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/event-info1.vue b/src/views/modules/shequzhili/event/cpts/event-info1.vue new file mode 100644 index 00000000..72c04623 --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/event-info1.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/issue-info.vue b/src/views/modules/shequzhili/event/cpts/issue-info.vue new file mode 100644 index 00000000..2be1ffeb --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/issue-info.vue @@ -0,0 +1,288 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/issue-suggest.vue b/src/views/modules/shequzhili/event/cpts/issue-suggest.vue new file mode 100644 index 00000000..a4cf9f03 --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/issue-suggest.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue new file mode 100644 index 00000000..1320d10d --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue @@ -0,0 +1,137 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue new file mode 100644 index 00000000..a989bb16 --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/process-form.vue @@ -0,0 +1,248 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/project-evaluation.vue b/src/views/modules/shequzhili/event/cpts/project-evaluation.vue new file mode 100644 index 00000000..a4cf9f03 --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/project-evaluation.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/project-info.vue b/src/views/modules/shequzhili/event/cpts/project-info.vue deleted file mode 100644 index 7cbc9989..00000000 --- a/src/views/modules/shequzhili/event/cpts/project-info.vue +++ /dev/null @@ -1,703 +0,0 @@ - - - - - diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index b76c8096..a8a44bea 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -1,235 +1,283 @@ @@ -238,32 +286,41 @@ import { requestPost } from "@/js/dai/request"; import nextTick from "dai-js/tools/nextTick"; import { mapGetters } from "vuex"; -import projectInfo from "./cpts/project-info"; +import eventInfo from "./cpts/event-info"; import axios from "axios"; export default { - components: { projectInfo }, + components: { eventInfo }, data () { - return { - pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info + let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 + let nowData = Date.now() + if (this.formData.startTime) { + let startTime = new Date(this.formData.startTime) + return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime + } else { + return time.getTime() > nowData + } - pageNo: 1, - pageSize: window.localStorage.getItem("pageSize") || 20, - total: 1, + } + let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 + let nowData = Date.now() + return time.getTime() > nowData + } + return { + pageType: "list", // 列表list 新增add 处理dispose 详情info 议题详情issue-info agencyId: '', gridList: [],//所属网格list--场所区域 - tableData: [], statusArray: [ { - value: "1", + value: "processing", label: "处理中", }, { - value: "0", + value: "closed_case", label: "已完成", }, ], @@ -290,19 +347,29 @@ export default { }, ], - gridId: '', - qudao: '', - content: '', - fmData: { - title: "", - status: "", - birthdayStart: "", - birthdayEnd: "", - birthdayTime: ["", ""], - }, + formData: { + gridId: '', + sourceType: '', + eventContent: '', + name: '', + mobile: '', + startTime: '', + endTime: '', + status: '', + }, + pageNo: 1, + pageSize: window.localStorage.getItem("pageSize") || 20, + total: 1, + endPickerOptions: { + disabledDate: endDisabledDate + }, + startPickerOptions: { + disabledDate: startDisabledDate + }, + eventId: '', currentProject: { - projectId: "", + eventId: "", userId: "", categoryCodes: [], }, @@ -311,20 +378,15 @@ export default { computed: { maxTableHeight () { return this.$store.state.inIframe - ? this.clientHeight - 360 + this.iframeHeigh - : this.clientHeight - 360; + ? this.clientHeight - 400 + this.iframeHeigh + : this.clientHeight - 400; }, ...mapGetters(["clientHeight", "iframeHeight"]), }, watch: { - "fmData.birthdayTime": function (val) { - if (Array.isArray(val) && val.length == 2) { - this.fmData.birthdayStart = val[0]; - this.fmData.birthdayEnd = val[1]; - } else { - this.fmData.birthdayStart = ""; - this.fmData.birthdayEnd = ""; - } + "formData.endTime": function (val) { + let arrayTemp = val.split(' ') + this.formData.endTime = arrayTemp[0] + ' 23:59:59' }, }, mounted () { @@ -336,7 +398,7 @@ export default { methods: { handleSearch (val) { - console.log(this.fmData); + console.log(this.formData); this.pageNo = 1; this.getTableData(); }, @@ -359,40 +421,16 @@ export default { }, - - - - - - - handleSizeChange (val) { - console.log(`每页 ${val} 条`); - this.pageSize = val; - window.localStorage.setItem("pageSize", val); - this.getTableData(); - }, - handleCurrentChange (val) { - console.log(`当前页: ${val}`); - this.pageNo = val; - this.getTableData(); - }, - - - resetForm (formName) { - this.$refs[formName].resetFields(); - this.handleSearch(); - }, - async handleExport () { const url = "/epmetuser/icBirthRecord/export"; - const { pageSize, pageNo, fmData } = this; + const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, method: "post", data: { pageSize, pageNo, - ...fmData, + ...formData, }, responseType: "blob", }) @@ -418,11 +456,15 @@ export default { }); }, - async handleAdd () { }, + async handleAdd () { + + this.pageType = "add"; + }, + async handleWatch (rowIndex) { let item = this.tableData[rowIndex]; this.currentProject = { - projectId: item.projectId, + eventId: item.eventId, }; this.pageType = "info"; }, @@ -430,16 +472,16 @@ export default { async handleEdit (rowIndex) { let item = this.tableData[rowIndex]; this.currentProject = { - projectId: item.projectId, + eventId: item.eventId, }; this.pageType = "edit"; }, handleClose () { this.pageType = "list"; - this.currentProject = { - projectId: "", - }; + + this.eventId = "" + }, handleEditSuccess () { @@ -466,15 +508,16 @@ export default { }, async getTableData () { - const url = "/epmetuser/icBirthRecord/page"; - const { pageSize, pageNo, fmData } = this; + // const url = "/gov/project/icEvent/list"; + const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/list"; + const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { pageSize, pageNo, - ...fmData, + ...formData, }); if (code === 0) { - console.log("列表请求成功！！！！！！！！！！！！！！"); + this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { @@ -484,6 +527,35 @@ export default { } else { } }, + + handleSizeChange (val) { + + this.pageSize = val; + window.localStorage.setItem("pageSize", val); + this.getTableData(); + }, + handleCurrentChange (val) { + + this.pageNo = val; + this.getTableData(); + }, + + resetSearch () { + this.formData = { + gridId: '', + sourceType: '', + eventContent: '', + name: '', + mobile: '', + startTime: '', + endTime: '', + status: '', + } + + + // this.pageNo = 1 + // this.loadTable() + }, }, }; @@ -491,8 +563,4 @@ export default { From 2c86878f38cfa43d80d9602eea9fd199eba7adc2 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 19 May 2022 10:00:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=A2=9E=E5=8A=A0=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/sqzzz/cpts/edit.vue | 40 +++++++++++++++++-- .../modules/communityService/sqzzz/index.vue | 6 +++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue index f68176ee..b75f9346 100644 --- a/src/views/modules/communityService/sqzzz/cpts/edit.vue +++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue @@ -24,7 +24,21 @@ > - + + + + + + + +