-
+
+ placeholder="请选择或点击区域选择">
-
+
-
+ 请输入姓名
+
-
@@ -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;
}
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index c8114b35b..267b19fc6 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -4,7 +4,7 @@
-
+ 请输入姓名
+ 搜索
+ 搜索
+
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
}
},
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 4eb670df9..32d6becbc 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -2,35 +2,43 @@
-
-
-
-
-
-
-
-
-
-
- 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
@@ -188,13 +196,23 @@ export default {
total: null,
conditions: [],
tableData: [],
- value: '',
+ isWarn: null,
+ level: null,
options: [
{
label: '是',
value: 1
},{
label: '否',
+ value: 0
+ }
+ ],
+ optionsType: [
+ {
+ label: '黄色预警',
+ value: 1
+ },{
+ label: '红色预警',
value: 2
}
],
@@ -246,8 +264,9 @@ export default {
managementIcon: '',
houseShowIcon: '',
warn: '',
- level1: '',
- level2: ''
+ level1: 0,
+ level2: 0,
+ level3: 0
},
rules: {
managementIcon: [{ required: true, message: '管理平台图标不能为空', trigger: 'blur' }],
@@ -311,6 +330,9 @@ export default {
this.conditions = val
this.getTableData()
},
+ handleLevelChange(val) {
+ if (val > this.form.level2) this.form.level2 = val
+ },
handlerCancle() {
this.dialogVisible = false
@@ -362,12 +384,21 @@ export default {
},
async handleEdit(row) {
- this.form = { ...row }
+ 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() {
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,
@@ -458,6 +489,8 @@ export default {
this.tableLoading = true
let params = {
// formCode: 'resi_base_info',
+ isWarn: this.isWarn,
+ level: this.level,
pageNo: this.currentPage,
pageSize: this.pageSize
}