Browse Source

Merge branch 'dev-fivelayer0725' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fivelayer0725

master
jiangyy 3 years ago
parent
commit
b9ff2bce27
  1. BIN
      src/assets/img/shuju/command/ico2/IS_CJ.png
  2. BIN
      src/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png
  3. BIN
      src/assets/img/shuju/command/ico2/IS_PARTY.png
  4. BIN
      src/assets/img/shuju/command/ico2/IS_SD.png
  5. BIN
      src/assets/img/shuju/command/ico2/IS_SN.png
  6. BIN
      src/assets/img/shuju/command/ico2/IS_SPECIAL.png
  7. BIN
      src/assets/img/shuju/command/ico2/IS_SZ.png
  8. BIN
      src/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png
  9. BIN
      src/assets/img/shuju/command/ico2/IS_VETERANS.png
  10. BIN
      src/assets/img/shuju/command/ico2/IS_VOLUNTEER.png
  11. BIN
      src/assets/img/shuju/command/ico2/IS_YLFN.png
  12. BIN
      src/assets/img/shuju/command/ico3/IS_CJ.png
  13. BIN
      src/assets/img/shuju/command/ico3/IS_ENSURE_HOUSE.png
  14. BIN
      src/assets/img/shuju/command/ico3/IS_PARTY.png
  15. BIN
      src/assets/img/shuju/command/ico3/IS_SD.png
  16. BIN
      src/assets/img/shuju/command/ico3/IS_SN.png
  17. BIN
      src/assets/img/shuju/command/ico3/IS_SPECIAL.png
  18. BIN
      src/assets/img/shuju/command/ico3/IS_SZ.png
  19. BIN
      src/assets/img/shuju/command/ico3/IS_UNITED_FRONT.png
  20. BIN
      src/assets/img/shuju/command/ico3/IS_VETERANS.png
  21. BIN
      src/assets/img/shuju/command/ico3/IS_VOLUNTEER.png
  22. BIN
      src/assets/img/shuju/command/ico3/IS_YLFN.png
  23. 2
      src/assets/scss/shuju-card.scss
  24. 20
      src/views/modules/visual/command/cpts/popup.vue
  25. 13
      src/views/modules/visual/command/cpts/sidemenu-left.vue
  26. 13
      src/views/modules/visual/command/index.vue
  27. 195
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

BIN
src/assets/img/shuju/command/ico2/IS_CJ.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

BIN
src/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

BIN
src/assets/img/shuju/command/ico2/IS_PARTY.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

BIN
src/assets/img/shuju/command/ico2/IS_SD.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

BIN
src/assets/img/shuju/command/ico2/IS_SN.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 B

BIN
src/assets/img/shuju/command/ico2/IS_SPECIAL.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

BIN
src/assets/img/shuju/command/ico2/IS_SZ.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 B

BIN
src/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 B

BIN
src/assets/img/shuju/command/ico2/IS_VETERANS.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

BIN
src/assets/img/shuju/command/ico2/IS_VOLUNTEER.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

BIN
src/assets/img/shuju/command/ico2/IS_YLFN.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 285 B

BIN
src/assets/img/shuju/command/ico3/IS_CJ.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
src/assets/img/shuju/command/ico3/IS_ENSURE_HOUSE.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
src/assets/img/shuju/command/ico3/IS_PARTY.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
src/assets/img/shuju/command/ico3/IS_SD.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
src/assets/img/shuju/command/ico3/IS_SN.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/assets/img/shuju/command/ico3/IS_SPECIAL.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
src/assets/img/shuju/command/ico3/IS_SZ.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/assets/img/shuju/command/ico3/IS_UNITED_FRONT.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/assets/img/shuju/command/ico3/IS_VETERANS.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
src/assets/img/shuju/command/ico3/IS_VOLUNTEER.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
src/assets/img/shuju/command/ico3/IS_YLFN.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

2
src/assets/scss/shuju-card.scss

@ -80,9 +80,7 @@
min-height: 200px;
background-image: url(../img/shuju/card/bg.png);
background-repeat: repeat;
overflow-y: auto;
height: 100%;
margin-right: -8px;
@include scrollBar;
}
}

20
src/views/modules/visual/command/cpts/popup.vue

