diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index e18bc984..cef62b8a 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -219,6 +219,7 @@ export default {
longitude: 36.0722275, //经度
latitude: 120.38945519 //纬度
},
+ serviceList: []
}
},
@@ -233,6 +234,9 @@ export default {
this.startLoading()
this.$refs.ref_form.resetFields();
+ //获取服务事项
+ await this.loadService()
+
this.formType = type
if (activityId) {
this.activityId = activityId
@@ -244,7 +248,25 @@ export default {
}
this.endLoading()
+ },
+
+ //获取服务事项下拉框
+ async loadService () {
+ const url = "/heart/serviceitem/dict-list"
+
+ let params = {
+ type: 'usable'
+ // parentCategoryCode: '1010'
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.serviceList = data
+ } else {
+ this.$message.error(msg)
+ }
},
@@ -506,10 +528,10 @@ export default {
default: []
},
- serviceList: {
- type: Array,
- default: []
- },
+ // serviceList: {
+ // type: Array,
+ // default: []
+ // },
}
}
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 8cae50a1..d5679446 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -240,7 +240,6 @@
top="5vh"
@closed="editDiaClose">
@@ -305,24 +304,7 @@ export default {
agencyId: '',
unitList: [],//单位list
- serviceList: [
- {
- id: "1",
- name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
- },
- {
- id: "2",
- name: '积极配合'
- },
- {
- id: "3",
- name: '积极配合社区安全巡查员进行'
- },
- {
- id: "4",
- name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
- },
- ],//服务list
+ serviceList: [],//服务list
typeList: [],//分类list
unitId: '',
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 168763c0..7777b20c 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -190,6 +190,7 @@ export default {
longitude: 36.0722275, //经度
latitude: 120.38945519 //纬度
},
+ serviceList: [],//服务list
}
},
@@ -204,6 +205,9 @@ export default {
this.startLoading()
this.$refs.ref_form.resetFields();
+ //获取服务事项
+ await this.loadService()
+
this.formType = type
if (unitId) {
this.unitId = unitId
@@ -218,6 +222,25 @@ export default {
},
+ //获取服务事项下拉框
+ async loadService () {
+ const url = "/heart/serviceitem/dict-list"
+ let params = {
+ type: 'usable'
+ // parentCategoryCode: '1010'
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.serviceList = data
+
+ } else {
+ this.$message.error(msg)
+ }
+
+ },
+
//加载组织
async loadFormData () {
const url = '/heart/icpartyunit/detail'
@@ -481,10 +504,7 @@ export default {
type: Array,
default: []
},
- serviceList: {
- type: Array,
- default: []
- },
+
}
}
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 6ebcb622..48801936 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -6,8 +6,8 @@
-
-
+
+
@@ -19,6 +19,7 @@
+
@@ -370,88 +371,88 @@ export default {
.info_loading {
margin-top: 50px;
}
-.customer_select {
- /* 未选中任何选项的时候 placeholder的样式 需要先选中父元素 增加权重 */
- /deep/ input::-webkit-input-placeholder {
- color: #fff;
- }
- /deep/ input::-moz-input-placeholder {
- color: #fff;
- }
- /deep/ input::-ms-input-placeholder {
- color: #fff;
- }
- /* 修改的是el-input的样式 */
- /* 一种方法是设置最里层el-input__inner的背景色 外层的两级父元素设置为透明色 */
- /* 另一种方法是从el-select到el-input__inenr的背景色都设置为需要的颜色 */
- /deep/ .el-select,
- /deep/ .el-input,
- /deep/ .el-input__inner {
- background-color: #08164d00;
+.second-title {
+ display: flex;
+ align-items: center;
+ margin-top: 20px;
+ .second-title-label {
+ position: relative;
+ padding-left: 40px;
+ font-size: 16px;
+ font-weight: 500;
color: #fff;
- border: 0px;
- border-radius: 0px;
- text-align: left;
- font-size: 22px;
- font-family: PingFang SC;
- font-weight: 800;
- color: #ffffff;
- display: flex;
}
-
- /* el-input聚焦的时候 外层的border会有一个样式 */
- /deep/ .el-select .el-input.is-focus .el-input__inner {
- border: 0px;
- }
-
- /* 修改的是el-input上下的小图标的颜色 */
- /deep/ .el-select .el-input .el-select__caret::before {
- color: #fff;
+ .second-title-label::after {
content: "";
- background: url("../../../../assets/img/xiala.png") center center no-repeat;
position: absolute;
- width: 100%;
- height: 100%;
top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- }
-
- /* 修改总体选项的样式 最外层 */
- /deep/ .el-select-dropdown {
- background-color: #08164d;
- margin: 0px;
- border: 0px;
- border-radius: 0px;
- }
-
- /* 修改选项整体的样式 */
- /deep/ .el-select-dropdown__list {
- padding: 6px 0 20px 0;
- }
- /* 修改单个的选项的样式 */
- /deep/ .el-select-dropdown__item {
- background-color: transparent;
- color: #fff;
+ left: 20px;
+ width: 12px;
+ height: 12px;
+ box-sizing: border-box;
+ margin-top: -6px;
+ background: #2865fa;
+ border-radius: 50%;
}
+}
+.second-select {
+ margin: 0 10px 10px;
+ ::v-deep .el-input {
+ width: 180px;
+ height: 36px;
+ .el-input__inner {
+ height: 100%;
+ padding: 0 10px;
+ color: #fff;
+ line-height: 36px;
+ background: #06186d;
+ border: 1px solid #1a64cc;
+ }
- /* item选项的hover样式 */
- /deep/ .el-select-dropdown__item.hover,
- /deep/ .el-select-dropdown__item:hover {
- color: #409eff;
+ .el-icon-arrow-up:before {
+ content: "\e78f";
+ }
+ // .el-select__caret:before {
+ // content: '\E790'
+ // }
}
-
- /* 修改的是下拉框选项内容上方的尖角 */
- /deep/ .el-popper .popper__arrow,
- .el-popper .popper__arrow::after {
- display: none;
+ ::v-deep .el-date-editor {
+ width: 360px;
+ position: relative;
+ background: #06186d;
+ border: 1px solid #1a64cc;
+ .el-range-input {
+ color: #fff;
+ background: #06186d;
+ }
+ .el-range-separator {
+ color: #fff;
+ }
+ .el-range__icon {
+ position: absolute;
+ right: 5px;
+ // float: right;
+ }
+ .el-input__prefix {
+ left: unset;
+ right: 5px;
+ }
}
}
+.second-select:last-child {
+ margin-left: 0;
+ margin-bottom: 10px;
+}
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index fd637b06..9f8596ef 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -246,6 +246,7 @@ const vueGis = {
zoom: null,
parentPolygon: [],
+ centerFlag: 'point',//定义中心点的flag point点 fit 自适应
}
},
@@ -266,7 +267,7 @@ const vueGis = {
//加载当前园区的标注
this.loadPolygon(this.subAgencyArray)
-
+ this.setMapLocation()
await this.loadList()
},
@@ -366,6 +367,7 @@ const vueGis = {
this.orgData.zoom = map.getView().getZoom()
console.log('center', map.getView().getCenter())
console.log('zoom', map.getView().getZoom())
+
this.runAgencyArray.push(this.orgData)
this.subAgencyArray.forEach(item => {
@@ -396,20 +398,74 @@ const vueGis = {
//加载组织数据
await this.loadOrgData()
+
+ //绘制父级组织数据
this.loadParentPolygon()
+ //绘制本级组织数据
+ this.loadPolygon(this.subAgencyArray)
- //加载当前园区的标注
- await this.loadPolygon(this.subAgencyArray)
+ //重置地图中心点
- // //重置地图中心点
// if (isRefreshView) {
- // this.setMapLocation()
- // mapView.setCenter(this.centerPoint);
- // mapView.setZoom(this.zoom);
+ this.setMapLocation()
+
// }
await this.loadList()
+ },
+
+ //设置地图定位的中心点和缩放级别
+ setMapLocation () {
+ if (!this.zoom) {
+ this.setZoom(this.orgData.agencyLevel)
+ }
+ this.centerPoint = []
+
+
+ //如果存在中心点（返回时赋值）
+ if (this.center && this.center.length > 0) {
+ this.centerPoint = this.center
+ this.centerFlag = 'point'
+ this.center = []
+
+ } else if (parentLayer.getSource().getFeatures()[0]) {//如果是初次进入，不存在下级组织，用父级组织
+ this.centerFlag = 'flag_parent'
+
+
+ } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+ this.centerFlag = 'flag_polygon'
+
+ } else if (this.orgData.longitude && this.orgData.latitude) {
+ this.centerPoint.push(this.orgData.longitude)
+ this.centerPoint.push(this.orgData.latitude)
+ this.centerFlag = 'point'
+
+ } else {
+ this.centerPoint = centerPointGlobal
+ this.centerFlag = 'point'
+ }
+ // debugger
+ if (this.centerFlag === 'flag_parent') {
+ let parentFeatures = parentLayer.getSource().getFeatures()[0]
+ let polygon = parentFeatures.getGeometry();
+ map.getView().fit(polygon, map.getSize());
+ this.zoom = map.getView().getZoom() - 1
+
+ } else if (this.centerFlag === 'flag_polygon') {
+ let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+ let polygon = polygonFeatures.getGeometry();
+ map.getView().fit(polygon, map.getSize());
+ this.zoom = map.getView().getZoom() - 1
+
+ } else {
+ mapView.setCenter(this.centerPoint);
+
+ }
+ mapView.setZoom(this.zoom);
+
+
+
},
//返回所选组织
@@ -608,7 +664,7 @@ const vueGis = {
let oneArray = [x, y]
this.iconCoordinators.push(oneArray)
// debugger
- //视频监控样式
+ //地图icon样式
let oneCctv = new Feature({
geometry: new Point([x, y]),
id: oneIcon.id_,
@@ -637,26 +693,8 @@ const vueGis = {
iconSource.addFeatures(iconFeatures);
}
- // this.addGif()
-
},
- //设置地图定位的中心点和缩放级别
- setMapLocation () {
- this.centerPoint = []
- if (this.center && this.center.length > 0) {
- this.centerPoint = this.center
- } else if (this.orgData.longitude && this.orgData.latitude) {
-
- this.centerPoint.push(this.orgData.longitude)
- this.centerPoint.push(this.orgData.latitude)
- } else {
- this.centerPoint = centerPointGlobal
- }
- if (!this.zoom) {
- this.setZoom(this.orgData.agencyLevel)
- }
- },
//根据组织层级设置缩放级别
setZoom (agencyLevel) {
@@ -670,8 +708,23 @@ const vueGis = {
},
+ firstCenterMap () {
+ this.centerPoint = []
+ if (this.orgData.longitude && this.orgData.latitude) {
+ this.centerPoint.push(this.orgData.longitude)
+ this.centerPoint.push(this.orgData.latitude)
+
+ } else {
+ this.centerPoint = centerPointGlobal
+ }
+
+ if (!this.zoom) {
+ this.setZoom(this.orgData.agencyLevel)
+ }
+ },
+
initMap () {
- this.setMapLocation()
+ this.firstCenterMap()
gaodeMapLayer = new TileLayer({
title: "地图",
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 73236c98..410cffd0 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -657,82 +657,4 @@ export default {
scoped
>
-