From b65febdb4b558abd4247b58232bcb444837d3a85 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 9 Dec 2021 14:21:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production.sit | 4 +- public/index.html | 3 +- .../visual/communityGovern/processAnalyze.vue | 2 + .../communityGovern/processPieOption.js | 2 +- .../{basicInfoMain.vue => index copy.vue} | 35 +- .../visual/components/screen-map/index.vue | 612 ++++++++++++++++++ 7 files changed, 635 insertions(+), 27 deletions(-) rename src/views/modules/visual/components/screen-map/{basicInfoMain.vue => index copy.vue} (94%) create mode 100644 src/views/modules/visual/components/screen-map/index.vue diff --git a/.env.development b/.env.development index 5431a9bc..2ad1156b 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -# VUE_APP_API_SERVER = http://118.190.150.119:41080/api -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api +# VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = http://192.168.51.36:8080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_NODE_ENV=dev diff --git a/.env.production.sit b/.env.production.sit index 6e5b4e9b..de86de77 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -1,5 +1,5 @@ NODE_ENV=production -# VUE_APP_API_SERVER = http://118.190.150.119:41080/api -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api +# VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_NODE_ENV=prod:sit VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index a156e939..99efda61 100644 --- a/public/index.html +++ b/public/index.html @@ -36,7 +36,8 @@ <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %> diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index 1517c453..10f8da5d 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -73,6 +73,7 @@ import { requestPost } from "@/js/dai/request"; import cptCard from "@/views/modules/visual/cpts/card"; import cptTb from "@/views/modules/visual/cpts/tb"; import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame"; +import screenMap from "@/views/modules/visual/components/screen-map"; import { pieOption } from './processPieOption.js' import { lineOption } from './processLineOption.js' @@ -397,6 +398,7 @@ export default { cptCard, cptTb, screenEchartsFrame, + screenMap, }, watch: { diff --git a/src/views/modules/visual/communityGovern/processPieOption.js b/src/views/modules/visual/communityGovern/processPieOption.js index 0ab2bfd2..84062915 100644 --- a/src/views/modules/visual/communityGovern/processPieOption.js +++ b/src/views/modules/visual/communityGovern/processPieOption.js @@ -81,7 +81,7 @@ const center= ['50%', '200px'] avoidLabelOverlap: false, // top: top + '%', // height: '80%', - selectedMode: 'single', + // selectedMode: 'single', left: 'center', width: 400, label: { diff --git a/src/views/modules/visual/components/screen-map/basicInfoMain.vue b/src/views/modules/visual/components/screen-map/index copy.vue similarity index 94% rename from src/views/modules/visual/components/screen-map/basicInfoMain.vue rename to src/views/modules/visual/components/screen-map/index copy.vue index 6f48ebd4..09217e02 100644 --- a/src/views/modules/visual/components/screen-map/basicInfoMain.vue +++ b/src/views/modules/visual/components/screen-map/index copy.vue @@ -38,10 +38,10 @@ let loading;//加载动画 let map; let mapView; let gaodeMapLayer;//背景地图图层 -let polygonLayer;//变电站标注图层 +let polygonLayer;//区域标注图层 let iconLayer; // icon标注图层 let iconSource; // icon -let polygonSource;//变电站标注多边形 +let polygonSource;//标注多边形 let select;//选中标注 @@ -120,18 +120,6 @@ const vueGis = { currentCoordinate: null, overlay: null, - //右侧搜索 - searchName: "", - - //右侧列表 - listData: [],//得到的数据 - listDatashow: [],//处理成一行两列的数据 - - //下钻层级记录 - runNum: 0, - runAgencyArray: [], - selUserId: '', - } }, @@ -275,7 +263,7 @@ const vueGis = { let oneArray = [x, y] this.iconCoordinators.push(oneArray) // debugger - //视频监控样式 + let oneCctv = new Feature({ geometry: new Point([x, y]), id: oneIcon.id_, @@ -290,8 +278,6 @@ const vueGis = { // anchor: [0.5, 0.5], // imgSize: [32, 32], scale: 0.5, - // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" src: iconUrlArray[oneIcon.values_.index - 1] }) }); @@ -468,11 +454,18 @@ const vueGis = { }, }, props: { + //是否显示多边形图层 + showPolygonLayer: { + type: Boolean, + default: false + }, + + //是否显示标注 + showIconLayer: { + type: Boolean, + default: false + } - // vueFlag: { - // type: String, - // default: "alarm" - // } }, computed: { diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue new file mode 100644 index 00000000..4dfac221 --- /dev/null +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -0,0 +1,612 @@ + + + + + + + \ No newline at end of file