From dccd7f4839958bb621b4e363d373c947bf84708e Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 2 Aug 2022 09:05:39 +0800 Subject: [PATCH] 111 --- .../communityParty/regionalParty/units.vue | 15 +- .../modules/communityService/sqzzz/index.vue | 17 +- .../shequzhili/tuceng/zhonghe/baseTotal.vue | 29 +- .../communityGovern/fivelayers/mapIndex.vue | 158 +-------- .../communityGovern/fivelayers/qsydw.vue | 319 ++++++++++++++++++ 5 files changed, 374 insertions(+), 164 deletions(-) create mode 100644 src/views/modules/visual/communityGovern/fivelayers/qsydw.vue diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 5666675a..568768eb 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -574,11 +574,16 @@ export default { if (code === 0) { if (data.type) { - this.$message({ - type: "success", - message: "同步成功" - }); - this.loadTable() + if (data.msg) { + this.$message({ + type: "success", + message: "同步成功" + }); + this.loadTable() + } else { + this.$message.error(data.msg) + } + } else { this.$message.error(data.msg) } diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index 312ef51c..b0c04a39 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -520,17 +520,20 @@ export default { if (code === 0) { if (data.type) { - this.$message({ - type: "success", - message: "同步成功" - }); - this.getTableData(); + if (data.msg) { + this.$message({ + type: "success", + message: "同步成功" + }); + this.loadTable() + } else { + this.$message.error(data.msg) + } + } else { this.$message.error(data.msg) } - - } else { this.$message.error(msg) } diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue index 5d71f7d4..b0bd49d6 100644 --- a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue +++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue @@ -12,7 +12,7 @@ label="居民类别">
- 0) { + this.fmData.category = this.jmlbOptions[0].value + let temp = { + queryType: this.jmlbOptions[0].queryType, + tableName: this.jmlbOptions[0].tableName, + columnName: this.jmlbOptions[0].columnName, + columnValue: [this.jmlbOptions[0].columnValue], + } + + this.elseParams.push(temp) + } this.handleSearch(); }, diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 07a2796b..583bc2ba 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -20,11 +20,6 @@
-
-
-
@@ -367,9 +362,9 @@ :uid="selUserId" ref="ref_people"> - + @handleClose="handleClose" /> --> +
@@ -412,6 +410,7 @@ import People from "../../basicinfo/people"; import eventInfo from "./eventInfo"; import serviceInfo from "./serviceInfo"; import fuwuInfo from "./fuwuInfo"; +import qsydw from "./qsydw"; @@ -419,125 +418,13 @@ var centerPointGlobal = [120.664619, 36.504963] let loading;//加载动画 -let map; -let mapView; -let gaodeMapLayer;//背景地图图层 -let parentLayer;//上级组织图层 -let parentSource;//上级组织多边形 -let polygonLayer;//标注图层 -let iconLayer; // icon标注图层 -let iconSource; // icon -let polygonSource;//标注多边形 -let select;//选中标注 - -let xoffset = 0 -let yoffset = 0 - - -//url图标 - -let iconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' -]; -let textColorArray = [ - 'rgba(236, 69, 4, 0.66)', - 'rgba(0, 146, 238, 0.75)', - 'rgba(238, 151, 0, 0.8)' -]; -let polygonColorArray = [ - 'rgba(210, 2, 2, 0.24)', - 'rgba(43, 231, 253, 0.25)', - 'rgba(183, 185, 0, 0.16)' -]; -//标注的文字样式 -var createTextStyle = function (feature) { - return new Text({ - textAlign: undefined, - font: "18px Arial", - //fontFamily: "Courier New, monospace", - // fontWeight: "bold", - text: feature.values_.name, - backgroundFill: new Fill({ - // color: 'rgba(0, 146, 238, 0.75)' - color: textColorArray[feature.values_.colorIndex] - }), - padding: [4, 10, 4, 10], - //text: "名称", - fill: new Fill({ color: "#ffffff" }), - // stroke: new Stroke({ color: "#ffffff", width: 3 }), - offsetY: -30, - offsetX: -50, - overflow: true, - }); -}; - -//上级组织标注样式 -var parentStyleFunction = (function () { - return function (feature) { - return new Style({ - // fill: new Fill({ - // color: [255, 255, 255, 0.3] - // }), - stroke: new Stroke({ - color: [0, 103, 182, 1], - width: 2 - }), - - // text: createTextStyle(feature) - });; - }; -})() - - -//标注样式 -var polygonStyleFunction = (function () { - return function (feature) { - return new Style({ - fill: new Fill({ - // color: [255, 255, 255, 0.3] - color: polygonColorArray[feature.values_.colorIndex] - }), - stroke: new Stroke({ - color: polygonColorArray[feature.values_.colorIndex], - width: 3 - }), - - text: createTextStyle(feature) - });; - }; -})() - -//定义颜色转换方法 -let reverseFunc = function (pixelsTemp) { - //蓝色 - for (var i = 0; i < pixelsTemp.length; i += 4) { - var r = pixelsTemp[i]; - var g = pixelsTemp[i + 1]; - var b = pixelsTemp[i + 2]; - //运用图像学公式,设置灰度值 - var grey = r * 0.3 + g * 0.59 + b * 0.11; - //将rgb的值替换为灰度值 - pixelsTemp[i] = grey; - pixelsTemp[i + 1] = grey; - pixelsTemp[i + 2] = grey; - - //基于灰色,设置为蓝色,这几个数值是我自己试出来的,可以根据需求调整 - pixelsTemp[i] = 55 - pixelsTemp[i]; - pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1]; - pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2]; - } -}; + const vueGis = { name: 'HomeMap', data () { return { - centerPoint: [],//中心点位置 - zoom: 14,//缩放范围:区14 - minZoom: 1,//最小缩放 orgData: {},//当前组织对象 orgId: '', @@ -705,35 +592,6 @@ const vueGis = { }, async mounted () { - //加载组织数据 - await this.loadOrgData() - - //初始化地图 - this.initMap() - - await nextTick(300) - this.addParentLayer() - this.loadParentPolygon() - //添加标注图层 - this.addPolygonLayer() - - //添加icontuceng - this.addIconLayer() - - //加载当前园区的标注 - this.loadPolygon(this.subAgencyArray) - - - this.setMapLocation() - await this.loadCategoryList() - this.getTable(); - await this.getMapTable(); - - - //初始化icon图层 - this.addOverlay() - - this.addMapClick() }, methods: { @@ -1869,7 +1727,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { cptTb, cptCard, ScreenLoading, People, eventInfo, serviceInfo, fuwuInfo }, + components: { cptTb, cptCard, ScreenLoading, People, eventInfo, serviceInfo, fuwuInfo, qsydw }, } export default vueGis; diff --git a/src/views/modules/visual/communityGovern/fivelayers/qsydw.vue b/src/views/modules/visual/communityGovern/fivelayers/qsydw.vue new file mode 100644 index 00000000..8308df39 --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/qsydw.vue @@ -0,0 +1,319 @@ + + + + + +