From b9c66c29a399181ed7458878450b6797ba92e47a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 19 Nov 2021 11:17:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/mapConfig.vue | 46 ++++++++++++++----------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue index c8114b35..267b19fc 100644 --- a/src/views/modules/workSys/mapConfig.vue +++ b/src/views/modules/workSys/mapConfig.vue @@ -4,7 +4,7 @@
+ placeholder="请选择或点击区域选择"> -
+
0) { this.subAgencyArray = data.children - this.selAgencyId = this.subAgencyArray[0].id + // this.selAgencyId = this.subAgencyArray[0].id } else { this.subAgencyArray = [] - this.selAgencyId = '' + // this.selAgencyId = '' } } @@ -300,9 +301,7 @@ const vueGis = { oneData.geometry.coordinates.push(polygonArray) featureData.push(oneData) } - }); - } if (featureData && featureData.length > 0) { @@ -320,23 +319,26 @@ const vueGis = { //选择feature selectFeature (e) { - if (this.method === undefined || this.method === '') { - this.selAgencyId = e.selected[0].id_ - this.subAgencyArray.forEach((element, index) => { - if (element.id === e.selected[0].id_) { - this.selAgencyIndex = index - this.orgChange(index) - } + if (e.selected.length > 0) { + console.log("selectFeature22222222222222222222222") + if (this.method === undefined || this.method === '') { + this.selAgencyId = e.selected[0].id_ + this.subAgencyArray.forEach((element, index) => { + if (element.id === e.selected[0].id_) { + this.selAgencyIndex = index + this.orgChange(index) + } - }); + }); + } } - }, //下钻到下一级 toSubAgency (e) { if (this.method != 'mAddPolygon' && this.level != 'neighborHood') { + this.selAgencyId = '' //下钻到下一级 this.subAgencyArray.forEach(item => { if (item.id === e.selected[0].id_) { @@ -359,10 +361,12 @@ const vueGis = { //高亮某个标注 highlightPolygon () { + let features = polygonSource.getFeatures() features.forEach(element => { if (element.id_ === this.selAgencyId) { + selectedFeatures.push(element) } }); @@ -383,11 +387,11 @@ const vueGis = { //根据组织层级设置缩放级别 setZoom (agencyLevel) { if (agencyLevel === 'district') { - this.zoom = 14 + this.zoom = 13 } else if (agencyLevel === 'street') { - this.zoom = 15 + this.zoom = 14 } else if (agencyLevel === 'community') { - this.zoom = 16 + this.zoom = 15 } }, From 3e269ea8cd6ad7bdc1bc33a1d881ca150a107f37 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 19 Nov 2021 14:58:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/resiCate.vue | 80 ++++++++++++++++---------- 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue index 4eb670df..ca2b8292 100644 --- a/src/views/modules/workSys/resiCate.vue +++ b/src/views/modules/workSys/resiCate.vue @@ -2,35 +2,43 @@
- - - - - - - - - 查询 + + + + + + + + + + + + + + + 查询 + +
Date: Fri, 19 Nov 2021 15:53:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9C=B0=E5=9B=BEbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/basicInfoMain.scss | 40 +++++++++---- .../modules/base/community/buildForm.vue | 7 ++- .../modules/base/community/communityForm.vue | 8 ++- .../visual/basicinfo/basicInfoCommunity.vue | 10 +++- .../visual/basicinfo/basicInfoMain.vue | 60 +++++++------------ 5 files changed, 68 insertions(+), 57 deletions(-) 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; } From 79d57a5ce6122c5e3456f960d4389694032a5862 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 22 Nov 2021 09:41:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/resiCate.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue index ca2b8292..34146341 100644 --- a/src/views/modules/workSys/resiCate.vue +++ b/src/views/modules/workSys/resiCate.vue @@ -158,10 +158,10 @@ - 人/楼宇 + 人/楼宇 - 人/楼宇 + 人/楼宇
@@ -329,6 +329,9 @@ export default { this.conditions = val this.getTableData() }, + handleLevelChange(val) { + if (val > this.form.level2) this.form.level2 = val + }, handlerCancle() { this.dialogVisible = false @@ -380,12 +383,15 @@ export default { }, async handleEdit(row) { - this.form = { ...row } + this.form = { ...row, warn: row.warn == '1' ? true : false } this.dialogVisible = true }, async handleSUbmit() { this.$refs.ruleForm.validate(async (valid) => { if (valid) { + if (this.form.warn) { + if (!this.form.level1) return this.$message.error('黄色预警不能为0') + } this.btnLoading = true const _form = { ...this.form, From 094262c855871e9df4dda159b7abd7075c0fbeed Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 22 Nov 2021 10:11:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=80=BC=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/resiCate.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue index 34146341..32d6becb 100644 --- a/src/views/modules/workSys/resiCate.vue +++ b/src/views/modules/workSys/resiCate.vue @@ -264,8 +264,9 @@ export default { managementIcon: '', houseShowIcon: '', warn: '', - level1: '', - level2: '' + level1: 0, + level2: 0, + level3: 0 }, rules: { managementIcon: [{ required: true, message: '管理平台图标不能为空', trigger: 'blur' }], @@ -383,7 +384,13 @@ export default { }, async handleEdit(row) { - this.form = { ...row, warn: row.warn == '1' ? true : false } + this.form = { + ...row, + warn: row.warn == '1' ? true : false, + level1: row.level1 || 0, + level2: row.level2 || 0, + level3: row.level3 || 0 + } this.dialogVisible = true }, async handleSUbmit() {