From 6c6eb0a1810ada99a7a2848beb36981b79158670 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 15:13:00 +0800 Subject: [PATCH 01/20] 11 --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index ad6160919..a3c1e3f3d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => { // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); http - .get("/gov/access/menu/nav?tableName=data_menu") + .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => { }); http - .get("/gov/access/menu/nav") + .get("gov/access/menu/navDigitalCommunity") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 From c76d469248a243c55d4318396b3461b17a63d331 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 13 Jul 2022 17:33:15 +0800 Subject: [PATCH 02/20] =?UTF-8?q?404=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 36 +++++++++++++++++++++++++------- src/views/modules/404.vue | 16 ++++++++++++++ src/views/modules/visual/404.vue | 16 ++++++++++++++ src/views/pages/404.vue | 4 ++-- 4 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 src/views/modules/404.vue create mode 100644 src/views/modules/visual/404.vue diff --git a/src/router/index.js b/src/router/index.js index a3c1e3f3d..b367df8c0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -94,6 +94,16 @@ export const moduleRoutes = { isTab: true, }, }, + { + path: "404", + props: true, + component: () => import("@/views/modules/404"), + name: "main-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, ], }; @@ -129,6 +139,16 @@ export const moduleShujuRoutes = { isTab: false, }, }, + { + path: "404", + props: true, + component: () => import("@/views/modules/visual/404"), + name: "main-shuju-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, ], }; @@ -519,10 +539,10 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { children: routes, }, { - path: "*", - // redirect: { - // name: "404", - // }, + path: "/main/*", + redirect: { + path: "/main/404", + }, }, ]); window.SITE_CONFIG["dynamicMenuRoutes"] = routes; @@ -593,10 +613,10 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) { children: routes, }, { - path: "*", - // redirect: { - // name: "404", - // }, + path: "/main-shuju/*", + redirect: { + path: "/main-shuju/404", + }, }, ]); window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes; diff --git a/src/views/modules/404.vue b/src/views/modules/404.vue new file mode 100644 index 000000000..33682a332 --- /dev/null +++ b/src/views/modules/404.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/modules/visual/404.vue b/src/views/modules/visual/404.vue new file mode 100644 index 000000000..047aec709 --- /dev/null +++ b/src/views/modules/visual/404.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/pages/404.vue b/src/views/pages/404.vue index 5d49d6434..e7796ec66 100644 --- a/src/views/pages/404.vue +++ b/src/views/pages/404.vue @@ -2,11 +2,11 @@
-

404

+

页面未找到或无权访问

{{ $t('notFound.back') }} - {{ $t('notFound.home') }} + {{ $t('notFound.home') }}
From 03029c1505c3fdf39abd6d2a03386f74474a71e6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 08:51:00 +0800 Subject: [PATCH 03/20] 11 --- src/views/modules/workSys/role/roleForm.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index 753a1ce0f..05f6281f4 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -126,7 +126,6 @@ export default { await this.getMenuList() await this.getMenuShujuList() - this.$refs.menuListTree.setCheckedKeys([]) this.$refs.menuListShujuTree.setCheckedKeys([]) @@ -329,7 +328,7 @@ export default { dataRule () { return { name: [ - { required: true, message: '姓名不能为空', trigger: 'blur' } + { required: true, message: '角色名称不能为空', trigger: 'change' } ], @@ -340,11 +339,6 @@ export default { props: { - - // serviceList: { - // type: Array, - // default: [] - // }, } } From 280de3840b40d62c2855aae0216b62ea7846df53 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 09:09:16 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/visual/communityGovern/fivelayers/mapIndex copy.vue | 2 +- .../modules/visual/communityGovern/fivelayers/mapIndex.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue index efc340ebf..981f4b0a0 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue @@ -923,7 +923,7 @@ const vueGis = { // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" let params = { - icSuperiorResourceId: info.id + icDangerousChemicalsId: info.id } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 35664c135..9485e3ce3 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -923,7 +923,7 @@ const vueGis = { // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" let params = { - icSuperiorResourceId: info.id + icDangerousChemicalsId: info.id } const { data, code, msg } = await requestPost(url, params) From d6ea1c75ef4507687303c7c6126b9f1450cfddf3 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 14 Jul 2022 10:19:52 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 2 + src/js/dai/request2.js | 2 + src/router/index.js | 186 -------------------------------------- src/utils/index.js | 1 + src/views/pages/index.vue | 65 +++++++------ src/views/pages/login.vue | 2 +- 6 files changed, 44 insertions(+), 214 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 92fb78314..709895d60 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -4,6 +4,7 @@ import axios from "axios"; import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; +import { clearLoginInfo } from "@/utils"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -42,6 +43,7 @@ const request = curry( // 10005 token为空 10006登陆超时 10007别处登录 console.log("登录失效"); Message.error(res.data.msg); + clearLoginInfo(); return next({ name: "login", }); diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 92fb78314..709895d60 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -4,6 +4,7 @@ import axios from "axios"; import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; +import { clearLoginInfo } from "@/utils"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -42,6 +43,7 @@ const request = curry( // 10005 token为空 10006登陆超时 10007别处登录 console.log("登录失效"); Message.error(res.data.msg); + clearLoginInfo(); return next({ name: "login", }); diff --git a/src/router/index.js b/src/router/index.js index b367df8c0..9f87613e6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -213,192 +213,6 @@ router.beforeEach((to, from, next) => { const customerId = localStorage.getItem("customerId"); console.log("customerId：", customerId); - window.SITE_CONFIG["menuShujuList"] = [ - // { - // url: "/visual/plugin/power/organization", - // name: "动力主轴", - // id: "5feawfwaefwa577", - // }, - { - id: "22213213", - name: "基础信息", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "/visual/basicinfo/basicInfoMain", - name: "人房信息统计", - id: "5feawfwaefwa5", - }, - { - url: "/visual/basicinfo/personCategory/index", - name: "人员类别分析", - id: "5fwaefwaefawef5", - }, - { - url: "/visual/basicinfo/houseStatic/houseStatic", - name: "人房概览统计", - id: "5fwaefwaefawef6", - }, - ], - }, - { - icon: "icon-setting", - id: "2", - name: "人员图谱", - url: "visual/basicinfo/peopleSearch", - }, - { - icon: "icon-setting", - id: "3", - name: "人员预警", - url: "visual/warning/index", - }, - { - icon: "icon-setting", - id: "2221321001", - name: "社区党建", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "/visual/communityParty/gridParty", - name: "网格党建平面图", - id: "5feawfwaefwa579", - }, - { - url: "/visual/communityParty/party", - name: "党员信息统计", - id: "5feawfwaefwa578", - }, - { - url: "/visual/communityParty/community", - name: "联建单位分析", - id: "5fwaefwaefawef588", - }, - { - url: "/visual/communityParty/elegant", - name: "党员风采榜", - id: "5fwaefwaefawef589", - }, - ], - }, - { - icon: "icon-setting", - id: "2221321123", - name: "社区服务", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "/visual/measure/service", - name: "需求服务分析", - id: "5feawfwaefwa57", - }, - { - url: "/visual/measure/volunteer", - name: "志愿服务分析", - id: "5fwaefwaefawef58", - }, - ], - }, - { - icon: "icon-setting", - id: "6", - name: "社区治理", - children: [ - { - url: "visual/communityGovern/shijianchuli/shijianchulifenxi", - name: "事件处理分析", - id: "shijianchulifenxi", - }, - // { - // url: "visual/communityGovern/processAnalyze", - // name: "事件处置分析", - // id: "processAnalyze", - // }, - { - url: "/visual/communityGovern/shijianfenlei/shijianfenleifenxi", - name: "事件分类分析", - id: "shijianfenleifenxi", - }, - { - url: "/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi", - name: "多元服务分析", - id: "duoyuanfuwufenxi", - }, - // { - // url: "/visual/communityGovern/typeAnalyze", - // name: "事件分类分析", - // id: "typeAnalyze", - // }, - // { - // url: "/visual/communityGovern/resibuzz", - // name: "居民热议分析", - // id: "resibuzz", - // }, - // { - // url: "/visual/communityGovern/distributionAnalyze", - // name: "事件分布分析", - // id: "distributionAnalyze", - // }, - ], - }, - - { - icon: "icon-setting", - id: "2221321fefefaewfa123", - name: "初心互助", - url: "visual/heart/index", - children: [], - }, - { - icon: "icon-setting", - id: "2221321fefefaewfa122223", - name: "疫情防控", - url: "", - children: [], - }, - { - icon: "icon-setting", - id: "44rq22222q2222", - name: "智慧安防", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel", - // url: "/visual/ai/index", - name: "视频监控", - id: "5feawfwa111111efwa57", - }, - /*{ - url: "/visual/ai/renliu", - name: "人流数据", - id: "5fwaefwae222112fawef58", - }, - { - url: "/visual/ai/cheliu", - name: "车流数据", - id: "erawerwecsxefwaw", - }, - { - url: "/visual/ai/shebei", - name: "设备数据", - id: "zfzffewaf", - }, - { - url: "/visual/ai/gongdan", - name: "工单数据", - id: "fewafwafewaefddd", - },*/ - { - // url: "/visual/ai/yujing", - url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis", - name: "预警分析", - id: "545345fdsfs", - }, - ], - }, - ]; - // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); - http .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") .then(({ data: res }) => { diff --git a/src/utils/index.js b/src/utils/index.js index c2232ac77..1e6b6e6fa 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -45,6 +45,7 @@ export function getDictLabel(dictType, dictValue) { export function clearLoginInfo() { store.commit('resetStore') Cookies.remove('token') + localStorage.setItem("token", ''); window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false } diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue index 056814c60..19ec9d88f 100644 --- a/src/views/pages/index.vue +++ b/src/views/pages/index.vue @@ -5,14 +5,14 @@
- +
数字社区管理平台
- +
数字社区可视化平台
@@ -21,7 +21,9 @@
@@ -29,60 +31,69 @@
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 6db09b136..10cf96a93 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -247,7 +247,7 @@ export default { localStorage.setItem("userType", "work"); localStorage.setItem("showHeader", "0"); localStorage.setItem("token", res.data.token); - this.$router.replace({ name: "home" }); + this.$router.replace({ name: "index" }); }) .catch(() => {}); // epmet-ext9.elinkservice.cn/platform-admin From fd9d98ad4a0e9ca85db66b49766e5061019fce34 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 10:42:29 +0800 Subject: [PATCH 06/20] 11 --- src/views/modules/workSys/role/roleForm.vue | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index 05f6281f4..0e0304a2a 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -91,8 +91,6 @@ export default { return { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 - - btnDisable: false, roleId: '', @@ -230,19 +228,7 @@ export default { async addNat () { - // let menuList1 = [ - // ...this.$refs.menuListTree.getCheckedKeys(), - // ...this.$refs.menuListTree.getHalfCheckedKeys(), - // ] - // let menuList2 = [ - // ...this.$refs.menuListShujuTree.getCheckedKeys(), - // ...this.$refs.menuListShujuTree.getHalfCheckedKeys() - // ] - - // console.log('menuList1', menuList1) - // console.log('menuList2', menuList2) - // let menuAll=menuList1.concat(menuList2) - // console.log('menuAll',menuAll) + this.formData.menuIdList = [] this.formData.menuIdList = [ ...this.$refs.menuListTree.getCheckedKeys(), @@ -297,6 +283,7 @@ export default { }, resetData () { + this.roleId = '' this.formData = { @@ -307,6 +294,7 @@ export default { customerId: '' } + this.$refs['ref_form'].resetFields() }, // 开启加载动画 startLoading () { From 38cd589aad02e9d77e6148f32d41e1fa6927bc0f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 10:45:44 +0800 Subject: [PATCH 07/20] 11 --- src/views/modules/workSys/role/role.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index c6b03d012..f61225cde 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -242,7 +242,7 @@ export default { }, diaClose () { - + this.$refs.ref_form.resetData() this.formShow = false }, From 376d05bbdbf84aeff81de5f02af5d7e0a6e2d140 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 14:26:40 +0800 Subject: [PATCH 08/20] 11 --- src/views/modules/workSys/role/role.vue | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index f61225cde..da7d11f58 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -317,17 +317,13 @@ export default { //重置搜索条件 resetSearch () { this.formData = { - orgType: 'current',//当前组织:current 根组织：all + name: '',//姓名 - mobile: '',//手机号 - idCard: '',//身份证号码 - startTime: '',//检测开始时间yyyy-MM-dd HH:mm - endTime: '',//检测结束时间yyyy-MM-dd HH:mm + } - this.timeRange = [] this.pageNo = 0 - // this.loadTable() + this.loadTable() }, handleSizeChange (val) { From 9af0447d917f63f0341d859a4bf4680d0c923152 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 14 Jul 2022 16:10:46 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/basicInfoMain.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 819f2df36..c21671d64 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -424,6 +424,7 @@ width: 370px; height: 470px; overflow: hidden; + pointer-events: none; .wrap { display: flex; @@ -433,6 +434,7 @@ transform: translateX(-5px); transition: all ease 1s; border-radius: 4px; + pointer-events: auto; } .wrap-hidden { From 973b40c74332da84701dac237675737dbc0b1b85 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 20 Jul 2022 17:59:26 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/grid/pos-green2.png | Bin 0 -> 3807 bytes src/assets/img/shuju/grid/pos-red2.png | Bin 0 -> 3310 bytes src/assets/img/shuju/grid/pos-yellow2.png | Bin 0 -> 3628 bytes src/views/modules/visual/test/l7.vue | 96 ++++++++++++++++++---- 4 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 src/assets/img/shuju/grid/pos-green2.png create mode 100644 src/assets/img/shuju/grid/pos-red2.png create mode 100644 src/assets/img/shuju/grid/pos-yellow2.png diff --git a/src/assets/img/shuju/grid/pos-green2.png b/src/assets/img/shuju/grid/pos-green2.png new file mode 100644 index 0000000000000000000000000000000000000000..7162005f509e101e0bdba7e254b263f190afe1c8 GIT binary patch literal 3807 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 VtS^drNDlx2002ovPDHLkV1h3zb6NlZ literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/grid/pos-red2.png b/src/assets/img/shuju/grid/pos-red2.png new file mode 100644 index 0000000000000000000000000000000000000000..1f2faa80dc1cd179fb7626804e9c1bb197a2be8f GIT binary patch literal 3310 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 { + // 底图服务 + // const baseLayer = new RasterLayer({ + // zIndex: 1, + // }); + // baseLayer.source( + // "https://t1.tianditu.gov.cn/DataServer?T=vec_w&X={x}&Y={y}&L={z}&tk=6557fd8a19b09d6e91ae6abf9d13ccbd", + // { + // parser: { + // type: "rasterTile", + // tileSize: 256, + // // minZoom: 6, + // // maxZoom: 15, + // zoomOffset: 0, + // }, + // } + // ); + + // // 注记服务 + // const annotionLayer = new RasterLayer({ + // zIndex: 2, + // }); + // annotionLayer.source( + // "https://t1.tianditu.gov.cn/DataServer?T=cva_w&X={x}&Y={y}&L={z}&tk=6557fd8a19b09d6e91ae6abf9d13ccbd", + // { + // parser: { + // type: "rasterTile", + // tileSize: 256, + // // minZoom: 6, + // // maxZoom: 15, + // zoomOffset: 0, + // }, + // } + // ); + + // scene.addLayer(baseLayer); + // scene.addLayer(annotionLayer); + const polygon = [ ...srcMapData.children .filter((item) => item.coordinates.length > 0) @@ -235,9 +288,9 @@ export default { }) .source({ type: "FeatureCollection", features: polygon }) .shape("name", ["pos-red", "pos-green", "pos-yellow"]) - .size(14) + .size(12) .style({ - offsets: [0, 10], // 文本相对锚点的偏移量 [水平, 垂直] + offsets: [0, 8], // 文本相对锚点的偏移量 [水平, 垂直] // rotation: 60, layerType: "fillImage", }); @@ -256,7 +309,7 @@ export default { .size(16) .style({ textAnchor: "center", // 文本相对锚点的位置 center|left|right|top|bottom|top-left - textOffset: [0, 45], // 文本相对锚点的偏移量 [水平, 垂直] + textOffset: [0, 40], // 文本相对锚点的偏移量 [水平, 垂直] spacing: 2, // 字符间距 padding: [1, 1], // 文本包围盒 padding [水平，垂直]，影响碰撞检测结果，避免相邻文本靠的太近 stroke: "#ffffff", // 描边颜色 @@ -312,7 +365,7 @@ export default { sweepCenter: [120.145319, 30.238915], }, }); - // scene.addLayer(pointLayer); + // scene.addLayer(pointLayer); }); // const textFeatures = [ @@ -389,6 +442,17 @@ export default { rotation: 0, layerType: "fillImage", }); + + dotLayer.on("mousemove", (e) => { + console.log(e); + const popup = new Popup({ + offsets: [0, -0], + closeButton: false, + }) + .setLnglat(e.feature.geometry.coordinates) + .setHTML(`类型: ${e.feature.properties.categoryKey}`); + scene.addPopup(popup); + }); scene.addLayer(dotLayer); }, From 090f48089873b6ab213e51d4659e1a3ad4db1d68 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 21 Jul 2022 17:13:18 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/change/changewelfare.vue | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue index 921f93f3d..fe4ecbd6e 100644 --- a/src/views/modules/plugins/change/changewelfare.vue +++ b/src/views/modules/plugins/change/changewelfare.vue @@ -54,8 +54,11 @@ + + +
- {{ $t('add') }} + {{ $t('export') }}
@@ -145,7 +148,8 @@ export default { getDataListURL: '/epmetuser/changeWelfare/page', getDataListIsPage: true, deleteURL: '/epmetuser/changeWelfare', - deleteIsBatch: true + deleteIsBatch: true, + exportURL: '/epmetuser/changeWelfare/export' }, dataForm: { id: '' @@ -178,6 +182,34 @@ export default { } }, methods: { + exportHandle () { + const url = this.mixinViewModuleOptions.exportURL + this.$http({ + method: 'GET', + url, + responseType: 'blob', + params: this.dataForm + }).then(res => { + // this.download(res.data, title + '.xls') + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + console.log('filename', fileName) + let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }) + var url = window.URL.createObjectURL(blob) + var aLink = document.createElement('a') + aLink.style.display = 'none' + aLink.href = url + aLink.setAttribute('download', fileName) + document.body.appendChild(aLink) + aLink.click() + document.body.removeChild(aLink) //下载完成移除元素 + window.URL.revokeObjectURL(url) //释放掉blob对象 + } else this.$message.error('下载失败') + }).catch(err => { + console.log('err', err) + return this.$message.error('网络错误') + }) + }, resetForm(formName) { for(const n in this.dataForm) { this.dataForm[n] = '' From f77c2ec99b0cdea908907b023ff594067e0e5e93 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 22 Jul 2022 13:41:00 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/basicinfo/basicInfoMain.vue | 1011 +++-------------- .../visual/basicinfo/cpts/grid-map.vue | 322 ++++++ src/views/modules/visual/test/l7.vue | 55 +- 3 files changed, 535 insertions(+), 853 deletions(-) create mode 100644 src/views/modules/visual/basicinfo/cpts/grid-map.vue diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index c57aaef37..38908c51f 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -1,73 +1,78 @@ - + - \ No newline at end of file + diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue new file mode 100644 index 000000000..f7eedd845 --- /dev/null +++ b/src/views/modules/visual/basicinfo/cpts/grid-map.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/src/views/modules/visual/test/l7.vue b/src/views/modules/visual/test/l7.vue index f1badfd0c..951fd7b71 100644 --- a/src/views/modules/visual/test/l7.vue +++ b/src/views/modules/visual/test/l7.vue @@ -28,6 +28,9 @@ import { GaodeMap, Map } from "@antv/l7-maps"; import { spliceIntoChunks } from "@/utils/index"; let scene; +// window._AMapSecurityConfig = { +// securityJsCode: "您申请的安全密钥", +// }; export default { name: "l7", @@ -115,33 +118,33 @@ export default { methods: { iniMap() { const { srcMapData } = this; - scene = new Scene({ - id: "map", - logoVisible: false, - map: new GaodeMap({ - // viewMode: "3D", - pitch: 35.210526315789465, - style: "dark", - // style: "light", - center: [srcMapData.longitude, srcMapData.latitude], - // token: "xxxx - token", - zoom: 18, - minZoom: 10, - }), - }); + scene = new Scene({ + id: "map", + logoVisible: false, + map: new GaodeMap({ + // viewMode: "3D", + pitch: 35.210526315789465, + // style: "dark", + style: "light", + center: [srcMapData.longitude, srcMapData.latitude], + // token: "77e4e81967f342b3e7b81ad1d0411224", + zoom: 18, + minZoom: 10, + }), + }); - // scene = new Scene({ - // id: "map", - // map: new Map({ - // pitch: 35.210526315789465, - // style: "dark", - // // style: "light", - // center: [srcMapData.longitude, srcMapData.latitude], - // // token: "xxxx - token", - // zoom: 18, - // minZoom: 10, - // }), - // }); + // scene = new Scene({ + // id: "map", + // map: new Map({ + // pitch: 35.210526315789465, + // style: "dark", + // // style: "light", + // center: [srcMapData.longitude, srcMapData.latitude], + // // token: "xxxx - token", + // zoom: 18, + // minZoom: 10, + // }), + // }); scene.on("loaded", () => { // 底图服务 From aee54a87be2d8db72784f9a21b40e3e36b9d6ef5 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 22 Jul 2022 18:20:13 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=BA=E6=88=BF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/basicinfo/basicInfoMain-备份.vue | 1017 +++++++++++++++++ .../visual/basicinfo/basicInfoMain.vue | 91 +- .../visual/basicinfo/cpts/grid-map.vue | 232 ++-- 3 files changed, 1195 insertions(+), 145 deletions(-) create mode 100644 src/views/modules/visual/basicinfo/basicInfoMain-备份.vue diff --git a/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue new file mode 100644 index 000000000..c57aaef37 --- /dev/null +++ b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue @@ -0,0 +1,1017 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 38908c51f..3a0e2ccee 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -34,7 +34,11 @@ v-show="orgLevel !== 'people' && orgLevel !== 'neighborHood'" class="div_map" > - +
@@ -76,21 +80,6 @@
- -
@@ -203,7 +192,7 @@ export default { async mounted() { //加载组织数据 - // await this.loadOrgData(); + await this.loadOrgData(); await this.loadList(); }, @@ -223,6 +212,30 @@ export default { this.showAgencyList = !this.showAgencyList; }, + //加载组织数据 + async loadOrgData() { + const url = "/gov/org/agency/maporg"; + let params = { + orgId: this.orgId, + level: this.orgLevel, + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.orgData = data; + this.orgId = this.orgData.id; + this.orgLevel = this.orgData.level; + if (data.children && data.children.length > 0) { + this.subAgencyArray = data.children; + } else { + this.subAgencyArray = []; + } + } else { + this.$message.error(msg); + } + }, + //获取右侧infolist数据 async loadList() { this.infoLoading = true; @@ -268,6 +281,38 @@ export default { this.level = ""; }, + //返回所选组织 + handleClickAgency(index) { + //如果是从小区返回，清空一下小区的人员显示列表 + if (this.orgLevel === "neighborHood") { + this.$nextTick(() => { + // 小区id，小区名称 + this.$refs.ref_community.handleCloseAllUser(); + }); + } + const cutNum = this.runAgencyArray.length - index; //要减去的长度 + this.runNum = this.runNum - cutNum; + + this.orgData = this.runAgencyArray[index]; + + for (let i = 0; i < cutNum; i++) { + this.runAgencyArray.pop(); + } + + this.orgId = this.orgData.id; + this.orgLevel = this.orgData.level; + + if (this.orgLevel === "people") { + } else if (this.orgLevel === "neighborHood") { + //显示小区 + } else { + this.$nextTick(() => { + this.refreshMap(true); + this.$forceUpdate(); + }); + } + }, + //点击组织列表数据 clickAgencyItem(item, index) { let e = { @@ -304,10 +349,6 @@ export default { return false; } this.runNum++; - this.orgData.center = map.getView().getCenter(); - this.orgData.zoom = map.getView().getZoom(); - console.log("center", map.getView().getCenter()); - console.log("zoom", map.getView().getZoom()); this.runAgencyArray.push(this.orgData); @@ -334,6 +375,14 @@ export default { } }, + //刷新地图 + async refreshMap(isRefreshView) { + //加载组织数据 + await this.loadOrgData(); + + await this.loadList(); + }, + //开启加载动画 startLoading() { loading = Loading.service({ diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue index f7eedd845..9756ea9f2 100644 --- a/src/views/modules/visual/basicinfo/cpts/grid-map.vue +++ b/src/views/modules/visual/basicinfo/cpts/grid-map.vue @@ -9,91 +9,32 @@ import { requestPost } from "@/js/dai/request"; import cptCard from "@/views/modules/visual/cpts/card"; import cptTb from "@/views/modules/visual/cpts/tb"; import nextTick from "dai-js/tools/nextTick"; -import dateFormat from "dai-js/tools/dateFormat"; -import { - Scene, - PointLayer, - PolygonLayer, - LineLayer, - CityBuildingLayer, - RasterLayer, - Popup, -} from "@antv/l7"; +import { Scene, PolygonLayer, LineLayer } from "@antv/l7"; import { GaodeMap, Map } from "@antv/l7-maps"; -// import { DrawEvent, DrawPolygon } from "@antv/l7-draw"; import { spliceIntoChunks } from "@/utils/index"; let scene; -// window._AMapSecurityConfig = { -// securityJsCode: "您申请的安全密钥", -// }; +let polygonLayer; +let lineLayer; +let textLayer; +let posLayer; +let circleLayer; export default { name: "l7", + data() { return { - srcMapData: [], - dotData: [], - iconUrlArray: { - anzhibangjiao: require("@/assets/img/shuju/fiveLayer/anzhibangjiao.png"), - buliangqingshaonian: require("@/assets/img/shuju/fiveLayer/buliangqingshaonian.png"), - shequjiaozheng: require("@/assets/img/shuju/fiveLayer/shequjiaozheng.png"), - resi_xfry: require("@/assets/img/shuju/fiveLayer/resi_xfry.png"), - xidurenyuan: require("@/assets/img/shuju/fiveLayer/xidurenyuan.png"), - xiejiaorenyuan: require("@/assets/img/shuju/fiveLayer/xiejiaorenyuan.png"), - zhaoshizhaohuojingshenbing: require("@/assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png"), - - yjdw: require("@/assets/img/shuju/fiveLayer/yjdw.png"), - sr_gy: require("@/assets/img/shuju/fiveLayer/sr_gy.png"), - sr_gc: require("@/assets/img/shuju/fiveLayer/sr_gc.png"), - whdw: require("@/assets/img/shuju/fiveLayer/whdw.png"), - sr_ggld: require("@/assets/img/shuju/fiveLayer/sr_ggld.png"), - lwh: require("@/assets/img/shuju/fiveLayer/lwh.png"), - sr_tyc: require("@/assets/img/shuju/fiveLayer/sr_tyc.png"), - lyjlb: require("@/assets/img/shuju/fiveLayer/lyjlb.png"), - sr_yjy: require("@/assets/img/shuju/fiveLayer/sr_yjy.png"), - zaxld: require("@/assets/img/shuju/fiveLayer/zaxld.png"), - other: require("@/assets/img/shuju/fiveLayer/other.png"), - sr_jzz: require("@/assets/img/shuju/fiveLayer/sr_jzz.png"), - sr_djc: require("@/assets/img/shuju/fiveLayer/sr_djc.png"), - sr_rfqck: require("@/assets/img/shuju/fiveLayer/sr_rfqck.png"), - ep_lg: require("@/assets/img/shuju/fiveLayer/ep_lg.png"), - sr_xfz: require("@/assets/img/shuju/fiveLayer/sr_xfz.png"), - pu_jgzsbm: require("@/assets/img/shuju/fiveLayer/pu_jgzsbm.png"), - ep_qt: require("@/assets/img/shuju/fiveLayer/ep_qt.png"), - - gr_czw: require("@/assets/img/shuju/fiveLayer/gr_czw.png"), - ep_cycs: require("@/assets/img/shuju/fiveLayer/ep_cycs.png"), - dc_jyz: require("@/assets/img/shuju/fiveLayer/dc_jyz.png"), - ep_gwylcs: require("@/assets/img/shuju/fiveLayer/ep_gwylcs.png"), - dc_jqz: require("@/assets/img/shuju/fiveLayer/dc_jqz.png"), - dc_whpdw: require("@/assets/img/shuju/fiveLayer/dc_whpdw.png"), - ep_wb: require("@/assets/img/shuju/fiveLayer/ep_wb.png"), - ep_mrxycs: require("@/assets/img/shuju/fiveLayer/ep_mrxycs.png"), - dc_yqhjz: require("@/assets/img/shuju/fiveLayer/dc_yqhjz.png"), - dc_jzgd: require("@/assets/img/shuju/fiveLayer/dc_jzgd.png"), - ep_scjgqy: require("@/assets/img/shuju/fiveLayer/ep_scjgqy.png"), - - cm_nmsc: require("@/assets/img/shuju/fiveLayer/cm_nmsc.png"), - event_tdnd: require("@/assets/img/shuju/fiveLayer/event_tdnd.png"), - cm_bhsc: require("@/assets/img/shuju/fiveLayer/cm_bhsc.png"), - cm_cjsc: require("@/assets/img/shuju/fiveLayer/cm_cjsc.png"), - ep_lssd: require("@/assets/img/shuju/fiveLayer/ep_lssd.png"), - - resi_szry: require("@/assets/img/shuju/fiveLayer/resi_szry.png"), - ps_lyy: require("@/assets/img/shuju/fiveLayer/ps_lyy.png"), - resi_snry: require("@/assets/img/shuju/fiveLayer/resi_snry.png"), - ps_mzb: require("@/assets/img/shuju/fiveLayer/ps_mzb.png"), - ps_zs: require("@/assets/img/shuju/fiveLayer/ps_zs.png"), - ps_wss: require("@/assets/img/shuju/fiveLayer/ps_wss.png"), - ps_jjz: require("@/assets/img/shuju/fiveLayer/ps_jjz.png"), - ep_xx: require("@/assets/img/shuju/fiveLayer/ep_xx.png"), - ep_yy: require("@/assets/img/shuju/fiveLayer/ep_yy.png"), - }, + // srcGridData: {}, }; }, - props: {}, + props: { + srcGridData: { + type: Object, + default: null, + }, + }, computed: {}, @@ -105,63 +46,94 @@ export default { watch: {}, async mounted() { - await this.getMapData(); + // 临时这么用吧 + window._AMapSecurityConfig = { + securityJsCode: "92ea2c965c6cf1ba7ee3a8fe01449ef2", + }; + + // await this.getMapData(); this.iniMap(); - await this.getDotData(); - this.updateMap(); + }, + + computed: { + polygonData() { + const { srcGridData } = this; + if ( + !srcGridData || + !srcGridData.children || + !Array.isArray(srcGridData.children) + ) { + return { type: "FeatureCollection", features: [] }; + } + const polygon = [ + ...srcGridData.children + .filter((item) => item.coordinates.length > 0) + .map((item) => ({ + type: "Feature", + properties: { + // id: item.id, + // name: item.name, + // level: item.level, + center: [item.longitude, item.latitude], + ...item, + }, + geometry: { + type: "Polygon", + coordinates: [ + spliceIntoChunks( + item.coordinates.split(",").map((item) => parseFloat(item)), + 2 + ), + ], + }, + })), + ]; + return { type: "FeatureCollection", features: polygon }; + }, + }, + + watch: { + srcGridData(val, oldValue) { + if (oldValue == null) { + this.iniMap(); + } else { + this.updateMap(); + } + }, }, methods: { iniMap() { - // 临时这么用吧 - window._AMapSecurityConfig = { - securityJsCode: "92ea2c965c6cf1ba7ee3a8fe01449ef2", - }; + const { srcGridData, polygonData } = this; + if (!srcGridData) return false; - const { srcMapData } = this; scene = new Scene({ id: "map", logoVisible: false, map: new GaodeMap({ - // viewMode: "3D", - pitch: 35.210526315789465, + pitch: 60, // style: "dark", - style: "light", - center: [srcMapData.longitude, srcMapData.latitude], + // style: "grey", + style: "amap://styles/blue", + center: [ + srcGridData.longitude || this.$store.state.user.longitude, + srcGridData.latitude || this.$store.state.user.latitude, + ], token: "fc14b42e0ca18387866d68ebd4f150c1", zoom: 18, minZoom: 10, + isHotspot: false, + resizeEnable: true, + doubleClickZoom: false, }), }); scene.on("loaded", () => { - const polygon = [ - ...srcMapData.children - .filter((item) => item.coordinates.length > 0) - .map((item) => ({ - type: "Feature", - properties: { - name: item.name, - center: [item.longitude, item.latitude], - }, - geometry: { - type: "Polygon", - coordinates: [ - spliceIntoChunks( - item.coordinates.split(",").map((item) => parseFloat(item)), - 2 - ), - ], - }, - })), - ]; - console.log(polygon); - - const polygonLayer = new PolygonLayer({ + polygonLayer = new PolygonLayer({ autoFit: true, }) // .size(1000) - .source({ type: "FeatureCollection", features: polygon }) + .source(polygonData) .color("name", [ "rgba(255, 100, 60, 0.5)", "rgba(43, 231, 253, 0.35)", @@ -184,11 +156,11 @@ export default { scene.addLayer(polygonLayer); - const linelayer = new LineLayer({ + lineLayer = new LineLayer({ zIndex: 2, name: "line2", }) - .source({ type: "FeatureCollection", features: polygon }) + .source(polygonData) .shape("line") .size(1) .color("name", [ @@ -204,12 +176,12 @@ export default { duration: 2, // 持续时间，延时 trailLength: 2, // 流线长度 }); - scene.addLayer(linelayer); + scene.addLayer(lineLayer); - const circleLayer = new PolygonLayer({ + circleLayer = new PolygonLayer({ zIndex: 3, }) - .source({ type: "FeatureCollection", features: polygon }) + .source(polygonData) .color("name", [ "rgba(255, 50, 50, 0.99)", "rgba(43, 231, 253, 0.99)", @@ -237,10 +209,10 @@ export default { "pos-yellow", require("@/assets/img/shuju/grid/pos-yellow.png") ); - const posLayer = new PolygonLayer({ + posLayer = new PolygonLayer({ zIndex: 4, }) - .source({ type: "FeatureCollection", features: polygon }) + .source(polygonData) .shape("name", ["pos-red", "pos-green", "pos-yellow"]) .size(12) .style({ @@ -250,10 +222,10 @@ export default { }); scene.addLayer(posLayer); - const textLayer = new PolygonLayer({ + textLayer = new PolygonLayer({ zIndex: 10, }) - .source({ type: "FeatureCollection", features: polygon }) + .source(polygonData) .color("name", [ "rgba(255, 100, 60, 0.99)", "rgba(43, 231, 253, 0.99)", @@ -273,17 +245,18 @@ export default { .active(true); scene.addLayer(textLayer); - textLayer.on("mousemove", (e) => { - textLayer.style({ + polygonLayer.on("mousemove", (e) => { + polygonLayer.style({ raisingHeight: 0, }); }); - textLayer.on("click", (e) => { - console.log(e.feature.properties.name); + polygonLayer.on("click", (e) => { + console.log(e.feature.properties); + this.$emit("clickAgency", e.feature.properties); }); - textLayer.on("unmousemove", (e) => { + polygonLayer.on("unmousemove", (e) => { polygonLayer.style({ raisingHeight: 0, }); @@ -291,13 +264,24 @@ export default { }); }, + updateMap() { + const { polygonData } = this; + if (polygonLayer) { + polygonLayer.setData(polygonData); + lineLayer.setData(polygonData); + textLayer.setData(polygonData); + posLayer.setData(polygonData); + circleLayer.setData(polygonData); + } + }, + async getMapData() { const { data, code, msg } = await requestPost("/gov/org/agency/maporg", { level: "", orgId: "", }); if (msg === "success" && code === 0) { - this.srcMapData = data; + this.srcGridData = data; } }, }, From 7caaa0e2e5e94c3b7009a5c5f36bf9c8b7adbe8a Mon Sep 17 00:00:00 2001 From: HAHA Date: Mon, 25 Jul 2022 17:34:01 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E6=96=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 4421 ++++++++--------- 1 file changed, 2061 insertions(+), 2360 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 18aa71b43..147ae6bb5 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1,2256 +1,2075 @@ \ No newline at end of file From 2910efe1583a0bdcc8f69321ace7b9c863994ec3 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Jul 2022 09:41:50 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/basicinfo/cpts/grid-map.vue | 128 +++++++++++++----- 1 file changed, 95 insertions(+), 33 deletions(-) diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue index 9756ea9f2..d1f5cbd0b 100644 --- a/src/views/modules/visual/basicinfo/cpts/grid-map.vue +++ b/src/views/modules/visual/basicinfo/cpts/grid-map.vue @@ -1,6 +1,14 @@ @@ -22,10 +30,61 @@ let circleLayer; export default { name: "l7", + inject: ["refresh"], data() { return { + mapStyleType: localStorage.getItem("mapStyle") || "dark", // srcGridData: {}, + darkStyle: { + style: "amap://styles/blue", + polygonColor: [ + "rgba(255, 100, 60, 0.5)", + "rgba(43, 231, 253, 0.35)", + "rgba(255, 255, 50, 0.35)", + ], + lineColor: [ + "rgba(255, 180, 150, 0.9)", + "rgba(43, 231, 253, 0.7)", + "rgba(255, 255, 50, 0.7)", + ], + circleColor: [ + "rgba(255, 180, 150, 0.99)", + "rgba(43, 231, 253, 0.99)", + "rgba(255, 255, 50, 0.99)", + ], + textColor: [ + "rgba(255, 100, 60, 0.99)", + "rgba(43, 231, 253, 0.99)", + "rgba(255, 255, 50, 0.99)", + ], + textStrokeColor: "#fff", + }, + + lightStyle: { + style: "amap://styles/whitesmoke", + polygonColor: [ + "rgba(255, 100, 60, 0.3)", + "rgba(43, 231, 253, 0.3)", + "rgba(255, 255, 50, 0.3)", + ], + lineColor: [ + "rgba(220, 150, 120, 0.9)", + "rgba(33, 201, 223, 0.8)", + "rgba(200, 200, 50, 0.9)", + ], + circleColor: [ + "rgba(255, 180, 150, 0.99)", + "rgba(13, 181, 203, 0.8)", + "rgba(255, 255, 50, 0.99)", + ], + textColor: [ + "rgba(200, 50, 10, 0.99)", + "rgba(0, 130, 153, 0.99)", + "rgba(120, 120, 0, 0.99)", + ], + textStrokeColor: "#666", + }, }; }, @@ -104,17 +163,20 @@ export default { methods: { iniMap() { - const { srcGridData, polygonData } = this; + const { darkStyle, lightStyle, srcGridData, polygonData } = this; if (!srcGridData) return false; + let styleConfig = darkStyle; + if (this.mapStyleType == "light") { + styleConfig = lightStyle; + } + scene = new Scene({ id: "map", logoVisible: false, map: new GaodeMap({ pitch: 60, - // style: "dark", - // style: "grey", - style: "amap://styles/blue", + style: styleConfig.style, center: [ srcGridData.longitude || this.$store.state.user.longitude, srcGridData.latitude || this.$store.state.user.latitude, @@ -134,11 +196,7 @@ export default { }) // .size(1000) .source(polygonData) - .color("name", [ - "rgba(255, 100, 60, 0.5)", - "rgba(43, 231, 253, 0.35)", - "rgba(255, 255, 50, 0.35)", - ]) + .color("name", styleConfig.polygonColor) // .shape("extrude") .shape("fill") .style({ @@ -163,11 +221,7 @@ export default { .source(polygonData) .shape("line") .size(1) - .color("name", [ - "rgba(255, 50, 50, 0.7)", - "rgba(43, 231, 253, 0.7)", - "rgba(255, 255, 50, 0.7)", - ]) + .color("name", styleConfig.lineColor) .style({ opacity: 1, }) @@ -182,11 +236,7 @@ export default { zIndex: 3, }) .source(polygonData) - .color("name", [ - "rgba(255, 50, 50, 0.99)", - "rgba(43, 231, 253, 0.99)", - "rgba(255, 255, 50, 0.99)", - ]) + .color("name", styleConfig.circleColor) .shape("circle") .active(true) .animate(true) @@ -223,24 +273,21 @@ export default { scene.addLayer(posLayer); textLayer = new PolygonLayer({ - zIndex: 10, + zIndex: 20, }) .source(polygonData) - .color("name", [ - "rgba(255, 100, 60, 0.99)", - "rgba(43, 231, 253, 0.99)", - "rgba(255, 255, 50, 0.99)", - ]) + .color("name", styleConfig.textColor) .shape("name", "text") .size(16) .style({ textAnchor: "center", // 文本相对锚点的位置 center|left|right|top|bottom|top-left textOffset: [0, 40], // 文本相对锚点的偏移量 [水平, 垂直] spacing: 2, // 字符间距 - padding: [1, 1], // 文本包围盒 padding [水平，垂直]，影响碰撞检测结果，避免相邻文本靠的太近 - stroke: "#ffffff", // 描边颜色 - strokeWidth: 0.3, // 描边宽度 - strokeOpacity: 1.0, + padding: [2, 2], // 文本包围盒 padding [水平，垂直]，影响碰撞检测结果，避免相邻文本靠的太近 + stroke: styleConfig.textStrokeColor, // 描边颜色 + strokeWidth: 0.1, // 描边宽度 + strokeOpacity: 0.8, + textAllowOverlap: true, }) .active(true); scene.addLayer(textLayer); @@ -264,6 +311,12 @@ export default { }); }, + shiftMapStyle(type) { + this.mapStyleType = type; + localStorage.setItem("mapStyle", type); + this.refresh(); + }, + updateMap() { const { polygonData } = this; if (polygonLayer) { @@ -289,10 +342,6 @@ export default { From d4c125cb49902da39655f6b626e7316664d11138 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Jul 2022 13:45:22 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BE=9B=E8=B0=83=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/cpts/grid-map.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue index d1f5cbd0b..afbd0af07 100644 --- a/src/views/modules/visual/basicinfo/cpts/grid-map.vue +++ b/src/views/modules/visual/basicinfo/cpts/grid-map.vue @@ -171,6 +171,8 @@ export default { styleConfig = lightStyle; } + console.log('地图初始化数据', polygonData) + scene = new Scene({ id: "map", logoVisible: false, From fc260c675473394b1381c303db0841d91dc172e4 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Jul 2022 13:54:34 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/cpts/grid-map.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue index afbd0af07..a357ca6fa 100644 --- a/src/views/modules/visual/basicinfo/cpts/grid-map.vue +++ b/src/views/modules/visual/basicinfo/cpts/grid-map.vue @@ -142,7 +142,7 @@ export default { spliceIntoChunks( item.coordinates.split(",").map((item) => parseFloat(item)), 2 - ), + ).filter((item) => item.length == 2), ], }, })), @@ -171,7 +171,7 @@ export default { styleConfig = lightStyle; } - console.log('地图初始化数据', polygonData) + console.log("地图初始化数据", polygonData); scene = new Scene({ id: "map", From a39d0398e6d96ee000148a4ba0a2665b8b8b4a68 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Jul 2022 15:11:14 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/cpts/grid-map.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue index a357ca6fa..b830be4c8 100644 --- a/src/views/modules/visual/basicinfo/cpts/grid-map.vue +++ b/src/views/modules/visual/basicinfo/cpts/grid-map.vue @@ -196,7 +196,7 @@ export default { polygonLayer = new PolygonLayer({ autoFit: true, }) - // .size(1000) + // .size(0) .source(polygonData) .color("name", styleConfig.polygonColor) // .shape("extrude") @@ -209,7 +209,7 @@ export default { opacity: 1, // heightfixed: true, // pickLight: true, - // raisingHeight: 1000, + raisingHeight: 0, // sourceColor: "#333", // targetColor: "rgba(255,255,255, 0.5)", }); @@ -346,8 +346,9 @@ export default { + +