+
+ ![]()
+
+
+
+ 删除
+
（事项封面，图片小于1M）
+
+
- 添加
+ 添加
@@ -266,6 +294,9 @@ let loading; // 加载动画
export default {
data() {
return {
+ uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+ customerId: "",
+
formType: "add", //表单操作类型 add新增，edit编辑，detail详情
btnDisable: false,
@@ -342,14 +373,39 @@ export default {
watch: {},
async mounted() {
+ this.customerId = localStorage.getItem("customerId");
this.initMap();
},
methods: {
+ handleImgSuccess(index, res, file) {
+ if (res.code === 0 && res.msg === "success") {
+ console.log("res.data.url", res.data.url);
+ this.dataForm.matterList[index].matterImg = res.data.url;
+ } else {
+ this.$message.error(res.msg);
+ }
+ },
+
+ beforeImgUpload(file) {
+ const isLt1M = file.size / 1024 / 1024 < 1;
+
+ if (!isLt1M) {
+ this.$message.error("上传图片大小不能超过 1MB!");
+ }
+ return isLt1M;
+ },
+
handleAddStaff() {
this.dataForm.matterList = [
...this.dataForm.matterList,
- { matterName: "", appointmentType: "", startTime: "", endTime: "" },
+ {
+ matterName: "",
+ appointmentType: "",
+ matterImg: "",
+ startTime: "",
+ endTime: "",
+ },
];
},
handleDelStaff(index) {
@@ -482,9 +538,28 @@ export default {
this.dataForm.partyServiceCenterId = this.partyServiceCenterId;
}
+ const matterList = this.dataForm.matterList.filter(
+ (item) => !item.matterId
+ );
+ if (
+ matterList.some(
+ (item) =>
+ !item.matterImg ||
+ !item.matterName ||
+ !item.appointmentType ||
+ !item.startTime ||
+ !item.endTime
+ )
+ ) {
+ return this.$message({
+ type: "warning",
+ message: "请补充完整可预约事项信息",
+ });
+ }
+
const { data, code, msg } = await requestPost(url, {
...this.dataForm,
- matterList: this.dataForm.matterList.filter((item) => !item.matterId),
+ matterList,
});
if (code === 0) {
@@ -580,9 +655,48 @@ export default {
width: 650px;
.item {
- display: flex;
- justify-content: space-around;
- margin-bottom: 7px;
+ .item-info {
+ display: flex;
+ justify-content: space-around;
+ margin-bottom: 7px;
+ }
+ .item-pic {
+ display: flex;
+ align-items: center;
+ .hint {
+ font-size: 14px;
+ color: #999999;
+ margin-left: 10px;
+ }
+ .avatar-uploader {
+ ::v-deep .el-upload {
+ cursor: pointer;
+ position: relative;
+ overflow: hidden;
+ }
+ img {
+ object-fit: cover;
+ }
+ .el-upload:hover {
+ border-color: #409eff;
+ }
+ .avatar {
+ width: 50px;
+ height: 50px;
+ display: block;
+ }
+ .avatar-uploader-icon {
+ border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ font-size: 28px;
+ color: #8c939d;
+ width: 50px;
+ height: 50px;
+ line-height: 50px;
+ text-align: center;
+ }
+ }
+ }
}
.item-add {
}
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 568c453b..e538d41e 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -549,11 +549,11 @@ const vueGis = {
//根据组织层级设置缩放级别
setZoom (agencyLevel) {
if (agencyLevel === 'district') {
- this.zoom = 14
+ this.zoom = 12
} else if (agencyLevel === 'street') {
- this.zoom = 15
+ this.zoom = 13
} else if (agencyLevel === 'community') {
- this.zoom = 16
+ this.zoom = 14
}
},
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 5f5e4c79..b2ef7685 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -4,31 +4,32 @@
项目分布分析
-
-
- 事件分类分析
+ 项目分类分析
@@ -31,6 +38,7 @@
end-placeholder="结束日期"
prefix-icon="el-icon-caret-bottom"
value-format="yyyy-MM-dd HH:mm:ss"
+ :clearable="false"
:default-time="['00:00:00', '23:59:59']"
>
@@ -135,7 +143,7 @@ export default {
{ title: "区域化党建单位名称", coulmn: 'unitName' },
{ title: "活动标题", coulmn: 'title' },
{ title: "活动地址", coulmn: 'address' },
- { title: "服务事项", coulmn: 'serviceMatter' },
+ { title: "服务事项", coulmn: 'serviceMatterName' },
{ title: "服务人数", coulmn: 'peopleCount' },
{ title: "活动时间", coulmn: 'activityTime' }
],
@@ -147,13 +155,15 @@ export default {
value2: '',
timeRange: '',
visibleLoading: true,
- serviceMatter: '',
+ serviceMatter: 'all',
pageNo: 1,
pageSize: 10,
total: 0,
activeIndex: 0,
activeLevel: "1",
+ selectAgency: '',
unitList: [],
+ propTree: [],
partyItem: [
{
name: '楼宇党建',
@@ -231,33 +241,37 @@ export default {
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
+ console.log('agencyId-------', this.agencyId)
+ this.initTime()
await nextTick(100);
+ await this.getAgencyList()
this.loadUnit()
- this.getList();
- this.getCateCount()
- this.getCateType()
+ this.getList(this.agencyId)
+ this.getCateCount(this.agencyId)
+ this.getCateType(this.agencyId)
+
await this.getWorkUserInfo()
- await this.getMapUnitList()
+ await this.getMapUnitList(this.agencyId)
},
watch: {
timeRange(val) {
console.log('val-www', val)
- this.getList();
+ this.getList(this.agencyId);
}
},
methods: {
//具体人员列表
- async getList () {
+ async getList (agencyId) {
this.visibleLoading = true
const url = "/heart/icpartyactivity/activitylist"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
let params = {
- agencyId: this.agencyId,
+ agencyId,
pageSize: this.pageSize,
pageNo: this.pageNo,
- serviceMatter: this.serviceMatter,
+ serviceMatter: this.serviceMatter == 'all' ? '' : this.serviceMatter,
startTime: this.timeRange && this.timeRange[0] || '',
endTime: this.timeRange && this.timeRange[1] || ''
}
@@ -277,12 +291,61 @@ export default {
}
this.visibleLoading = false
},
- async getCateCount () {
+ async getAgencyList() {
+ // const url = "/gov/org/customeragency/staffinagencylist";
+ // const url = '/gov/org/customeragency/agencygridtree'
+ const url = '/gov/org/customeragency/staffinagencylist'
+ // let params = {
+ // agencyId: this.$store.state.user.agencyId,
+ // };
+ const { data, code, msg } = await requestPost(url);
+ if (code === 0) {
+ console.log('data-org----o', data)
+ let { agencyList, subAgencyList } = data
+ this.selectAgency = [`${agencyList.agencyId}-${agencyList.level}`]
+ let arr = []
+ agencyList.subAgencyList = subAgencyList
+ arr.push(agencyList)
+ this.propTree = arr && this.getTreeData(arr)
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ getTreeData(data){
+ if (!Array.isArray(data)) return []
+ let arr = data.map(item => {
+ let _item = {}
+ if (item.subAgencyList) {
+ if (item.subAgencyList.length === 0) {
+ _item = {
+ label: item.agencyName,
+ value: item.agencyId + '-' + item.level,
+ level: item.level,
+ children: undefined
+ }
+ } else _item = {
+ label: item.agencyName,
+ value: item.agencyId + '-' + item.level,
+ level: item.level,
+ children: this.getTreeData(item.subAgencyList)}
+ } else {
+ _item = {
+ label: item.agencyName,
+ value: item.agencyId + '-' + item.level,
+ level: item.level,
+ }
+ }
+ return _item
+ })
+ return arr
+ },
+ async getCateCount (agencyId) {
const url = "/heart/icpartyactivity/statistics"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
let params = {
- agencyId: this.agencyId
+ agencyId
}
const { data, code, msg } = await requestPost(url, params)
@@ -293,12 +356,12 @@ export default {
this.$message.error(msg)
}
},
- async getCateType () {
+ async getCateType (agencyId) {
const url = "/heart/icpartyunit/typestatistics"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
let params = {
- agencyId: this.agencyId
+ agencyId
}
const { data, code, msg } = await requestPost(url, params)
@@ -352,7 +415,37 @@ export default {
this.$message.error(msg)
}
},
-
+ handleCascader(val) {
+ console.log('val-vvv', val)
+ if (val.length > 0) {
+ const _arr = val[val.length - 1].split('-')
+ const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+ this.getList(_arr[0])
+ this.getMapUnitList(_arr[0])
+ this.getCateCount(_arr[0])
+ this.getCateType(_arr[0])
+ }
+
+ },
+ initTime() {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ console.log('time-rtt', this.timeFormat(start), this.timeFormat(end))
+ this.timeRange = [this.timeFormat(start), this.timeFormat(end)]
+ },
+ timeFormat(date) {
+ if (!date || typeof date === 'string') {
+ return false
+ }
+ var y = date.getFullYear() //年
+ var m = date.getMonth() + 1 //月
+ if (m < 10) m = '0' + m
+ var d = date.getDate() //日
+ if (d < 10) d = '0' + d
+
+ return y + '-' + m + '-' + d + ' 00:00:00'
+ },
async loadUnit () {
const url = "/heart/icresidemanddict/subcodelist"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
@@ -365,7 +458,10 @@ export default {
if (code === 0) {
this.unitList = data
-
+ this.unitList.unshift({
+ label: '全部',
+ value: 'all'
+ })
} else {
this.$message.error(msg)
}
@@ -419,27 +515,33 @@ export default {
// },
//获取联建单位分布图
- async getMapUnitList () {
+ async getMapUnitList (agencyId) {
const url = "/heart/icpartyunit/distribution"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
let params = {
- agencyId: this.agencyId
+ agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- // this.unitMapList = data
- this.unitMapList = this.unitMapList1
-
+ console.log('unitMapList----data', data)
+ this.unitMapList = data.map((item, index) => {
+ return {
+ ...item,
+ urlIndex: index
+ }
+ })
+ // this.unitMapList = this.unitMapList1
+ console.log('unitMapList----', this.unitMapList)
this.unitMapList.forEach(item => {
- if (item.type === '党建楼宇') {
+ if (item.type === '楼宇党建') {
item.urlIndex = 0
- } else if (item.type === '两新党建') {
+ } else if (item.type === '两新组织') {
item.urlIndex = 1
- } else if (item.type === '辖区单位') {
+ } else if (item.type === '区域单位党建') {
item.urlIndex = 2
} else if (item.type === '机关直属部门') {
item.urlIndex = 3
@@ -492,7 +594,7 @@ export default {
this.showedMoreInfo = true
},
- handleSelectChange () {
+ handleSelectChange (val) {
this.getList();
},
pageSizeChangeHandleNew (val) {
@@ -562,8 +664,22 @@ export default {
margin-right: 6px;
}
.title-label {
- font-size: 16px;
+ font-size: 20px;
font-weight: 800;
+ ::v-deep .el-input {
+ width: 180px;
+ margin-left: 10px;
+ .el-input__inner {
+ font-size: 18px;
+ font-weight: 800;
+ color: #fff;
+ background: transparent;
+ border: 0;
+ }
+ .el-icon-arrow-down::before {
+ content: "\e790";
+ }
+ }
}
::v-deep .el-dropdown {
font-size: 16px;
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index ca13dcae..238e8160 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -40,7 +40,7 @@
不同事件类别在不同时间段的变化和分布
-
-
-
-
-
-
+
@@ -36,19 +37,21 @@
+
+
+
+
+
+
+
+
+
-
@@ -208,6 +211,7 @@ export default {
await this.getAgencylist()//获取组织级别
await nextTick(500)
await this.loadOrgData()
+
await this.getApiData();
},
@@ -237,6 +241,15 @@ export default {
if (month2 < 10) {
month2 = '0' + month2;
}
+ if (month < 10) {
+ month = '0' + month;
+ }
+ if (day < 10) {
+ day = '0' + day;
+ }
+ if (day2 < 10) {
+ day2 = '0' + day2;
+ }
var t2 = year2 + '-' + month2 + '-' + day2;
var t1 = year + '-' + month + '-' + day;
// let t3 = formate(t2, style);
@@ -250,9 +263,19 @@ export default {
},
async getApiData () {
-
- await this.getLine()
+ await this.getLineChart()
await this.loadMapData();
+
+ this.assignData()
+ },
+
+ assignData () {
+ if (!this.showNoData) {
+ this.getLine()
+ }
+
+ this.loadMap()
+ this.isfirstInit = false
},
// 获取当前登录人员信息及组织信息
@@ -349,18 +372,19 @@ export default {
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
+
this.legendArray = []
- if (data.above) {
+ if (data.under === 0 || data.under) {
this.under = data.under
this.legendArray.push(
{
color: this.colorArray[0],
- name: data.under + '以下'
+ name: data.under + '及以下'
}
)
}
- if (data.above) {
+ if (data.above === 0 || data.above) {
this.above = data.above
this.legendArray.push(
{
@@ -371,7 +395,7 @@ export default {
this.legendArray.push(
{
color: this.colorArray[2],
- name: data.above + '以上'
+ name: data.above + '及以上'
}
)
}
@@ -392,21 +416,22 @@ export default {
item.latitude = agencyItem.latitude
item.coordinates = agencyItem.coordinates
- if (this.under) {
+ if (this.under === 0 || this.under) {
if (item.count < this.under || item.count === this.under) {
item.color = this.colorArray[0]
item.fillColor = this.colorFillArray[0]
- }
-
- if (this.above) {
- if (item.count > this.under && item.count < this.above) {
- item.color = this.colorArray[1]
- item.fillColor = this.colorFillArray[1]
- } else {
- item.color = this.colorArray[2]
- item.fillColor = this.colorFillArray[2]
+ } else {
+ if (this.above === 0 || this.above) {
+ if (item.count > this.under && item.count < this.above) {
+ item.color = this.colorArray[1]
+ item.fillColor = this.colorFillArray[1]
+ } else {
+ item.color = this.colorArray[2]
+ item.fillColor = this.colorFillArray[2]
+ }
}
}
+
}
break
}
@@ -416,8 +441,7 @@ export default {
});
console.log(this.mapList)
- this.loadMap()
- this.isfirstInit = false
+
} else {
this.$message.error(msg);
@@ -442,7 +466,7 @@ export default {
},
getLine () {
if (this.lineInitState) {
- this.getLineChart()
+ this.assignLineChart()
} else {
setTimeout(() => {
this.getLine()
@@ -451,9 +475,13 @@ export default {
},
// 获取折线图
async getLineChart () {
- this.$refs.lineChart.clear()
+ if (!this.showNoData) {
+ this.$refs.lineChart.clear()
+ this.$refs.lineChart.showLoading()
+ }
+
const _that = this
- this.$refs.lineChart.showLoading()
+
const url = "/gov/project/project/projectdistributionanalysisleft";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft";
let params = {
@@ -463,28 +491,20 @@ export default {
};
const { data, code, msg } = await requestPost(url, params);
- this.$refs.lineChart.hideLoading()
+ if (!this.showNoData) {
+ this.$refs.lineChart.hideLoading()
+ }
if (code === 0) {
- // 获取pieChart配置
- this.lineOption = lineOption()
if (data && data.length > 0) {
this.lineList = data
- this.loadCategoryData()
-
-
-
- this.$refs.lineChart.setOption(this.lineOption, true)
- this.$refs.lineChart.setOption({
- xAxis: { data: this.xaxis },
- legend: { data: this.legend },
- series: this.series
- }, true)
+ this.showNoData = false
} else {
this.lineList = []
+ this.showNoData = true
}
-
+ this.loadCategoryData()
} else {
this.$message.error(msg);
@@ -492,60 +512,75 @@ export default {
},
+ assignLineChart () {
+ // 获取pieChart配置
+ this.lineOption = lineOption()
+
+ this.$refs.lineChart.setOption(this.lineOption, true)
+ this.$refs.lineChart.setOption({
+ xAxis: { data: this.xaxis },
+ legend: { data: this.legend },
+ series: this.series
+ }, true)
+ },
+
//解析折线图数据
loadCategoryData () {
this.xaxis = []
this.series = []
this.legend = []
- let num = this.lineList[0].categoryList.length
+ if (this.lineList.length > 0) {
- let dataArray = new Array(num)
- //遍历每个分类
- this.lineList[0].categoryList.forEach((categoryItem, index) => {
- this.legend.push(categoryItem.categoryName)
- dataArray[index] = []
- });
-
-
- //遍历每个时间
- this.lineList.forEach(item => {
- this.xaxis.push(item.time)
+ let num = this.lineList[0].categoryList.length
+ let dataArray = new Array(num)
//遍历每个分类
- item.categoryList.forEach((categoryItem, index) => {
- dataArray[index].push(categoryItem.count)
+ this.lineList[0].categoryList.forEach((categoryItem, index) => {
+ this.legend.push(categoryItem.categoryName)
+ dataArray[index] = []
+
});
- });
-
- //遍历第一组的分类
- this.lineList[0].categoryList.forEach((categoryItem, index) => {
-
- let object = {
- name: categoryItem.categoryName,
- 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: categoryItem.color }
- ]
- )
- },
- data: dataArray[index]
- }
- this.series.push(object)
+ //遍历每个时间
+ this.lineList.forEach(item => {
+ this.xaxis.push(item.time)
+ //遍历每个分类
+ item.categoryList.forEach((categoryItem, index) => {
+ dataArray[index].push(categoryItem.count)
+ });
- });
+ });
+ //遍历第一组的分类
+ this.lineList[0].categoryList.forEach((categoryItem, index) => {
+
+ let object = {
+ name: categoryItem.categoryName,
+ 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: categoryItem.color }
+ ]
+ )
+ },
+ data: dataArray[index]
+ }
+
+ this.series.push(object)
+
+
+ });
+ }
},
handleChangeAgency (value) {
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 8ed41ee2..73236c98 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -424,7 +424,8 @@ export default {
loadMap () {
if (this.isfirstInit) {
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
- this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000)
+ // this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000)
+ this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle)
} else {
this.$refs.map.refreshMap(null, this.projectList)
}
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index e8a7faf1..92d1c819 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -279,6 +279,7 @@ export default {
let params = {
orgId: this.orgId,
orgType: this.orgType,
+ status: this.status,
};
@@ -405,8 +406,10 @@ export default {
},
- handleChangeState (index) {
- this.getTable()
+ async handleChangeState (index) {
+ await this.getApiData()
+ this.assignPieChart()
+
},
async handleChangeAgency (value) {
@@ -453,9 +456,9 @@ export default {
item.status ? item.status : '',
item.createdTime ? item.createdTime : '',
item.issueOriginator ? item.issueOriginator : '',
- item.voteAccount ? item.voteAccount : 0,
+ item.voteAccount ? item.voteAccount : '',
item.supportCount ? item.supportCount : 0,
- item.oppositionCount ? item.oppositionCount : '',
+ item.oppositionCount ? item.oppositionCount : 0,
{ type: "operate", list: ["查看"] },
];
});
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index a1b3f1b0..0c17367a 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -2,7 +2,7 @@
+ 
+
+
- 事件分类分析
+ 项目分类分析
@@ -123,10 +123,7 @@ export default {
align: "center",
width: "5%",
},
- {
- align: "center",
- width: "10%",
- },
+
{
align: "center",
width: "10%",
@@ -145,7 +142,7 @@ export default {
},
{
align: "center",
- width: "20%",
+ width: "30%",
},
{
align: "center",
@@ -156,7 +153,7 @@ export default {
width: "10%",
},
],
- header: ["序号", "项目编号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
+ header: ["序号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
list: [],
pageSize: 10,
pageNo: 1,
@@ -427,7 +424,7 @@ export default {
item.statusShow = item.status === 'pending' ? '待处理' : '已结案'
return [
{ type: "index" },
- item.projectCode ? item.projectCode : '',
+ // item.projectCode ? item.projectCode : '',
item.categoryNames.join(','),
item.originShow ? item.originShow : '',
item.gridName ? item.gridName : '',
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 71601608..0c2833d5 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -6,13 +6,20 @@
src="../../../../assets/img/shuju/title-tip.png" />
区域化党建
+
+
党建单位分类统计
-
+
{{ item.name }}
@@ -59,6 +59,7 @@
:tableData="ageList"
:visibleLoading="visibleLoading"
:operate="false"
+ @row="handleClickRow"
>
{
if (index === seriesIndex) {
_code = element.code
+
+ if (!this.noInit) isClick = false
+ else {
+ element.isClick = !element.isClick
+ isClick = element.isClick
+ }
+
element.label = {
show: true,
@@ -470,6 +481,7 @@ export default {
};
console.log('zlcm', element)
} else {
+ element.isClick = false
element.label = {
show: false,
@@ -492,16 +504,25 @@ export default {
if (this.noInit) {
const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
- this.getAgeList(_arr[0], orgType, _code)
+ console.log('zlcm---isClick', isClick)
+ this.getAgeList(_arr[0], orgType, isClick && _code || '')
}
this.noInit = true
},
clickEduPie (seriesIndex) {
let _code = ''
+ let isClick = false
this.eduItem.forEach((element, index) => {
if (index === seriesIndex) {
_code = element.code
+
+ if (!this.noEduInit) isClick = false
+ else {
+ element.isClick = !element.isClick
+ isClick = element.isClick
+ }
+
element.label = {
show: true,
@@ -515,6 +536,7 @@ export default {
};
console.log('zlcm')
} else {
+ element.isClick = false
element.label = {
show: false,
@@ -538,7 +560,7 @@ export default {
const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
- this.getEduList(_arr[0], orgType, _code)
+ this.getEduList(_arr[0], orgType, isClick && _code || '')
}
this.noEduInit = true
@@ -552,10 +574,37 @@ export default {
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
- this.ageItem = data.map(item => {
+ const colorList = [
+ {
+ name: '50岁以下',
+ value: 1,
+ color: '#FAC126'
+ }, {
+ name: '50-59岁',
+ value: 2,
+ color: '#3DDA83'
+ }, {
+ name: '60-69岁',
+ value: 3,
+ color: '#A800FF'
+ }, {
+ name: '70-79岁',
+ value: 4,
+ color: '#2865FA'
+ }, {
+ name: '80岁以上',
+ value: 5,
+ color: '#00DAD2'
+ }
+ ]
+ this.ageItem = data.map((item, index) => {
return {
...item,
- name: item.label
+ name: item.label,
+ isClick: false,
+ itemStyle: {
+ color: colorList[index].color
+ }
}
})
data.forEach(item => {
@@ -576,7 +625,8 @@ export default {
this.eduItem = data.map(item => {
return {
...item,
- name: item.label
+ name: item.label,
+ isClick: false
}
})
data.forEach(item => {
@@ -679,6 +729,12 @@ export default {
})
return arr
},
+ handleClickRow(val) {
+ console.log('click-row----', val)
+ this.$router.push({
+ path: `/main-shuju/visual-basicinfo-people/${val.userId}`,
+ });
+ },
handleCascader(val) {
console.log('val-vvv', val)
const _arr = val[val.length - 1].split('-')
@@ -912,18 +968,18 @@ export default {
padding-left: 6px;
font-size: 16px;
color: #EFF0F1;
- background: url('../../../../assets/img/shuju/measure/zi@2x.png') no-repeat left bottom;
+ background: url('../../../../assets/img/shuju/measure/huang@2x.png') no-repeat left bottom;
&1 {
- background: url('../../../../assets/img/shuju/measure/huang@2x.png') no-repeat left bottom;
+ background: url('../../../../assets/img/shuju/measure/lv@2x.png') no-repeat left bottom;
}
&2 {
- background: url('../../../../assets/img/shuju/measure/lan@2x.png') no-repeat left bottom;
+ background: url('../../../../assets/img/shuju/measure/zi@2x.png') no-repeat left bottom;
}
&3 {
- background: url('../../../../assets/img/shuju/measure/lanlv@2x.png') no-repeat left bottom;
+ background: url('../../../../assets/img/shuju/measure/lan@2x.png') no-repeat left bottom;
}
&4 {
- background: url('../../../../assets/img/shuju/measure/lv@2x.png') no-repeat left bottom;
+ background: url('../../../../assets/img/shuju/measure/lanlv@2x.png') no-repeat left bottom;
}
}
.tips-items-num {
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 0166c8c3..f33f095f 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -450,11 +450,11 @@ const vueGis = {
//根据组织层级设置缩放级别
setZoom (level) {
if (level === 'district') {
- this.zoom = 14
+ this.zoom = 11
} else if (level === 'street') {
- this.zoom = 15
+ this.zoom = 12
} else if (level === 'community') {
- this.zoom = 16
+ this.zoom = 13
}
},
diff --git a/src/views/modules/visual/components/screen-table/index.vue b/src/views/modules/visual/components/screen-table/index.vue
index bfc00da9..c26e00fa 100644
--- a/src/views/modules/visual/components/screen-table/index.vue
+++ b/src/views/modules/visual/components/screen-table/index.vue
@@ -22,6 +22,7 @@
class="table-body-tr"
v-for="(value, index) in tableData"
:key="index"
+ @click.stop="handleClickRow(value)"
>