From 73841a11a2413c90a016ed3ee1e79c2cacb2e239 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 23 May 2022 16:22:47 +0800 Subject: [PATCH 001/112] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/hikerrorinfo-add-or-update.vue | 145 ++++++++++++++++++ .../modules/plugins/rent/hikerrorinfo.vue | 60 ++++++++ 2 files changed, 205 insertions(+) create mode 100644 src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue create mode 100644 src/views/modules/plugins/rent/hikerrorinfo.vue diff --git a/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue new file mode 100644 index 00000000..5ecc620f --- /dev/null +++ b/src/views/modules/plugins/rent/hikerrorinfo-add-or-update.vue @@ -0,0 +1,145 @@ + + + diff --git a/src/views/modules/plugins/rent/hikerrorinfo.vue b/src/views/modules/plugins/rent/hikerrorinfo.vue new file mode 100644 index 00000000..58ece8e9 --- /dev/null +++ b/src/views/modules/plugins/rent/hikerrorinfo.vue @@ -0,0 +1,60 @@ + + + From a042086afa823ae087b49867270ebdbb9e5eaeb5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 23 May 2022 17:34:40 +0800 Subject: [PATCH 002/112] bug --- src/views/modules/plugins/rent/hikerrorinfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/hikerrorinfo.vue b/src/views/modules/plugins/rent/hikerrorinfo.vue index 58ece8e9..f6356981 100644 --- a/src/views/modules/plugins/rent/hikerrorinfo.vue +++ b/src/views/modules/plugins/rent/hikerrorinfo.vue @@ -37,7 +37,7 @@ diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue new file mode 100644 index 00000000..8083ce67 --- /dev/null +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue new file mode 100644 index 00000000..0b018e41 --- /dev/null +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -0,0 +1,200 @@ + + + diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue new file mode 100644 index 00000000..dfaa2714 --- /dev/null +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue @@ -0,0 +1,88 @@ + + + From 21c45fba0e0c7d49e09e965790d31607773d753e Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 21 Jun 2022 10:17:47 +0800 Subject: [PATCH 004/112] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...icpointnucleicmonitoring-add-or-update.vue | 76 +++------- .../point/icpointnucleicmonitoring.vue | 23 +-- ...pointvaccinesinoculation-add-or-update.vue | 139 +++++++----------- .../point/icpointvaccinesinoculation.vue | 21 +-- 4 files changed, 84 insertions(+), 175 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index df3cb3c2..8109fb89 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -1,57 +1,21 @@ @@ -270,6 +271,7 @@ export default { }, }, mounted() { + console.log(document.getElementById("map_app")); this.getFormInfo(); this.initMap(); }, @@ -450,4 +452,8 @@ export default { .position_label >>> .el-form-item__label::before{ color:#fff!important; } +.submit{ + text-align: center; + margin: auto; +} diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue index 9668e34f..230d2c1a 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue @@ -323,9 +323,18 @@ export default { }; From 199514343a9db5be3b60eeb53f0f17098c501cdf Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 23 Jun 2022 14:04:08 +0800 Subject: [PATCH 013/112] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../point/icpointnucleicmonitoring-add-or-update.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index b18b80e7..f08dcc00 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -7,15 +7,16 @@ @keyup.enter.native="dataFormSubmitHandle()" label-width="120px" > - + - + @@ -352,7 +353,11 @@ export default { .catch(() => {}); }, // 表单提交 - dataFormSubmitHandle: debounce( + dataFormSubmitHandle(){ + console.log(this.dataForm) + }, + + dataFormSubmitHandle2: debounce( function () { this.$refs["dataForm"].validate((valid) => { if (!valid) { From 4638e3f09f6b3190fa4375db464d142abfd4fb5e Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 23 Jun 2022 14:35:46 +0800 Subject: [PATCH 014/112] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...icpointnucleicmonitoring-add-or-update.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index 861aa278..7b476cbf 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -8,15 +8,13 @@ label-width="120px" > - - + @@ -208,6 +206,14 @@ export default { this.initMap(); }, methods: { + orgChangeHandle(val){ + for(var i = 0 ; i < this.organizationList.length ; i++){ + if( this.organizationList[i].orgId === val){ + this.dataForm.orgName=this.organizationList[i].orgName + return false + } + } + }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap() { // 定义地图中心点坐标 @@ -338,7 +344,6 @@ export default { // 获取信息 getInfo() { - console.log(111111); this.$http .get(`/epmetuser/icPointNucleicMonitoring/${this.dataForm.id}`) .then(({ data: res }) => { @@ -353,11 +358,7 @@ export default { .catch(() => {}); }, // 表单提交 - dataFormSubmitHandle(){ - console.log(this.dataForm) - }, - - dataFormSubmitHandle2: debounce( + dataFormSubmitHandle: debounce( function () { this.$refs["dataForm"].validate((valid) => { if (!valid) { From 5f9f601ab331e9f88f5e645857bff001a63f4372 Mon Sep 17 00:00:00 2001 From: 123456 <17862666717> Date: Thu, 23 Jun 2022 14:40:17 +0800 Subject: [PATCH 015/112] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/view-module.js | 8 - ...icpointnucleicmonitoring-add-or-update.vue | 5 +- .../point/icpointnucleicmonitoring.vue | 223 ++++++++++-------- ...pointvaccinesinoculation-add-or-update.vue | 1 - .../point/icpointvaccinesinoculation.vue | 178 ++++++++------ 5 files changed, 234 insertions(+), 181 deletions(-) diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js index dcfabd2e..079ac138 100644 --- a/src/mixins/view-module.js +++ b/src/mixins/view-module.js @@ -102,14 +102,6 @@ export default { this.page = 1 this.query() }, - // 新增 / 修改 - addOrUpdateHandle (id) { - this.addOrUpdateVisible = true - this.$nextTick(() => { - this.$refs.addOrUpdate.dataForm.id = id - this.$refs.addOrUpdate.init() - }) - }, // 删除 deleteHandle (id) { if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) { diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index 30096682..feb8b832 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -96,7 +96,7 @@
- {{ $t("cancel") }} + {{ $t("cancel") }} {{ $t("confirm") }} @@ -207,6 +207,9 @@ export default { this.initMap(); }, methods: { + closeSubmit(){ + this.$emit('closeDialog') + }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap() { // 定义地图中心点坐标 diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue index 18e7b785..85bb8543 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue @@ -6,48 +6,61 @@ :model="dataForm" @keyup.enter.native="getDataList()" > - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - {{ $t("query") }} + {{ + $t("query") + }} - {{ - $t("add") - }} + {{ $t("add") }} - - - + + +
@@ -168,7 +181,7 @@ @@ -199,50 +213,64 @@ export default { dataForm: { name: "", mobile: "", - orgId: "" + orgId: "", }, - organizationList: [], - orgIds:[] + organizationList: [], + orgIds: [], + updateId: null, }; }, components: { AddOrUpdate, }, - created(){ - this.getFormInfo() - }, + created() { + this.getFormInfo(); + }, methods: { - // 获取所属组织列表 - getFormInfo() { - this.$http - .post(`/gov/org/agency/getOrgTreeListByCustomerId`) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } - this.organizationList = res.data; - this.deleteChildren(this.organizationList) - }) - .catch(() => {}); - }, - deleteChildren(arr) { - let childs = arr - for (let i = childs.length; i--; i > 0) { - if (childs[i].children) { - if (childs[i].children.length) { - this.deleteChildren(childs[i].children) - } else { - delete childs[i].children - } - } - } - return arr - }, - orgChangeHandle () { - this.dataForm.orgId = this.orgIds[this.orgIds.length-1] - console.log(this.dataForm) - - }, + // 新增 / 修改 + addOrUpdateHandle(id) { + this.updateId = id; + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id; + this.$refs.addOrUpdate.init(); + }); + this.addOrUpdateVisible = true; + }, + // 关闭弹窗 + closeDialog() { + this.addOrUpdateVisible = false; + this.uploadId = null; + }, + // 获取所属组织列表 + getFormInfo() { + this.$http + .post(`/gov/org/agency/getOrgTreeListByCustomerId`) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } + this.organizationList = res.data; + this.deleteChildren(this.organizationList); + }) + .catch(() => {}); + }, + deleteChildren(arr) { + let childs = arr; + for (let i = childs.length; i--; i > 0) { + if (childs[i].children) { + if (childs[i].children.length) { + this.deleteChildren(childs[i].children); + } else { + delete childs[i].children; + } + } + } + return arr; + }, + orgChangeHandle() { + this.dataForm.orgId = this.orgIds[this.orgIds.length - 1]; + console.log(this.dataForm); + }, handleExportModule() { let title = "核酸检测点模板"; let url = "/epmetuser/icPointNucleicMonitoring/exporttemplate"; @@ -260,31 +288,30 @@ export default { } ); }, - // 下载文件 - download (data, fileName) { - if (!data) { - return - } - - var csvData = new Blob([data]) + // 下载文件 + download(data, fileName) { + if (!data) { + return; + } - 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); - } + 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); + } + }, // 上传文件之前的钩子 beforeUpload(file) { this.files = file; @@ -317,7 +344,7 @@ export default { }); //清空上传列表 - this.$refs['upload'].clearFiles(); + this.$refs["upload"].clearFiles(); let url = ""; let fileFormData = new FormData(); @@ -325,7 +352,10 @@ export default { url = "/epmetuser/icPointNucleicMonitoring/pointImport"; - window.app.ajax.post2(url,fileFormData,(data, rspMsg) => { + window.app.ajax.post2( + url, + fileFormData, + (data, rspMsg) => { if (data.code === 0 && data.msg == "success") { // this.$message.success('导入成功') } else { @@ -338,7 +368,6 @@ export default { // this.$message.error(rspMsg) } this.loadTable(); - }, (rspMsg, data) => {}, { headers: { "Content-Type": "multipart/form-data" } } diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue index c0ccdca7..5cfab8d2 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -253,7 +253,6 @@ export default { }, }, mounted() { - console.log(document.getElementById("map_app")); this.getFormInfo(); this.initMap(); }, diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue index 35c6621a..4cca565d 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue @@ -7,23 +7,36 @@ @keyup.enter.native="getDataList()" > - + - + - {{ $t("query") }} + {{ + $t("query") + }} - {{ - $t("add") - }} + {{ $t("add") }} - - - + + + @@ -77,10 +90,10 @@ width="50" > - - - - + + + + @@ -201,15 +215,30 @@ export default { deleteIsBatch: true, }, dataForm: { - name: "", - mobile: "" + name: "", + mobile: "", }, + updateId: null, }; }, components: { AddOrUpdate, }, methods: { + // 新增 / 修改 + addOrUpdateHandle(id) { + this.updateId = id; + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id; + this.$refs.addOrUpdate.init(); + }); + this.addOrUpdateVisible = true; + }, + // 关闭弹窗 + closeDialog() { + this.addOrUpdateVisible = false; + this.uploadId = null; + }, handleExportModule() { let title = "疫苗接种点模板"; let url = "/epmetuser/icPointVaccinesInoculation/exporttemplate"; @@ -227,31 +256,30 @@ export default { } ); }, - // 下载文件 - download (data, fileName) { - if (!data) { - return - } - - var csvData = new Blob([data]) + // 下载文件 + download(data, fileName) { + if (!data) { + return; + } - 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); - } + 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); + } + }, // 上传文件之前的钩子 beforeUpload(file) { this.files = file; @@ -271,46 +299,48 @@ export default { return true; } }, - async uploadFile() { - if (this.fileName == "") { - this.$message.warning("请选择要上传的文件！"); - return false; - } - - this.$message({ - showClose: true, - message: "导入中，请到系统管理-导入记录中查看进度", - duration: 0, - }); + async uploadFile() { + if (this.fileName == "") { + this.$message.warning("请选择要上传的文件！"); + return false; + } - //清空上传列表 - this.$refs['upload'].clearFiles(); - let url = ""; + this.$message({ + showClose: true, + message: "导入中，请到系统管理-导入记录中查看进度", + duration: 0, + }); - let fileFormData = new FormData(); - fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名 + //清空上传列表 + this.$refs["upload"].clearFiles(); + let url = ""; - url = "/epmetuser/icPointVaccinesInoculation/pointImport"; + let fileFormData = new FormData(); + fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名 - window.app.ajax.post2(url,fileFormData,(data, rspMsg) => { - if (data.code === 0 && data.msg == "success") { - // this.$message.success('导入成功') - } else { - // this.$message({ - // showClose: true, - // message: rspMsg, - // duration: 0, - // type: "error" - // }) - // this.$message.error(rspMsg) - } - this.loadTable(); + url = "/epmetuser/icPointVaccinesInoculation/pointImport"; - }, - (rspMsg, data) => {}, - { headers: { "Content-Type": "multipart/form-data" } } - ); - } + window.app.ajax.post2( + url, + fileFormData, + (data, rspMsg) => { + if (data.code === 0 && data.msg == "success") { + // this.$message.success('导入成功') + } else { + // this.$message({ + // showClose: true, + // message: rspMsg, + // duration: 0, + // type: "error" + // }) + // this.$message.error(rspMsg) + } + this.loadTable(); + }, + (rspMsg, data) => {}, + { headers: { "Content-Type": "multipart/form-data" } } + ); + }, }, }; From a5805765c85cfc8345b2ff0db7312f2bcc0d2e98 Mon Sep 17 00:00:00 2001 From: 123456 <17862666717> Date: Thu, 23 Jun 2022 14:44:01 +0800 Subject: [PATCH 016/112] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../point/icpointvaccinesinoculation-add-or-update.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue index 5cfab8d2..cc6babf2 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -120,7 +120,7 @@
- {{ $t("cancel") }} + {{ $t("cancel") }} {{ $t("confirm") }} @@ -253,10 +253,12 @@ export default { }, }, mounted() { - this.getFormInfo(); this.initMap(); }, methods: { + closeSubmit(){ + this.$emit('closeDialog') + }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap() { // 定义地图中心点坐标 From 52acf7bbeb285c62b0b3b2cb463d1dd8eff5bb04 Mon Sep 17 00:00:00 2001 From: 123456 <17862666717> Date: Thu, 23 Jun 2022 14:49:22 +0800 Subject: [PATCH 017/112] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/point/icpointnucleicmonitoring-add-or-update.vue | 4 +--- .../point/icpointvaccinesinoculation-add-or-update.vue | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index e4c30016..8fd4d1c8 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -113,7 +113,6 @@ var infoWindowList; export default { data() { return { - visible: false, dataForm: { id: "", customerId: "", @@ -336,7 +335,6 @@ export default { .catch(() => {}); }, init() { - this.visible = true; this.$nextTick(() => { this.$refs["dataForm"].resetFields(); if (this.dataForm.id) { @@ -380,8 +378,8 @@ export default { type: "success", duration: 500, onClose: () => { - this.visible = false; this.$emit("refreshDataList"); + this.closeSubmit() }, }); }) diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue index cc6babf2..ede57617 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -420,6 +420,7 @@ export default { // onClose: () => { // this.visible = false // this.$emit('refreshDataList') + // this.closeSubmit() // } // }) // }).catch(() => {}) From b96eff559c6c7726feb25ad39861723694e9b355 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 23 Jun 2022 15:51:33 +0800 Subject: [PATCH 018/112] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pointvaccinesinoculation-add-or-update.vue | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue index ede57617..789647ca 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -404,27 +404,26 @@ export default { // 表单提交 dataFormSubmitHandle: debounce( function () { - console.log(this.dataForm); - // this.$refs['dataForm'].validate((valid) => { - // if (!valid) { - // return false - // } - // this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/icPointVaccinesInoculation/', this.dataForm).then(({ data: res }) => { - // if (res.code !== 0) { - // return this.$message.error(res.msg) - // } - // this.$message({ - // message: this.$t('prompt.success'), - // type: 'success', - // duration: 500, - // onClose: () => { - // this.visible = false - // this.$emit('refreshDataList') - // this.closeSubmit() - // } - // }) - // }).catch(() => {}) - // }) + this.$refs['dataForm'].validate((valid) => { + if (!valid) { + return false + } + this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/icPointVaccinesInoculation/', this.dataForm).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.$emit('refreshDataList') + this.closeSubmit() + } + }) + }).catch(() => {}) + }) }, 1000, { leading: true, trailing: false } From 52756db4121d18a174e6dadb450e243349bf8cc8 Mon Sep 17 00:00:00 2001 From: 123456 <17862666717> Date: Thu, 23 Jun 2022 18:06:36 +0800 Subject: [PATCH 019/112] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/point/icpointNoice.vue | 172 +++++++++++------- ...icpointnucleicmonitoring-add-or-update.vue | 11 +- .../point/icpointnucleicmonitoring.vue | 35 +++- ...pointvaccinesinoculation-add-or-update.vue | 11 +- .../point/icpointvaccinesinoculation.vue | 35 +++- 5 files changed, 189 insertions(+), 75 deletions(-) diff --git a/src/views/modules/plugins/point/icpointNoice.vue b/src/views/modules/plugins/point/icpointNoice.vue index d425f8ee..b75a9e63 100644 --- a/src/views/modules/plugins/point/icpointNoice.vue +++ b/src/views/modules/plugins/point/icpointNoice.vue @@ -1,17 +1,19 @@ diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index 8fd4d1c8..4365131b 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -200,9 +200,8 @@ export default { }; }, }, - mounted() { + mounted() { this.getFormInfo(); - this.initMap(); }, methods: { closeSubmit(){ @@ -219,7 +218,8 @@ export default { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap() { // 定义地图中心点坐标 - var center = new window.TMap.LatLng(36.0722275, 120.38945519); + let _this = this + var center = new window.TMap.LatLng(_this.dataForm.latitude, _this.dataForm.longitude); // 定义map变量，调用 TMap.Map() 构造函数创建地图 map = new window.TMap.Map(document.getElementById("map_add"), { center: center, // 设置地图中心点坐标 @@ -339,6 +339,10 @@ export default { this.$refs["dataForm"].resetFields(); if (this.dataForm.id) { this.getInfo(); + }else{ + this.dataForm.ongitude = "120.38945519" + this.dataForm.latitude = "36.0722275" + this.initMap(); } }); }, @@ -355,6 +359,7 @@ export default { ...this.dataForm, ...res.data, }; + this.initMap(); }) .catch(() => {}); }, diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue index 85bb8543..dc4f1605 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue @@ -100,6 +100,13 @@ >导入核酸监测点数据 + 发送通知
+ + + + diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue index dc4f1605..ffba3c65 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue @@ -105,6 +105,7 @@ class="diy-button--more" size="small" @click="handleSendNotice" + v-if="noticeVisible" >发送通知 @@ -208,9 +209,10 @@ width="850px" top="5vh" class="dialog-h" - @closed="diaClose"> + @closed="diaClose" + :destroy-on-close="true"> + @diaClose="diaClose" :noticeOrigin="noticeOrigin"> @@ -239,6 +241,8 @@ export default { orgIds: [], updateId: null, sendNoticeFormShow:false, + noticeVisible:false, + noticeOrigin:"3" }; }, components: { @@ -246,15 +250,13 @@ export default { icpointNoice }, created() { + this.noticeFun() this.getFormInfo(); }, methods: { // 发送通知 handleSendNotice () { this.sendNoticeFormShow = true - this.$nextTick(() => { - this.$refs.ref_sendnotice.initForm(this.selectionAll, '3') - }) }, // 关闭通知 diaClose(){ @@ -287,6 +289,17 @@ export default { }) .catch(() => {}); }, + // 获取发送通知按钮显示与隐藏 + noticeFun(){ + this.$http + .post(`/epmetuser/icPointNucleicMonitoring/getShowType`) + .then(({ data: res }) => { + if (res.code === 0 && res.data) { + this.noticeVisible = true + } + }) + .catch(() => {}); + }, deleteChildren(arr) { let childs = arr; for (let i = childs.length; i--; i > 0) { diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue index b4c2b227..2fac69f9 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue @@ -80,6 +80,7 @@ class="diy-button--more" size="small" @click="handleSendNotice" + v-if="noticeVisible" >发送通知 @@ -212,9 +213,10 @@ width="850px" top="5vh" class="dialog-h" - @closed="diaClose"> + @closed="diaClose" + :destroy-on-close="true"> + @diaClose="diaClose" :noticeOrigin="noticeOrigin" > @@ -240,24 +242,37 @@ export default { }, updateId: null, sendNoticeFormShow:false, + noticeVisible:false, + noticeOrigin:"4" }; }, components: { AddOrUpdate, icpointNoice }, + mounted(){ + this.noticeFun() + }, methods: { // 发送通知 handleSendNotice () { this.sendNoticeFormShow = true - this.$nextTick(() => { - this.$refs.ref_sendnotice.initForm(this.selectionAll, '4') - }) }, // 关闭通知 diaClose(){ this.sendNoticeFormShow = false }, + // 获取发送通知按钮显示与隐藏 + noticeFun(){ + this.$http + .post(`/epmetuser/icPointNucleicMonitoring/getShowType`) + .then(({ data: res }) => { + if (res.code === 0 && res.data) { + this.noticeVisible = true + } + }) + .catch(() => {}); + }, // 新增 / 修改 addOrUpdateHandle(id) { this.updateId = id; From 88edeb6cb2a58dad77658c915b006f93b19fe377 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 24 Jun 2022 15:39:35 +0800 Subject: [PATCH 021/112] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../point/icpointnucleicmonitoring.vue | 61 ++++++++++--------- .../point/icpointvaccinesinoculation.vue | 24 ++++++-- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue index ffba3c65..6ce82ba5 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue @@ -6,18 +6,6 @@ :model="dataForm" @keyup.enter.native="getDataList()" > - - - - - - - - - - - - - {{ + {{ $t("query") }} {{ $t("add") }} + size="small" + class="diy-button--reset" + @click="resetSearch">重置 - - - - -
+ {{ $t("add") }} + + + diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue new file mode 100644 index 00000000..8567a5bd --- /dev/null +++ b/src/views/modules/communityParty/heart/heartFinish.vue @@ -0,0 +1,374 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index cf907040..03b84a36 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -14,7 +14,7 @@ - - - @@ -87,7 +88,7 @@ prop="reward" style="display: block" label-width="150px"> - @@ -95,7 +96,7 @@ prop="sponsorContacts" label-width="150px" style="display: block"> - @@ -108,7 +109,7 @@ prop="sponsorTel" label-width="150px" style="display: block"> - @@ -127,6 +128,7 @@ label-width="150px" style="display: block"> + （选中后报名参加活动人员可以直接审核通过） @@ -134,11 +136,12 @@ style="display: block" prop="signUpEndTime" label-width="150px"> - + placeholder="选择时间"> @@ -146,7 +149,7 @@ prop="requirement" label-width="150px" style="display: block"> - - @@ -257,20 +260,20 @@
-

+ v-html="formData.actContentHtml">

 @@ -325,54 +328,108 @@ export default { let nowData = Date.now() return time.getTime() > nowData } + const valActTime = (rule, value, callback) => { + if (value === '' || value === null) { + callback(new Error('请选择活动开始时间')) + } else if (!this.formData.actEndTime) { + callback(new Error('请选择活动结束时间')) + } else { + callback() + } + } + const valSigninTime = (rule, value, callback) => { + if (value === '' || value === null) { + callback(new Error('请选择签到开始时间')) + } else if (!this.formData.signInEndTime) { + callback(new Error('请选择签到结束时间')) + } else { + callback() + } + } return { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 btnDisable: false, customerId: '', + actId: '', + valActTime: valActTime, + valSigninTime: valSigninTime, - placesList: [],//场景列表 - teamsList: [],//分队列表 - inspectorsList: [],//检查人员列表 - - placePatrolRecordId: '', formData: { - actAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - actContent: "", + actAddress: "", + actContentHtml: "", + actContent: {}, actDraftId: "", - actEndTime: "2022-08-30 13:34", + actEndTime: "", actId: "", - actLatitude: 36.08743, - actLongitude: 120.37479, - actQuota: "10", - actStartTime: "2022-07-30 13:34", + actLatitude: null, + actLongitude: null, + actQuota: undefined, + actStartTime: "", actType: "heart", - auditSwitch: true, - coverPic: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png", + auditSwitch: false, + coverPic: "", coverPicAuditStatus: "", - customerId: "45687aa479955f9d06204d415238f7cc", + customerId: "", noticePassedPeople: false, requirement: "", - reward: "10", - - signInAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - signInEndTime: "2022-07-30 10:34", - signInLatitude: 36.08743, - signInLongitude: 120.37479, - signInRadius: "100", - signInStartTime: "2022-07-29 13:34", - signUpEndTime: "2022-07-28 13:34", - sponsorContacts: "张三", - sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", - sponsorName: "市北区", - sponsorTel: "15111111111", - sponsorType: "agency", + reward: undefined, + + signInAddress: "", + signInEndTime: "", + signInLatitude: null, + signInLongitude: null, + signInRadius: undefined, + signInStartTime: "", + signUpEndTime: "", + sponsorContacts: "", + sponsorId: "", + sponsorPath: '', + sponsorName: "", + sponsorTel: "", + sponsorType: "", target: "", - title: "312313", + title: "", volunteerLimit: false, }, + formDataTemp: { + actAddress: "山东省青岛市市北区安达路", + actContent: {}, + actContentHtml: "", + actDraftId: "", + actEndTime: "2022-07-20 00:00", + actId: "", + actLatitude: 36.102321679746424, + actLongitude: 120.37441423359928, + actQuota: 50, + actStartTime: "2022-07-15 00:00", + actType: "heart", + auditSwitch: true, + coverPic: "", + coverPicAuditStatus: "", + customerId: "", + noticePassedPeople: false, + requirement: "报名条件报名条件报名条件", + reward: 100, + signInAddress: "山东省青岛市市南区南京路79号丁", + signInEndTime: "2022-07-14 11:00", + signInLatitude: 36.07208450171733, + signInLongitude: 120.38920734352655, + signInRadius: 100, + signInStartTime: "2022-07-14 10:00", + signUpEndTime: "2022-07-13 00:00", + sponsorContacts: "王二麻", + sponsorPath: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28,63d5ff92ea981b1c58e4914ac894c610", + sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", + sponsorName: "市北区", + sponsorTel: "1511111111", + sponsorType: "agency", + target: "", + title: "31231", + volunteerLimit: true, + }, orgOptions: [], orgOptionProps: { @@ -397,10 +454,10 @@ export default { // upload_url: '', // 上传URL upload_name: '', // 图片或视频名称 replayImgList: [ - { - id: '1', - url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png' - } + // { + // id: '1', + // url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png' + // } ], hideUploadBtn: false @@ -412,23 +469,29 @@ export default { this.initMap() this.loadSponsorlist() + + // this.replayImgList.push() }, methods: { - async initForm (type, placePatrolRecordId) { + async initForm (type, actId) { this.$refs.ref_form.resetFields(); - this.startLoading() + + this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); + this.agencyIdArray = this.formData.sponsorPath.split(',') this.formType = type - if (placePatrolRecordId) { - this.placePatrolRecordId = placePatrolRecordId - this.formData.placePatrolRecordId = placePatrolRecordId + if (actId) { + this.startLoading() + this.actId = actId + this.formData.actId = actId await this.loadFormData() + this.endLoading() } - this.endLoading() + }, //获取主办方 @@ -457,39 +520,53 @@ export default { if (obj) { this.formData.sponsorId = obj.gridId this.formData.sponsorName = obj.agencyName + this.formData.sponsorPath = this.agencyIdArray.join(',') - if (obj.level === 'agency') { + if (obj.level === 'agency') { this.formData.sponsorType = 'agency' } else { - this.formData.sponsorType = 'grid' } } else { this.formData.sponsorId = '' + this.formData.sponsorPath = '' this.formData.sponsorName = '' this.formData.sponsorType = '' } - }, - //加载form async loadFormData () { - const url = '/gov/org/placepatrolrecord/detail' + const url = '/heart/work/act/detail' let params = { - placePatrolRecordId: this.placePatrolRecordId + actId: this.actId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { - data.inspectorArray = data.inspectors.split(',') - this.formData = { ...data } + debugger + this.formData = JSON.parse(JSON.stringify(data)); + this.agencyIdArray = this.formData.sponsorPath.split(',') + if (this.formData.actContent && this.formData.actContent.length > 0) { + this.formData.actContentHtml = this.formData.actContent[0].content + } + + if (this.formData.coverPic) { + let obj = { + id: '111', + url: this.formData.coverPic + } + this.replayImgList = [] + this.replayImgList.push(obj) + + this.hideUploadBtn = true + } } else { @@ -497,30 +574,40 @@ export default { } }, - async handleComfirm () { console.log(this.formData) - // this.btnDisable = true - // setTimeout(() => { - // this.btnDisable = false - // }, 10000) - // this.$refs['ref_form'].validate((valid, messageObj) => { - // if (!valid) { - // app.util.validateRule(messageObj) - // this.btnDisable = false - // } else { - // this.addRecord() - // } - - // }) + + this.btnDisable = true + setTimeout(() => { + this.btnDisable = false + }, 3000) + + this.$refs['ref_form'].validate((valid, messageObj) => { + + if (!valid) { + + app.util.validateRule(messageObj) + this.btnDisable = false + } else { + this.addHeartAct() + } + + }) }, - async addRecord () { - this.formData.actContent = this.dormatHtml(this.formData.actContent) + async addHeartAct () { + let obj = { + contentType: 'rich_text', + content: this.dormatHtml(this.formData.actContentHtml) + } + this.formData.actContent = [] + this.formData.actContent.push(obj) + + this.formData.customerId = this.customerId - let url = "/gov/org/placepatrolrecord/add" + let url = "/heart/work/act/publishV2" // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add" - this.formData.inspectors = this.formData.inspectorArray.join(',') + const { data, code, msg } = await requestPost(url, this.formData) @@ -749,39 +836,41 @@ export default { resetData () { this.formData = { - actAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - actContent: "", + actAddress: "", + actContentHtml: "", + actContent: {}, actDraftId: "", - actEndTime: "2022-08-30 13:34", + actEndTime: "", actId: "", - actLatitude: 36.08743, - actLongitude: 120.37479, - actQuota: "10", - actStartTime: "2022-07-30 13:34", + actLatitude: null, + actLongitude: null, + actQuota: undefined, + actStartTime: "", actType: "heart", - auditSwitch: true, - coverPic: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png", + auditSwitch: false, + coverPic: "", coverPicAuditStatus: "", - customerId: "45687aa479955f9d06204d415238f7cc", + customerId: "", noticePassedPeople: false, requirement: "", - reward: "10", - - signInAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - signInEndTime: "2022-07-30 10:34", - signInLatitude: 36.08743, - signInLongitude: 120.37479, - signInRadius: "100", - signInStartTime: "2022-07-29 13:34", - signUpEndTime: "2022-07-28 13:34", - sponsorContacts: "张三", - sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", - sponsorName: "市北区", - sponsorTel: "15111111111", - sponsorType: "agency", + reward: undefined, + + signInAddress: "", + signInEndTime: "", + signInLatitude: null, + signInLongitude: null, + signInRadius: undefined, + signInStartTime: "", + signUpEndTime: "", + sponsorContacts: "", + sponsorId: "", + sponsorPath: '', + sponsorName: "", + sponsorTel: "", + sponsorType: "", target: "", - title: "312313", + title: "", volunteerLimit: false, } @@ -806,31 +895,50 @@ export default { dataRule () { return { - gridId: [ - { required: true, message: '场所网格不能为空', trigger: 'blur' } - ], - ninePlaceVal: [ - { required: true, message: '场所类型不能为空', trigger: 'blur' }, + sponsorId: [ + { required: true, message: '主办方不能为空', trigger: 'change' } ], - placeOrgId: [ - { required: true, message: '场所名称不能为空', trigger: 'blur' } + title: [ + { required: true, message: '活动标题不能为空', trigger: 'change' }, ], - placePatrolTeamId: [ - { required: true, message: '分队不能为空', trigger: 'blur' } + + coverPic: [ + { required: true, message: '封面图不能为空', trigger: 'change' } ], - inspectorArray: [ - { required: true, message: '巡检人员不能为空', trigger: 'blur' } + actContentHtml: [ + { required: true, message: '活动详情不能为空', trigger: 'change' } + ], + actAddress: [ + { required: true, message: '活动地点不能为空', trigger: 'change' } ], - firstTime: [ - { required: true, message: '首次巡查时间不能为空', trigger: 'blur' } + actStartTime: [ + { required: true, validator: this.valActTime, message: '活动时间不能为空', trigger: 'change' } ], - detailed: [ - { required: true, message: '隐患明细不能为空', trigger: 'blur' } + actQuota: [ + { required: true, message: '活动人数不能为空', trigger: 'change' } + ], + reward: [ + { required: true, message: '活动积分不能为空', trigger: 'change' } + ], + signUpEndTime: [ + { required: true, message: '报名截止时间不能为空', trigger: 'change' } + ], + signInStartTime: [ + { required: true, validator: this.valSigninTime, message: '签到时间不能为空', trigger: 'change' } + ], + signInAddress: [ + { required: true, message: '签到地点不能为空', trigger: 'change' } + ], + signInRadius: [ + { required: true, message: '签到有效范围不能为空', trigger: 'change' } + ], + sponsorContacts: [ + { required: true, message: '联系人不能为空', trigger: 'change' } + ], + sponsorTel: [ + { required: true, message: '联系电话不能为空', trigger: 'change' } ], - firstResult: [ - { required: true, message: '首次巡查结果不能为空', trigger: 'blur' } - ] } }, @@ -848,6 +956,10 @@ export default { .avatar-uploader { margin: 0 0 0 20px; } +.div-tooltip { + margin-left: 10px; + color: red; +} diff --git a/src/views/modules/communityParty/heart/heartReview.vue b/src/views/modules/communityParty/heart/heartReview.vue index ec45e380..8724d640 100644 --- a/src/views/modules/communityParty/heart/heartReview.vue +++ b/src/views/modules/communityParty/heart/heartReview.vue @@ -1,138 +1,40 @@ @@ -141,252 +43,119 @@ import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 import { requestPost } from '@/js/dai/request' +import Tinymce from '@c/tinymce2/index.vue' + let loading // 加载动画 + + export default { data () { + return { - tableLoading: false, - placePatrolRecordId: '', - tableData: [], + formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 + btnDisable: false, + customerId: '', + actId: '', + + formData: { + actContent: '', + }, + + } }, - components: {}, + components: { Tinymce }, mounted () { + this.customerId = localStorage.getItem('customerId') }, methods: { - async initTable (placePatrolRecordId) { - this.placePatrolRecordId = placePatrolRecordId - await this.loadTeams() - - await this.loadTable() - - }, - - - //加载分队 - async loadTeams () { - const url = '/gov/org/placepatrolteam/getlist' - // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist' - let params = { - isPage: false - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.teamsList = data.list - - - } else { - this.$message.error(msg) - } - }, - - //点击分队切换人员 - async hancleChangeTeam (row, index, tableIndex) { - this.tableData[tableIndex].inspectorArray = [...[]] - let teamId = this.teamsList[index].teamId - await this.loadInspectors(teamId, tableIndex) - }, - - //加载分队下人员 - async loadInspectors (teamId, tableIndex) { + async initForm (type, actId) { + this.$refs.ref_form.resetFields(); + this.startLoading() - const url = '/gov/org/placepatrolteamstaff/getlist' - // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist' - let params = { - teamId: teamId - } + this.formType = type + if (actId) { + this.actId = actId + this.formData.actId = actId - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - // let obj = this.tableData[tableIndex] - this.tableData[tableIndex].inspectorsList = [...data] - // this.tableData[tableIndex]= - // obj.inspectorsList = data - // this.$set(this.tableData, tableIndex, obj) - console.log(this.tableData) - } else { - this.$message.error(msg) } + this.endLoading() }, - //加载form - async loadTable () { - this.tableLoading = true - const url = '/gov/org/placepatrolreviewrecord/getlist' - // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist' - let params = { - placePatrolRecordId: this.placePatrolRecordId - } - const { data, code, msg } = await requestPost(url, params) - this.tableLoading = false - if (code === 0) { - if (data.list && data.list.length > 0) { - data.list.forEach(item => { - item.isEdit = false - item.isNew = false - let arrayInspectors = item.inspectors.split(',') - item.inspectorArray = [...arrayInspectors] - let arrayReviewTime = item.reviewTime.split(' ') - item.reviewTime = arrayReviewTime[0] - }); - this.tableData = [...data.list] - } else { - this.tableData = [] - } + async handleComfirm () { + console.log(this.formData) + // this.btnDisable = true + // setTimeout(() => { + // this.btnDisable = false + // }, 10000) + // this.$refs['ref_form'].validate((valid, messageObj) => { + // if (!valid) { + // app.util.validateRule(messageObj) + // this.btnDisable = false + // } else { + // this.addRecord() + // } - } else { - this.$message.error(msg) - } - }, + // }) - handleAdd () { - let obj = { - isNew: true,//是否新增 - isEdit: true,//是否编辑 - placePatrolRecordId: this.placePatrolRecordId, - reviewTime: '', - placePatrolTeamId: '', - inspectors: '', - inspectorArray: [], - inspectorsList: [], - reviewResult: '', - } - this.tableData.push(obj) }, + async addRecord () { + this.formData.actContent = this.dormatHtml(this.formData.actContent) - async handleEdit (row, tableIndex) { - let teamId = row.placePatrolTeamId - await this.loadInspectors(teamId, tableIndex) + let url = "/gov/org/placepatrolrecord/add" + // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add" + this.formData.inspectors = this.formData.inspectorArray.join(',') - let rowData = JSON.parse(JSON.stringify(row)) - rowData.isEdit = true - rowData.isNew = false - rowData.inspectorArray = rowData.inspectors.split(',') + const { data, code, msg } = await requestPost(url, this.formData) - console.log(rowData) - this.$set(this.tableData, tableIndex, rowData) - }, - - async handleComfirm (row, tableIndex) { - let valiMsg = this.validata(row) - if (valiMsg) { + if (code === 0) { this.$message({ - type: 'warning', - message: valiMsg + type: 'success', + message: '操作成功' }) - return false - } - - this.addReview(row, tableIndex) - - }, - async addReview (row, tableIndex) { - - let url = "/gov/org/placepatrolreviewrecord/add" - if (row.placePatrolReviewRecordId) { - url = "/gov/org/placepatrolreviewrecord/edit" - } - - let params = JSON.parse(JSON.stringify(row)) - params.inspectors = params.inspectorArray.join(',') - params.reviewTime = params.reviewTime + ' 00:00:00' - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - let array = data.reviewTime.split(' ') - data.reviewTime = array[0] - data.isEdit = false - data.isNew = false - - this.$set(this.tableData, tableIndex, data) - + this.resetData() + this.$emit('dialogOk') + this.btnDisable = false } else { - + this.btnDisable = false this.$message.error(msg) } }, - validata (row) { - let message = '' - if (row.reviewTime === '') { - message = message + '复查时间不能为空；' - } - if (row.placePatrolTeamId === '') { - message = message + '分队名称不能为空；' - } - if (row.inspectorArray.length === 0) { - message = message + '检查人员不能为空；' + dormatHtml (content) { + let c = '' + if (content.indexOf('DOCTYPE') != -1) { + c = content.slice(45, -16); } - if (row.reviewResult === '') { - message = message + '复查结论不能为空；' - } - return message + console.log('content', typeof content) + return c || content }, - async handleDelete (row, tableIndex) { - - this.$confirm("确认删除?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }) - .then(() => { - if (row.placePatrolReviewRecordId) {//存在id，调用服务删除 - this.deleteRecord(row, tableIndex) - } else {//不存在id，直接删除数组数据 - this.tableData.splice(tableIndex, 1); - } - - }) - .catch(err => { - if (err == "cancel") { - - } - }); - }, - - async deleteRecord (row, tableIndex) { - - const url = "/gov/org/placepatrolreviewrecord/del" - - let params = { - placePatrolReviewRecordId: row.placePatrolReviewRecordId - } - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - // this.$message({ - // type: "success", - // message: "删除成功" - // }); - - this.tableData.splice(tableIndex, 1); - } else { - this.$message.error(msg) - } - }, handleCancle () { + + this.resetData() this.$emit('dialogCancle') }, - + resetData () { + this.formData = { + actContent: '', + } + }, // 开启加载动画 startLoading () { loading = Loading.service({ @@ -404,47 +173,62 @@ export default { } }, computed: { - tableHeight () { - - return (this.clientHeight - 360) - + dataRule () { + return { + + gridId: [ + { required: true, message: '场所网格不能为空', trigger: 'blur' } + ], + ninePlaceVal: [ + { required: true, message: '场所类型不能为空', trigger: 'blur' }, + ], + placeOrgId: [ + { required: true, message: '场所名称不能为空', trigger: 'blur' } + ], + placePatrolTeamId: [ + { required: true, message: '分队不能为空', trigger: 'blur' } + ], + + inspectorArray: [ + { required: true, message: '巡检人员不能为空', trigger: 'blur' } + ], + firstTime: [ + { required: true, message: '首次巡查时间不能为空', trigger: 'blur' } + ], + detailed: [ + { required: true, message: '隐患明细不能为空', trigger: 'blur' } + ], + firstResult: [ + { required: true, message: '首次巡查结果不能为空', trigger: 'blur' } + ] + } }, - ...mapGetters(['clientHeight']) - }, props: { - resultList: { - type: Array, - default: [] - } } } - + + + From c358b095e0831b66e7936c0e45c281618162b481 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 1 Jul 2022 10:58:51 +0800 Subject: [PATCH 077/112] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/cpts/tb.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue index 8b77155d..2920ee64 100644 --- a/src/views/modules/visual/cpts/tb.vue +++ b/src/views/modules/visual/cpts/tb.vue @@ -21,13 +21,22 @@ + :key="index" + @click="handleClickRow(index)">
{{ item }}
+ +
+ + + +
div { overflow: hidden; From 173c09b0d89fb14911e3fd840c8d2723cb3fc1be Mon Sep 17 00:00:00 2001 From: 123456 <17862666717> Date: Fri, 1 Jul 2022 11:13:15 +0800 Subject: [PATCH 078/112] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/point/icpointnucleicmonitoring-add-or-update.vue | 2 +- src/views/modules/plugins/point/icpointnucleicmonitoring.vue | 4 ++-- .../point/icpointvaccinesinoculation-add-or-update.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index d9cd4d37..6b3a98ca 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -1,5 +1,5 @@ + + + + + +
@@ -42,12 +73,16 @@ import basePage from "@/views/modules/cpts/base/index"; import { getItemByIdInCascader, collapse } from "@/utils/cascader"; import { requestPost } from "@/js/dai/request"; import dateFormat from "dai-js/tools/dateFormat.js"; +import offline from "./cpts/offline"; +import nextTick from "dai-js/tools/nextTick"; export default { props: {}, data() { return { + offlineShowed: false, + draftBtnDisable: false, searchParams: [ @@ -144,7 +179,7 @@ export default { type: "array", arrayDiv: "、", }, - { field: "状态", keyName: "statusFlag", type: "text" }, + { field: "状态", keyName: "statusFlagName", type: "text" }, { field: "发布单位", keyName: "publisherName", type: "text" }, { field: "发布时间", keyName: "publishDate", type: "text" }, { @@ -192,9 +227,9 @@ export default { limit: 1, editDisabled: true, rules: [], - value: [], + value: () => [], supKeys: ["imgUrlArr", "imgUrl"], - supValues: [[], ""], + supValues: [() => [], ""], beforeImgUpload(file, item, that) { console.log(file); const isLt1M = file.size / 1024 / 1024 < 10; @@ -215,9 +250,9 @@ export default { field: "发布范围", keyName: "gridIdList", type: "cascader", - value: [], + value: () => [], supKeys: ["publishRangeDesc"], - supValues: [[]], + supValues: [() => []], optionUrl: "/gov/org/customeragency/agencygridtree", optionUrlParams: { agencyId: this.$store.state.user.agencyId, @@ -402,7 +437,7 @@ export default { } else if (item.contentType == "img") { return ``; } else if (item.contentType == "video") { - return ``; + return ``; } else if (item.contentType == "file") { return `附件：${item.fileName}`; } @@ -426,13 +461,25 @@ export default { }, }; }, - components: { basePage }, + components: { basePage, offline }, computed: {}, watch: {}, async mounted() {}, methods: { + async handleOfflineShow(item) { + console.log(item); + this.offlineShowed = true; + await nextTick(100); + this.$refs.offlineForm.initForm(item); + }, + + handleOfflineSuccess() { + this.$refs.basePage.refresh(); + this.offlineShowed = false; + }, + async handleClickDraft(fmData) { let url = this.addUrl; let params = { diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 933fc02d..d451ecc2 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -85,7 +85,7 @@ size="small" clearable show-word-limit - :format="item.format || 'yyyy-MM-dd'" + :value-format="item.format || 'yyyy-MM-dd'" :placeholder="item.placeholder || '请输入'" > @@ -163,9 +163,14 @@ v-model="fmData[item.keyName]" :customerId="customerId" :placeholder="item.placeholder || '请输入'" + :height="500" /> -
+
@@ -187,6 +192,10 @@ @@ -253,6 +255,7 @@ @closed="handleClose" > Date: Tue, 5 Jul 2022 09:27:09 +0800 Subject: [PATCH 094/112] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=8D=95=E4=BD=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/article/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 23ccd330..2ec611ec 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -335,8 +335,8 @@ export default { label: "以组织名义", optionList: [ { - label: agencyId, - value: agencyName, + label: agencyName, + value: agencyId, type: "agency", }, ], From cf057c1ab1c2c3996697d945b1657f8643707b88 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 5 Jul 2022 14:10:47 +0800 Subject: [PATCH 095/112] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E7=AE=B1=E2=80=9C=E6=96=B0=E5=A2=9E=E2=80=9D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/article/drafts.vue | 2 +- src/views/modules/cpts/base/index.vue | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index 69582150..f2a12978 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -71,7 +71,7 @@ export default { importUrl: "", exportUrl: "", - addUrl: "/gov/voice/article/addOrSaveDraft", + addUrl: "", editUrl: "/gov/voice/article/addOrSaveDraft", infoUrl: "/gov/voice/draft/detailV2", delUrl: "/gov/voice/draft/deletedraft", diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 79bed9c6..896153ac 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -93,7 +93,10 @@
-
+
Date: Tue, 5 Jul 2022 15:58:01 +0800 Subject: [PATCH 096/112] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/article/drafts.vue | 13 +++++++++++++ .../modules/communityParty/article/index.vue | 17 +++++++++++++---- src/views/modules/cpts/base/cpts/edit.vue | 19 +++++++++++++++++-- 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index f2a12978..d134279b 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -186,6 +186,11 @@ export default { keyName: "publishDate", type: "date", value: dateFormat(new Date(), "yyyy-MM-dd"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, rules: [ { required: true, @@ -335,6 +340,14 @@ export default { return data; }, + + beforeSubmit(formType, fmData, that) { + if (fmData.isTop == "1" && !fmData.imgUrl) { + that.$message.error("请上传封面图片"); + return false; + } + return true; + }, }, }; }, diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 2ec611ec..18c6f8db 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -110,10 +110,6 @@ export default { optionUrl: "", optionUrlParams: {}, optionList: [ - { - label: "全部", - value: "", - }, { label: "已发布", value: "published", @@ -309,6 +305,11 @@ export default { keyName: "publishDate", type: "date", value: dateFormat(new Date(), "yyyy-MM-dd"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, rules: [ { required: true, @@ -458,6 +459,14 @@ export default { return data; }, + + beforeSubmit(formType, fmData, that) { + if (fmData.isTop == "1" && !fmData.imgUrl) { + that.$message.error("请上传封面图片"); + return false; + } + return true; + }, }, }; }, diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index d451ecc2..9a2226ef 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -81,6 +81,7 @@ formType == 'add' || (formType == 'edit' && !item.editDisable) " v-model="fmData[item.keyName]" + :picker-options="item.pickerOptions" class="item-input" size="small" clearable @@ -771,10 +772,18 @@ export default { }, async submit() { + const { editConfig, fmData, formType, editFixedParams } = this; + if ( + typeof editConfig.beforeSubmit == "function" && + !editConfig.beforeSubmit(formType, fmData, this) + ) { + return; + } + let url = ""; let params = { - ...this.fmData, - ...this.editFixedParams, + ...fmData, + ...editFixedParams, // serviceType: this.fmData.serviceTypeArr.join(","), }; @@ -823,6 +832,12 @@ export default { .item-rich-text { width: 817px; + max-height: 500px; + overflow: auto; + + img { + max-width: 100%; + } &.z-show { box-sizing: border-box; padding: 15px; From 538d6222fdd86e6cc01298b99f99c25e5c83cc10 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 5 Jul 2022 16:59:39 +0800 Subject: [PATCH 097/112] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/epidemic/antiInfo.vue | 4 + .../modules/base/epidemic/natInfo/natList.vue | 4 + .../communityParty/heart/heartForm.vue | 20 +- .../communityParty/heart/heartList.vue | 5 + .../communityParty/heart/heartPerson.vue | 10 +- .../fivelayers/mapIndex copy 2.vue | 2063 +++++++++++++++++ .../fivelayers/mapIndex copy.vue | 1987 ++++++++++++++++ .../communityGovern/fivelayers/mapIndex.vue | 32 +- .../visual/components/screen-map/index.vue | 4 +- 9 files changed, 4118 insertions(+), 11 deletions(-) create mode 100644 src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue create mode 100644 src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index dc93596d..8e464525 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -152,6 +152,7 @@ - @@ -93,7 +93,7 @@ prop="reward" style="display: block" label-width="150px"> - @@ -141,7 +141,7 @@ style="display: block" prop="signUpEndTime" label-width="150px"> - - @@ -424,7 +424,7 @@ export default { signInEndTime: "", signInLatitude: null, signInLongitude: null, - signInRadius: undefined, + signInRadius: 200, signInStartTime: "", signUpEndTime: "", sponsorContacts: "", @@ -918,7 +918,7 @@ export default { signInEndTime: "", signInLatitude: null, signInLongitude: null, - signInRadius: undefined, + signInRadius: 200, signInStartTime: "", signUpEndTime: "", sponsorContacts: "", @@ -1020,11 +1020,15 @@ export default { } .text_p { + width: 1000px; margin: 0 0; border: 3px; - > p { - margin: 0 0; + p { + margin: 0; + padding: 0; + -webkit-margin-start: 0; + -webkit-margin-end: 0; } } .div_content { diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue index 37c2f935..f6cc8bca 100644 --- a/src/views/modules/communityParty/heart/heartList.vue +++ b/src/views/modules/communityParty/heart/heartList.vue @@ -283,6 +283,7 @@ class="dialog-h" @closed="personDiaClose"> @@ -586,6 +587,10 @@ export default { this.personShow = false// }, + personDiaClose () { + + this.personShow = false// + }, finishDiaClose () { this.finishShow = false// diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue index 0acab6d6..898a27b4 100644 --- a/src/views/modules/communityParty/heart/heartPerson.vue +++ b/src/views/modules/communityParty/heart/heartPerson.vue @@ -104,6 +104,11 @@
+
+ 关 闭 + +
@@ -220,6 +225,9 @@ export default { this.cancleShow = true }, + handleCancle () { + this.$emit('personDiaClose') + }, // 开启加载动画 startLoading () { @@ -278,6 +286,6 @@ export default { .div_btn { margin-top: 10px; display: flex; - justify-content: flex-end; + justify-content: center; } diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue new file mode 100644 index 00000000..7ee8f5f8 --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue @@ -0,0 +1,2063 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue new file mode 100644 index 00000000..efc340eb --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue @@ -0,0 +1,1987 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 5535dc57..efc340eb 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -373,6 +373,8 @@ import 'ol/ol.css' import { Map, View } from 'ol' import TileLayer from 'ol/layer/Tile.js'; +import ImageLayer from 'ol/layer/Image'; +import { Raster as RasterSource } from 'ol/source'; import XYZ from 'ol/source/XYZ.js'; import VectorLayer from 'ol/layer/Vector.js'; import VectorSource from 'ol/source/Vector.js'; @@ -489,6 +491,28 @@ var polygonStyleFunction = (function () { }; })() +//定义颜色转换方法 +let reverseFunc = function (pixelsTemp) { + //蓝色 + for (var i = 0; i < pixelsTemp.length; i += 4) { + var r = pixelsTemp[i]; + var g = pixelsTemp[i + 1]; + var b = pixelsTemp[i + 2]; + //运用图像学公式，设置灰度值 + var grey = r * 0.3 + g * 0.59 + b * 0.11; + //将rgb的值替换为灰度值 + pixelsTemp[i] = grey; + pixelsTemp[i + 1] = grey; + pixelsTemp[i + 2] = grey; + + //基于灰色，设置为蓝色，这几个数值是我自己试出来的，可以根据需求调整 + pixelsTemp[i] = 55 - pixelsTemp[i]; + pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1]; + pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2]; + } +}; + + const vueGis = { name: 'HomeMap', data () { @@ -1642,9 +1666,13 @@ const vueGis = { url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}', wrapX: true//x方向平铺，也可以选择false }), - zIndex: 20 + zIndex: 20, + crossOrigin: 'anonymous' }); + + + mapView = new View({ //中心点坐标 center: this.centerPoint, @@ -1674,6 +1702,8 @@ const vueGis = { }); map.removeInteraction(dblClickInteraction); + + }, //添加标注图层 addParentLayer () { diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index 58206f45..7e13d380 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -422,7 +422,7 @@ const vueGis = { // imgSize: [32, 32], // scale: 0.5, // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0] - src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0] + src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index && this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0] }), // text: createTextStyle(oneIcon) }); @@ -627,6 +627,8 @@ const vueGis = { this.zoom = 13 } else if (level === 'community') { this.zoom = 14 + } else { + this.zoom = 12 } }, From fac237d3a89055940c396e6a4401039d1443319a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 6 Jul 2022 09:04:06 +0800 Subject: [PATCH 098/112] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8---?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 2cad16bd..4586e0d2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -116,18 +116,32 @@ + + + + + + + 取 消 + 确 定 + + @@ -176,7 +190,10 @@ export default { { dictValue: '孙子女', dictName: '孙子女' }, { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' }, { dictValue: '中介', dictName: '中介' } - ] + ], + checkReason: '', + checkVisible: false, + disabledBtn: false } }, computed: { @@ -269,13 +286,28 @@ export default { } }).catch(() => {}) }, + // 打开审核不通过对话框 + openCheckReasonDialog(){ + this.checkVisible = true + this.checkReason = '' + this.disabledBtn = false + }, + // 不通过审核意见提交 + dialogCheckHandle(){ + if(this.checkReason === ''){ + return this.$message.error('请填写不通过原因') + } + this.checkHandle('2') + this.disabledBtn = true + }, // 审核提交方法 checkHandle: function (type) { const params = { id: this.dataForm.id, state: type, homeId: this.dataForm.homeId, - lessorRelation: this.dataForm.lessorRelation + lessorRelation: this.dataForm.lessorRelation, + reason: this.checkReason } this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => { if (res.code !== 0) { @@ -296,6 +328,8 @@ export default { type: 'success', duration: 500, onClose: () => { + this.disabledBtn = false + this.checkVisible = false this.visible = false this.$emit('refreshDataList') } From 801c45b66c37cc2cfd8a43091cbaf09dcc2dc7b8 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 6 Jul 2022 10:08:45 +0800 Subject: [PATCH 099/112] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8---?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo-add-or-update.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 4586e0d2..ba3a95a1 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -116,7 +116,7 @@ - + From 9ae0d14d86c23d26aacd2dcf38a9bf9da321d3e4 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 6 Jul 2022 10:27:28 +0800 Subject: [PATCH 100/112] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/index.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 896153ac..f875806d 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -93,10 +93,7 @@
-
+
Date: Wed, 6 Jul 2022 11:07:11 +0800 Subject: [PATCH 101/112] 000 --- src/views/modules/communityParty/article/drafts.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index d134279b..8a882997 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -104,9 +104,9 @@ export default { limit: 1, editDisabled: true, rules: [], - value: [], + value: () => [], supKeys: ["imgUrlArr", "imgUrl"], - supValues: [[], ""], + supValues: [() => [], ""], beforeImgUpload(file, item, that) { console.log(file); const isLt1M = file.size / 1024 / 1024 < 10; @@ -217,8 +217,8 @@ export default { label: "以组织名义", optionList: [ { - label: agencyId, - value: agencyName, + label: agencyName, + value: agencyId, type: "agency", }, ], From 4af07ae63fc00e500f428eaaa092ef6fce11dab0 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 6 Jul 2022 13:27:00 +0800 Subject: [PATCH 102/112] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/heart/heartForm.vue | 12 +- .../fivelayers/mapIndex-baidu.vue | 2071 +++++++++++++++++ 2 files changed, 2078 insertions(+), 5 deletions(-) create mode 100644 src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index 701b62df..fbd73725 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -85,6 +85,7 @@ style="display: block" label-width="150px"> @@ -94,6 +95,7 @@ style="display: block" label-width="150px"> @@ -158,7 +160,7 @@ type="textarea" maxlength="200" show-word-limit - :rows="5" + :rows="7" placeholder="请输入报名条件，不超过200字" v-model="formData.requirement"> @@ -407,7 +409,7 @@ export default { actId: "", actLatitude: null, actLongitude: null, - actQuota: undefined, + actQuota: 0, actStartTime: "", actType: "heart", @@ -418,7 +420,7 @@ export default { noticePassedPeople: false, requirement: "", - reward: undefined, + reward: 0, signInAddress: "", signInEndTime: "", @@ -901,7 +903,7 @@ export default { actId: "", actLatitude: null, actLongitude: null, - actQuota: undefined, + actQuota: 0, actStartTime: "", actType: "heart", @@ -912,7 +914,7 @@ export default { noticePassedPeople: false, requirement: "", - reward: undefined, + reward: 0, signInAddress: "", signInEndTime: "", diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue new file mode 100644 index 00000000..049037cd --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue @@ -0,0 +1,2071 @@ + + + + + + + + + + + \ No newline at end of file From 6cff725eb314149d7822ffd2561a692fb5ce8839 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 6 Jul 2022 14:03:16 +0800 Subject: [PATCH 103/112] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/heart/heartFinish.vue | 14 +++++++++++--- .../modules/communityParty/heart/heartForm.vue | 16 +++++++++++++--- .../modules/communityParty/heart/heartList.vue | 8 ++++---- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue index 0c7fc05f..bdf0a988 100644 --- a/src/views/modules/communityParty/heart/heartFinish.vue +++ b/src/views/modules/communityParty/heart/heartFinish.vue @@ -3,9 +3,10 @@
+ class="div_form mgl10"> + min-width="320">