diff --git a/src/assets/images/ui/cell-bg.png b/src/assets/images/ui/cell-bg.png new file mode 100644 index 0000000..8d19839 Binary files /dev/null and b/src/assets/images/ui/cell-bg.png differ diff --git a/src/assets/images/ui/img_block@2x.png b/src/assets/images/ui/img_block@2x.png new file mode 100644 index 0000000..436aa2d Binary files /dev/null and b/src/assets/images/ui/img_block@2x.png differ diff --git a/src/assets/images/ui/serial-number.png b/src/assets/images/ui/serial-number.png new file mode 100644 index 0000000..b6ef94a Binary files /dev/null and b/src/assets/images/ui/serial-number.png differ diff --git a/src/store/getters.js b/src/store/getters.js index 8a60c71..b9517a5 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -27,5 +27,6 @@ const getters = { queryParamsIndex: (state) => state.taicang.queryParams, queryParamsXiaoqu: (state) => state.xiaoqu.queryParmas, mapParmas: (state) => state.xiaoqu.mapParmas, + netWorkintroduce: (state) => state.xiaoqu.netWorkintroduce, }; export default getters; diff --git a/src/store/modules/xiaoqu.js b/src/store/modules/xiaoqu.js index 212b732..a856c24 100644 --- a/src/store/modules/xiaoqu.js +++ b/src/store/modules/xiaoqu.js @@ -6,6 +6,7 @@ const xiaoqu = { sd: false, networkName: undefined, }, + netWorkintroduce: {}, }, mutations: { //参数变化 @@ -19,13 +20,26 @@ const xiaoqu = { state.mapParmas[key] = query[key]; } }, + SET_NETWORK_INTRODUCE: (state, data) => { + state.netWorkintroduce = data; + }, //重置参数 RESET_QUERY: (state, query) => { + state.netWorkintroduce = { + intro: "", + list: [], + }; state.queryParmas = { xiaoquId: undefined, //小区 parentid: undefined, //网格 buildingid: undefined, //楼栋 deptId: undefined, //苑id + color: undefined, + type: undefined, + isd: undefined, + isk: undefined, + isx: undefined, + isj: undefined, }; }, }, diff --git a/src/views/components/introduceTitle/subTtile.vue b/src/views/components/introduceTitle/subTtile.vue index 5d1cea5..0e222fe 100644 --- a/src/views/components/introduceTitle/subTtile.vue +++ b/src/views/components/introduceTitle/subTtile.vue @@ -1,6 +1,7 @@ @@ -11,6 +12,10 @@ export default { type: String, default: "标题", }, + isSlot: { + type: Boolean, + default: false, + }, }, data() { return {}; @@ -26,8 +31,9 @@ export default { display: flex; align-items: center; overflow: hidden; + box-sizing: border-box; + padding: 0 20px 0 40px; .main-title { - margin-left: 40px; font-size: 19px; color: #ffffff; font-family: "xiniu"; diff --git a/src/views/components/xiaoqu/leftData/networkInfo.vue b/src/views/components/xiaoqu/leftData/networkInfo.vue index 85f1b06..43b7cfd 100644 --- a/src/views/components/xiaoqu/leftData/networkInfo.vue +++ b/src/views/components/xiaoqu/leftData/networkInfo.vue @@ -1,9 +1,226 @@ - + diff --git a/src/views/components/xiaoqu/map/index.vue b/src/views/components/xiaoqu/map/index.vue index 63bc7c8..9a2e9d9 100644 --- a/src/views/components/xiaoqu/map/index.vue +++ b/src/views/components/xiaoqu/map/index.vue @@ -60,7 +60,7 @@ export default { handler(newValue, oldValue) { this.add3DXiaoqu(newValue.sd); this.addNetworkLayer(newValue.networkName); - // console.log("Object changed:", newValue); + if (this.map.getLayerById("dth")) this.map.getLayerById("dth").clear(); //清除单体化 }, deep: true, // Deeply watch all nested properties }, @@ -81,10 +81,7 @@ export default { }); map.on(mars3d.EventType.click, function (e) { if (!e.id) { - // map.getLayerById("dth").clear(); //清除单体化 - // _this.mapLayer.network.eachGraphic((graphic) => { - // graphic.closeHighlight(); - // }); + map.getLayerById("dth").clear(); //清除单体化 _this.$store.commit("CHANGE_QUERY", { buildingid: undefined, deptId: undefined, @@ -422,14 +419,8 @@ export default { this.$nextTick(() => { if (show && this.mapLayer.network.length > 0) { this.mapLayer.network.show = true; - - // this.mapLayer.network.eachGraphic((graphic) => { - // graphic.closeHighlight(); - // }); - let networkItem = this.mapLayer.network.getGraphicById(show); networkItem.openHighlight({ - type: "click", color: "#FF3992", opacity: 0.5, outline: true, @@ -444,7 +435,7 @@ export default { //3D小区模型 add3DXiaoqu(show) { - if (show && this.mapLayer.tiles3dLayer != "undefined") { + if (show && this.mapLayer.tiles3dLayer == undefined) { //2D显存 - 集显 let maximumMemoryUsage = process.env.NODE_ENV === "production" ? (1024 * 2) / 2 : 1024 / 2; @@ -476,14 +467,12 @@ export default { }, //2D - 3D点处理 handle3dPoint(type) { - //修改二维图标成为三维 this.mapLayer.planePoint.eachGraphic((graphic) => { var centerPoint = graphic.centerPoint; if (type == "3d") { let attr = graphic.attr; centerPoint.alt = Number(attr.floorNum) * 3 + 10; } - graphic.setOptions({ position: centerPoint, style: { diff --git a/src/views/components/xiaoqu/mapSearchBox.vue b/src/views/components/xiaoqu/mapSearchBox.vue index 98317f5..ff68abb 100644 --- a/src/views/components/xiaoqu/mapSearchBox.vue +++ b/src/views/components/xiaoqu/mapSearchBox.vue @@ -45,7 +45,7 @@