From 705036a303a19e1767b2b693a1e4ad4d1e441d77 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Mon, 25 Apr 2022 18:47:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- src/views/modules/visual/plugin/power/organization.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 51d5f0763..4052ea1b3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -225,7 +225,7 @@ router.beforeEach((to, from, next) => { window.SITE_CONFIG["menuShujuList"] = [ { url: "/visual/plugin/power/organization", - name: "组织架构", + name: "动力主轴", id: "5feawfwaefwa577", }, { diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue index a12788fb9..62fdfc1ff 100644 --- a/src/views/modules/visual/plugin/power/organization.vue +++ b/src/views/modules/visual/plugin/power/organization.vue @@ -4,12 +4,12 @@
- 组织架构 + 动力主轴
Date: Mon, 25 Apr 2022 20:22:24 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index 4052ea1b3..cb3d34feb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -103,7 +103,7 @@ export const moduleShujuRoutes = { component: () => import("@/views/main-shuju/main"), name: "main-shuju", redirect: { - path: "/main-shuju/visual-basicinfo-basicInfoMain", + path: "/main-shuju/visual-plugin-power-organization", }, meta: { title: "主入口布局", From d68d30b492bc529e629ee974689103c95ab2cad4 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 26 Apr 2022 18:44:58 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/assets/boy.png | Bin 0 -> 11553 bytes src/views/modules/plugins/assets/girl.png | Bin 0 -> 15246 bytes .../power/kernelhouseholdAddMember.vue | 136 ++++++++++++++++++ .../plugins/power/kernelhouseholdTable.vue | 55 ++++++- .../plugins/power/poweraxis_add_leader.vue | 11 +- 5 files changed, 194 insertions(+), 8 deletions(-) create mode 100644 src/views/modules/plugins/assets/boy.png create mode 100644 src/views/modules/plugins/assets/girl.png create mode 100644 src/views/modules/plugins/power/kernelhouseholdAddMember.vue diff --git a/src/views/modules/plugins/assets/boy.png b/src/views/modules/plugins/assets/boy.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b11a8f3e117930b9219cd62098ba674ee05b52 GIT binary patch literal 11553 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 MaRsqT5yQa$15r93>;M1& literal 0 HcmV?d00001 diff --git a/src/views/modules/plugins/power/kernelhouseholdAddMember.vue b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue new file mode 100644 index 000000000..5bf7d64dd --- /dev/null +++ b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue @@ -0,0 +1,136 @@ + + + + + + + + diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue index 66ea920f4..557a2f7ee 100644 --- a/src/views/modules/plugins/power/kernelhouseholdTable.vue +++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue @@ -2,7 +2,7 @@
-
房主姓名
+
党员名称
+ + @@ -57,6 +61,10 @@ class="div-table-button--delete" size="small" @click="handleDelete(scope.row.id)">删除 + 添加党员 @@ -86,12 +94,26 @@ :axisStructId="axisStructId"> + + + +
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue index 62fdfc1ff..f8501043a 100644 --- a/src/views/modules/visual/plugin/power/organization.vue +++ b/src/views/modules/visual/plugin/power/organization.vue @@ -129,7 +129,7 @@ export default { return { headerList: [ { title: "序号", coulmn: 'index', width: '100px' }, - { title: "党员", coulmn: 'ownerName' }, + { title: "党员", coulmn: 'kernelMemberNameConcat' }, { title: "地址", coulmn: 'address' } ], headerStyle: [ From e6cb76e34a079986c851efd8660ac32005ef3af3 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 26 Apr 2022 19:05:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/power/kernelhouseholdTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue index 557a2f7ee..97a45c1f3 100644 --- a/src/views/modules/plugins/power/kernelhouseholdTable.vue +++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue @@ -64,7 +64,7 @@ 添加党员 + @click="handleAddMember(scope.row.houseId, scope.row.ownerName)">中心党员 From c62dc81c8f9a8fcd7a23a1f73c8ae3ef03c8734b Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 27 Apr 2022 14:13:01 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../power/components/screen-org-map.vue | 50 ++++++++++++------- .../visual/plugin/power/organization.vue | 3 +- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue index db7d4a6b6..177bca7ef 100644 --- a/src/views/modules/visual/plugin/power/components/screen-org-map.vue +++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue @@ -35,16 +35,14 @@ let markerLayer let parentLayer;//上级组织图层 let parentSource;//上级组织多边形 -let parentPolygon = [] -let subAgencyArray = [] -// let coordinates = "120.37330480288234,36.09522923236327,120.37414203308269,36.08471360544846,120.37538113592544,36.08156561138691,120.37856261681883,36.08273773673343,120.380806397435,36.082838206810294,120.38244737292013,36.082804716145915,120.3844902172151,36.082804716145915,120.38552838373664,36.08277122739781,120.38991547489212,36.08166608146377,120.39209227801209,36.08099629692024,120.3958095865403,36.080192555468,120.39912502242612,36.080192555468,120.40110089305742,36.08025953296422,120.40197160817334,36.082369356671684,120.4011678667211,36.08457964662348,120.40006272270334,36.08665598158284,120.3979863858277,36.08889976219901,120.39751753952164,36.09037329011105,120.39785243083527,36.09161239295379,120.3990245561818,36.09419106584173,120.39775196842349,36.09573157124999,120.3975845208504,36.09646833520601,120.37330480288234,36.09522923236327" + + let polygonSource;//变电站标注多边形 let iconSource; // icon let polygonLayer;//变电站标注图层 let select;//选中标注 let iconLayer; // icon标注图层 -let iconCoordinators = [] - +var centerPointGlobal = [120.38945519, 36.0722275] const iconArray = [ 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', @@ -126,9 +124,13 @@ export default { name: "screen-org-map", data() { return { - centerPoint: [120.38945519, 36.0722275], // 中心点位置 - zoom: 15, // 缩放范围：区14 + centerPoint: [], // 中心点位置 + zoom: 14, // 缩放范围：区14 minZoom: 1, // 最小缩放 + orgData: {},//当前组织对象 + iconCoordinators: [], + parentPolygon: [], + subAgencyArray: [] } }, async mounted() { @@ -149,6 +151,8 @@ export default { }, methods: { initMap () { + this.firstCenterMap() + gaodeMapLayer = new TileLayer({ title: "地图", source: new XYZ({ @@ -175,6 +179,16 @@ export default { // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326')); }) }, + firstCenterMap () { + this.centerPoint = [] + if (this.orgData.longitude && this.orgData.latitude) { + this.centerPoint.push(this.orgData.longitude) + this.centerPoint.push(this.orgData.latitude) + + } else { + this.centerPoint = centerPointGlobal + } + }, addMarker (list, icon=iconArray[0], scale=1) { markerSource = new VectorSource({ // features: new GeoJSON().readFeatures(geojsonObject) @@ -244,15 +258,15 @@ export default { if (code === 0) { - // this.orgData = data + this.orgData = data // this.orgId = this.orgData.id // this.orgLevel = this.orgData.level - parentPolygon = [] - parentPolygon.push(data) + this.parentPolygon = [] + this.parentPolygon.push(data) if (data.children && data.children.length > 0) { - subAgencyArray = data.children + this.subAgencyArray = data.children } else { - subAgencyArray = [] + this.subAgencyArray = [] } } else { @@ -265,10 +279,10 @@ export default { parentSource.clear()//清空变电站标注 let featureData = []//标注数据 - if (parentPolygon && parentPolygon.length > 0) {//判断是否存在下级标注 + if (this.parentPolygon && this.parentPolygon.length > 0) {//判断是否存在下级标注 let oneData = {} - parentPolygon.forEach(agencyItem => { + this.parentPolygon.forEach(agencyItem => { if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标 oneData = { @@ -320,12 +334,12 @@ export default { loadPolygon () { let featureData = []//标注数据 - if (subAgencyArray && subAgencyArray.length > 0) {//判断是否存在下级标注 + if (this.subAgencyArray && this.subAgencyArray.length > 0) {//判断是否存在下级标注 let oneData = {} let count = 0 - for (let i = 0; i < subAgencyArray.length; i++) { - const agencyItem = subAgencyArray[i] + for (let i = 0; i < this.subAgencyArray.length; i++) { + const agencyItem = this.subAgencyArray[i] if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标 @@ -384,7 +398,7 @@ export default { let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2 let oneArray = [x, y] - iconCoordinators.push(oneArray) + this.iconCoordinators.push(oneArray) // debugger //地图icon样式 let oneCctv = new Feature({ diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue index f8501043a..e74a96e79 100644 --- a/src/views/modules/visual/plugin/power/organization.vue +++ b/src/views/modules/visual/plugin/power/organization.vue @@ -170,7 +170,7 @@ export default { // this.agencyId = user.agencyId // console.log('agencyId-------', this.agencyId) // this.agencyId = '50140d770c578100328792121aa7b3c5' - this.axisStructId = '1518062548749725697' + // this.axisStructId = '1518062548749725697' await nextTick(100) await this.getAgencylist()//获取组织级别 await this.getStructTree() @@ -179,6 +179,7 @@ export default { }, methods: { onClickNode (e) { + this.pageNo = 1 this.axisStructId = e.id this.getList() }, From dd40eba513cb4973095dbeae44ab8ed017b59bb4 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 28 Apr 2022 09:24:07 +0800 Subject: [PATCH 7/7] =?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/visual/plugin/power/components/screen-org-tree.vue | 3 +++ src/views/modules/visual/plugin/power/organization.vue | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue index aee878e2b..77263287e 100644 --- a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue +++ b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue @@ -249,6 +249,9 @@ export default { .screen-org-tree { width: 100%; height: 100%; + .level-row{ + overflow: auto; + } .level-1-row { width: 100%; display: flex; diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue index e74a96e79..303424b19 100644 --- a/src/views/modules/visual/plugin/power/organization.vue +++ b/src/views/modules/visual/plugin/power/organization.vue @@ -466,6 +466,7 @@ export default { position: relative; flex: 1; height: 100%; + width: 50%; &-top { width: 100%; height: 550px; @@ -511,6 +512,7 @@ export default { position: relative; flex: 1; height: 100%; + width: 50%; &-top { width: 100%; height: 100px;