@ -261,7 +261,12 @@
</div>
</div>
<div v-if="placeType === 'enterprise_patrol'">
<div
v-if="
placeType === 'enterprise_patrol' ||
placeType === 'enterprise_patrol_unqualified'
"
>
<div class="info-title">企事业信息</div>
<div class="item">
场所类型
@ -291,6 +296,12 @@
联系电话
<span>{{ info.mobile || "--" }}</span>
</div>
<div class="operate">
<div @click="handleClickBtn('watch-xuncha')" class="btn">
查看更多
</div>
</div>
</div>
<div v-if="placeType === 'party_unit'">
@ -442,6 +453,13 @@ export default {
//
await this.loadPartyUnit(item);
}
if (
placeType === "enterprise_patrol" ||
placeType === "enterprise_patrol_unqualified"
) {
//
await this.loadEnterprisePartrol(item);
}
if (placeType === "enterprise_patrol") {
//
await this.loadEnterprisePartrol(item);

13
src/views/modules/visual/command/cpts/sidemenu-left.vue

@ -95,13 +95,24 @@ export default {
shequjiaozheng: require("@/assets/img/shuju/command/ico2/shequjiaozheng.png"),
xidurenyuan: require("@/assets/img/shuju/command/ico2/xidurenyuan.png"),
IS_DBH: require("@/assets/img/shuju/command/ico2/IS_DBH.png"),
// IS_YLFN: require("@/assets/img/shuju/command/ico2/IS_YLFN.png"),
IS_YLFN: require("@/assets/img/shuju/command/ico2/IS_YLFN.png"),
IS_OLD_PEOPLE: require("@/assets/img/shuju/command/ico2/IS_OLD_PEOPLE.png"),
IS_UNEMPLOYED: require("@/assets/img/shuju/command/ico2/IS_UNEMPLOYED.png"),
IS_DB: require("@/assets/img/shuju/command/ico2/IS_DB.png"),
IS_MB: require("@/assets/img/shuju/command/ico2/IS_MB.png"),
anzhibangjiao: require("@/assets/img/shuju/command/ico2/anzhibangjiao.png"),
IS_KC: require("@/assets/img/shuju/command/ico2/IS_KC.png"),
IS_XFRY: require("@/assets/img/shuju/command/ico2/IS_XFRY.png"),
IS_SD: require("@/assets/img/shuju/command/ico2/IS_SD.png"),
IS_SN: require("@/assets/img/shuju/command/ico2/IS_SN.png"),
IS_SZ: require("@/assets/img/shuju/command/ico2/IS_SZ.png"),
IS_SPECIAL: require("@/assets/img/shuju/command/ico2/IS_SPECIAL.png"),
IS_UNITED_FRONT: require("@/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png"),
IS_VOLUNTEER: require("@/assets/img/shuju/command/ico2/IS_VOLUNTEER.png"),
IS_VETERANS: require("@/assets/img/shuju/command/ico2/IS_VETERANS.png"),
IS_ENSURE_HOUSE: require("@/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png"),
IS_CJ: require("@/assets/img/shuju/command/ico2/IS_CJ.png"),
IS_PARTY: require("@/assets/img/shuju/command/ico2/IS_PARTY.png"),
},
};
},

13
src/views/modules/visual/command/index.vue

