From 538d6222fdd86e6cc01298b99f99c25e5c83cc10 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 5 Jul 2022 16:59:39 +0800 Subject: [PATCH 01/34] =?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 dc93596d1..8e4645251 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 37c2f9357..f6cc8bca4 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 0acab6d62..898a27b49 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 000000000..7ee8f5f85 --- /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 000000000..efc340ebf --- /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 5535dc576..efc340ebf 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 58206f455..7e13d3809 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 12146fb2e0971ba6041a04249663b8a4bd9855a0 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 6 Jul 2022 10:15:38 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/change/verifyForm.vue | 93 ++++++++++++++----- 1 file changed, 70 insertions(+), 23 deletions(-) diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue index 99c19afec..fb9151e90 100644 --- a/src/views/modules/plugins/change/verifyForm.vue +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -34,7 +34,7 @@ {{ detailInfo.villageName + detailInfo.buildName + detailInfo.unitName + detailInfo.homeName }} - + - {{ detailInfo.moveOutDate }} - + --> 当前人员已不在该房屋 + + + 需要 + 不需要 + + --> - + + + + + + {{ detailInfo.moveOutDate }} + + + + + - 其他 - + --> -
+
-
+ { this.loadingForm = false @@ -500,9 +539,9 @@ export default { async getAgencylist() { const url = '/gov/org/customeragency/rootagencygridtree' - + const { agencyId } = this.$store.state.user const params = { - agencyId: this.rootAgency.id + agencyId: agencyId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { @@ -663,6 +702,10 @@ export default { setTimeout(() => { this.btnDisable = false }, 2000) + if (this.isMoveOut == 0) { + this.saveForm() + return + } this.$refs['ref_form'].validate((valid, messageObj) => { if (!valid) { // app.util.validateRule(messageObj) @@ -690,6 +733,7 @@ export default { let params = { id: this.detailInfo.id, confirmResult: this.confirmResult, + isMoveOut: this.isMoveOut, reason: this.reason } if (this.confirmResult == 1 && this.detailInfo.isInHome) { @@ -715,12 +759,15 @@ export default { } }, async saveForm() { - const url = '/epmetuser/changeRelocation/moveOutHome' + const url = '/epmetuser/changeRelocation/moveOutHomeConfirm' let noData = new Date() noData = util.dateFormatter(noData, 'time') this.dataForm.transferTime = noData - - const { data, code, msg } = await requestPost(url, this.dataForm) + const _data = { + ...this.dataForm, + isMoveOut: this.isMoveOut + } + const { data, code, msg } = await requestPost(url, _data) if (code === 0) { // this.$message.success('调动成功') 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 03/34] =?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 896153ac6..f875806d0 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 04/34] 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 d134279b8..8a8829970 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 05/34] =?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 701b62dfd..fbd73725d 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 000000000..049037cdb --- /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 06/34] =?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 0c7fc05f7..bdf0a988b 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"> + + + + + + + + From f85080ebbeb8df680090c75126de4053aa43aab3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 6 Jul 2022 15:22:30 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/management/list-main.scss | 3 +++ .../modules/communityParty/heart/heartAudit.vue | 8 ++++---- .../modules/communityParty/heart/heartList.vue | 4 ++-- .../modules/communityParty/heart/heartPerson.vue | 14 +++++++------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 922bfaf71..c752e60c4 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -19,6 +19,9 @@ .item_width_1{ width: 260px; } + .item_width_3{ + width: 200px; + } .item_width_2{ width: 160px; } diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue index c8260e08b..d8361e867 100644 --- a/src/views/modules/communityParty/heart/heartAudit.vue +++ b/src/views/modules/communityParty/heart/heartAudit.vue @@ -32,7 +32,7 @@ align="center" label="姓名" :show-overflow-tooltip="true" - width="150"> + min-width="100"> + width="180"> + min-width="100"> + width="90"> diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue index 1450ac74d..d852ed17f 100644 --- a/src/views/modules/communityParty/heart/heartList.vue +++ b/src/views/modules/communityParty/heart/heartList.vue @@ -10,7 +10,7 @@ prop="title"> @@ -42,7 +42,7 @@ - + min-width="100"> + width="120"> @@ -37,7 +37,7 @@ header-align="center" align="center" label="身份证" - min-width="180"> + width="180"> + min-width="100"> + width="90"> + width="90"> + width="90"> From 70248ffa52908afc8eebe02cbd9e54559b3a99c2 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 6 Jul 2022 15:24:16 +0800 Subject: [PATCH 12/34] 1 --- src/views/modules/communityParty/heart/heartList.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue index d852ed17f..3a99cd0c7 100644 --- a/src/views/modules/communityParty/heart/heartList.vue +++ b/src/views/modules/communityParty/heart/heartList.vue @@ -88,11 +88,13 @@ header-align="center" align="center" label="活动标题" + :show-overflow-tooltip="true" min-width="180"> @@ -100,6 +102,7 @@