From b4ad54dbc234898fd5f9e1f5b2dad6a9ee73a99d Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 8 Nov 2023 17:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E3=80=81=E6=B5=81=E8=BD=AC=E7=AD=89=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/store/index.js | 65 +- src/views/main-content.vue | 9 +- .../difficulty/difficultyForm.vue | 12 +- .../secretaryLog/humanisticCare/careForm.vue | 11 +- .../modules/secretaryLog/workLog/form.vue | 14 +- .../shequzhili/event/cpts/event-info.vue | 2 +- .../shequzhili/event/cpts/process-form.vue | 1 + .../modules/shequzhili/eventOld/cpts/add.vue | 1047 ++++++----- .../shequzhili/eventOld/cpts/event-detail.vue | 853 ++++----- .../shequzhili/eventOld/cpts/event-info.vue | 1320 +++++++------- .../eventOld/cpts/process-form-demand.vue | 1190 ++++++------- .../eventOld/cpts/process-form-designate.vue | 5 +- .../eventOld/cpts/process-form-replay.vue | 441 +++-- .../shequzhili/eventOld/cpts/process-form.vue | 413 ++--- .../modules/shequzhili/eventOld/eventList.vue | 1584 +++++++---------- 15 files changed, 3127 insertions(+), 3840 deletions(-) diff --git a/src/js/store/index.js b/src/js/store/index.js index cfd03b33e..040cd627b 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -76,52 +76,49 @@ export default new Vuex.Store({ interTimer = setInterval(() => { const _t = dateFormats("YYYY-mm-dd HH:MM", new Date(new Date().toLocaleDateString()).getTime()); const _tt = new Date(_t).getTime(); - console.log("230000---", _t); const t = dateFormats("YYYY-mm-dd HH:MM", new Date().getTime()); const nt = new Date(t).getTime(); // 判断当前时间是否为 00:00 - if (nt == _tt) { - dispatch("setTipsTime"); - return; - } + // if (nt == _tt) { + // dispatch("setTipsTime"); + // return; + // } let times = state.tipsTime; - console.log("nt---000", nt); state.tipsTime.forEach((item, index) => { const _t = new Date(item).getTime(); if (_t == nt) { clearInterval(interTimer); - dispatch("setTipsList", item); + // dispatch("setTipsList", item); times.splice(index, 1); - commit("SET_TIPS_TIME", times); + // commit("SET_TIPS_TIME", times); } }); }, 60000); }, - setTipsList({ commit }, time) { - return new Promise(async (resolve, reject) => { - const url = "/governance/memoAttr/memosToRemind"; - const params = { - remindTime: time || "", - }; - const { data, code, msg } = await requestPost(url, params); - if (code === 0) { - commit("SET_TIPS_LIST", data); - resolve(); - } else reject(msg); - }); - }, - setTipsTime({ commit, dispatch }) { - return new Promise(async (resolve, reject) => { - if (interTimer) clearInterval(interTimer); - const url = "/governance/memoAttr/memoTime"; - - const { data, code, msg } = await requestPost(url); - if (code === 0) { - commit("SET_TIPS_TIME", data); - if (data.length > 0) dispatch("setInterval"); - resolve(); - } else reject(msg); - }); - }, + // setTipsList({ commit }, time) { + // return new Promise(async (resolve, reject) => { + // const url = "/governance/memoAttr/memosToRemind"; + // const params = { + // remindTime: time || "", + // }; + // const { data, code, msg } = await requestPost(url, params); + // if (code === 0) { + // commit("SET_TIPS_LIST", data); + // resolve(); + // } else reject(msg); + // }); + // }, + // setTipsTime({ commit, dispatch }) { + // return new Promise(async (resolve, reject) => { + // if (interTimer) clearInterval(interTimer); + // const url = "/governance/memoAttr/memoTime"; + // const { data, code, msg } = await requestPost(url); + // if (code === 0) { + // commit("SET_TIPS_TIME", data); + // if (data.length > 0) dispatch("setInterval"); + // resolve(); + // } else reject(msg); + // }); + // }, }, }); diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 61dc9ac17..6c46d21b5 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -242,7 +242,6 @@ export default { const iframe = document.getElementsByClassName("iframes")[0].contentWindow; - console.log("iframe", iframe); // iframe.postMessage({ // token: localStorage.getItem('token'), // customerId: localStorage.getItem('customerId') @@ -250,8 +249,8 @@ export default { iframe.postMessage({ name: "lalalal" }, "*"); }, loopTips() { - this.$store.dispatch("setTipsList"); - this.$store.dispatch("setTipsTime"); + // this.$store.dispatch("setTipsList"); + // this.$store.dispatch("setTipsTime"); // let id = 1 // this.timer = setInterval(() => { // id = id + 1 @@ -284,12 +283,10 @@ export default { } else this.$message.error(msg); }, handleClose(item, index) { - console.log("close-----", item); this.$store.state.tipsList.splice(index, 1); this.closeTips(item.memoId); }, async handleLook(item, index) { - console.log("look-----", item); const formType = { work_diary: "ref_form", concern: "concern_form", @@ -300,9 +297,7 @@ export default { this.formType = item.type; this.dialogFormVisible = true; - console.log("ref0-----", this.formType); this.$nextTick(() => { - console.log("this.$refs-----", this.$refs); this.$refs[formType[item.type]].initForm("look", item.memoId); this.$store.state.tipsList.splice(index, 1); this.closeTips(item.memoId); diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue index 86c170634..4274002ac 100644 --- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue +++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue @@ -257,8 +257,8 @@ export default { this.resetData() this.$emit('dialogOk') this.btnDisable = false - this.$store.dispatch('setTipsList') - this.$store.dispatch('setTipsTime') + // this.$store.dispatch('setTipsList') + // this.$store.dispatch('setTipsTime') } else { this.btnDisable = false this.$message.error(msg) @@ -300,33 +300,25 @@ export default { }, handleFileSuccess (res, file) { - if (res.code === 0 && res.msg === 'success') { const array = file.name.split('.') const fileType = array[array.length - 1] - file.fileName = file.name file.attachmentUrl = res.data.url file.attachmentSize = file.size file.attachmentType = 'doc' file.attachmentFormat = fileType - this.fileList.push(file) - console.log(this.fileList) } else this.$message.error(res.msg) }, //下载 handleFileDownload (file) { - var a = document.createElement('a'); var event = new MouseEvent('click'); a.download = file.fileName; - console.log(a) a.href = file.attachmentUrl; a.dispatchEvent(event); - - }, resetData () { diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue index 948be55af..677f9e3a8 100644 --- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue +++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue @@ -312,8 +312,8 @@ export default { this.resetData() this.$emit('dialogOk') this.btnDisable = false - this.$store.dispatch('setTipsList') - this.$store.dispatch('setTipsTime') + // this.$store.dispatch('setTipsList') + // this.$store.dispatch('setTipsTime') } else { this.btnDisable = false this.$message.error(msg) @@ -359,29 +359,22 @@ export default { if (res.code === 0 && res.msg === 'success') { const array = file.name.split('.') const fileType = array[array.length - 1] - file.fileName = file.name file.attachmentUrl = res.data.url file.attachmentSize = file.size file.attachmentType = 'doc' file.attachmentFormat = fileType - this.fileList.push(file) - console.log(this.fileList) } else this.$message.error(res.msg) }, //下载 handleFileDownload (file) { - var a = document.createElement('a'); var event = new MouseEvent('click'); a.download = file.fileName; - console.log(a) a.href = file.attachmentUrl; a.dispatchEvent(event); - - }, resetData () { diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue index 4cf7032ce..afda3a4b2 100644 --- a/src/views/modules/secretaryLog/workLog/form.vue +++ b/src/views/modules/secretaryLog/workLog/form.vue @@ -233,8 +233,8 @@ export default { this.$emit('dialogOk') this.btnDisable = false - this.$store.dispatch('setTipsList') - this.$store.dispatch('setTipsTime') + // this.$store.dispatch('setTipsList') + // this.$store.dispatch('setTipsTime') } else { this.btnDisable = false this.$message.error(msg) @@ -275,44 +275,34 @@ export default { }, handleFileSuccess (res, file) { - if (res.code === 0 && res.msg === 'success') { const array = file.name.split('.') const fileType = array[array.length - 1] - file.fileName = file.name file.attachmentUrl = res.data.url file.attachmentSize = file.size file.attachmentType = 'doc' file.attachmentFormat = fileType - this.fileList.push(file) - console.log(this.fileList) } else this.$message.error(res.msg) }, //下载 handleFileDownload (file) { - var a = document.createElement('a'); var event = new MouseEvent('click'); a.download = file.name; - console.log(a) a.href = file.url; a.dispatchEvent(event); - - }, resetData () { this.id = '' - this.formData = { content: '',//内容 workType: '',//解决方式 remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] - } }, // 开启加载动画 diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index ab6605a54..288e75d76 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -427,7 +427,7 @@ export default { this.$message.error(msg); } } else if (this.formData.operationType == "") { - this.$message.error("请选择处理方式!"); + this.$message.error("请选择一种处理方式!"); } }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue index 3e977c1e5..d95b20496 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form.vue @@ -17,6 +17,7 @@ +
diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue index 1ed27b5d5..67486b3f7 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/add.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue @@ -1,146 +1,92 @@ diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue index 7f4d5ae63..1100090e5 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue @@ -1,496 +1,423 @@ diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index 620928a76..c2fab3dc1 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -1,330 +1,276 @@ diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue index 2e3c2e333..f26343913 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue @@ -1,11 +1,7 @@ - - - - - - + \ No newline at end of file diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue index a87027c5c..3a8692bb0 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue @@ -8,7 +8,7 @@ -->