@ -370,13 +370,24 @@ export default {
shequjiaozheng: require("@/assets/img/shuju/command/ico3/shequjiaozheng.png"),
xidurenyuan: require("@/assets/img/shuju/command/ico3/xidurenyuan.png"),
IS_DBH: require("@/assets/img/shuju/command/ico3/IS_DBH.png"),
// IS_YLFN: require("@/assets/img/shuju/command/ico3/IS_YLFN.png"),
IS_YLFN: require("@/assets/img/shuju/command/ico3/IS_YLFN.png"),
IS_OLD_PEOPLE: require("@/assets/img/shuju/command/ico3/IS_OLD_PEOPLE.png"),
IS_UNEMPLOYED: require("@/assets/img/shuju/command/ico3/IS_UNEMPLOYED.png"),
IS_DB: require("@/assets/img/shuju/command/ico3/IS_DB.png"),
IS_MB: require("@/assets/img/shuju/command/ico3/IS_MB.png"),
anzhibangjiao: require("@/assets/img/shuju/command/ico3/anzhibangjiao.png"),
IS_KC: require("@/assets/img/shuju/command/ico3/IS_KC.png"),
IS_XFRY: require("@/assets/img/shuju/command/ico3/IS_XFRY.png"),
IS_SD: require("@/assets/img/shuju/command/ico3/IS_SD.png"),
IS_SN: require("@/assets/img/shuju/command/ico3/IS_SN.png"),
IS_SZ: require("@/assets/img/shuju/command/ico3/IS_SZ.png"),
IS_SPECIAL: require("@/assets/img/shuju/command/ico3/IS_SPECIAL.png"),
IS_UNITED_FRONT: require("@/assets/img/shuju/command/ico3/IS_UNITED_FRONT.png"),
IS_VOLUNTEER: require("@/assets/img/shuju/command/ico3/IS_VOLUNTEER.png"),
IS_VETERANS: require("@/assets/img/shuju/command/ico3/IS_VETERANS.png"),
IS_ENSURE_HOUSE: require("@/assets/img/shuju/command/ico3/IS_ENSURE_HOUSE.png"),
IS_CJ: require("@/assets/img/shuju/command/ico3/IS_CJ.png"),
IS_PARTY: require("@/assets/img/shuju/command/ico3/IS_PARTY.png"),
},
searchName: "",

195
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@ -2,7 +2,7 @@
<div style="position: relative">
<!-- 组织路由 -->
<div v-if="pageType===''">
<div class="div_top">
<div class="router_line"></div>
<div class="div_router">
@ -20,6 +20,11 @@
<div v-show="!showPeopleInfo"
class="div_content">
<div class="div_map"
id="map"
ref="map">
</div>
<div class="div_data">
<div class="div_tips">
<cpt-card>
@ -84,8 +89,7 @@
</div>
<div class="m-pagination">
<el-pagination hide-on-single-page
:current-page="demand.pageNo"
<el-pagination hide-on-single-page :current-page="demand.pageNo"
:page-size="demand.pageSize"
:total="demand.total"
background
@ -356,26 +360,9 @@
</div>
</div>
<people v-if="showPeopleInfo"
:uid="selUserId"
ref="ref_people"></people>
<!-- <event-info v-if="pageType==='dispose'"
ref="eleEditForm"
@handleClose="handleClose" /> -->
<!-- <service-info v-if="pageType==='dispose'"
ref="eleEditForm"
@handleClose="handleClose" /> -->
<!-- <fuwu-info v-if="pageType==='dispose'"
ref="eleEditForm"
@handleClose="handleClose" /> -->
<qsydw v-if="pageType==='dispose'"
ref="eleEditForm"
@handleClose="handleClose" />
</div>
</template>
@ -407,24 +394,130 @@ import cptTb from "@/views/modules/visual/cpts/tb";
import cptCard from "@/views/modules/visual/cpts/card";
import ScreenLoading from "@/views/modules/visual/cpts/loading";
import People from "../../basicinfo/people";
import eventInfo from "./eventInfo";
import serviceInfo from "./serviceInfo";
import fuwuInfo from "./fuwuInfo";
import qsydw from "./qsydw";
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: '',
@ -582,16 +675,41 @@ const vueGis = {
selPlaceType: '',
selInfo: {},
selUserId: '',
showPeopleInfo: false,
pageType: '',
eventId: '1542065054671142914',
eventDetailData: {},
showPeopleInfo: false
}
},
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: {
@ -1036,18 +1154,11 @@ const vueGis = {
this.getTable();
this.getMapTable();
},
// handleSearch () {
// this.demand.pageNo = 1
// this.getTable();
// this.getMapTable();
// },
handleSearch () {
this.pageType = "dispose";
},
handleClose () {
this.pageType = "";
this.demand.pageNo = 1
this.getTable();
this.getMapTable();
},
//
handleClickRow (index) {
let selData = this.tableList[index]
@ -1727,7 +1838,7 @@ const vueGis = {
...mapGetters(["clientHeight"])
},
components: { cptTb, cptCard, ScreenLoading, People, eventInfo, serviceInfo, fuwuInfo, qsydw },
components: { cptTb, cptCard, ScreenLoading, People },
}
export default vueGis;
</script>

Loading…
Cancel
Save