From 427a242daaee4b407a0c94174836696378fb95ed Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Sun, 24 Apr 2022 18:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 11 +-
.../visual/plugin/power/components/geojson.js | 69 --------
.../plugin/power/components/house-dialog.vue | 162 +++++++++++++++++
.../plugin/power/components/info-dialog.vue | 2 +-
.../power/components/screen-org-map.vue | 166 ++++--------------
.../power/components/screen-org-tree.vue | 20 +++
.../visual/plugin/power/organization.vue | 130 ++++++++++++--
7 files changed, 338 insertions(+), 222 deletions(-)
delete mode 100644 src/views/modules/visual/plugin/power/components/geojson.js
create mode 100644 src/views/modules/visual/plugin/power/components/house-dialog.vue
diff --git a/src/router/index.js b/src/router/index.js
index b72dd3ee..c4f758ab 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -214,7 +214,11 @@ router.beforeEach((to, from, next) => {
// });
window.SITE_CONFIG["menuShujuList"] = [
{
- icon: "icon-setting",
+ url: "/visual/plugin/power/organization",
+ name: "组织架构",
+ id: "5feawfwaefwa577",
+ },
+ {
id: "22213213",
name: "基础信息",
// url: "visual/basicinfo/basicInfoMain",
@@ -249,11 +253,6 @@ router.beforeEach((to, from, next) => {
name: "社区党建",
// url: "visual/basicinfo/basicInfoMain",
children: [
- {
- url: "/visual/plugin/power/organization",
- name: "组织架构",
- id: "5feawfwaefwa577",
- },
{
url: "/visual/communityParty/party",
name: "党员信息统计",
diff --git a/src/views/modules/visual/plugin/power/components/geojson.js b/src/views/modules/visual/plugin/power/components/geojson.js
deleted file mode 100644
index 8386f087..00000000
--- a/src/views/modules/visual/plugin/power/components/geojson.js
+++ /dev/null
@@ -1,69 +0,0 @@
-export function getPolygonGeoJSON () {
- return {
- type: 'FeatureCollection',
- features: [
- {
- type: 'Feature',
- geometry: {
- type: 'Polygon',
- coordinates: [
- [
- [120.34641692835909, 36.089631138388036],
- [120.3610683961656, 36.07743361100231],
- [120.41981862563858, 36.094178143435734],
- [120.40240403504704, 36.11798699226542],
- [120.34534806364974, 36.11752870787426],
- [120.34191095693906, 36.117070430475906],
- [120.34641692835909, 36.089631138388036]
- ]
- ]
- }
- }
- ]
- }
-}
-export function getGridGeoJSON () {
- return {
- type: 'FeatureCollection',
- features: [
- {
- type: 'Feature',
- properties: {
- name: '第一网格',
- index: 0
- },
- geometry: {
- type: 'Polygon',
- coordinates: [
- [
- [120.36042111463216, 36.123630243850776],
- [120.37646657270601, 36.11574122696447],
- [120.36427923644065, 36.105102846593255],
- [120.34074589793231, 36.10363201293648],
- [120.36042111463216, 36.123630243850776]
- ]
- ]
- }
- },
- {
- type: 'Feature',
- properties: {
- name: '第二网格',
- index: 1
- },
- geometry: {
- type: 'Polygon',
- coordinates: [
- [
- [120.35623852355958, 36.0892643916626],
- [120.37271801574708, 36.0903801906128],
- [120.36894146545411, 36.08102464556885],
- [120.35795513732911, 36.07767724871827],
- [120.35623852355958, 36.0892643916626]
- ]
- ]
- }
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
new file mode 100644
index 00000000..c95bea2a
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -0,0 +1,162 @@
+
+
+
+