diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 32154576..70c4e5d9 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -51,21 +51,35 @@ .div_search { width: 100%; height: 56px; - background: #011168; - border-radius: 4px; text-align: center; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + opacity: 0.7; display: flex; - justify-content: flex-end; - - .icon { + justify-content: space-between; + .div_search_left { display: flex; - align-items: center; - margin-left: 29px; - margin-top: 16px; + justify-content: flex-start; + .icon { + display: flex; + align-items: center; + margin-left: 29px; + + > img { + width: 24px; + height: 24px; + } + } - > img { - width: 24px; - height: 24px; + > span { + line-height: 56px; + margin-left: 10px; } } @@ -83,6 +97,10 @@ } } + .div_search:hover { + cursor: pointer; + } + .div_info { box-sizing: border-box; width: 100%; diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue index 7ae2ff1c..d144e270 100644 --- a/src/views/modules/base/community/buildForm.vue +++ b/src/views/modules/base/community/buildForm.vue @@ -168,13 +168,16 @@ export default { this.dataForm.gridId = agencyObj.gridId this.dataForm.neighborHoodId = agencyObj.id - map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude)) - this.formType = type if (row) { this.dataForm = JSON.parse(JSON.stringify(row)) this.buildingId = this.dataForm.buildingId this.buildType = this.dataForm.buildingTypeKey + + map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude)) + this.setMarker(this.dataForm.latitude, this.dataForm.longitude) + } else { + map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude)) } diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue index c6875c5e..6dec5775 100644 --- a/src/views/modules/base/community/communityForm.vue +++ b/src/views/modules/base/community/communityForm.vue @@ -277,14 +277,16 @@ export default { async initForm (type, row, agencyObj) { this.$refs.ref_form.resetFields(); this.agencyObj = agencyObj - // debugger - map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude)) this.formType = type if (row) { - this.dataForm = JSON.parse(JSON.stringify(row)) this.neighborHoodId = this.dataForm.neighborHoodId + map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude)) + this.setMarker(this.dataForm.latitude, this.dataForm.longitude) + + } else { + map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude)) } diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index 78b8f751..50f54367 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -11,11 +11,11 @@ - + @click.native="handleClickBuilding(index)"> @@ -393,10 +393,14 @@ export default { }, //切换楼栋 - handleClickBuilding (index) { + async handleClickBuilding (index) { + this.selBuildingId = this.buildingArray[index].buildingId this.selBuildingName = this.buildingArray[index].buildingName + await this.loadRoom() + this.roomLoaded = true + this.$emit('refreshInfoList', this.selBuildingId, 'building') }, //选择房间 diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 8341e9a0..fffed07d 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -38,20 +38,18 @@
-
- +
+
- + 请输入姓名 +
-
搜索
+
搜索
@@ -291,11 +289,12 @@ const vueGis = { //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） search 点击搜索 people 点击详情 async toSubAgency (type, e, searchName) { - //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图 + console.log(e) this.runNum++ this.runAgencyArray.push(this.orgData) - + //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图 if (type === 'people') { + this.orgLevel = 'people' this.selUserId = e this.orgId = '' @@ -307,6 +306,8 @@ const vueGis = { this.searchName = searchName } else if (type === 'search') { + + this.orgLevel = 'search' this.orgId = '' this.orgData = { @@ -320,7 +321,8 @@ const vueGis = { } else { this.subAgencyArray.forEach(item => { - if (item.id === e.selected[0].id_) { + + if (item.id === e.selected[0].values_.id) { this.orgId = item.id this.orgLevel = item.level this.orgData = item @@ -338,6 +340,7 @@ const vueGis = { } else { this.refreshMap(true) } + } @@ -365,7 +368,6 @@ const vueGis = { //返回所选组织 handleClickAgency (index) { - const cutNum = this.runAgencyArray.length - index//要减去的长度 this.runNum = this.runNum - cutNum this.orgData = this.runAgencyArray[index] @@ -379,10 +381,8 @@ const vueGis = { if (this.orgLevel === 'people') { - } else if (this.orgLevel === 'search') { this.$nextTick(() => { - this.$refs.ref_search.loadByName(this.searchName); }); @@ -430,7 +430,8 @@ const vueGis = { //加载当前园区的标注 loadPolygon (subAgencyArray) { - polygonSource.clear()//清空变电站标注 + polygonSource.clear()//清空多边形标注 + iconSource.clear()//清空多边形标注 let featureData = []//标注数据 if (subAgencyArray && subAgencyArray.length > 0) {//判断是否存在下级标注 @@ -473,9 +474,7 @@ const vueGis = { oneData.geometry.coordinates.push(polygonArray) featureData.push(oneData) } - }); - } if (featureData && featureData.length > 0) { @@ -489,6 +488,7 @@ const vueGis = { let iconFeatures = []; feature.forEach(oneIcon => { + var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy] // var center = getCenter(extent); //获取边界区域的中心位置 //添加标注 @@ -497,19 +497,17 @@ const vueGis = { let oneArray = [x, y] this.iconCoordinators.push(oneArray) - + // debugger //视频监控样式 let oneCctv = new Feature({ geometry: new Point([x, y]), - id: oneIcon.id, + id: oneIcon.id_, properties: { type: "icon", - id: oneIcon.id + id: oneIcon.id_ } }); - console.log(oneIcon.values_) - let iconStyle = new Style({ image: new Icon({ // anchor: [0.5, 0.5], @@ -525,9 +523,7 @@ const vueGis = { iconFeatures.push(oneCctv); }); - console.log(iconFeatures) - iconSource.clear(); //清空cctyv标注 iconSource.addFeatures(iconFeatures); } @@ -591,7 +587,7 @@ const vueGis = { }) map.on('singleclick', function (e) { - console.log(e.coordinate) + // console.log(e.coordinate) // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326')); }) @@ -745,19 +741,7 @@ export default vueGis; .ol-overlaycontainer-stopevent { display: none; } -.el-input__inner[WarningColor="warning"] { - background-color: #011168; - border-radius: 4px 0 0 4px; - height: 56px; - border: none; - box-shadow: 0 0 10px inset #1a5afd; - padding-left: 70px; - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - opacity: 0.7; -} + .el-scrollbar__wrap { overflow-x: hidden !important; }