diff --git a/package.json b/package.json
index ca7e8abbb..6c2f6f5ac 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"babel-eslint": "^8.0.1",
"babel-plugin-component": "^1.1.1",
"echarts": "^5.2.2",
+ "echarts-gl": "^2.0.9",
"element-theme": "^2.0.1",
"element-ui": "^2.13.0",
"file-saver": "^2.0.5",
diff --git a/src/assets/img/shuju/3d-pid-bg.png b/src/assets/img/shuju/3d-pid-bg.png
new file mode 100644
index 000000000..4519b38e8
Binary files /dev/null and b/src/assets/img/shuju/3d-pid-bg.png differ
diff --git a/src/assets/img/shuju/volunteer3.png b/src/assets/img/shuju/volunteer3.png
index a070fa692..509fdf17f 100644
Binary files a/src/assets/img/shuju/volunteer3.png and b/src/assets/img/shuju/volunteer3.png differ
diff --git a/src/assets/scss/modules/visual/search_1.scss b/src/assets/scss/modules/visual/search_1.scss
index 55aaef76f..ffb46b67f 100644
--- a/src/assets/scss/modules/visual/search_1.scss
+++ b/src/assets/scss/modules/visual/search_1.scss
@@ -24,6 +24,7 @@
display: flex;
align-items: center;
margin-left:40px;
+ z-index: 10;
.second-select {
diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss
index bd9655728..ca099bed4 100644
--- a/src/assets/scss/modules/visual/shijianchulifenxi.scss
+++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss
@@ -21,8 +21,8 @@
}
.l_bottom {
- height: calc(100vh - 200px - 355px);
- margin-top: 20px;
+ height: calc(100vh - 200px - 365px);
+ margin-top: 0;
}
}
@@ -35,25 +35,7 @@
}
.l_bottom {
- .bottom_label {
- position: relative;
- padding-left: 40px;
- font-size: 16px;
- font-weight: 500;
- color: #fff;
- }
- .bottom_label::after {
- content: '';
- position: absolute;
- top: 50%;
- left: 20px;
- width: 12px;
- height: 12px;
- box-sizing: border-box;
- margin-top: -6px;
- background: #2865fa;
- border-radius: 50%;
- }
+
> span {
font-size: 18px;
font-family: PingFang SC;
@@ -66,6 +48,26 @@
}
}
+.bottom_label {
+ position: relative;
+ padding-left: 40px;
+ font-size: 16px;
+ font-weight: 500;
+ color: #fff;
+}
+.bottom_label::after {
+ content: '';
+ position: absolute;
+ top: 50%;
+ left: 20px;
+ width: 12px;
+ height: 12px;
+ box-sizing: border-box;
+ margin-top: -6px;
+ background: #2865fa;
+ border-radius: 50%;
+}
+
.g-r {
.m-tb {
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index dcfabd2ed..079ac1386 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -102,14 +102,6 @@ export default {
this.page = 1
this.query()
},
- // 新增 / 修改
- addOrUpdateHandle (id) {
- this.addOrUpdateVisible = true
- this.$nextTick(() => {
- this.$refs.addOrUpdate.dataForm.id = id
- this.$refs.addOrUpdate.init()
- })
- },
// 删除
deleteHandle (id) {
if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index ad7b9b0b1..05e086d92 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -1,92 +1,120 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ ns.label }}
-
-
-
-
-
- {{ns.label}}
-
-
-
-
-
-
-
+
+
+
+
+ {{ ns.label }}
+
+
+
+
+
+ {{ns.label}}
+
+
+
+
+
+
+
@@ -348,7 +380,7 @@ export default {
_form = { ...obj }
// return _form
}
- const itemTypes = ['daterange', 'timerange']
+ const itemTypes = ['cascader', 'daterange', 'timerange']
arr.forEach(item => {
if (item.multiSelect || itemTypes.includes(item.itemType)) {
if (item.columnValue && item.columnValue.indexOf(',') > -1) _form[item.columnName] = item.columnValue.split(',')
@@ -381,7 +413,7 @@ export default {
}
let form = initForm(this.formInfo, this.formList)
let rules = initRules(this.formList)
- let tempFormList = [ ...this.formList ]
+ let tempFormList = [...this.formList]
let constForm = {
...form
}
@@ -525,13 +557,13 @@ export default {
}
})
},
- getTreeData(data){
+ getTreeData (data) {
if (!Array.isArray(data)) return []
let arr = data.map(item => {
let _item = {}
if (item.children) {
if (item.children.length === 0) _item = { ...item, children: undefined }
- else _item = { ...item, children: this.getTreeData(item.children)}
+ else _item = { ...item, children: this.getTreeData(item.children) }
} else {
_item = { ...item }
}
@@ -613,9 +645,9 @@ export default {
this.getHouseList()
},
// 为了实现根据房屋类型改版是否租户的需求
- handleChangeH(val){
+ handleChangeH (val) {
let item = this.optionsH.find(item => item.value === val);
- if(item && item.type == '1'){
+ if (item && item.type == '1') {
this.form.IS_TENANT = '1'
console.log('item-----', item)
} else this.form.IS_TENANT = '0'
@@ -624,7 +656,7 @@ export default {
let arr = []
this.addList.forEach(item => {
// console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
- arr.push([ ...this.$refs['baseForms' + item.row][0].handleForm() ])
+ arr.push([...this.$refs['baseForms' + item.row][0].handleForm()])
})
if (arr.length === 0) return arr
let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
@@ -807,17 +839,16 @@ export default {
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 185d96020..842806954 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -187,6 +187,7 @@
size="small"
clearable
class="resi-cell-select"
+ :collapse-tags="n.multiSelect == 1 ? true : false"
:multiple="n.multiSelect == 1 ? true : false"
>
{
if (item.itemType == 'checkbox') _form[item.columnName] = []
- else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
+ else if (item.queryType == 'resi_category' && columnName ){
+ _form[item.columnName] = [columnName]
+ } else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
else if (item.itemType == 'inputRange') _form[item.columnName] = { start: '', end: ''}
else _form[item.columnName] = ''
})
+ console.log('_form----------rrr', _form)
return _form
}
let itemList = this.formList.map(item => {
@@ -289,7 +293,7 @@ export default {
return {
...item,
- isChange: this.columnName && this.columnName === item.columnName ? true : false
+ isChange:( item.queryType == 'resi_category' && this.columnName) || this.columnName === item.columnName ? true : false
}
})
let constForm = {
@@ -783,13 +787,13 @@ export default {
min-height: 32px;
}
.resi-cell-input {
- width: 200px;
+ max-width: 200px;
}
.resi-cell--daterange {
- max-width: 235px;
+ max-width: 240px;
}
.resi-cell-select {
- width: 200px;
+ max-width: 200px;
box-sizing: border-box;
margin-right: 10px;
&-middle {
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 5a9c703f2..ffaf80203 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -24,6 +24,21 @@
v-model="dataForm.buildingName">
+
+
+
+
+ 生成
+
+
+
+
+
+
+
+
@@ -169,9 +204,13 @@ export default {
totalUnitNum: 1,//单元数
totalFloorNum: 0,//层数
totalHouseNum: 0,//总户数
+ realPerson: 0,
buildingLeaderName: '',//楼长姓名
buildingLeaderMobile: '',//楼长电话
type: '',//房屋类型
+ coordinatePosition: '',
+ sysCoding: '',
+ coding: '',
location: '', //坐标位置
longitude: '', //经度
latitude: '' //纬度
@@ -199,7 +238,8 @@ export default {
if (row) {
this.dataForm = JSON.parse(JSON.stringify(row))
this.buildingId = this.dataForm.buildingId
- this.buildType = this.dataForm.buildingTypeKey
+ // this.buildType = this.dataForm.buildingTypeKey
+ this.buildType = this.dataForm.type
map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude))
this.setMarker(this.dataForm.latitude, this.dataForm.longitude)
@@ -226,6 +266,18 @@ export default {
})
},
+ async handleCode() {
+ const { data, code, msg } = await requestPost(
+ "/gov/org/houseInformation/getBuildingCoding/" + this.dataForm.neighborHoodId);
+ console.log('data----', data)
+ console.log('code----', code)
+ console.log('msg----', msg)
+ if (msg == "success" && code == 0) {
+ this.dataForm.coding = data.coding
+ this.dataForm.sysCoding = data.sysCoding
+
+ }
+ },
async addBuild () {
if (this.dataForm.buildingLeaderMobile) {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
@@ -328,12 +380,14 @@ export default {
let { data } = result
if (Array.isArray(data) && data.length > 0) {
const {
- location: { lat, lng }
+ location: { lat, lng },
+ address
} = data[0]
map.setCenter(new TMap.LatLng(lat, lng))
this.setMarker(lat, lng)
this.dataForm.latitude = lat
this.dataForm.longitude = lng
+ this.dataForm.coordinatePosition = address
} else {
this.$message.error('未检索到相关位置坐标')
}
@@ -405,6 +459,9 @@ export default {
totalUnitNum: [
{ required: true, message: '单元数不能为空', trigger: 'blur' }
],
+ coding: [
+ { required: true, message: '楼栋编码不能为空', trigger: 'blur' }
+ ]
// totalFloorNum: [
// { required: true, message: '层数不能为空', trigger: 'blur' }
// ],
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 68466e237..486dc9ec7 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -360,11 +360,12 @@ export default {
this.formShow = false
},
- handleDetail (row) {
+ async handleDetail (row) {
this.formTitle = '楼栋详情'
this.formShow = true
+ const _data = await this.detail(row)
this.$nextTick(() => {
- this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+ this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
})
},
@@ -376,11 +377,12 @@ export default {
})
},
- handleEdit (row) {
+ async handleEdit (row) {
this.formTitle = '修改楼栋'
this.formShow = true
+ const _data = await this.detail(row)
this.$nextTick(() => {
- this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+ this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
})
},
@@ -508,6 +510,18 @@ export default {
this.$message.error(msg)
}
},
+ async detail (row) {
+ const url = "/gov/org/houseInformation/getBuildingDetail/" + row.buildingId
+
+
+ const { data, code, msg } = await requestPost(url)
+
+ if (code === 0) {
+ return data
+ } else {
+ this.$message.error(msg)
+ }
+ },
//导出表格
async handleExport () {
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 18ba594ac..03b19b0de 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -131,15 +131,50 @@
class="diy-button--reset"
@click="resetSearch">重置
-
-
-
房主手机
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -508,6 +543,7 @@ export default {
}
+
+
+
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 9dd8aef98..bf588d58c 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -41,6 +41,21 @@
v-model="dataForm.neighborHoodName">
+
+
+
+
+ 生成
+
添加物业
+
+
+
{
- this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+ this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
})
},
@@ -371,7 +372,18 @@ export default {
this.$refs.ref_form.initForm('add', null, this.agencyObj)
})
},
+ async detail (row) {
+ const url = "/gov/org/houseInformation/neighborhoodDetail/" + row.neighborHoodId
+
+ const { data, code, msg } = await requestPost(url)
+
+ if (code === 0) {
+ return data
+ } else {
+ this.$message.error(msg)
+ }
+ },
// 补全一房一码点击事件
async handleYhymInfo () {
this.yhymLoading = true
@@ -400,11 +412,12 @@ export default {
}
},
- handleEdit (row) {
+ async handleEdit (row) {
this.formTitle = '修改小区'
this.formShow = true
+ const _data = await this.detail(row)
this.$nextTick(() => {
- this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+ this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
})
},
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 172254d25..c6381fb99 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -11,7 +11,7 @@
- {{ dataForm.neighborHoodName }}{{dataForm.buildingName}}
+ {{ agencyObj.neighborHoodName }}-{{agencyObj.label}}
-
+
+
+
+
+ 生成
+
下载
+
'
var position = document.getElementById("pos");
- var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+ if(this.latitude === null || this.latitude === "" || this.longitude === null || this.longitude === ""){
+ var center = new window.TMap.LatLng(36.116796, 120.339959);
+ }else {
+ var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+ }
+
//初始化地图
var map = new window.TMap.Map("con", {
center: center
diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 3a261a3a1..4e14bafea 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -26,6 +26,13 @@
clearable
>
+
+
+
{{ $t("query") }}
@@ -176,7 +183,8 @@ export default {
dataForm: {
buildingName: "",
communityName: "",
- gridId:""
+ gridId:"",
+ buildingAddr:""
},
caLouDongOptions:[],
optionsG:[]
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index b461b473d..4416b96c9 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -26,6 +26,13 @@
clearable
>
+
+
+
{{ $t("query") }}
@@ -176,7 +183,8 @@ export default {
dataForm: {
buildingName: "",
communityName: "",
- gridId:""
+ gridId:"",
+ buildingAddr:""
},
caLouDongOptions:[],
optionsG:[]
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index bb8ed3c34..c22dee647 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -33,6 +33,13 @@
clearable
>
+
+
+
{{ $t("query") }}
@@ -177,7 +184,8 @@ export default {
houseName: "",
residentName: "",
renterName: "",
- gridId:""
+ gridId:"",
+ houseAddress:""
},
caLouDongOptions:[],
optionsG:[]
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index cc9c0f3bb..b0b357e19 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -29,6 +29,13 @@
clearable
>
+
+
+
{{ $t("query") }}
@@ -189,7 +196,8 @@ export default {
idCard: "",
residentName: "",
telephone: "",
- gridId:""
+ gridId:"",
+ curliveAddressDetail:""
},
caLouDongOptions:[],
optionsG:[]
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 8111a77b1..eb4fe9398 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -29,6 +29,13 @@
clearable
>
+
+
+
{{ $t("query") }}
@@ -165,7 +172,8 @@ export default {
idCard: "",
residentName: "",
telephone: "",
- gridId:""
+ gridId:"",
+ curliveAddressDetail:""
},
caLouDongOptions:[],
optionsG:[]
diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
new file mode 100644
index 000000000..d3a9c1030
--- /dev/null
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("query") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 去处置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 6a07e6f1e..e5bbe954b 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -442,7 +442,14 @@ export default {
userId: this.rowData.icResiUserId,
joinReason: this.blacklistReason,
welfareFlag: this.welfareFlag,
- deathDate: this.deathDate
+ deathDate: this.deathDate
+ }
+ if (this.deathDate === '') {
+ this.$message({
+ message: '请选择死亡日期',
+ type:'warning'
+ })
+ return false
}
this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
if (res.code !== 0) {
diff --git a/src/views/modules/plugins/point/icpointNoice.vue b/src/views/modules/plugins/point/icpointNoice.vue
new file mode 100644
index 000000000..03f8b24e9
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointNoice.vue
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
new file mode 100644
index 000000000..d9cd4d37b
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -0,0 +1,464 @@
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
new file mode 100644
index 000000000..e84251927
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -0,0 +1,542 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("query") }}
+
+
+ 重置
+
+
+
+
+
+
+ {{ $t("add") }}
+ 下载模板
+
+
+ 导入
+
+ 导出
+
+
+ 发送通知
+
+
+
+
+
+
+
+
+
+ {{ "查看" }}
+ {{ scope.row.longitude === null ? "待完善" : "修改" }}
+ {{ $t("delete") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
new file mode 100644
index 000000000..a8a513143
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -0,0 +1,601 @@
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
new file mode 100644
index 000000000..1bb5ea05b
--- /dev/null
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -0,0 +1,520 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("query") }}
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ $t("add") }}
+ 下载模板
+
+
+ 导入
+
+ 导出
+ 发送通知
+
+
+
+
+
+
+
+ {{ scope.row.moStartTime }} - {{ scope.row.moEndTime }}
+
+
+
+
+ {{ scope.row.afStartTime }} - {{ scope.row.afEndTime }}
+
+
+
+
+
+
+
+ {{ "查看" }}
+ {{ scope.row.longitude === null ? "待完善" : "修改" }}
+ {{ $t("delete") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 53e007da4..1f646b050 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -62,7 +62,9 @@
@clickFeature="clickMap"
:showIconLayer="true"
:showPolygonLayer="true"
+ :showPolIconLayer="true"
:clickType="'popup'"
+ :areaScale="0.1"
:isAddOpenlay="true">
@@ -111,6 +113,7 @@ const legendList = [
{ name: '#8fc41e', icon: require('../../../../../assets/img/shuju/volunteer7.png') },
{ name: '#00a1be', icon: require('../../../../../assets/img/shuju/volunteer8.png') },
{ name: '#0067b6', icon: require('../../../../../assets/img/shuju/volunteer9.png') },
+ { name: '#e5007f', icon: require('../../../../../assets/img/shuju/volunteer3.png') },
{ name: '', icon: require('../../../../../assets/img/shuju/volunteer1.png') }
]
const defaultLegendIcon = require('../../../../../assets/img/shuju/volunteer1.png')
@@ -164,10 +167,10 @@ export default {
require('../../../../../assets/img/shuju/volunteer5.png'), // 楼委会
require('../../../../../assets/img/shuju/volunteer7.png'), // 老友俱乐部
require('../../../../../assets/img/shuju/volunteer8.png'), // 治安巡逻
+ require('../../../../../assets/img/shuju/volunteer3.png'), // 应急队伍
require('../../../../../assets/img/shuju/volunteer9.png'), // 其他
require('../../../../../assets/img/shuju/volunteer1.png'), // 采集员
require('../../../../../assets/img/shuju/volunteer2.png'), // 代办员
- require('../../../../../assets/img/shuju/volunteer3.png'), // 能人达人
require('../../../../../assets/img/shuju/volunteer6.png'), // 调解员
],
polygonList: []
@@ -220,7 +223,7 @@ export default {
}
this.pieData.push(ob)
})
- this.getMapData()
+ // this.getMapData()
} else {
this.$message.error(msg)
}
@@ -364,6 +367,9 @@ export default {
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
+ this.agencyInfo.agencyLevel = data.agencyLevel,
+ this.agencyInfo.longitude = data.longitude,
+ this.agencyInfo.latitude = data.latitude
let subPolygonList = []
data.children.forEach((item, index) => {
if (item.coordinates && item.coordinates.length > 0) {
@@ -765,7 +771,10 @@ export default {
align-items: center;
margin-top: 10px;
margin-right: 40px;
-
+ .title-icon {
+ width: 40px;
+ height: 34px;
+ }
.map-tips-icon {
width: 20px;
height: 10px;
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
index ae6ffd8ce..3afabd257 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
@@ -44,7 +44,7 @@ export function pieOption (_charts) {
// tooltip: {
// },
center: center,
- radius: ['53%', '53.3%'],
+ radius: ['48%', '48.3%'],
label: {
show: false
},
@@ -70,7 +70,7 @@ export function pieOption (_charts) {
// name: 'Access From',
type: 'pie',
center: center,
- radius: ['30%', '43%'],
+ radius: ['25%', '38%'],
avoidLabelOverlap: false,
// top: top + '%',
// height: '80%',
@@ -87,14 +87,14 @@ export function pieOption (_charts) {
edgeDistance: 1,
lineHeight: 15,
color: '#fff',
- fontSize: 10,
+ fontSize: 8,
// distanceToLabelLine: -60,
rich: {
name: {
padding: [0, 6, 0, 6]
},
a: {
- fontSize: 25,
+ fontSize: 23,
color: '#fff',
padding: [0, 6, 6, 6]
},
@@ -110,9 +110,9 @@ export function pieOption (_charts) {
labelLine: {
show: false,
smooth: 0.2,
- length: 40,
+ length: 20,
length2: 0,
- maxSurfaceAngle: 80
+ maxSurfaceAngle: 60
},
labelLayout: function (params) {
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/chart.js b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
new file mode 100644
index 000000000..f7c5dda59
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
@@ -0,0 +1,276 @@
+/**
+ * 绘制3d图
+ * @param pieData 总数据
+ * @param internalDiameterRatio:透明的空心占比
+ * @param distance 视角到主体的距离
+ * @param alpha 旋转角度
+ * @param pieHeight 立体的高度
+ * @param opacity 饼或者环的透明度
+ */
+ const getPie3D = (pieData, internalDiameterRatio, distance, alpha, pieHeight, opacity = 1) => {
+ const series = []
+ let sumValue = 0
+ let startValue = 0
+ let endValue = 0
+ let legendData = []
+ let legendBfb = []
+ const k = 1 - internalDiameterRatio
+ pieData.sort((a, b) => {
+ return b.value - a.value
+ })
+ // 为每一个饼图数据,生成一个 series-surface 配置
+ for (let i = 0; i < pieData.length; i++) {
+ sumValue += pieData[i].value
+ const seriesItem = {
+ name:
+ typeof pieData[i].name === 'undefined'
+ ? `series${i}`
+ : pieData[i].name,
+ type: 'surface',
+ parametric: true,
+ wireframe: {
+ show: false
+ },
+ pieData: pieData[i],
+ pieStatus: {
+ selected: false,
+ hovered: false,
+ k: k
+ },
+ center: ['10%', '50%']
+ }
+ if (typeof pieData[i].itemStyle !== 'undefined') {
+ const itemStyle = {}
+ itemStyle.color =
+ typeof pieData[i].itemStyle.color !== 'undefined'
+ ? pieData[i].itemStyle.color
+ : opacity
+ itemStyle.opacity =
+ typeof pieData[i].itemStyle.opacity !== 'undefined'
+ ? pieData[i].itemStyle.opacity
+ : opacity
+ seriesItem.itemStyle = itemStyle
+ }
+ series.push(seriesItem)
+ }
+
+ // 使用上一次遍历时,计算出的数据和 sumValue,调用 getParametricEquation 函数,
+ // 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation,也就是实现每一个扇形。
+ legendData = []
+ legendBfb = []
+ for (let i = 0; i < series.length; i++) {
+ endValue = startValue + series[i].pieData.value
+ series[i].pieData.startRatio = startValue / sumValue
+ series[i].pieData.endRatio = endValue / sumValue
+ series[i].parametricEquation = getParametricEquation(
+ series[i].pieData.startRatio,
+ series[i].pieData.endRatio,
+ false,
+ false,
+ k,
+ series[i].pieData.value
+ )
+ startValue = endValue
+ const bfb = fomatFloat(series[i].pieData.value / sumValue, 4)
+ legendData.push({
+ name: series[i].name,
+ value: bfb
+ })
+ legendBfb.push({
+ name: series[i].name,
+ value: bfb
+ })
+ }
+ const boxHeight = getHeight3D(series, pieHeight) // 通过pieHeight设定3d饼/环的高度,单位是px
+ // 准备待返回的配置项,把准备好的 legendData、series 传入。
+ const option = {
+ legend: {
+ show: false,
+ data: legendData,
+ orient: 'vertical',
+ left: 10,
+ top: 10,
+ itemGap: 10,
+ textStyle: {
+ color: '#A1E2FF'
+ },
+ icon: 'circle',
+ formatter: function (param) {
+ const item = legendBfb.filter(item => item.name === param)[0]
+ const bfs = fomatFloat(item.value * 100, 2) + '%'
+ return `${item.name} ${bfs}`
+ }
+ },
+ labelLine: {
+ show: true,
+ lineStyle: {
+ color: '#fff'
+ }
+ },
+ label: {
+ show: true,
+ position: 'outside',
+ formatter: '{b} \n{c} {d}%'
+ },
+ tooltip: {
+ backgroundColor: '#033b77',
+ borderColor: '#21f2c4',
+ textStyle: {
+ color: '#fff',
+ fontSize: 13
+ },
+ formatter: params => {
+
+ // if (
+ // params.seriesName !== 'mouseoutSeries' &&
+ // params.seriesName !== 'pie2d'
+ // ) {
+ // const bfb = (
+ // (option.series[params.seriesIndex].pieData.endRatio -
+ // option.series[params.seriesIndex].pieData.startRatio) *
+ // 100
+ // ).toFixed(2)
+ // return (
+ // `${params.seriesName}
` +
+ // `
` +
+ // `${bfb}%`
+ // )
+ // }
+ }
+ },
+ xAxis3D: {
+ min: -1,
+ max: 1
+ },
+ yAxis3D: {
+ min: -1,
+ max: 1
+ },
+ zAxis3D: {
+ min: -1,
+ max: 1
+ },
+ grid3D: {
+ show: false,
+ boxHeight: boxHeight, // 圆环的高度
+ viewControl: {
+ // 3d效果可以放大、旋转等,请自己去查看官方配置
+ alpha, // 角度
+ beta: -40,
+ distance, // 调整视角到主体的距离,类似调整zoom
+ rotateSensitivity: 0, // 设置为0无法旋转
+ zoomSensitivity: 0, // 设置为0无法缩放
+ panSensitivity: 0, // 设置为0无法平移
+ autoRotate: false // 自动旋转
+ }
+ },
+ series: series
+ }
+ return option
+}
+
+/**
+ * 生成扇形的曲面参数方程,用于 series-surface.parametricEquation
+ */
+const getParametricEquation = (startRatio, endRatio, isSelected, isHovered, k, h) => {
+ // 计算
+ const midRatio = (startRatio + endRatio) / 2
+ const startRadian = startRatio * Math.PI * 2
+ const endRadian = endRatio * Math.PI * 2
+ const midRadian = midRatio * Math.PI * 2
+ // 如果只有一个扇形,则不实现选中效果。
+ if (startRatio === 0 && endRatio === 1) {
+ isSelected = false
+ }
+ // 通过扇形内径/外径的值,换算出辅助参数 k(默认值 1/3)
+ k = typeof k !== 'undefined' ? k : 1 / 3
+ // 计算选中效果分别在 x 轴、y 轴方向上的位移(未选中,则位移均为 0)
+ const offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0
+ const offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0
+ // 计算高亮效果的放大比例(未高亮,则比例为 1)
+ const hoverRate = isHovered ? 1.05 : 1
+ // 返回曲面参数方程
+ return {
+ u: {
+ min: -Math.PI,
+ max: Math.PI * 3,
+ step: Math.PI / 32
+ },
+ v: {
+ min: 0,
+ max: Math.PI * 2,
+ step: Math.PI / 20
+ },
+ x: function (u, v) {
+ if (u < startRadian) {
+ return (
+ offsetX +
+ Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate
+ )
+ }
+ if (u > endRadian) {
+ return (
+ offsetX + Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate
+ )
+ }
+ return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate
+ },
+ y: function (u, v) {
+ if (u < startRadian) {
+ return (
+ offsetY +
+ Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate
+ )
+ }
+ if (u > endRadian) {
+ return (
+ offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate
+ )
+ }
+ return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate
+ },
+ z: function (u, v) {
+ if (u < -Math.PI * 0.5) {
+ return Math.sin(u)
+ }
+ if (u > Math.PI * 2.5) {
+ return Math.sin(u) * h * 0.1
+ }
+ return Math.sin(v) > 0 ? 1 * h * 0.1 : -1
+ }
+ }
+}
+
+/**
+ * 获取3d丙图的最高扇区的高度
+ */
+const getHeight3D = (series, height) => {
+ series.sort((a, b) => {
+ return b.pieData.value - a.pieData.value
+ })
+ return (height * 25) / series[0].pieData.value
+}
+
+/**
+ * 格式化浮点数
+ */
+const fomatFloat = (num, n) => {
+ let f = parseFloat(num)
+ if (isNaN(f)) {
+ return false
+ }
+ f = Math.round(num * Math.pow(10, n)) / Math.pow(10, n) // n 幂
+ let s = f.toString()
+ let rs = s.indexOf('.')
+ // 判定如果是整数,增加小数点再补0
+ if (rs < 0) {
+ rs = s.length
+ s += '.'
+ }
+ while (s.length <= rs + n) {
+ s += '0'
+ }
+ return s
+}
+
+export { getPie3D, getParametricEquation }
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
index 04b4f9503..d02e4b20b 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
@@ -1,4 +1,11 @@
import * as echarts from 'echarts'
+let circleList = [
+ 'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFdklEQVRYhY1YTY/bRBh+/BHbiRN7l02bqst+st1dVT0gceXABYk7PfYPwIELv4IfABJ3euuBCxKCKxckBEKi2y1F6Xa3abTZT+fLHxnbaMZje+zE3Y70aiLPzPs888w778xEin/8EO9YJKGbVDEkrvhdWdSKBumGehGJReBVdVZyApsPk/roicSdi4aKb4sUEK38jeLEHIdVRQWOnsgLgORCLWsKzFUDqlmHXEvGRzMCMnEx6XmIgpCDRaU6saMnMTYfRpmMQgzIJdCiNTebqHc6kHUbMYkQBT7ikCReFBWypkNSZUS+A/f0FOOjMSdRtlgglikgypwCK8z0FQPWzgYkpQn/8grT3jFmo0ggjMxhrSWjsWqhcXcP9c4Yo5fH8AYugFDQOSVBx8apAqkzRQBXYd1bhnF7G8HVNZznV4hDhZNWuIkEQm4EkhLC3luGtrwEb9DF8MUV+560R7xmpFXMB1kCYu+1obc3MD7qY9qbAagDqHFTKwhQkBnicIbrgyEaqy6am9uQ5Fdwnp8LfaW0FpcgX3NzvcXARy/6cAchB9e5aZxEqhaEWVGiAQCftU97PuJZH617GzBdH5Njh4/JglKdi3i1XkNzbQuTNwO4A8LBjZJpXAWRAOHgnkBOgjtwoZgD5tM/ewripkHJMFMHuQr2fgehTzB+ORVmTUmYAJoAWgAsAHbJLN7W5H1z1agv6pP6LgZvYRdIkGsKVLOD64Mel1njM6fOGtxxg33rfLwNe3+DjXYOX+H0t64we0nYasnSjLrnWLq/CrnWZ3mDkygSsHdtRLMA/iXhYJqgQELAuvc+9r98BOPWeqbdnU+Ajc+PcfjdDxi+eC2Akywu/MsJ800xrp6epQTkwi5QmzYCZ8yJqYIKCYn6nTYefP1FATwt9Btto31y+TVh16jMN8UQMOWCAnKtgeDaK+SCnISGDx59CrW5PAeeLWhzmfVJ+xe3rMx8yzVTPE+KQSgpOmbD2cKMyBLTzoNK8LQkfcRkJWdKU9+SoolBKJeGS4gjlLZmbkrdupGA0rAqx+e+s1ImEPNVKR+riYX+6EYCoTeqHJ/7XkggRhwGqFk1IYqjQo4fdZ/dSGDUPRTyfij4iZlviiGQSAkkDKPZFJplCMBEyHABuo9/BZlWq0Dbuo9/yfrn4xMi1DfFEC4ossAmBpk4qC01CwdLnts9TE5Ocfjt9wicwRx44CRttE+SkHw+dpaRoL4phoCpZuDURl0HKx9tQVuiW6ac25MMd/l3F79/9Q1WP7uP1vY6l/0YvZ8PEIf07J9yc/nYRAnqU9F1XP/jiAoUCZApAZkO0Npq4+KvMz5YFRJWcuzSdXz90x8A/uTjIz5TnwOnBHIVWlu3mG+KUVoCCCQiOAd9KA0d5pohKJA6pVmSxsCQngAlG/K28ZwC1JfSMJjv/EaEVAFxq0QgLoHbfwlzfQdk2oN/4S3I7W+7D/gF01ckmOsduP3/mO/SJbW4BKkjGguKfgJ7fw3Df9/AO/OEwAxuvBGlshu3FFi7dxFcnjCf+bYsxEB6RUovCSGrr58NYO9FsHY3ob93Aee5w52rhQuHuHzi1rX3bOjtFfjnR/w6Fop3wXRceikt3/9TABX1TgOt7Q12unnnV5icjBB65fhJlkExAHOtBaO9zOQfdV/BPZ1yUlFJgUgkAIFA+V2QkLF2LRjt25BVC2HgI/LpuyCZiaTIkHUdiqYjIkP4F2dcsaiUDefeBSKBRQeIPFerpgJz3YRq1NlDhAlJIhDPxeR4AjKZm2U58BblgfTNFvPnWeHqLMQHQCYSnGd+xeM0fwNWAGbPMv42rHqelx+gVa/lcnnba1gkl5Wq53m587v8NyCOXfR7vgD4H8khvGFl000HAAAAAElFTkSuQmCC',
+ 'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFb0lEQVRYhY1YW28bRRT+ZtbrS24mjVu3btPUDoiqFIEQ4gUh8dKX8hf4A/wT+Am88cA7b5GgrxVPFIREL0rapHHbOHGcxM7Fa3u9c9BMZrZn1+umI43W2j2Xb75z5pwZi89/JLznEExMTFGhKb+njtyUD+KCZxaILOfTnvGIAfj3z5/hmjGcnpjyLosBPtPvtB+yfsxIMBCuQWY4komnD09eRVHMoISc1R9jTH0EahcDhIisM5V6mhmugfz75t35qlgOyJTTxJQ3MCcqqIo8yhRBIcQQCmOrmYOPgvAgaYQedbCnXuPUgkhPYsBiBjjNzrGnp1hEUd7CCiTmqIsjtYsmnRllyfSMQTELKa5iQVTxsXcZp6qJJh0gAAwrbjgQWpc4gLTznKxjUSyhgR660Qu8hDLv8w5cCkBEZ4joBU4h0fNWsSjr+IQWsKm2cDQlYQ2AdJKdO2+gIi5hhV6jpXYRAijpHLIzlwXAZAMQ6gBFGziWVxGIG2hIgW21iQ6TFe7JGYhjLmuY187VS7SoYwxr5wU78xaEZ+VhaY2Mc2AEYKi/q10MxRgtHUI5wFDtoGd14qTMpTNeFOHLGupqD23qmBVp58XUzFsWOICxdT5g4AR1EFAJbW2TDvGYBnFSCs5AzIJcRZVGGKtX6AOYsasu2d8lxoafAhDalfPwmOTUtsQi5rXt6DFe8zqSTEIfnphBNdrAG+sgb1fuAMzaZ7FxG40rNaxo5fYOtjefYZOtXrCtZkKjmuh4H+E6fLQQGrbEBACvjjKFGFHXCMxaAJyB2cvXcOPre/h+dgE33SpW7wCffoXmnw/w637LrJBYWExeUBdn2rb2Ea1j3wGQiV0wgzKdmAKSs9PnIOY/QOXb7/ADd+7G3AJu6m9ahoUpz3ZNztieQZn7lJwB4WOGjg2NcS1gIPJffoN7+SIW087d0N+0jJNPbVmpbQvfMCs4A2+TUKKAU0PZREXUhipV3J3m3A0rk2N6MmZa25YGWJyEMqUvSLGkTE0/j4WLAPgFI5Opz2zHIw2AbFDSbfW8k4U4uQhAODIymfrMdiYAgsIIcyZuxDpY5MrsYRtPLwJw2MYzm/1OT8UNSNtWplglWnC8YhqjL+bNvlestrsKN3r0EA/sCqeu/tFD/OHkmb4Bom1rH/yAIhkaQh89MY+5RGN5W9sH3QPsPfwdPwd9tNPOg/75Ny1jC9LQ6oYOhLHdN/0g0Q1jBlQTPe8u6qIMSb2J2m4q3M42Nn/7BT/d/gx3KtXzetDZQ/PZv3hCyvT+vp2B1TVMaJsij0K0HgMwIBIAKMCYBmjLZVSinqlWI9Z0XHmNSGH09B/8BeBvq897QcAAxCzIZVzWtrWPLAAOhFIbaMm7qMgaimrHKPNEdeV1eEE3HHAGtC1RRDH6D+vsRAQHgG8VRQOMqY0tUcOHIsAbOjJG0rX9XeeBIZ9iEULUUFVtPNe2kTqkJkLgDOlckHm8kqtYVlvYoQMDImKrfPeJyNIuluDJOmrUxSttk23LRAjcEckdErSQUM/Rlg0or45bqowDtWkMhLy2pw+lfOvKBsryEpbUIV7a45irC/GJOM2AYB+MoFakE/TlMla8L1CmQxypFk4MuZNVVOn+J6+Z45xuWMNoG09o3yTkGMnjOTJ3AYvn252xj9NoH09lHQtiCVdyVdwifScYYYjIynqmxRSEjwKNcUxdbKkXhjGVqoYqlXMTu4BnO88LqbZwiC10RQmeuI5ZUUAJecvCGIqOEag3OKMgEefM21F6F5hh72xkr2eJozPLD1AAQc9NELIup9x4VkOCu5ZN3A3dC+6MGZt2W06Pd92G3QITY9r1PEHTe/43wHWzfk8OAP8D28XBfaJJ48oAAAAASUVORK5CYII='
+]
+let className = ['1号停车场', '2号停车场', '3号停车场', '4号停车场', '5号停车场', '6号停车场', '7号停车场']
+let serviceCount = [50, 28, 17, 38, 90, 73, 39]
+
export function lineOption () {
return {
@@ -11,6 +18,13 @@ export function lineOption () {
}
}
},
+ // grid: {
+ // left: '5%',
+ // right: '5%',
+ // bottom: '5%',
+ // top: '10%',
+ // containLabel: true
+ // },
xAxis: {
type: 'category',
// boundaryGap: false,
@@ -25,7 +39,8 @@ export function lineOption () {
lineStyle: {
color: '#0c4b59'
}
- }
+ },
+ // data: className
},
yAxis: {
nameTextStyle: {
@@ -58,29 +73,82 @@ export function lineOption () {
}
}
},
+ // series: [
+ // {
+ // name: '项目数',
+ // type: 'line',
+ // smooth: true,
+ // barWidth: 15,
+ // areaStyle: {},
+ // itemStyle: {
+ // color: new echarts.graphic.LinearGradient(
+ // 0, 1, 0, 0,
+ // [
+ // { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+ // { offset: 1, color: '#6339FF' }
+ // ]
+ // )
+ // }
+ // },
+ // // {
+ // // data: [820, 932, 901, 934, 1290, 1330, 1320],
+ // // type: 'line',
+ // // areaStyle: {}
+ // // }
+ // ]
series: [
{
- name: '项目数',
- type: 'line',
- smooth: true,
- barWidth: 15,
- areaStyle: {},
- itemStyle: {
- color: new echarts.graphic.LinearGradient(
- 0, 1, 0, 0,
- [
- { offset: 0, color: 'rgba(121, 55, 255, 0)' },
- { offset: 1, color: '#6339FF' }
- ]
- )
- }
+ name: '',
+ type: 'bar',
+ zlevel: 1,
+ itemStyle: {
+
+ normal: {
+ barBorderRadius: 0,
+ color: function (params) {
+ // 大于等于50%的是黄色 反之为蓝色
+ var colorList = [
+ ['rgba(252, 210, 152, .2)', 'rgba(252, 210, 152, 1)'],
+ ['rgba(36, 253, 231, .2)', 'rgba(36, 253, 231, 1)'],
+ ];
+ var colorItem
+
+ colorItem = colorList[1];
+
+ // 设置线条渐变色
+ return new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+ offset: 0,
+ color: colorItem[0]
+ },
+ {
+ offset: 1,
+ color: colorItem[1]
+ }
+ ], false);
+ }
+
+ },
+ },
+ barWidth: 4,
+ // data: serviceCount
+ },
+
+ {
+ name: 'XXX',
+ type: 'pictorialBar',
+ symbol: function (params, value) {
+ // 设置图片
+
+ return circleList[1]
},
- // {
- // data: [820, 932, 901, 934, 1290, 1330, 1320],
- // type: 'line',
- // areaStyle: {}
- // }
+ symbolPosition: 'end',
+ symbolSize: [30, 30],
+ symbolOffset: [0, -12],
+ z: 20,
+ // data: serviceCount
+ }
]
+
}
}
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
index 5eb83badb..6e9b5c886 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
@@ -1,183 +1,184 @@
export function pieOption (_charts) {
-const center= ['50%', '170px']
- return {
- title: {
- text: '0',
- top: 140,
- left: 'center',
- textStyle: {
- width: '100%',
- fontSize: 32,
- color: '#FFFFFF',
- fontWeight: 400
- },
- itemGap: 5,
- subtext: '总数',
- subtextStyle: {
- fontSize: 20,
- color: '#fff',
- fontWeight: 400
- }
- },
- tooltip: {
- show: false
- },
- // legend: {
- // top: 350,
- // bottom: 0,
- // itemWidth: 20,
- // itemHeight: 10,
- // textStyle: {
- // color: '#D2E7FF',
- // fontSize: 16,
- // lineHeight: 20,
- // },
-
- // },
- series: [
- // 外侧圆环
- {
- type: 'pie',
- // 起始刻度的角度,默认为 90 度,即圆心的正上方。0 度为圆心的正右方。
- startAngle: 0,
- hoverAnimation: false,
- // tooltip: {
- // },
- center: center,
- radius: ['58%', '58.3%'],
- label: {
- normal: {
- show: false
- }
- },
- labelLine: {
- normal: {
- show: false
- }
+ const center= ['50%', '170px']
+ return {
+ title: {
+ text: '0',
+ top: 140,
+ left: 'center',
+ textStyle: {
+ width: '100%',
+ fontSize: 32,
+ color: '#FFFFFF',
+ fontWeight: 400
},
- data: [{
- value: 360,
- itemStyle: {
- normal: {
- color: 'rgba(40, 101, 250, 0)',
- width:0,
- borderColor: 'rgba(40, 101, 250, 0.5)',
- borderWidth: 1,
- borderType: 'dotted'
- }
- }
+ itemGap: 5,
+ subtext: '总数',
+ subtextStyle: {
+ fontSize: 20,
+ color: '#fff',
+ fontWeight: 400
}
- ]
},
-
- // 突出的
- {
- hoverAnimation: false,
- // name: 'Access From',
- type: 'pie',
- center: center,
- radius: ['35%', '48%'],
- avoidLabelOverlap: false,
- // top: top + '%',
- // height: '80%',
- selectedMode: 'single',
- left: 'center',
- width: 400,
- label: {
- // show: false,
- position: 'outside',
- alignTo: 'edge',
- // formatter: '{a|{c}}\n\n{name|{b}}',
- formatter: '{a|{c}%}\n{r|}\n{name|{b}}',
- minMargin: 5,
- edgeDistance: 1,
- lineHeight: 15,
- color: '#fff',
- fontSize: 12,
- // distanceToLabelLine: -60,
- rich: {
- name: {
- padding: [0, 6, 0, 6]
- },
- a: {
- fontSize: 30,
- color: '#fff',
- padding: [0, 6, 6, 6]
- },
- r: {
- backgroundColor: 'auto',
- borderRadius: 6,
- width: 6,
- height: 6,
- // padding: [3, 3, 0, -12]
- }
- }
- },
- labelLine: {
- show: false,
- smooth: 0.2,
- length: 30,
- length2: 0,
- maxSurfaceAngle: 80
- },
- labelLayout: function (params) {
-
- const isLeft = params.labelRect.x < _charts.getWidth() / 2;
- const points = params.labelLinePoints;
- // Update the end point.
- if (points) {
- points[2][0] = isLeft
- ? params.labelRect.x
- : params.labelRect.x + params.labelRect.width;
- }
-
- return {
- labelLinePoints: points
- };
- },
- itemStyle: {
- color:function(params) {
- //自定义颜色
- var colorList = [ '#FAC126', '#3DDA83'];
- return colorList[params.dataIndex]
- }
- },
- data: [],
-
+ tooltip: {
+ show: false
},
- // 中间圆环
- {
+ // legend: {
+ // top: 350,
+ // bottom: 0,
+ // itemWidth: 20,
+ // itemHeight: 10,
+ // textStyle: {
+ // color: '#D2E7FF',
+ // fontSize: 16,
+ // lineHeight: 20,
+ // },
+
+ // },
+ series: [
+ // 外侧圆环
+ {
type: 'pie',
// 起始刻度的角度,默认为 90 度,即圆心的正上方。0 度为圆心的正右方。
startAngle: 0,
hoverAnimation: false,
- center: center,
// tooltip: {
// },
- radius: ['0%', '25%'],
+ center: center,
+ radius: ['58%', '58.3%'],
label: {
-
+ normal: {
show: false
-
+ }
},
labelLine: {
-
+ normal: {
show: false
-
+ }
},
data: [{
value: 360,
itemStyle: {
normal: {
- color: 'rgba(8, 37, 134, 1)',
-
+ color: 'rgba(40, 101, 250, 0)',
+ width:0,
+ borderColor: 'rgba(40, 101, 250, 0.5)',
+ borderWidth: 1,
+ borderType: 'dotted'
}
}
}
]
},
- ]
-
+
+ // 突出的
+ {
+ hoverAnimation: false,
+ // name: 'Access From',
+ type: 'pie',
+ center: center,
+ radius: ['35%', '48%'],
+ avoidLabelOverlap: false,
+ // top: top + '%',
+ // height: '80%',
+ selectedMode: 'single',
+ left: 'center',
+ width: 400,
+ label: {
+ // show: false,
+ position: 'outside',
+ alignTo: 'edge',
+ // formatter: '{a|{c}}\n\n{name|{b}}',
+ formatter: '{a|{c}%}\n{r|}\n{name|{b}}',
+ minMargin: 5,
+ edgeDistance: 1,
+ lineHeight: 15,
+ color: '#fff',
+ fontSize: 12,
+ // distanceToLabelLine: -60,
+ rich: {
+ name: {
+ padding: [0, 6, 0, 6]
+ },
+ a: {
+ fontSize: 30,
+ color: '#fff',
+ padding: [0, 6, 6, 6]
+ },
+ r: {
+ backgroundColor: 'auto',
+ borderRadius: 6,
+ width: 6,
+ height: 6,
+ // padding: [3, 3, 0, -12]
+ }
+ }
+ },
+ labelLine: {
+ show: false,
+ smooth: 0.2,
+ length: 30,
+ length2: 0,
+ maxSurfaceAngle: 80
+ },
+ labelLayout: function (params) {
+
+ const isLeft = params.labelRect.x < _charts.getWidth() / 2;
+ const points = params.labelLinePoints;
+ // Update the end point.
+ if (points) {
+ points[2][0] = isLeft
+ ? params.labelRect.x
+ : params.labelRect.x + params.labelRect.width;
+ }
+
+ return {
+ labelLinePoints: points
+ };
+ },
+ itemStyle: {
+ color:function(params) {
+ //自定义颜色
+ var colorList = [ '#FAC126', '#3DDA83'];
+ return colorList[params.dataIndex]
+ }
+ },
+ data: [],
+
+ },
+ // 中间圆环
+ {
+ type: 'pie',
+ // 起始刻度的角度,默认为 90 度,即圆心的正上方。0 度为圆心的正右方。
+ startAngle: 0,
+ hoverAnimation: false,
+ center: center,
+ // tooltip: {
+ // },
+ radius: ['0%', '25%'],
+ label: {
+
+ show: false
+
+ },
+ labelLine: {
+
+ show: false
+
+ },
+ data: [{
+ value: 360,
+ itemStyle: {
+ normal: {
+ color: 'rgba(8, 37, 134, 1)',
+
+ }
+ }
+ }
+ ]
+ },
+ ]
+
+ }
}
-}
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue
new file mode 100644
index 000000000..8ec4d06f2
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy 2.vue
@@ -0,0 +1,328 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
new file mode 100644
index 000000000..301a60a96
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
@@ -0,0 +1,740 @@
+
+
+
+

+
事件处理分析
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{item.name}}
+
![]()
+
+
+
+
+
+
+
+ 加载中
+
+
+
+
+
月度新增事件统计
+
+
+
+ 加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 65d0919c6..4ea08dbe4 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -166,7 +166,7 @@ export default {
await this.loadOrgData()
// this.loadMap()
this.getMapData()
- await this.getWorkUserInfo()
+ // await this.getWorkUserInfo()
// this.isfirstInit = false
// 地图相关end
},
@@ -458,6 +458,16 @@ export default {
if (code === 0) {
this.orgData = data
+ this.agencyInfo = data //之前获取用户信息的接口不用了。。。
+ if (!this.agencyInfo.latitude) {
+ this.agencyInfo.latitude = 36.072227
+ }
+ if (!this.agencyInfo.longitude) {
+ this.agencyInfo.longitude = 120.389455
+ }
+ if (!this.agencyInfo.level) {
+ this.agencyInfo.level = 'street'
+ }
this.orgId = this.orgData.id
this.orgType = this.orgData.level
this.parentPolygon = []
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index ebebad7ae..21c95ff9e 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -189,8 +189,8 @@ const vueGis = {
],
//icon图标样式
iconUrlArray: [],
- iconTextColor: "#ffffff",
- distanceMax: null, //显示的坐标距离中心点的范围
+ iconTextColor: '#ffffff',
+ distanceMax: null,//显示的坐标距离中心点的范围
input_lat: null,
input_lon: null,
@@ -652,8 +652,9 @@ const vueGis = {
});
+
map.addLayer(polygonLayer)
- if (this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失,屏蔽这段代码以后可以解决
+ if (this.$route.path == '/main-shuju/visual-communityGovern-duoyuanfuwu-duoyuanfuwufenxi' || this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失,屏蔽这段代码以后可以解决
console.log('去掉默认点击')
} else {
map.addInteraction(select);
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 2920ee649..8b77155dd 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -21,22 +21,13 @@
+ :key="index">
|
{{ item }}
-
-
-
- ![]()
-
-
 div {
overflow: hidden;
|