From 520959daa2576e83917c543d45d103d9ecc62b61 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 1 Jun 2022 11:12:54 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partymember/icpartymemberpayrecorddetail.vue | 2 +- src/views/modules/partymember/icpartyorgtree.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue index dc685a44e..e184c20c6 100644 --- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue +++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue @@ -56,7 +56,7 @@ - {{ $t('query') }} + {{ $t('query') }} 重置 diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index 1e132a6fa..1c74a8520 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -7,7 +7,7 @@ 删除 + class="btn-color-del">删除 From bae862022b1714890d4aaf83d93488d1e83aac5a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 9 Jun 2022 09:28:06 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=86=B2=E7=AA=81-=E7=9B=B4=E6=8E=A5=E8=B5=8B=E5=80=BCfangwu?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 101 ++++++++++++++++-- 1 file changed, 90 insertions(+), 11 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index f6d9a462e..c19f811cf 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -48,7 +48,7 @@ - 重置 - -
-
房主手机
-
- - + +
+
+ + + + + +
+
@@ -234,7 +269,7 @@ export default { await this.loadOrgData() await this.loadTree() - await this.loadOpenNode() + // await this.loadOpenNode() await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) if (this.treeData.length > 0) { @@ -312,6 +347,8 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { + this.openNodes = [] + this.openNodes.push(data[0].id) this.treeData = data if (!isRefresh && data.length > 0) { @@ -502,6 +539,7 @@ export default { } + + + From e30a3fa72764a538715f031d6536e122bae084ae Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 9 Jun 2022 09:49:39 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/components/screen-map/index.vue | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index 6915ca92c..2924e5200 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -20,11 +20,20 @@ --> -
- @@ -126,7 +135,7 @@ var polygonStyleFunction = (function () { const vueGis = { name: "HomeMap", - data() { + data () { return { centerPoint: [], //中心点位置 zoom: 14, //缩放范围：区14 @@ -188,14 +197,14 @@ const vueGis = { isChangeCenter: true, //是否根据多边形改变数组 }; }, - async mounted() {}, + async mounted () { }, methods: { - showPosition() { + showPosition () { let array = [this.input_lat, this.input_lon]; map.getView().setCenter(array); }, //加载地图:地图基本信息，多边形区域信息，多边形icon - loadMap( + loadMap ( mapInfo, polygonArray, polIconUrlArray, @@ -247,7 +256,7 @@ const vueGis = { }, //刷新地图:地图信息，多边形数组，标注数组，是否根据多边形改变中心点 - async refreshMap(mapInfo, polygonArray, iconArrays, isChangeCenter) { + async refreshMap (mapInfo, polygonArray, iconArrays, isChangeCenter) { this.mapInfo = mapInfo; this.polygonArray = []; this.polygonArray = polygonArray; @@ -283,7 +292,7 @@ const vueGis = { }, //加载区域多边形 - loadPolygon() { + loadPolygon () { polygonSource.clear(); //清空多边形标注 // iconSource.clear() let featureData = []; //多边形数据数据 @@ -342,7 +351,7 @@ const vueGis = { }, //加载区域多边形的icon - loadPolIcon(feature) { + loadPolIcon (feature) { polIconSource.clear(); let polyIconFeatures = []; console.log("feature-----", feature); @@ -379,7 +388,7 @@ const vueGis = { }, //加载icon图标 - loadIcon() { + loadIcon () { iconSource.clear(); //清空多边形标注 if (this.iconArrays && this.iconArrays.length > 0) { let iconFeatures = []; @@ -425,7 +434,7 @@ const vueGis = { }, //计算和中心点距离 - computedDistance(lon, lat, max) { + computedDistance (lon, lat, max) { let c1 = [2]; c1[0] = lon; c1[1] = lat; @@ -440,7 +449,7 @@ const vueGis = { }, //初始化地图 - initMap() { + initMap () { this.firstCentermap(); gaodeMapLayer = new TileLayer({ title: "地图", @@ -491,7 +500,7 @@ const vueGis = { map.removeInteraction(dblClickInteraction); }, //设置地图定位的中心点和缩放级别 - setMapLocation() { + setMapLocation () { if (!this.isChangeCenter) { return false; } @@ -532,12 +541,8 @@ const vueGis = { mapView.setCenter(this.centerPoint); } mapView.setZoom(this.zoom); -<<<<<<< HEAD -======= - ->>>>>>> dev-fangwu }, - firstCentermap() { + firstCentermap () { if (this.mapInfo.longitude && this.mapInfo.latitude) { this.centerPoint = []; this.centerPoint.push(this.mapInfo.longitude); @@ -550,7 +555,7 @@ const vueGis = { }, //根据组织层级设置缩放级别 - setZoom(level) { + setZoom (level) { if (level === "district") { this.zoom = 11; } else if (level === "street") { @@ -561,7 +566,7 @@ const vueGis = { }, //初始化多边形标注图层 - initPolygonLayer() { + initPolygonLayer () { polygonSource = new VectorSource({ // features: (new GeoJSON()).readFeatures(geojsonObject) wrapX: false, @@ -609,7 +614,7 @@ const vueGis = { }, //初始化多边形icon图层 - initPolIconLayer() { + initPolIconLayer () { polIconSource = new VectorSource({ //features: (new GeoJSON()).readFeatures(geojsonObject) wrapX: false, @@ -624,7 +629,7 @@ const vueGis = { }, //初始化icon图层 - initIconLayer() { + initIconLayer () { iconSource = new VectorSource({ //features: (new GeoJSON()).readFeatures(geojsonObject) wrapX: false, @@ -646,7 +651,7 @@ const vueGis = { }, //添加覆盖层 - addOverlay() { + addOverlay () { // 使用变量存储弹窗所需的 DOM 对象 var container = document.getElementById("popup"); var closer = document.getElementById("popup-closer"); @@ -684,7 +689,7 @@ const vueGis = { }, //注册地图点击事件 - addMapClick() { + addMapClick () { let _that = this; map.on("click", function (evt) { @@ -704,7 +709,7 @@ const vueGis = { }); }, - handleShowPopup(showData, coordinate, isShowMore) { + handleShowPopup (showData, coordinate, isShowMore) { if (isShowMore) { document.getElementById("popup-goMore").style.display = "block"; } else { @@ -720,19 +725,19 @@ const vueGis = { //把 overlay 显示到指定的 x,y坐标 }, // 关闭弹窗 - handleClosePopup() { + handleClosePopup () { this.overlay.setPosition(undefined); document.getElementById("popup-closer").blur(); return false; }, //取随机数 - getRndBetween(lowerLimit, upperLimit) { + getRndBetween (lowerLimit, upperLimit) { return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit; }, //开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, //是否锁定 text: "正在加载……", //加载中需要显示的文字 @@ -741,7 +746,7 @@ const vueGis = { }, //结束加载动画 - endLoading() { + endLoading () { //clearTimeout(timer); if (loading) { loading.close(); @@ -786,7 +791,7 @@ const vueGis = { }, }, computed: { - mapHeight() { + mapHeight () { return this.clientHeight - 120; }, From 71ab8156504104af5f14b6ffb65c136618866307 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 9 Jun 2022 10:43:14 +0800 Subject: [PATCH 04/12] dd --- src/views/components/editResi.vue | 1 + src/views/components/resiForm.vue | 1 + .../communityParty/members/cpts/record.vue | 10 +++--- .../communityParty/members/crateForm.vue | 9 ++--- src/views/modules/shequ/cpts/people-more.vue | 35 +++++++++++-------- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index bcacbaf09..542b5841a 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -236,6 +236,7 @@ v-model.trim="form[n.columnName]" :options="n.options" :disabled="disabled" + :props="{ emitPath: false }" clearable size="small" class="resi-cell-select"> diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 7246d608c..ec8bea499 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -198,6 +198,7 @@ v-else-if="n.itemType === 'cascader'" v-model.trim="form[n.columnName]" :options="n.options" + :props="{ emitPath: false }" clearable size="small" class="resi-cell-select"> diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue index cc7d8795a..188001175 100644 --- a/src/views/modules/communityParty/members/cpts/record.vue +++ b/src/views/modules/communityParty/members/cpts/record.vue @@ -54,8 +54,8 @@ {{ scope.row.startDate + ' - ' + scope.row.endDate }} - + diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue index e0269b0aa..11775d811 100644 --- a/src/views/modules/communityParty/members/crateForm.vue +++ b/src/views/modules/communityParty/members/crateForm.vue @@ -216,11 +216,11 @@ export default { address: '', rdsj: '', sszb: '', - isLd: '', + isLd: '0', ldzh: '', - partyZw: '', - isDyzxh: '', - isMxx: '', + partyZw: '0', + isDyzxh: '0', + isMxx: '0', culture: '', remark: '' }, @@ -239,6 +239,7 @@ export default { handler(val) { if (Object.keys(val).length > 0) { this.form = { ...val } + if (val.icResiUserId) this.isAuto = true console.log('val----------in', val) this.partyOrgs = val.orgPids.split(':') console.log('partyOrgs-----', this.partyOrgs) diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 49d0755de..4ebad94fb 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -484,20 +484,9 @@ export default { if (Array.isArray(options)) { let valueArr = value.split(","); if (type == "cascader") { - if (valueArr.length > 0) { - let level1 = options.find((item) => item.value == valueArr[0]); - if (level1) { - if (valueArr.length > 1 && level1.children) { - let level2 = level1.children.find( - (item) => item.value == valueArr[1] - ); - if (level2) { - return level1.label + "-" + level2.label; - } - } - return level1.label; - } - } + let finalValue = []; + this.getNodePath(options, value, finalValue); + return finalValue.join("-"); } else { return valueArr .map((val) => { @@ -513,6 +502,24 @@ export default { return "--"; }, + getNodePath(node, val, path) { // node:所有数据，val:后台返回的id, path:要渲染的数组id + for (let i = 0; i < node.length; i++) { + const ele = node[i]; + if (ele.value === val) { + path.push(ele.label); + return path + } else if (ele.children && ele.children.length > 0) { + if (ele.children.some(row => row.value === val)) { + path.unshift(ele.label); + this.getNodePath(ele.children,val,path); + } else { + this.getNodePath(ele.children,val,path); + } + } + } + return path; + }, + //加载组织数据 async getField() { const url = "/oper/customize/icform/getcustomerform"; From ff2605011cc80b717e262a6de74a315bfff78f42 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 9 Jun 2022 13:53:29 +0800 Subject: [PATCH 05/12] dd --- src/views/components/resiForm.vue | 2 ++ src/views/modules/visual/communityParty/options.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index ec8bea499..5c5f6680d 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -682,6 +682,8 @@ export default { console.log('获取查询详情成功', res.data) if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1' else this.form.IS_VOLUNTEER = '0' + if (res.data.isPartyMember == '1') this.form.IS_PARTY = '1' + else this.form.IS_PARTY = '0' } }) .catch(() => { diff --git a/src/views/modules/visual/communityParty/options.js b/src/views/modules/visual/communityParty/options.js index ba0ddd334..a22fd586d 100644 --- a/src/views/modules/visual/communityParty/options.js +++ b/src/views/modules/visual/communityParty/options.js @@ -88,7 +88,7 @@ export function pieOption (_charts) { // formatter: '{a|{c}}\n\n{name|{b}}', formatter: '{a|{c}}\n{r|}\n{name|{b}}', minMargin: 5, - edgeDistance: 1, + edgeDistance: '10%', lineHeight: 15, color: '#fff', fontSize: 12, From 31b81f15d29da8a6f86a0303a58c3e01308f3022 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 9 Jun 2022 14:27:12 +0800 Subject: [PATCH 06/12] bug --- .../icpartymemberpayrecorddetail.vue | 19 +++- .../modules/partymember/icpartyorgtree.vue | 2 +- src/views/modules/partymember/lookMember.vue | 100 ++++++++++++++++-- .../visual/communityParty/gridParty.vue | 6 +- .../visual/components/screen-map/index.vue | 8 +- 5 files changed, 117 insertions(+), 18 deletions(-) diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue index e184c20c6..6ac74f3d2 100644 --- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue +++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue @@ -73,7 +73,7 @@
{{ $t('export') }}
- +