Browse Source

Merge branch 'dev-shuju' into test

shibei_master
jiangyy 4 years ago
parent
commit
a5cce0f474
  1. 6
      public/index.html
  2. BIN
      src/assets/img/shuju/measure/down-right.png
  3. BIN
      src/assets/img/shuju/measure/gantanhao.png
  4. BIN
      src/assets/img/shuju/measure/up-right.png
  5. BIN
      src/assets/img/shuju/measure/you@2x.png
  6. BIN
      src/assets/img/shuju/measure/zhuhu@2x.png
  7. BIN
      src/assets/img/shuju/measure/zuo@2x.png
  8. BIN
      src/assets/img/shuju/weiwanjie.png
  9. BIN
      src/assets/img/shuju/yiwanjie.png
  10. 144
      src/assets/scss/modules/visual/distributionAnalyze.scss
  11. 77
      src/assets/scss/modules/visual/processAnalyze.scss
  12. 135
      src/assets/scss/modules/visual/typeAnalyze.scss
  13. 13
      src/views/modules/communityParty/elegant/index.vue
  14. 8
      src/views/modules/communityParty/regionalParty/activitys.vue
  15. 6
      src/views/modules/communityParty/regionalParty/units.vue
  16. 28
      src/views/modules/communityService/measure/index.vue
  17. 18
      src/views/modules/communityService/ninePlaces/places/placesForm.vue
  18. 399
      src/views/modules/visual/communityGovern/distributionAnalyze.vue
  19. 89
      src/views/modules/visual/communityGovern/distributionLineOption.js
  20. 222
      src/views/modules/visual/communityGovern/processAnalyze.vue
  21. 2
      src/views/modules/visual/communityGovern/resiPieOption.js
  22. 21
      src/views/modules/visual/communityGovern/resibuzz.vue
  23. 644
      src/views/modules/visual/communityGovern/typeAnalyze.vue
  24. 179
      src/views/modules/visual/communityGovern/typePieOption.js
  25. 398
      src/views/modules/visual/communityParty/community.vue
  26. 189
      src/views/modules/visual/communityParty/dialogInfo.vue
  27. 176
      src/views/modules/visual/communityParty/options.js
  28. 380
      src/views/modules/visual/communityParty/party.vue
  29. 516
      src/views/modules/visual/components/screen-map/index copy.vue
  30. 180
      src/views/modules/visual/components/screen-map/index.vue
  31. 5
      src/views/modules/visual/components/screen-table/index.vue
  32. 0
      src/views/modules/visual/cpts/analyse.vue
  33. 255
      src/views/modules/visual/measure/volunteer.vue
  34. 22
      src/views/modules/workSys/demandCate.vue

6
public/index.html

@ -36,9 +36,9 @@
<!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
<script>
// window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
// window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
// window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
window.SITE_CONFIG['apiURL'] = 'https://epmet-test.elinkservice.cn/api'
// window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
// window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
</script>
<% } %>

BIN
src/assets/img/shuju/measure/down-right.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
src/assets/img/shuju/measure/gantanhao.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

BIN
src/assets/img/shuju/measure/up-right.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
src/assets/img/shuju/measure/you@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/assets/img/shuju/measure/zhuhu@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

BIN
src/assets/img/shuju/measure/zuo@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/assets/img/shuju/weiwanjie.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/assets/img/shuju/yiwanjie.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

144
src/assets/scss/modules/visual/distributionAnalyze.scss

@ -0,0 +1,144 @@
@import '../../c/config';
@import '../../c/function';
@import './c/common';
.title {
padding: 10px;
font-size: 22px;
font-family: PingFang SC;
font-weight: 800;
color: #ffffff;
position: relative;
.card-title {
display: flex;
align-items: center;
img {
display: block;
margin-right: 5px;
}
span {
display: block;
}
}
.second-title {
display: block;
display: flex;
align-items: center;
margin-top: 20px;
.second-title-label {
position: relative;
padding-left: 40px;
font-size: 16px;
font-weight: 500;
color: #fff;
}
.second-title-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%;
}
.second-select {
margin: 0 10px 0 40px;
::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;
}
.el-icon-arrow-up:before {
content: '\e78f';
}
// .el-select__caret:before {
// content: '\E790'
// }
}
::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;
}
}
.cascader {
::v-deep .el-input {
width: 220px;
}
}
.status-select {
position: absolute;
top: 20px;
right: 10px;
}
.second-select:last-child {
margin-left: 0;
}
}
.g-cpt-resi {
display: flex;
flex-direction: row;
// flex-wrap: wrap;
// justify-content: center;
height: calc(100vh - 230px);
.g-l {
width: 50%;
height: calc(100vh - 290px);
.echart-line {
margin-left: 30px;
// margin-top: 100px;
text-align: center;
position: relative;
width: 100%;
height: 100%;
box-sizing: border-box;
.echart-org {
width: 100%;
height: 90%;
}
}
}
.g-r {
width: 50%;
height: calc(100vh - 290px);
}
}

77
src/assets/scss/modules/visual/processAnalyze.scss

@ -63,7 +63,7 @@
.g-cpt-resi {
display: flex;
flex-direction: row;
height: calc(100vh - 170px);
height: calc(100vh - 180px);
.g-l {
flex-shrink: 0;
@ -87,9 +87,9 @@
.g-r {
text-align: center;
margin: 40px 19px 20px;
width: calc(100vw - 60px - 800px);
height: calc(100vh - 160px - 20px);
margin: 20px 10px 20px;
width: calc(100vw - 700px);
height: calc(100vh - 180px - 20px);
}
}
@ -172,41 +172,68 @@
}
.g-r {
.tb {
.r-map {
position: relative;
height: calc(100vh - 220px);
overflow-y: auto;
@include scrollBar;
height: calc(100vh - 180px - 20px - 70px);
width: 100%;
.map {
height: 100%;
width: 100%;
}
.m-pagination {
.r-status {
position: absolute;
box-sizing: border-box;
right: 0;
bottom: 0;
width: 100%;
height: 40px;
right: 0;
display: flex;
justify-content: flex-end;
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
background: #0266d1;
color: #000d3f;
.status {
height: 30px;
width: 70px;
line-height: 30px;
font-size: 12px;
font-family: PingFang SC;
font-weight: 400;
color: #d2e7ff;
background-color: #1146c2;
}
/deep/ .el-pagination .el-pager li {
background: #002e74;
.status-closed {
}
/deep/ .el-pagination .btn-prev {
background: #002e74;
.status-pending {
border-radius: 5px 0 0 0;
}
/deep/ .el-pagination .btn-next {
background: #002e74;
.sel-status {
background-color: #082586;
}
}
}
.r-legend {
display: flex;
justify-content: center;
margin-top: 14px;
align-items: center;
> img {
margin-left: 58px;
height: 35px;
width: 40px;
}
> span {
margin-left: 3px;
font-size: 16px;
font-family: PingFang SC;
font-weight: 400;
color: #d2e7ff;
}
}
.r-legend:hover {
cursor: pointer;
}
}
.echart-wr {

135
src/assets/scss/modules/visual/typeAnalyze.scss

@ -0,0 +1,135 @@
@import '../../c/config';
@import '../../c/function';
@import './c/common';
.title {
padding: 10px;
font-size: 22px;
font-family: PingFang SC;
font-weight: 800;
color: #ffffff;
display: flex;
align-items: center;
position: relative;
img {
display: block;
margin-right: 5px;
}
span {
display: block;
}
.second-select {
margin: 0 10px 0 40px;
::v-deep .el-input {
width: 140px;
height: 36px;
.el-input__inner {
height: 100%;
padding: 0 10px;
color: #fff;
line-height: 36px;
background: #06186d;
border: 1px solid #1a64cc;
}
.el-icon-arrow-up:before {
content: '\e78f';
}
}
::v-deep .el-date-editor {
.el-input__prefix {
left: unset;
right: 5px;
}
}
}
.cascader {
::v-deep .el-input {
width: 220px;
}
}
.status-select {
position: absolute;
top: 20px;
right: 10px;
}
.second-select:last-child {
margin-left: 0;
}
}
.g-cpt-resi {
display: flex;
flex-direction: row;
// flex-wrap: wrap;
// justify-content: center;
height: calc(100vh - 130px);
.g-l {
flex-shrink: 0;
width: 600px;
height: calc(100vh - 190px);
}
.g-r {
text-align: center;
margin: 40px 19px 20px;
width: calc(100vw - 60px - 600px);
height: calc(100vh - 140px - 20px);
}
}
.g-r {
.tb {
position: relative;
height: calc(100vh - 220px);
overflow-y: auto;
@include scrollBar;
.m-pagination {
position: absolute;
box-sizing: border-box;
right: 0;
bottom: 0;
width: 100%;
height: 40px;
display: flex;
justify-content: flex-end;
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
background: #0266d1;
color: #000d3f;
}
/deep/ .el-pagination .el-pager li {
background: #002e74;
}
/deep/ .el-pagination .btn-prev {
background: #002e74;
}
/deep/ .el-pagination .btn-next {
background: #002e74;
}
}
}
}
.echart-wr {
margin-left: 30px;
// margin-top: 100px;
text-align: center;
position: relative;
width: 500px;
height: 100%;
box-sizing: border-box;
.echart-org {
width: 100%;
height: 90%;
}
}

13
src/views/modules/communityParty/elegant/index.vue

@ -3,7 +3,7 @@
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="所属网格">
<el-form-item label="所属网格" prop="gridId">
<el-select v-model="searchForm.gridId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in optionsG"
@ -13,7 +13,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="党员姓名">
<el-form-item label="党员姓名" prop="name">
<el-select v-model="searchForm.name" filterable placeholder="请选择" clearable>
<el-option
v-for="item in demandOptions"
@ -23,7 +23,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="主要事迹">
<el-form-item label="主要事迹" prop="mainDeed">
<el-input v-model="searchForm.mainDeed" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item>
@ -127,7 +127,7 @@
:close-on-click-modal="false"
:before-close="handlerCancle"
>
<el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
<el-form v-if="dialogVisible" label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
<el-form-item label="所属网格" prop="gridId">
<el-select v-model="form.gridId" filterable
:disabled="disabled" placeholder="请选择" class="input-width" clearable>
@ -258,7 +258,9 @@ export default {
imageList: []
},
rules: {
categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }]
gridId: [{ required: true, message: '网格不能为空', trigger: 'blur' }],
name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
}
}
},
@ -424,6 +426,7 @@ export default {
},
resetForm(formName) {
this.$refs[formName].resetFields()
this.handleSearch()
},
handleAdd() {
this.dialogVisible = true

8
src/views/modules/communityParty/regionalParty/activitys.vue

@ -78,11 +78,11 @@
</div>
<div class="div_table">
<div class="div_btn">
<el-button style="float:left"
<el-button style=""
type="green"
size="small"
@click="handleAdd">新增</el-button>
<el-button style="float:left"
<!-- <el-button style="float:left"
type="yellow"
size="small"
@click="handleExport">导出</el-button>
@ -99,7 +99,11 @@
size="small"
type="red">导入</el-button>
<<<<<<< HEAD
</el-upload>
=======
</el-upload> -->
>>>>>>> dev-shuju
</div>

6
src/views/modules/communityParty/regionalParty/units.vue

@ -84,11 +84,11 @@
</div>
<div class="div_table">
<div class="div_btn">
<el-button style="float:left"
<el-button style=""
type="green"
size="small"
@click="handleAdd">新增</el-button>
<el-button style="float:left"
<!-- <el-button style="float:left"
type="yellow"
size="small"
@click="handleExport">导出</el-button>
@ -103,7 +103,7 @@
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
type="red">导入</el-button>
type="red">导入</el-button> -->
</el-upload>

28
src/views/modules/communityService/measure/index.vue

@ -17,7 +17,7 @@
<el-form-item label="需求分类" prop="categoryCode">
<el-cascader
v-model="searchForm.categoryCode"
:options="demandOptions"
:options="searchdemandOptions"
:props="{ checkStrictly: true }"
clearable
@change="handleCateCHange"></el-cascader>
@ -411,7 +411,7 @@ export default {
label: '已取消',
value: 'canceled'
}, {
label: '已派',
label: '已派',
value: 'assigned'
}, {
label: '已接单',
@ -448,6 +448,7 @@ export default {
],
reportOptions: [],
demandOptions: [],
searchdemandOptions: [],
demandUserList: [],
optionsG: [],
optionsEditG: [],
@ -637,12 +638,13 @@ export default {
this.searchForm.reportStartTime = ''
this.searchForm.reportEndTime = ''
this.searchForm.wantServiceStartTime = ''
this.searchForm.wantServiceTime = ''
this.searchForm.wantServiceEndTime = ''
this.searchForm.categoryCode = ''
this.searchForm.level = ''
this.reportTime = ''
this.serviceTime = ''
this.$refs[formName].resetFields()
this.handleSearch()
},
handleCateCHange(val) {
console.log('val', val)
@ -663,7 +665,8 @@ export default {
},
handleDemandChange(val) {
console.log('val', val)
console.log('val', val, this.selectDemandUser)
this.selectDemandUser = val.label
this.form.demandUserName = val.demandUserName
this.form.demandUserMobile = val.demandUserMobile
this.form.demandUserId = val.demandUserId
@ -727,7 +730,7 @@ export default {
this.disabled = disabled
}
if (addType == 'look') {
this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]
this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
}
if (addType == 'appoint' && row.serviceType) {
await this.getServiceuserList(row.serviceType)
@ -738,7 +741,7 @@ export default {
if (item.value === row.categoryCode) this.form.categoryCode = [row.categoryCode]
})
this.demandUserList.forEach(item => {
if (item.demandUserId == row.demandUserId) this.selectDemandUser = item
if (item.demandUserId == row.demandUserId) this.selectDemandUser = item.label
})
}
@ -916,6 +919,16 @@ export default {
})
return arr
},
getFlagData(data, flag) {
if (!Array.isArray(data)) return []
let arr1 = data.filter(item => item[flag])
let arr2 = arr1.map(item => {
if (item.children) return { ...item, children: this.getFlagData(item.children, flag) }
else return item
})
// console.log('arrr-oppp', arr2)
return arr2
},
async getGridList(type, agencyId) {
const { user } = await this.$store.state
console.log('user---ppp', user)
@ -967,7 +980,8 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
this.demandOptions = this.getTreeData(res.data)
this.searchdemandOptions = this.getTreeData(res.data)
this.demandOptions = this.getFlagData(this.getTreeData(res.data), 'usableFlag')
}
})
.catch(() => {

18
src/views/modules/communityService/ninePlaces/places/placesForm.vue

@ -196,15 +196,15 @@ export default {
},
async addPlace () {
// const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
// if (regPhone.test(this.formData.mobile) === false) {
// this.btnDisable = false
// this.$message({
// type: 'warning',
// message: ''
// })
// return false;
// }
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
if (regPhone.test(this.formData.mobile) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的手机号码'
})
return false;
}
let url = ''

399
src/views/modules/visual/communityGovern/distributionAnalyze.vue

@ -0,0 +1,399 @@
<template>
<cpt-card>
<div class="title">
<div class="card-title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>项目分布分析</span>
</div>
<div class="second-title">
<div class="second-title-label">不同事件类别在不同时间段的变化和分布</div>
<div class="second-select cascader">
<el-cascader class="customer_cascader"
ref="myCascader"
v-model="agencyIdArray"
:key="iscascaderShow"
:options="casOptions"
:props="optionProps"
@change="handleChangeAgency"
clearable></el-cascader>
</div>
<div class="second-select">
<el-date-picker v-model="timeRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
prefix-icon="el-icon-caret-bottom"
value-format="yyyy-MM-dd"
@change="handleSelectChange">
</el-date-picker>
</div>
</div>
</div>
<div class="g-cpt-resi">
<div class="g-l">
<screen-echarts-frame class="echart-line"
@myChartMethod="lineInitOk"
ref="lineChart"></screen-echarts-frame>
</div>
<div class="g-r">111
<!-- <screen-echarts-frame class="echart-wr"
@myChartMethod="lineInitOk"
ref="lineChart"></screen-echarts-frame> -->
</div>
</div>
</cpt-card>
</template>
<script>
import { Loading } from "element-ui"; //Loading
import { requestPost } from "@/js/dai/request";
import cptCard from "@/views/modules/visual/cpts/card";
import cptTb from "@/views/modules/visual/cpts/tb";
import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
import { lineOption } from './distributionLineOption.js'
import * as echarts from 'echarts'
export default {
name: "HomeMap",
data () {
return {
showNoData: false,
timer: null,
casOptions: [],
agencyIdArray: [],
customerList: [],
iscascaderShow: 0,
optionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
lineChart: '',
lineOption: {},
lineInitState: false,
lineColorArray: [],
xaxis: [],
series: [],
legend: [],
lineData: [820, 932, 901, 934, 1290, 1330, 1320],
lineList: [
{
time: '4:00',
categoryList: [
{
categoryCode: '001',
count: 100,
color: '#1B51FF',
name: '分类1'
},
{
categoryCode: '002',
count: 200,
color: '#00E5ED',
name: '分类2'
}
]
},
{
time: '5:00',
categoryList: [
{
categoryCode: '001',
count: 20,
color: '#1B51FF',
name: '分类1'
},
{
categoryCode: '002',
count: 400,
color: '#00E5ED',
name: '分类2'
}
]
},
{
time: '6:00',
categoryList: [
{
categoryCode: '001',
count: 50,
color: '#1B51FF',
name: '分类1'
},
{
categoryCode: '002',
count: 10,
color: '#00E5ED',
name: '分类2'
}
]
}
],
timeRange: [],
orgId: '',
};
},
// mixins: [animate]
beforeDestroy () {
this.timer && clearInterval(this.timer)
},
async mounted () {
this.userId = this.uid;
this.initData()
await this.getAgencylist()//
this.getApiData();
},
methods: {
initData () {
let yesterday = new Date((new Date).getTime() - 24 * 60 * 60 * 1000)
let year = yesterday.getFullYear()
let month = yesterday.getMonth() + 1 //
let day = yesterday.getDate() //
var days = new Date(year, month, 0);
days = days.getDate(); //
var year2 = year;
var month2 = parseInt(month) - 1;
if (month2 == 0) {
year2 = parseInt(year2) - 1;
month2 = 12;
}
var day2 = day;
var days2 = new Date(year2, month2, 0);
days2 = days2.getDate();
if (day2 > days2) {
day2 = days2;
}
if (month2 < 10) {
month2 = '0' + month2;
}
var t2 = year2 + '-' + month2 + '-' + day2;
var t1 = year + '-' + month + '-' + day;
// let t3 = formate(t2, style);
this.timeRange = [t2, t1]
},
handleSelectChange () {
this.getApiData();
},
async getApiData () {
await this.getLine()
// await this.getTable();
},
async getAgencylist () {
const url = '/gov/org/customeragency/agencylist'
// const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
const params = {
// customerId: '613cc61a6b8ce4c70d21bd413dac72cc'
customerId: '0c41b272ee9ee95ac6f184ad548a30eb'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
++this.iscascaderShow
this.casOptions = []
this.agencyIdArray.length = []
if (data) {
this.casOptions.push(data)
}
} else {
this.$message.error(msg)
}
},
handleChangeDate (value) {
this.dateId = value
this.getApiData()
},
lineInitOk (dom) {
console.log('line准备好了', dom)
this.lineInitState = true
},
getLine () {
if (this.lineInitState) {
this.getLineChart()
} else {
setTimeout(() => {
this.getLine()
}, 500)
}
},
// 线
async getLineChart () {
this.$refs.lineChart.clear()
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 = {
orgId: this.orgId,
startDate: this.timeRange.length > 0 && this.timeRange[0] || '',
endDate: this.timeRange.length > 0 && this.timeRange[1] || ''
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
// pieChart
this.lineOption = lineOption()
if (data && data.length > 0) {
this.loadCategoryData()
} else {
}
this.$refs.lineChart.setOption(this.lineOption, true)
this.$refs.lineChart.setOption({
xAxis: { data: this.xaxis },
legend: { data: this.legend },
series: this.series
}, true)
} else {
this.$message.error(msg);
}
},
//
loadCategoryData () {
this.xaxis = []
this.series = []
this.legend = []
let num = this.lineList[0].categoryList.length
let dataArray = new Array(num)
//
this.lineList[0].categoryList.forEach((categoryItem, index) => {
this.legend.push(categoryItem.name)
dataArray[index] = []
});
//
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.name,
type: 'line',
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)
});
console.log(this.series)
},
handleChangeAgency (value) {
this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
this.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
this.getApiData()
console.log(this.agencyIdArray)
},
toUserInfo (uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
},
props: {
uid: {
type: String,
default: "",
// default: "8ada68cb6f1e4b9a8333348a39ef3aee",
},
},
computed: {},
components: {
cptCard,
cptTb,
screenEchartsFrame,
},
watch: {
uid (id) {
this.userId = id;
},
userId () {
this.getApiData();
window.scrollTo(0, 0);
},
},
};
</script>
<style
lang="scss"
src="@/assets/scss/modules/visual/distributionAnalyze.scss"
scoped
></style>
<style lang=scss scoped>
</style>

89
src/views/modules/visual/communityGovern/distributionLineOption.js

@ -0,0 +1,89 @@
import * as echarts from 'echarts'
export function lineOption () {
return {
legend: {
textStyle: {
color: '#D2E7FF',
fontSize: 16,
},
itemWidth: 20,
itemHeight: 10,
// top: 350,
bottom: 0,
data: []
},
xAxis: {
type: 'category',
// boundaryGap: false,
axisLabel: {
color: '#8ec7dc',
fontSize: 16
},
axisTick: {
show: false
},
axisLine: {
lineStyle: {
color: '#0c4b59'
}
}
},
yAxis: {
nameTextStyle: {
color: '#8ec7dc',
fontSize: 18
},
splitNumber: 4,
minInterval: 1,
show: true,
type: 'value',
axisLabel: {
color: '#8ec7dc',
fontSize: 18
},
axisTick: {
show: false
},
splitLine: {
lineStyle: {
color: ['#145968'],
type: 'dotted'
}
},
axisLine: {
show: true,
symbol: ['none', 'arrow'],
symbolOffset: [0, 15],
lineStyle: {
color: '#0c4b59'
}
}
},
series: [
// {
// name: '项目数',
// type: 'line',
// 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: [120, 132, 101, 134, 90, 230, 210]
// },
// {
// data: [820, 932, 901, 934, 1290, 1330, 1320],
// type: 'line',
// areaStyle: {}
// }
]
}
}

222
src/views/modules/visual/communityGovern/processAnalyze.vue

@ -19,6 +19,7 @@
<el-date-picker v-model="dateId"
type="date"
:clearable="false"
@change="handleChangeDate"
prefix-icon="el-icon-caret-bottom"
placeholder="选择日期"
value-format="yyyyMMdd">
@ -47,21 +48,36 @@
</div>
</div>
<div class="l_bottom">
<div class="bottom_label">党建单位分类统计</div>
<div class="bottom_label">近12月新增项目数</div>
<screen-echarts-frame class="echart-line"
@myChartMethod="lineInitOk"
ref="lineChart"></screen-echarts-frame>
</div>
</div>
<div class="g-r">
<div class="m-tb">
<div class="r-map">
<screen-map class="map"
ref="map"
@clickFeature="clickProject"
:showIconLayer="true"></screen-map>
<div class="r-status">
<div :class="['status', 'status-pending', {'sel-status':status==='pending'}]"
@click="handleChangeStatus('pending')">未结案</div>
<div :class="['status', 'status-closed', {'sel-status':status==='closed'}]"
@click="handleChangeStatus('closed')">已结案</div>
<div class="tb">
</div>
<div class="r-legend">
<img src="@/assets/img/shuju/weiwanjie.png"
mode="aspectFill" />
<span>未结案</span>
<img src="@/assets/img/shuju/yiwanjie.png"
mode="aspectFill" />
<span>已结案</span>
</div>
</div>
</div>
</div>
</cpt-card>
@ -69,6 +85,7 @@
<script>
import { Loading } from "element-ui"; //Loading
import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
import { requestPost } from "@/js/dai/request";
import cptCard from "@/views/modules/visual/cpts/card";
import cptTb from "@/views/modules/visual/cpts/tb";
@ -85,6 +102,7 @@ export default {
return {
showNoData: false,
timer: null,
isfirstInit: true,
projectTotal: 0,
dateIncr: 0,
@ -107,28 +125,54 @@ export default {
{ value: 735, name: '已结案', color: '#3DDA83' },
],
//voting shift_project closedall
stateArray: [
dateId: '',
agencyId: '',
status: 'pending',//: pendingclosed
agencyInfo: {},
projectList: [],
projectList1: [
{
label: '全部',
value: 'all'
agencyId: '',
projectId: '',
origin: '',
status: 'pending',
title: '南宁第二网格南宁第二网格',
latitude: 36.062227,
longitude: 120.389455,
},
{
label: '表决中',
value: 'voting'
},
agencyId: '',
projectId: '',
origin: '',
status: 'closed',
latitude: 36.082227,
longitude: 120.389455,
title: "南宁第二网格",
}
],
projectList2: [
{
label: '已转项目',
value: 'shift_project'
agencyId: '',
projectId: '',
origin: '',
status: 'pending',
title: '山东路山东路',
latitude: 36.062227,
longitude: 120.379455,
},
{
label: '已关闭',
value: 'closed'
},
agencyId: '',
projectId: '',
origin: '',
status: 'closed',
latitude: 36.082227,
longitude: 120.379455,
title: "山东路",
}
],
dateId: '',
agencyId: '',
iconUrlArray: [],
iconTextStyle: {},
casOptions: [],
agencyIdArray: [],
@ -153,6 +197,8 @@ export default {
async mounted () {
this.userId = this.uid;
this.initData()
await this.getWorkUserInfo()
await this.getAgencylist()//
this.getApiData();
},
@ -163,10 +209,42 @@ export default {
},
async getApiData () {
await this.getAgencylist()//
await this.getProjectTotal()
await this.loadProjectlist()
await this.getLine()
// await this.getTable();
},
handleChangeDate (value) {
this.dateId = value
this.getApiData()
},
//
getWorkUserInfo () {
const url = '/epmetuser/customerstaff/staffbasicinfo'
let params = {}
window.app.ajax.post(
url,
params,
(data, rspMsg) => {
this.agencyInfo = data
if (!data.latitude) {
this.agencyInfo.latitude = 36.072227
}
if (!data.longitude) {
this.agencyInfo.longitude = 120.389455
}
if (!data.level) {
this.agencyInfo.level = 'street'
}
},
(rspMsg, data) => {
this.$message.error(rspMsg)
}
)
},
async getAgencylist () {
@ -174,7 +252,8 @@ export default {
// const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
const params = {
customerId: '613cc61a6b8ce4c70d21bd413dac72cc'
// customerId: '613cc61a6b8ce4c70d21bd413dac72cc'
customerId: '0c41b272ee9ee95ac6f184ad548a30eb'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
@ -229,14 +308,100 @@ export default {
}
},
//
async loadProjectlist () {
// const url = "/data/aggregator/project/projectstatuslist";
const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectstatuslist";
let params = {
agencyId: '',
dateId: this.dateId,
status: this.status
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
// this.projectList = [...data]
if (this.status === 'closed') {
this.projectList = this.projectList1
} else {
this.projectList = this.projectList2
}
this.projectList.forEach(item => {
item.values_ = {
name: item.title
}
if (item.title.length > 10) {
item.values_.name = item.title.substring(0, 9) + '...'
}
if (item.status === 'pending') {
item.urlIndex = 0
} else {
item.urlIndex = 1
}
});
this.iconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/0994757e8962405ca1cdf9792bf325e4.png',//
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/2a80f800b04442448c41a6ed4592cd95.png'//
]
this.iconTextStyle = {
textAlign: undefined,
font: "15px Arial",
//fontFamily: "Courier New, monospace",
// fontWeight: "bold",
text: '',
backgroundFill: new Fill({
color: "#194160",
}),
backgroundStroke: new Stroke({ color: "#2865FA", width: 2 }),
padding: [5, 10, 4, 10],
fill: new Fill({ color: "#ffffff" }),
// stroke: new Stroke({ color: "#2865FA", width: 3 }),
offsetY: -30,
offsetX: 50,
overflow: true,
}
//false
this.loadMap()
this.isfirstInit = false
} else {
this.$message.error(msg);
}
},
loadMap () {
if (this.isfirstInit) {
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle)
} else {
this.$refs.map.refreshMap(null, this.projectList)
}
},
//
clickProject (feature) {
console.log('项目信息', feature.values_.properties)
},
pieInitOk (dom) {
console.log('pie准备好了')
this.pieChartS = dom
this.pieInitState = true
},
lineInitOk () {
console.log('pie准备好了')
this.lineInitState = true
},
@ -320,7 +485,6 @@ export default {
});
this.pieOption.title.text = this.pieTotal
this.clickPie(0)
@ -367,14 +531,16 @@ export default {
this.$refs.pieChart.setOption(this.pieOption)
},
handleChangeState (index) {
// this.getTable()
handleChangeStatus (status) {
this.status = status
this.loadProjectlist()
},
handleChangeAgency (value) {
console.log(value)
this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
this.getApiData()
console.log(this.agencyIdArray)
},

2
src/views/modules/visual/communityGovern/resiPieOption.js

@ -85,7 +85,7 @@ const center= ['50%', '250px']
// formatter: '{a|{c}}\n\n{name|{b}}',
formatter: '{a|{c}}\n{r|}\n{name|{b}}',
minMargin: 5,
edgeDistance: 1,
edgeDistance: -20,
lineHeight: 15,
color: '#fff',
fontSize: 12,

21
src/views/modules/visual/communityGovern/resibuzz.vue

@ -93,7 +93,7 @@ export default {
{ count: 300, categoryName: '环境保护', color: '#FF7800' },
{ count: 1048, categoryName: '建设管理', color: '#FFBA00' },
{ count: 735, categoryName: '街道吹哨部门报到', color: '#FFD685' },
{ count: 580, categoryName: '社会治安综合', color: '#2A00FF' },
{ count: 1580, categoryName: '社会治安综合', color: '#2A00FF' },
{ count: 484, categoryName: '公安交通管理', color: '#C600FF' },
{ count: 300, categoryName: '卫生计生监管执法', color: '#FF2A00' },
{ count: 484, categoryName: '民生', color: '#3DDA83' },
@ -215,7 +215,8 @@ export default {
// const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
const params = {
customerId: '613cc61a6b8ce4c70d21bd413dac72cc'
// customerId: '613cc61a6b8ce4c70d21bd413dac72cc'
customerId: '0c41b272ee9ee95ac6f184ad548a30eb'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
@ -275,12 +276,24 @@ export default {
this.pieData = [{ count: 0, categoryName: '无分类', color: '#00E5ED' }]
}
this.pieData.forEach(item => {
let maxValue = this.pieData[0].count
let maxIndex = 0
this.pieData[0].selected = true
this.pieData.forEach((item, index) => {
item.name = item.categoryName
item.value = item.count
this.colorArray.push(item.color)
this.pieTotal = this.pieTotal + item.value
if (item.value > maxValue) {
maxValue = item.value
maxIndex = index
item.selected = true
} else if (index !== 0) {
item.selected = false
}
});
@ -290,7 +303,7 @@ export default {
return _that.colorArray[params.dataIndex]
}
}
this.clickPie(0)
this.clickPie(maxIndex)
let fun = function (params) {
_that.clickPie(params.dataIndex)

644
src/views/modules/visual/communityGovern/typeAnalyze.vue

@ -1,241 +1,43 @@
<template>
<div class="g-cpt">
<div class="g-l">
<div class="m-people">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>人员情况</span>
</div>
<div class="more"
@click="showedMoreInfo = true">查看更多</div>
<div class="ren">
<img class="pic-ren"
src="@/assets/img/shuju/people/ren.png" />
<div class="ren-name">
<span>{{ info.name }}</span>
<img src="@/assets/img/shuju/people/arrow.png" />
</div>
<div class="ren-prop z-1">
<img src="@/assets/img/shuju/people/ren-prop-1.png" />
<span>所属网格</span>
<div class="ren-cnt">
<h5>所属网格</h5>
<p>
{{ info.gridName }}
</p>
</div>
</div>
<div class="ren-prop z-2">
<img src="@/assets/img/shuju/people/ren-prop-2.png" />
<span>人员类别</span>
<div class="ren-cnt">
<h5>人员类别</h5>
<p>
{{
info.personCategory.length == 0
? "--"
: info.personCategory.join("、")
}}
</p>
</div>
</div>
<div class="ren-prop z-3">
<img src="@/assets/img/shuju/people/ren-prop-3.png" />
<span>工作单位</span>
<div class="ren-cnt">
<h5>工作单位</h5>
<p>
{{ info.workUnit || "--" }}
</p>
</div>
</div>
<div class="ren-prop z-4">
<img src="@/assets/img/shuju/people/ren-prop-4.png" />
<span>志愿者类别</span>
<div class="ren-cnt">
<h5>志愿者类别</h5>
<p>
{{
info.volunteerCategory.length == 0
? "--"
: info.volunteerCategory.join("、")
}}
</p>
</div>
</div>
<div class="ren-prop z-5">
<img src="@/assets/img/shuju/people/ren-prop-5.png" />
<span>房屋信息</span>
<div class="ren-cnt">
<h5>房屋信息</h5>
<p>
{{
info.houseInfo.length == 0
? "--"
: info.houseInfo.join("、")
}}
</p>
</div>
</div>
<div class="ren-prop z-6">
<img src="@/assets/img/shuju/people/ren-prop-6.png" />
<span>经济状况</span>
<div class="ren-cnt">
<h5>经济状况</h5>
<p>
月薪:
{{
info.financialSituation.monthlyIncome || "--"
}}退休金{{
info.financialSituation.retirementAmount || "--"
}}
</p>
</div>
</div>
</div>
</cpt-card>
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>事件分类分析</span>
<div class="second-select cascader">
<el-cascader class="customer_cascader"
ref="myCascader"
v-model="agencyIdArray"
:key="iscascaderShow"
:options="casOptions"
:props="optionProps"
@change="handleChangeAgency"
clearable></el-cascader>
</div>
<div class="second-select ">
<people-more v-show="showedMoreInfo"
v-if="userId"
:userId="userId"
:gridName="info.gridName"
@close="showedMoreInfo = false" />
<div class="m-relation">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>家庭关系</span>
</div>
<div class="info">
<div class="huzhu">
<img class="huzhu-bg"
src="@/assets/img/shuju/people/huzhu.png" />
<img class="huzhu-ico"
src="@/assets/img/shuju/people/huzhu-home.png" />
<div class="huzhu-name">{{ houseInfo.ownerName }}</div>
<p>户主</p>
</div>
<div class="rel z-zuo-2"
@click="toUserInfo(houseInfo.userList[0].userId)"
v-if="houseInfo.userList[0]">
<img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
<img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
<div class="rel-text"
:class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
<span class="rel-call">{{
houseInfo.userList[0].relation
}}</span>
<span class="rel-name">{{ houseInfo.userList[0].userName }}</span>
</div>
</div>
<el-date-picker v-model="dateId"
type="date"
:clearable="false"
@change="handleChangeDate"
prefix-icon="el-icon-caret-bottom"
placeholder="选择日期"
value-format="yyyyMMdd">
</el-date-picker>
<div class="rel z-you-2"
@click="toUserInfo(houseInfo.userList[1].userId)"
v-if="houseInfo.userList[1]">
<img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
<img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you2.png" />
<div class="rel-text"
:class="houseInfo.userList[1].isSelf == '1' ? 'z-on' : ''">
<span class="rel-call">{{
houseInfo.userList[1].relation
}}</span>
<span class="rel-name">{{ houseInfo.userList[1].userName }}</span>
</div>
</div>
<div class="rel z-zuo-1"
@click="toUserInfo(houseInfo.userList[2].userId)"
v-if="houseInfo.userList[2]">
<img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
<img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo1.png" />
<div class="rel-text"
:class="houseInfo.userList[2].isSelf == '1' ? 'z-on' : ''">
<span class="rel-call">{{
houseInfo.userList[2].relation
}}</span>
<span class="rel-name">{{ houseInfo.userList[2].userName }}</span>
</div>
</div>
<div class="rel z-you-1"
@click="toUserInfo(houseInfo.userList[3].userId)"
v-if="houseInfo.userList[3]">
<img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
<img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you1.png" />
<div class="rel-text"
:class="houseInfo.userList[3].isSelf == '1' ? 'z-on' : ''">
<span class="rel-call">{{
houseInfo.userList[3].relation
}}</span>
<span class="rel-name">{{ houseInfo.userList[3].userName }}</span>
</div>
</div>
</div>
</div>
<div class="rel z-zuo-3"
@click="toUserInfo(houseInfo.userList[4].userId)"
v-if="houseInfo.userList[4]">
<img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" />
<img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo3.png" />
<div class="rel-text"
:class="houseInfo.userList[4].isSelf == '1' ? 'z-on' : ''">
<span class="rel-call">{{
houseInfo.userList[4].relation
}}</span>
<span class="rel-name">{{ houseInfo.userList[4].userName }}</span>
</div>
</div>
<div class="g-cpt-resi">
<div class="g-l">
<screen-echarts-frame class="echart-wr"
@myChartMethod="pieInitOk"
ref="pieChart"></screen-echarts-frame>
<div class="rel z-you-3"
@click="toUserInfo(houseInfo.userList[5].userId)"
v-if="houseInfo.userList[5]">
<img class="rel-bg"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" />
<img class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you3.png" />
<div class="rel-text"
:class="houseInfo.userList[5].isSelf == '1' ? 'z-on' : ''">
<span class="rel-call">{{
houseInfo.userList[5].relation
}}</span>
<span class="rel-name">{{ houseInfo.userList[5].userName }}</span>
</div>
</div>
</div>
</cpt-card>
</div>
</div>
<div class="g-r">
<div class="m-tb">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>居民需求</span>
</div>
<div class="g-r">
<div class="m-tb">
<div class="tb">
<cpt-tb :col-list="demand.colList"
@ -253,89 +55,84 @@
</el-pagination>
</div>
</div>
</cpt-card>
</div>
<div class="m-row">
<div class="m-list">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>上报事件</span>
</div>
<div class="list"></div>
</cpt-card>
</div>
<div class="m-list">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>积分记录</span>
</div>
<div class="list"></div>
</cpt-card>
</div>
</div>
</div>
</div>
</cpt-card>
</template>
<script>
import { Loading } from "element-ui"; //Loading
import { requestPost } from "@/js/dai/request";
import cptCard from "@/views/modules/visual/cpts/card";
import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
import cptTb from "@/views/modules/visual/cpts/tb";
import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
import { pieOption } from './typePieOption.js'
export default {
name: "HomeMap",
data () {
return {
showedMoreInfo: false,
userId: "",
info: {
financialSituation: { monthlyIncome: "", retirementAmount: "" },
gridName: "",
houseInfo: [],
name: "",
personCategory: [],
volunteerCategory: [],
workUnit: "",
},
houseInfo: {
ownerName: "",
userList: [
// {
// userId: "",
// userName: "",
// isSelf: "",
// relation: "",
// },
],
},
showNoData: false,
timer: null,
pieChartS: null,
pieChart: '',
pieOption: {},
pieInitState: false,
pieTotal: 0,
colorArray: [],
pieData: [
{ total: 1048, categoryName: '城市管理', color: '#1B51FF', selected: true },
{ total: 735, categoryName: '为民服务', color: '#00E5ED' },
{ total: 580, categoryName: '安全监管', color: '#7800FF' },
{ total: 484, categoryName: '民政', color: '#16D783' },
{ total: 300, categoryName: '环境保护', color: '#FF7800' },
{ total: 1049, categoryName: '建设管理', color: '#FFBA00' },
{ total: 735, categoryName: '街道吹哨部门报到', color: '#FFD685' },
{ total: 580, categoryName: '社会治安综合', color: '#2A00FF' },
{ total: 484, categoryName: '公安交通管理', color: '#C600FF' },
{ total: 300, categoryName: '卫生计生监管执法', color: '#FF2A00' },
{ total: 484, categoryName: '民生', color: '#3DDA83' },
{ total: 300, categoryName: '街道安全', color: '#FAC126' }
],
agencyId: '',
dateId: '',
categoryCode: '',
demand: {
loading: true,
colList: [
{
align: "center",
width: "5%",
},
{
align: "center",
width: "10%",
},
{
align: "center",
width: "15%",
width: "10%",
},
{
align: "center",
width: "15%",
width: "10%",
},
{
align: "center",
width: "40%",
width: "10%",
},
{
align: "center",
width: "5%",
},
{
align: "center",
width: "20%",
},
{
align: "center",
@ -346,104 +143,224 @@ export default {
width: "10%",
},
],
header: ["序号", "服务时间", "需求类型", "需求内容", "状态", "操作"],
header: ["序号", "项目编号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
list: [],
pageSize: 5,
pageSize: 10,
pageNo: 1,
total: 0,
},
};
},
props: {
uid: {
type: String,
default: "",
// default: "8ada68cb6f1e4b9a8333348a39ef3aee",
},
},
},
computed: {},
casOptions: [],
agencyIdArray: [],
customerList: [],
iscascaderShow: 0,
optionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
components: {
cptCard,
peopleMore,
cptTb,
};
},
watch: {
uid (id) {
this.userId = id;
},
userId () {
this.getApiData();
window.scrollTo(0, 0);
},
// mixins: [animate]
beforeDestroy () {
this.timer && clearInterval(this.timer)
},
async mounted () {
this.userId = this.uid;
this.initData()
await this.getAgencylist()//
this.getApiData();
},
methods: {
handleSearch () { },
initData () {
var time = (new Date).getTime() - 24 * 60 * 60 * 1000;
this.dateId = new Date(time); //
getApiData () {
this.getInfo();
this.getHouseInfo();
this.getDemandData();
},
async getApiData () {
toUserInfo (uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
await this.getPie()
await this.getTable();
},
//
async getInfo () {
const url = "/epmetuser/icresiuser/persondata";
let params = {
userId: this.userId,
};
const { data, code, msg } = await requestPost(url, params);
async getAgencylist () {
const url = '/gov/org/customeragency/agencylist'
// const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
const params = {
// customerId: '613cc61a6b8ce4c70d21bd413dac72cc'
customerId: '0c41b272ee9ee95ac6f184ad548a30eb'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.info = { ...this.info, ...data };
++this.iscascaderShow
this.casOptions = []
this.agencyIdArray.length = []
if (data) {
this.casOptions.push(data)
}
} else {
this.$message.error(msg);
this.$message.error(msg)
}
},
//
async getHouseInfo () {
const url = "/epmetuser/icresiuser/ownerrelation";
handleChangeDate (value) {
this.dateId = value
this.getApiData()
},
pieInitOk (dom) {
console.log('pie准备好了', dom)
this.pieChartS = dom
this.pieInitState = true
},
getPie () {
if (this.pieInitState) {
this.getPieChart()
} else {
setTimeout(() => {
this.getPie()
}, 500)
}
},
//
async getPieChart () {
this.$refs.pieChart.clear()
this.pieTotal = 0
const _that = this
// this.$refs.pieChart.showLoading()
// const url ="/data/aggregator/project/projectcategorylist";
const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectcategorylist";
let params = {
userId: this.userId,
agencyId: this.agencyId,
dateId: this.dateId,
};
const { data, code, msg } = await requestPost(url, params);
// pieChart
if (code === 0) {
this.houseInfo = { ...this.houseInfo, ...data };
// pieChart
this.pieOption = pieOption(this.pieChartS)
if (data && data.length > 0) {
// this.pieData = data
} else {
this.pieData = [{ total: 0, categoryName: '无分类', color: '#00E5ED' }]
}
let maxValue = this.pieData[0].total
let maxIndex = 0
this.pieData[0].selected = true
this.pieData.forEach((item, index) => {
item.name = item.categoryName
item.value = item.total
this.colorArray.push(item.color)
this.pieTotal = this.pieTotal + item.value
if (item.value > maxValue) {
maxValue = item.value
maxIndex = index
item.selected = true
} else if (index !== 0) {
item.selected = false
}
});
this.pieOption.title.text = this.pieTotal
this.pieOption.series[1].itemStyle = {
color: function (params) {
return _that.colorArray[params.dataIndex]
}
}
let fun = function (params) {
_that.clickPie(params.dataIndex)
_that.categoryCode = _that.pieData[params.dataIndex].categoryCode
_that.getTable()
}
this.$refs.pieChart.handleClick(fun)
this.clickPie(maxIndex)
} else {
this.$message.error(msg);
}
},
handlePageNoChange_demand (val) {
this.demand.pageNo = val;
this.getDemandData();
clickPie (seriesIndex) {
this.pieData.forEach((element, index) => {
if (index === seriesIndex) {
element.label = {
show: true,
};
element.labelLine = {
show: true,
lineStyle: {
opacity: 1,
}
};
console.log('zhilma')
} else {
element.label = {
show: false,
};
element.labelLine = {
show: false,
lineStyle: {
opacity: 0,
color: 'rgba(255,255,255,0)'
}
};
}
});
this.pieOption.series[1].data = this.pieData
// this.$refs.pieChart.hideLoading()
this.$refs.pieChart.setOption(this.pieOption)
},
handleChangeAgency (value) {
this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
this.getApiData()
console.log(this.agencyIdArray)
},
//
async getDemandData () {
const url =
"http://yapi.elinkservice.cn/mock/245/heart/userdemand/mydemand";
async getTable () {
// const url = "/data/aggregator/project/categoryprojectlist";
const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/categoryprojectlist";
let params = {
userId: this.userId,
dateId: this.dateId,
agencyId: this.agencyId,
categoryCode: this.categoryCode,
pageNo: this.demand.pageNo,
pageSize: this.demand.pageSize,
isPage: true
};
const { data, code, msg } = await requestPost(url, params);
@ -452,12 +369,19 @@ export default {
if (code === 0) {
this.demand.total = data.total;
this.demand.list = data.list.map((item) => {
//:issue :agency :resi_event
item.originShow = item.origin === 'issue' ? '楼院小组' : item.origin === 'agency' ? '项目立项' : '事件上报'
//: pendingclosed
item.statusShow = item.status === 'pending' ? '待处理' : '已结案'
return [
{ type: "index" },
item.wantServiceTime,
item.content,
item.categoryName,
item.statusName,
item.projectCode,
item.categoryNames.join(','),
item.originShow,
item.gridName,
item.statusShow,
item.title,
item.time,
{ type: "operate", list: ["查看"] },
];
});
@ -465,12 +389,48 @@ export default {
this.$message.error(msg);
}
},
handlePageNoChange_demand (val) {
this.demand.pageNo = val;
this.getTable();
},
toUserInfo (uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
},
props: {
uid: {
type: String,
default: "",
// default: "8ada68cb6f1e4b9a8333348a39ef3aee",
},
},
computed: {},
components: {
cptCard,
cptTb,
screenEchartsFrame,
},
watch: {
uid (id) {
this.userId = id;
},
userId () {
this.getApiData();
window.scrollTo(0, 0);
},
},
};
</script>
<style
lang="scss"
src="@/assets/scss/modules/visual/resibuzz.scss"
src="@/assets/scss/modules/visual/typeAnalyze.scss"
scoped
></style>
<style lang=scss scoped>
</style>

179
src/views/modules/visual/communityGovern/typePieOption.js

@ -0,0 +1,179 @@
export function pieOption (_charts) {
const center= ['50%', '250px']
return {
title: {
text: '0',
top: 220,
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: 500,
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: ['55%', '55.3%'],
label: {
show: false
},
labelLine: {
show: false
},
data: [{
value: 360,
itemStyle: {
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: ['40%', '60%'],
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 = [
// '#00FFFF', '#00FF00', '#FFFF00', '#FF8C00', '#FF0000', '#FE8463',
// ];
// 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)',
}
}
}
]
},
]
}
}

398
src/views/modules/visual/communityParty/community.vue

@ -2,7 +2,8 @@
<div class="warning-box">
<cpt-card class="card-wr">
<div class="card-title">
<img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
<img class="title-icon"
src="../../../../assets/img/shuju/title-tip.png" />
<div class="title-label">
区域化党建
</div>
@ -10,22 +11,28 @@
<div class="second-title">
<div class="second-title-label">党建单位分类统计</div>
<div class="second-select">
<el-select v-model="value2" clearable placeholder="请选择">
<el-option
v-for="item in headerList"
:key="item.coulmn"
:label="item.title"
:value="item.coulmn">
<el-select v-model="serviceMatter"
clearable
placeholder="请选择"
@change="handleSelectChange"
@clear="handleSelectChange">
<el-option v-for="item in unitList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div class="second-select">
<el-date-picker
v-model="value2"
type="date"
prefix-icon="el-icon-caret-bottom"
placeholder="选择日期"
value-format="yyyy-MM-dd">
<el-date-picker v-model="timeRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
prefix-icon="el-icon-caret-bottom"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handleSelectChange"
@clear="handleSelectChange">
</el-date-picker>
</div>
</div>
@ -42,22 +49,18 @@
</div>
<div class="box-right">
<div class="warning-box-bottom">
<screen-table
:headerList="headerList"
:tableData="tableData"
:visibleLoading="visibleLoading"
:operate="false"
></screen-table>
<screen-table :headerList="headerList"
:tableData="tableData"
:visibleLoading="visibleLoading"
:operate="true"></screen-table>
<div class="pagination">
<el-pagination
:current-page="pageNo"
:page-size="pageSize"
background
layout="prev, pager, next"
@size-change="pageSizeChangeHandleNew"
@current-change="pageCurrentChangeHandleNew"
:total="total"
>
<el-pagination :current-page="pageNo"
:page-size="pageSize"
background
layout="prev, pager, next"
@size-change="pageSizeChangeHandleNew"
@current-change="pageCurrentChangeHandleNew"
:total="total">
</el-pagination>
</div>
</div>
@ -69,16 +72,26 @@
<div class="box-wr">
<div class="box-left box-left-w400">
<div v-for="item in partyItem" :key="item.value" class="box-left-item">
<div v-for="item in partyItem"
:key="item.value"
class="box-left-item">
<div class="box-label">{{ item.name }}</div>
<div class="box-num" :style="'color:' + item.color">{{ item.value }}</div>
<div class="box-num"
:style="'color:' + item.color">{{ item.value }}</div>
</div>
</div>
<div class="box-right">
<div class="box-map">这是地图容器</div>
<div class="map-tips">
<div v-for="item in partyItem" :key="item.value" class="map-tips-item">
<div class="box-map">
<screen-map class="map"
ref="map"
@clickFeature="clickProject"
:showIconLayer="true"></screen-map>
</div>
<div class="map-tips">
<div v-for="item in partyItem"
:key="item.value"
class="map-tips-item">
<div class="map-tips-icon">
<img :src="item.icon" />
</div>
@ -89,6 +102,8 @@
</div>
</cpt-card>
<dialog-info v-show="showedMoreInfo"
@close="showedMoreInfo = false" />
</div>
</template>
@ -97,37 +112,46 @@ import { requestPost } from "@/js/dai/request";
import screenTable from "../components/screen-table/index";
import cptCard from "@/views/modules/visual/cpts/card";
import nextTick from "dai-js/tools/nextTick";
import dialogInfo from './dialogInfo.vue'
import screenMap from "@/views/modules/visual/components/screen-map";
export default {
name: "warning-box",
components: {
cptCard,
screenTable,
dialogInfo,
screenMap
},
data() {
data () {
return {
showedMoreInfo: false,
tableLoading: false,
warningList: [],
headerList: [
{ title: "序号", coulmn: 'index' },
{ title: "需求类型", coulmn: 'gridName' },
{ title: "具体内容", coulmn: 'buildingName' },
{ title: "上报情况", coulmn: 'neighborhoodName' },
{ title: "上报人", coulmn: 'residentNames' },
{ title: "上报时间", coulmn: 'residentNames' },
{ title: "是否认领", coulmn: 'residentNames' },
{ title: "认领方", coulmn: 'residentNames' },
{ title: "认领时间", coulmn: 'residentNames' }
{ title: "区域化党建单位名称", coulmn: 'unitName' },
{ title: "活动标题", coulmn: 'title' },
{ title: "活动地址", coulmn: 'address' },
{ title: "服务事项", coulmn: 'serviceMatter' },
{ title: "服务人数", coulmn: 'peopleCount' },
{ title: "活动时间", coulmn: 'activityTime' }
],
tableData: [
// [1,'','','2',''],
],
agencyId: '',
value2: '',
timeRange: '',
visibleLoading: true,
serviceMatter: '',
pageNo: 1,
pageSize: 10,
total: 0,
activeIndex: 0,
activeLevel: "1",
unitList: [],
partyItem: [
{
name: '楼宇党建',
@ -156,68 +180,232 @@ export default {
icon: require('../../../../assets/img/shuju/measure/qita.png')
}
],
//
isfirstInit: true,//
agencyInfo: {},//level
unitMapList: [],
unitMapList1: [
{
type: '党建楼宇',
name: '建联单位1',
latitude: 36.062227,
longitude: 120.389455,
},
{
type: '党建楼宇',
name: '建联单位2',
latitude: 36.082227,
longitude: 120.389455,
},
{
type: '机关直属部门',
name: '建联单位3',
latitude: 36.062227,
longitude: 120.379455,
},
{
type: '两新党建',
name: '建联单位4',
latitude: 36.082227,
longitude: 120.379455,
},
{
type: '辖区单位',
name: '建联单位5',
latitude: 36.092227,
longitude: 120.379455,
},
{
type: '其他',
name: '建联单位6',
latitude: 36.102227,
longitude: 120.379455,
}
],
};
},
async mounted() {
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
await nextTick(100);
this.getBuildingwarnlist();
this.loadUnit()
this.getList();
await this.getWorkUserInfo()
await this.getMapUnitList()
},
methods: {
onClickList(index, level) {
this.activeIndex = index;
this.activeLevel = level;
this.pageNo = 1;
this.getUserwarnlist();
},
//
async getUserwarnlist() {
const { activeIndex, activeLevel, warningList } = this;
const reqItem = warningList[activeIndex];
let tableData = [];
const url = "/epmetuser/statsresiwarn/userwarnlist";
async getList () {
this.visibleLoading = true
const url = "/heart/icpartyactivity/search"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
let params = {
configId: reqItem.configId,
buildingIdList: reqItem["buildingIdList" + activeLevel],
pageNo: this.pageNo,
agencyId: this.agencyId,
pageSize: this.pageSize,
};
const { data, code, msg } = await requestPost(url, params);
pageNo: this.pageNo,
serviceMatter: this.serviceMatter,
startTime: this.timeRange.length > 0 && this.timeRange[0] || '',
endTime: this.timeRange.length > 0 && this.timeRange[1] || ''
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
tableData = data.list.map((item, index) => {
return {
...item,
index: index + 1,
residentNames: item.residentNames || "暂无"
}
});
this.tableData = tableData;
this.total = data.total;
this.total = data.total
this.tableData = data.list
} else {
this.$message.error(msg)
}
this.visibleLoading = false
},
async loadUnit () {
const url = "/heart/icresidemanddict/subcodelist"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
let params = {
parentCategoryCode: '1010'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.unitList = data
} else {
this.$message.error(msg)
}
},
//
async getBuildingwarnlist() {
const url = "/epmetuser/statsresiwarn/buildingwarnlist";
//
getWorkUserInfo () {
const url = '/epmetuser/customerstaff/staffbasicinfo'
let params = {}
window.app.ajax.post(
url,
params,
(data, rspMsg) => {
this.agencyInfo = data
if (!data.latitude) {
this.agencyInfo.latitude = 36.072227
}
if (!data.longitude) {
this.agencyInfo.longitude = 120.389455
}
if (!data.level) {
this.agencyInfo.level = 'street'
}
},
(rspMsg, data) => {
this.$message.error(rspMsg)
}
)
},
// //
// async loadType () {
// const url = "/sys/dict/data/dictlist"
// let params = {
// dictType: 'party_unit_type'
// }
// const { data, code, msg } = await requestPost(url, params)
// if (code === 0) {
// this.typeList = data
// } else {
// this.$message.error(msg)
// }
// },
//
async getMapUnitList () {
// const url = "/heart/icpartyunit/distribution"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
let params = {
agencyId: this.$store.state.user.agencyId,
};
const { data, code, msg } = await requestPost(url, params);
agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.warningList = data;
this.visibleLoading = false;
this.getUserwarnlist();
// this.unitMapList = data
this.unitMapList = this.unitMapList1
this.unitMapList.forEach(item => {
if (item.type === '党建楼宇') {
item.urlIndex = 0
} else if (item.type === '两新党建') {
item.urlIndex = 1
} else if (item.type === '辖区单位') {
item.urlIndex = 2
} else if (item.type === '机关直属部门') {
item.urlIndex = 3
} else if (item.type === '其他') {
item.urlIndex = 4
}
});
this.iconUrlArray = [
require('../../../../assets/img/shuju/measure/ly@2x.png'),//
require('../../../../assets/img/shuju/measure/jgzs@2x.png'),//
require('../../../../assets/img/shuju/measure/lxdj@2x.png'),//
require('../../../../assets/img/shuju/measure/xq@2x.png'),//
require('../../../../assets/img/shuju/measure/qita.png')//
]
//false
this.loadMap()
this.isfirstInit = false
} else {
this.$message.error(msg)
}
},
//
loadMap () {
if (this.isfirstInit) {
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
this.$refs.map.loadMap(this.agencyInfo, null, null, this.unitMapList, this.iconUrlArray, null)
} else {
this.$refs.map.refreshMap(null, this.unitMapList)
}
},
pageSizeChangeHandleNew(val) {
//
clickProject (feature) {
console.log('标注信息', feature.values_.properties)
},
handleSelectChange () {
this.getList();
},
pageSizeChangeHandleNew (val) {
this.pageNo = 1;
this.pageSize = val;
this.getList();
},
pageCurrentChangeHandleNew(val) {
pageCurrentChangeHandleNew (val) {
this.pageNo = val;
this.getUserwarnlist();
this.getList();
},
},
};
@ -258,7 +446,6 @@ export default {
color: #fff;
font-weight: 800;
}
}
.second-title {
display: flex;
@ -272,7 +459,7 @@ export default {
color: #fff;
}
.second-title-label::after {
content: '';
content: "";
position: absolute;
top: 50%;
left: 20px;
@ -280,31 +467,47 @@ export default {
height: 12px;
box-sizing: border-box;
margin-top: -6px;
background: #2865FA;
background: #2865fa;
border-radius: 50%;
}
.second-select {
margin: 0 10px 0 40px;
::v-deep .el-input {
width: 120px;
width: 180px;
height: 36px;
.el-input__inner {
height: 100%;
padding: 0 10px;
color: #fff;
line-height: 36px;
background: #06186D;
border: 1px solid #1A64CC;
background: #06186d;
border: 1px solid #1a64cc;
}
.el-icon-arrow-up:before {
content: "\e78f"
content: "\e78f";
}
// .el-select__caret:before {
// content: '\E790'
// }
}
::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;
@ -325,7 +528,7 @@ export default {
.box-left-item {
.box-label {
font-size: 16px;
color: rgba(255, 255, 255, .72);
color: rgba(255, 255, 255, 0.72);
}
.box-num {
font-size: 32px;
@ -338,7 +541,12 @@ export default {
flex: 1;
.box-map {
height: 400px;
border: 1px solid #2865FA;
// border: 1px solid #2865fa;
.map {
height: 100%;
width: 100%;
}
}
}
.box-left-w400 {
@ -365,7 +573,6 @@ export default {
}
}
.map-tips {
width: 100%;
display: flex;
@ -397,5 +604,4 @@ export default {
}
}
}
</style>

189
src/views/modules/visual/communityParty/dialogInfo.vue

@ -0,0 +1,189 @@
<template>
<div class="m-pop">
<div class="wrap">
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>需求详情</span>
</div>
<div class="btn-close" @click="handleClose">
<img src="@/assets/img/shuju/people/close.png" />
</div>
<div class="list-title">需求内容</div>
<div class="list-wr">
<div class="list">
<div class="item-desc">
<!-- <span class="item-field">所属网格</span> -->
<span>市北区同德花园小区物业管理服务公司的同志每天对该小区 公共部位喷洒消毒液进行消毒为杀灭新型冠状病毒近几 天以来市北区</span>
</div>
<div class="item">
<span class="item-field">所属网格</span>
<span>哈哈哈</span>
</div>
<div class="item">
<span class="item-field">需求类型</span>
<span>的是法撒旦法</span>
</div>
<div class="item">
<span class="item-field">需求状态</span>
<span>第三方士大夫</span>
</div>
<div class="item">
<span class="item-field">上报类型</span>
<span>撒打发斯蒂芬</span>
</div>
<div class="item">
<span class="item-field"> </span>
<span>撒打发斯蒂芬</span>
</div>
<div class="item">
<span class="item-field">上报人联系方式</span>
<span>撒打发斯蒂芬</span>
</div>
<div class="item">
<span class="item-field">上报时间</span>
<span>2021-09-17 12:52</span>
</div>
<div class="item">
<span class="item-field">服务时间</span>
<span>2021-09-17 12:52</span>
</div>
</div>
<div class="list">
<div class="item">
<span class="item-field">服务方</span>
<span>哈哈哈</span>
</div>
<div class="item">
<span class="item-field">实际服务时间</span>
<span>2021-09-17 12:52 <br/>
2021-09-17 17:52</span>
</div>
<div class="item">
<span class="item-field">完成情况</span>
<span>第三方士大夫</span>
</div>
<div class="item">
<span class="item-field">评价</span>
<span>
<el-rate value="4" disabled></el-rate>
</span>
</div>
</div>
</div>
<div class="tabs">
<div
class="tab-btn"
>
<img src="@/assets/img/shuju/people/arrow-double-left.png" />
</div>
<div
class="tab z-on"
>
研判分析
</div>
<div
class="tab-btn"
>
<img src="@/assets/img/shuju/people/arrow-double-right.png" />
</div>
</div>
<analyse />
</cpt-card>
</div>
</div>
</template>
<script>
import cptCard from "@/views/modules/visual/cpts/card";
import analyse from '../cpts/analyse.vue'
import { requestPost } from "@/js/dai/request";
export default {
name: "dialogInfo",
props: {
userId: {
type: String,
default: "",
},
gridName: {
type: String,
default: "",
},
},
components: {
cptCard,
analyse
},
data() {
return {
fieldList: [],
groupList: [],
groupIndex: 0,
startGroupIndex: 0,
info: {},
allInfo: {},
xiaoquList: [],
louList: [],
danyuanList: [],
homeList: [],
};
},
mounted() {
},
methods: {
handleClose() {
this.$emit("close");
},
}
};
</script>
<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
<style lang="scss" scoped>
.m-pop {
.wrap {
.list {
display: block;
width: 50%;
.item {
display: flex;
width: 100%;
box-sizing: border-box;
margin-top: 0;
margin-bottom: 15px;
font-size: 16px;
cursor: pointer;
}
.item-desc {
font-size: 16px;
margin-bottom: 10px;
line-height: 24px;
}
}
}
.list-title {
width: 100%;
box-sizing: border-box;
padding: 20px 0 10px 62px;
font-size: 20px;
cursor: pointer;
}
}
.list-wr {
display: flex;
padding: 0 32px;
}
</style>

176
src/views/modules/visual/communityParty/options.js

@ -0,0 +1,176 @@
export function pieOption (_charts) {
const center= ['50%', '50%']
return {
title: {
text: '0',
top: 125,
left: 196,
textAlign: 'center',
textStyle: {
width: '100%',
fontSize: 32,
color: '#FFFFFF',
fontWeight: 400,
align: 'center'
},
itemGap: 5,
subtext: '总数',
subtextStyle: {
fontSize: 16,
color: '#fff',
fontWeight: 400,
align: 'center'
}
},
tooltip: {
show: false
},
legend: {
top: 500,
bottom: 0,
itemWidth: 20,
itemHeight: 10,
textStyle: {
color: '#D2E7FF',
fontSize: 16,
lineHeight: 20,
},
},
series: [
// 外侧圆环
{
type: 'pie',
// 起始刻度的角度,默认为 90 度,即圆心的正上方。0 度为圆心的正右方。
startAngle: 90,
hoverAnimation: false,
// tooltip: {
// },
center: center,
left: 'left',
radius: ['60%', '70%'],
width: 400,
label: {
show: false
},
labelLine: {
show: false
},
data: [{
value: 480,
itemStyle: {
color: 'rgba(40, 101, 250, 0)',
width:0,
borderColor: 'rgba(40, 101, 250, 0.5)',
borderWidth: 1,
borderType: 'dotted'
}
}
]
},
// 突出的
{
hoverAnimation: false,
type: 'pie',
center: center,
radius: ['40%', '60%'],
avoidLabelOverlap: false,
selectedMode: 'single',
left: 'left',
width: 400,
startAngle: 90,
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: {
},
data: [],
},
// 中间圆环
{
type: 'pie',
// 起始刻度的角度,默认为 90 度,即圆心的正上方。0 度为圆心的正右方。
startAngle: 90,
hoverAnimation: false,
center: center,
left: 'left',
width: 400,
// tooltip: {
// },
radius: ['0%', '25%'],
label: {
show: false
},
labelLine: {
show: false
},
data: [
{
value: 360,
itemStyle: {
color: 'rgba(8, 37, 134, 1)',
}
}
]
},
]
}
}

380
src/views/modules/visual/communityParty/party.vue

@ -33,8 +33,11 @@
<div class="card-left-title">党员年龄统计</div>
<div class="card-flex">
<div class="echart-wr">
<div class="echart-cicle"></div>
<div id="echartOrg" class="echart-org"></div>
<!-- <div class="echart-cicle"></div> -->
<screen-echarts-frame class="echart-org"
@myChartMethod="pieInitOk"
ref="ageChart"></screen-echarts-frame>
<!-- <div id="echartOrg" class="echart-org"></div> -->
</div>
<div class="echarts-tips echarts-tips-wd50">
<div class="tips-lists">
@ -77,8 +80,11 @@
<div class="card-left-title">党员学历统计</div>
<div class="card-flex">
<div class="echart-wr echart-wr100">
<div class="echart-cicle echart-cicle0"></div>
<div id="echartType" class="echart-org"></div>
<!-- <div class="echart-cicle echart-cicle0"></div> -->
<!-- <div id="echartType" class="echart-org"></div> -->
<screen-echarts-frame class="echart-org"
@myChartMethod="pieInitOks"
ref="eduChart"></screen-echarts-frame>
</div>
<div v-if="false" class="echarts-tips">
<div class="tips-list">
@ -123,6 +129,8 @@ import { requestPost } from "@/js/dai/request";
import screenTable from "../components/screen-table/index";
import cptCard from "@/views/modules/visual/cpts/card";
import nextTick from "dai-js/tools/nextTick";
import screenEchartsFrame from "../components/screen-echarts-frame";
import { pieOption } from './options'
import * as echarts from 'echarts';
export default {
@ -130,6 +138,7 @@ export default {
components: {
cptCard,
screenTable,
screenEchartsFrame
},
data() {
return {
@ -212,126 +221,198 @@ export default {
color: 'rgba(255, 186, 0, 1)'
}
],
pieAgeChartS: null,
pieEduChartSs: null,
pieAgeOptions: null,
pieEduOptions: null
};
},
async mounted() {
await nextTick(100);
this.initCharts()
this.initChartType()
this.initAgeCharts()
this.initEduCharts()
// this.initChartType()
this.getBuildingwarnlist();
},
methods: {
initCharts() {
const eId = document.getElementById('echartOrg')
let _charts = echarts.init(eId)
pieInitOk (dom) {
console.log('pie准备好了', dom)
this.pieAgeChartS = dom
// this.pieInitState = true
},
pieInitOks (dom) {
console.log('pies准备好了', dom)
this.pieEduChartS = dom
// this.pieInitState = true
},
initAgeCharts() {
// const eId = document.getElementById('echartOrg')
// let _charts = echarts.init(eId)
let option = {
tooltip: {
show: false,
trigger: 'item'
},
legend: {
show: false,
orient: 'vertical',
top: '40%',
left: 'right',
textStyle: {
color: '#fff'
}
},
title: {
text: '12000', //80%
subtext: '总数',
left: "center",
top: "center",
textStyle: {
color: "#fff",
fontSize: 28,
align: "center"
},
subtextStyle: {
fontSize: 16,
color: '#fff'
// tooltip: {
// show: false,
// trigger: 'item'
// },
// legend: {
// show: false,
// orient: 'vertical',
// top: '40%',
// left: 'right',
// textStyle: {
// color: '#fff'
// }
// },
// title: {
// text: '12000', //80%
// subtext: '',
// left: "center",
// top: "center",
// textStyle: {
// color: "#fff",
// fontSize: 28,
// align: "center"
// },
// subtextStyle: {
// fontSize: 16,
// color: '#fff'
// }
// },
// series: [
// {
// // name: 'Access From',
// type: 'pie',
// // center: ['10%', '50%'],
// radius: ['40%', '60%'],
// avoidLabelOverlap: true,
// // top: top + '%',
// // height: '80%',
// left: 'center',
// width: 400,
// label: {
// show: true,
// position: 'outer',
// alignTo: 'edge',
// formatter: '{a|{c}}\n{r|}\n{name|{b}}',
// minMargin: 5,
// edgeDistance: 20,
// lineHeight: 15,
// color: '#fff',
// fontSize: 12,
// // padding: [5],
// distanceToLabelLine: 10,
// rich: {
// name: {
// padding: [0, 6, 0, 6]
// },
// a: {
// fontSize: 15,
// color: '#fff',
// padding: [0, 6, 0, 6]
// },
// r: {
// backgroundColor: 'auto',
// borderRadius: 6,
// width: 6,
// height: 6,
// // padding: [3, 3, 0, -12]
// }
// }
// },
// emphasis: {
// label: {
// show: true,
// fontSize: '14',
// fontWeight: 'bold'
// }
// },
// labelLine: {
// show: false,
// length: 20,
// length2: 0,
// maxSurfaceAngle: 80,
// lineStyle: {
// cap: 'round'
// }
// },
// labelLayout: function (params) {
// const isLeft = params.labelRect.x < this.pieChartS.getWidth() / 2;
// const points = params.labelLinePoints;
// // Update the end point.
// points[2][0] = isLeft
// ? params.labelRect.x
// : params.labelRect.x + params.labelRect.width;
// return {
// labelLinePoints: points
// };
// },
// data: this.ageItem
// }
// ]
}
this.pieAgeOptions = pieOption(this.pieAgeChartS)
this.clickAgePie(0)
let fun = params => {
this.clickAgePie(params.dataIndex)
}
this.$refs.ageChart.handleClick(fun)
// option && this.$refs.pieChart.setOption(option);
},
initEduCharts() {
// const eId = document.getElementById('echartOrg')
// let _charts = echarts.init(eId)
let option = {
}
let legend = {
show: true,
orient: 'vertical',
top: '20%',
right: 0,
textStyle: {
width: 90,
color: '#fff',
rich: {
a: {
width: 90
}
}
},
series: [
{
// name: 'Access From',
type: 'pie',
// center: ['10%', '50%'],
radius: ['40%', '60%'],
avoidLabelOverlap: true,
// top: top + '%',
// height: '80%',
left: 'center',
width: 400,
label: {
show: true,
position: 'outer',
alignTo: 'edge',
formatter: '{a|{c}}\n{r|}\n{name|{b}}',
minMargin: 5,
edgeDistance: 20,
lineHeight: 15,
color: '#fff',
fontSize: 12,
// padding: [5],
distanceToLabelLine: 10,
rich: {
name: {
padding: [0, 6, 0, 6]
},
a: {
fontSize: 15,
color: '#fff',
padding: [0, 6, 0, 6]
},
r: {
backgroundColor: 'auto',
borderRadius: 6,
width: 6,
height: 6,
// padding: [3, 3, 0, -12]
}
formatter: name => {
for (let a = 0; a < this.eduItem.length; a++) {
// this.data
if (this.eduItem[a].name === name) {
//
let params1 = name + "\n"; //returnlegend
console.log(params1);
let tmp = params1.split("\n");
let res = "" + params1;
for (let i in tmp) {
res = res.replace(tmp[i], "");
}
},
emphasis: {
label: {
show: true,
fontSize: '14',
fontWeight: 'bold'
}
},
labelLine: {
show: true,
length: 20,
length2: 0,
maxSurfaceAngle: 80,
lineStyle: {
cap: 'round'
}
},
labelLayout: function (params) {
const isLeft = params.labelRect.x < _charts.getWidth() / 2;
const points = params.labelLinePoints;
// Update the end point.
points[2][0] = isLeft
? params.labelRect.x
: params.labelRect.x + params.labelRect.width;
return {
labelLinePoints: points
};
},
data: this.ageItem
return res + params1;
}
}
]
}
}
option && _charts.setOption(option);
this.pieEduOptions = pieOption(this.pieEduChartS)
this.pieEduOptions.legend = { ...legend }
// this.pieEduOptions.series[1].width = 400
this.clickEduPie(0)
let fun = params => {
this.clickEduPie(params.dataIndex)
}
this.$refs.eduChart.handleClick(fun)
// option && this.$refs.pieChart.setOption(option);
},
initChartType() {
const eId = document.getElementById('echartType')
let _charts = echarts.init(eId)
let option = {
tooltip: {
trigger: 'item'
@ -365,21 +446,6 @@ export default {
return res + params1;
}
}
// var target;
// for(var i = 0; i < this.eduItem.length; i++){
// if(i == this.eduItem.length && parseFloat(this.eduItem[i].value * 100).toFixed(2) < parseFloat(0.01)){
// target = " (<0.01"
// break;
// }
// if(name == this.eduItem[i].name){
// target = " (" + (this.eduItem[i].value * 100).toFixed(2) + ""
// break;
// }
// }
// var arr = [
// '{a|' + name + target + '%)}',
// ]
// return arr.join('\n');
}
},
title: {
@ -467,6 +533,78 @@ export default {
}
option && _charts.setOption(option);
},
clickAgePie (seriesIndex) {
this.ageItem.forEach((element, index) => {
if (index === seriesIndex) {
element.label = {
show: true,
};
element.labelLine = {
show: true,
lineStyle: {
opacity: 1,
}
};
console.log('zlcm')
} else {
element.label = {
show: false,
};
element.labelLine = {
show: false,
lineStyle: {
opacity: 0,
color: 'rgba(255,255,255,0)'
}
};
}
});
this.pieAgeOptions.series[1].data = this.ageItem
// this.$refs.pieChart.hideLoading()
this.$refs.ageChart.setOption(this.pieAgeOptions)
},
clickEduPie (seriesIndex) {
this.eduItem.forEach((element, index) => {
if (index === seriesIndex) {
element.label = {
show: true,
};
element.labelLine = {
show: true,
lineStyle: {
opacity: 1,
}
};
console.log('zlcm')
} else {
element.label = {
show: false,
};
element.labelLine = {
show: false,
lineStyle: {
opacity: 0,
color: 'rgba(255,255,255,0)'
}
};
}
});
this.pieEduOptions.series[1].data = this.eduItem
// this.$refs.pieChart.hideLoading()
this.$refs.eduChart.setOption(this.pieEduOptions)
},
onClickList(index, level) {
this.activeIndex = index;

516
src/views/modules/visual/components/screen-map/index copy.vue

@ -1,516 +0,0 @@
<template>
<div style="position: relative">
<div class="div_map"
id="map"
ref="map">
<!-- <div id="map"
class="map"></div> -->
</div>
</div>
</template>
<script>
import 'ol/ol.css'
import { Map, View } from 'ol'
import TileLayer from 'ol/layer/Tile.js';
import XYZ from 'ol/source/XYZ.js';
import VectorLayer from 'ol/layer/Vector.js';
import VectorSource from 'ol/source/Vector.js';
import GeoJSON from 'ol/format/GeoJSON.js';
import Point from "ol/geom/Point.js";
import Feature from "ol/Feature.js";
import Overlay from 'ol/Overlay';
import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
import { getCenter, boundingExtent } from 'ol/extent.js';
import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
import { mapGetters } from "vuex";
import { Loading } from 'element-ui'; //Loading
import { requestPost } from "@/js/dai/request";
let loading;//
let map;
let mapView;
let gaodeMapLayer;//
let polygonLayer;//
let iconLayer; // icon
let iconSource; // icon
let polygonSource;//
let select;//
//url
let iconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
];
let textColorArray = [
'rgba(236, 69, 4, 0.66)',
'rgba(0, 146, 238, 0.75)',
'rgba(238, 151, 0, 0.8)'
];
let polygonColorArray = [
'rgba(210, 2, 2, 0.24)',
'rgba(43, 231, 253, 0.25)',
'rgba(183, 185, 0, 0.16)'
];
//
var createTextStyle = function (feature) {
return new Text({
textAlign: undefined,
font: "18px Arial",
//fontFamily: "Courier New, monospace",
// fontWeight: "bold",
text: feature.values_.name,
backgroundFill: new Fill({
// color: 'rgba(0, 146, 238, 0.75)'
color: textColorArray[feature.values_.index - 1]
}),
padding: [4, 10, 4, 10],
//text: "",
fill: new Fill({ color: "#ffffff" }),
// stroke: new Stroke({ color: "#ffffff", width: 3 }),
offsetY: -30,
offsetX: -50,
overflow: true,
});
};
//
var polygonStyleFunction = (function () {
return function (feature) {
return new Style({
fill: new Fill({
// color: [255, 255, 255, 0.3]
color: polygonColorArray[feature.values_.index - 1]
}),
stroke: new Stroke({
color: polygonColorArray[feature.values_.index - 1],
width: 3
}),
text: createTextStyle(feature)
});;
};
})()
const vueGis = {
name: 'HomeMap',
data () {
return {
centerPoint: [],//
zoom: 14,//14
minZoom: 1,//
orgData: {},//
orgId: '',
orgLevel: '',
subAgencyArray: [],//
iconCoordinators: [],
currentCoordinate: null,
overlay: null,
}
},
async mounted () {
//
await this.loadOrgData()
//
this.initMap()
//
this.addPolygonLayer()
//icontuceng
this.addIconLayer()
//
this.loadPolygon(this.subAgencyArray)
},
methods: {
//
async refreshMap (isRefreshView) {
//
await this.loadOrgData()
//
await this.loadPolygon(this.subAgencyArray)
//
if (isRefreshView) {
this.setMapLocation()
mapView.setCenter(this.centerPoint);
mapView.setZoom(this.zoom);
}
},
//
async loadOrgData () {
const url = "/gov/org/agency/maporg"
let params = {
orgId: this.orgId,
level: this.orgLevel
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.orgData = data
this.orgId = this.orgData.id
this.orgLevel = this.orgData.level
if (data.children && data.children.length > 0) {
this.subAgencyArray = data.children
} else {
this.subAgencyArray = []
}
} else {
this.$message.error(msg)
}
},
//
loadPolygon (subAgencyArray) {
polygonSource.clear()//
iconSource.clear()//
let featureData = []//
if (subAgencyArray && subAgencyArray.length > 0) {//
let oneData = {}
subAgencyArray.forEach(agencyItem => {
if (agencyItem.coordinates && agencyItem.coordinates !== '') {//
let urlNum = this.getRndBetween(1, 3)
oneData = {
type: 'Feature',
id: agencyItem.id,
properties: {
id: agencyItem.id,
level: agencyItem.level,
name: agencyItem.name,
index: urlNum//
},
geometry: {
type: 'Polygon',
coordinates: [],
},
}
let coorArray = agencyItem.coordinates.split(',')//
let itemArray = []//[lon,lat]
let polygonArray = []//[[lon,lat],[lon,lat],[lon,lat]]
coorArray.forEach((item, index) => {
itemArray.push(item)
if (index % 2 == 0) {//
} else {//
polygonArray.push(itemArray)
itemArray = []
}
});
oneData.geometry.coordinates.push(polygonArray)
featureData.push(oneData)
}
});
}
if (featureData && featureData.length > 0) {
var geojsonObject = {
'type': 'FeatureCollection',
'features': featureData
};
let feature = (new GeoJSON()).readFeatures(geojsonObject)
polygonSource.addFeatures(feature)
let iconFeatures = [];
feature.forEach(oneIcon => {
var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //[minx,miny,maxx,maxy]
// var center = getCenter(extent); //
//
let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
let oneArray = [x, y]
this.iconCoordinators.push(oneArray)
// debugger
let oneCctv = new Feature({
geometry: new Point([x, y]),
id: oneIcon.id_,
properties: {
type: "icon",
id: oneIcon.id_
}
});
let iconStyle = new Style({
image: new Icon({
// anchor: [0.5, 0.5],
// imgSize: [32, 32],
scale: 0.5,
src: iconUrlArray[oneIcon.values_.index - 1]
})
});
oneCctv.setStyle(iconStyle);
iconFeatures.push(oneCctv);
});
iconSource.addFeatures(iconFeatures);
}
// this.addGif()
},
//
setMapLocation () {
this.centerPoint = []
if (this.orgData.longitude && this.orgData.latitude) {
this.centerPoint.push(this.orgData.longitude)
this.centerPoint.push(this.orgData.latitude)
}
this.setZoom(this.orgData.agencyLevel)
},
//
setZoom (agencyLevel) {
if (agencyLevel === 'district') {
this.zoom = 14
} else if (agencyLevel === 'street') {
this.zoom = 15
} else if (agencyLevel === 'community') {
this.zoom = 16
}
},
initMap () {
this.setMapLocation()
gaodeMapLayer = new TileLayer({
title: "地图",
source: new XYZ({
//url
url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
wrapX: true//xfalse
}),
zIndex: 20
});
mapView = new View({
//
center: this.centerPoint,
// projection: 'EPSG:3857',
projection: 'EPSG:4326',
zoom: this.zoom,
minZoom: this.minZoom
})
//map
//
map = new Map({
layers: [gaodeMapLayer],
//
view: mapView,
target: 'map'
//map
})
map.on('singleclick', function (e) {
// console.log(e.coordinate)
// console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
})
//
const dblClickInteraction = map
.getInteractions()
.getArray()
.find(interaction => {
return interaction instanceof DoubleClickZoom;
});
map.removeInteraction(dblClickInteraction);
},
//
addPolygonLayer () {
polygonSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
});
polygonLayer = new VectorLayer({
source: polygonSource,
style: polygonStyleFunction,
zIndex: 50
});
//
var overlayStyle = (function () {
return function (feature) {
var styles = {};
styles['Polygon'] = [
new Style({
stroke: new Stroke({
color: '#ec9000',
width: 2
})
}),
new Style({
fill: new Fill({
color: 'rgba(0, 0, 255, 0.1)'
})
}),
new Style({
text: createTextStyle(feature)
})
];
styles['MultiPolygon'] = styles['Polygon'];
return styles[feature.getGeometry().getType()];
};
})();
select = new Select({
style: overlayStyle
});
map.addLayer(polygonLayer)
map.addInteraction(select);
},
addIconLayer () {
iconSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
});
iconLayer = new VectorLayer({
source: iconSource,
zIndex: 70
});
map.addLayer(iconLayer);
},
//
getRndBetween (lowerLimit, upperLimit) {
return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
});
},
//
endLoading () {
//clearTimeout(timer);
if (loading) {
loading.close();
}
},
},
props: {
//
showPolygonLayer: {
type: Boolean,
default: false
},
//
showIconLayer: {
type: Boolean,
default: false
}
},
computed: {
mapHeight () {
return this.clientHeight - 120;
},
// zoom: {
// get () {
// //zoom
// if (this.clientHeight < 900) {
// return 2.3
// } else {
// return 2.8
// }
// },
// set (value) {
// }
// },
...mapGetters(["clientHeight"])
},
components: {},
}
export default vueGis;
</script>
<style
lang="scss"
src="@/assets/scss/modules/visual/basicInfoMain.scss"
scoped
></style>
<style lang="scss" >
.div_content {
.ol-viewport {
border-radius: 5px;
}
}
.ol-overlaycontainer-stopevent {
display: none;
}
.el-scrollbar__wrap {
overflow-x: hidden !important;
}
</style>

180
src/views/modules/visual/components/screen-map/index.vue

@ -1,15 +1,12 @@
<template>
<div style="position: relative">
<div class="div_content_map">
<div class="div_map"
id="map"
ref="map">
<!-- <div id="map"
class="map"></div> -->
</div>
</div>
</template>
<script>
@ -26,6 +23,7 @@ import Overlay from 'ol/Overlay';
import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
import { getCenter, boundingExtent } from 'ol/extent.js';
import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
import { mapGetters } from "vuex";
import { Loading } from 'element-ui'; //Loading
@ -53,37 +51,13 @@ let select;//选中标注
//url
let textColorArray = [
'rgba(236, 69, 4, 0.66)',
'rgba(0, 146, 238, 0.75)',
'rgba(238, 151, 0, 0.8)'
];
let polygonColorArray = [
'rgba(210, 2, 2, 0.24)',
'rgba(43, 231, 253, 0.25)',
'rgba(183, 185, 0, 0.16)'
];
//
var createTextStyle = function (feature) {
return new Text({
textAlign: undefined,
font: "18px Arial",
//fontFamily: "Courier New, monospace",
// fontWeight: "bold",
text: feature.values_.name,
backgroundFill: new Fill({
// color: 'rgba(0, 146, 238, 0.75)'
color: textColorArray[feature.values_.index - 1]
}),
padding: [4, 10, 4, 10],
//text: "",
fill: new Fill({ color: "#ffffff" }),
// stroke: new Stroke({ color: "#ffffff", width: 3 }),
offsetY: -30,
offsetX: -50,
overflow: true,
});
};
//
@ -113,13 +87,7 @@ const vueGis = {
minZoom: 1,//
mapInfo: {
agencyLevel: "community",
coordinates: "120.37342346270151,36.0950221490494,120.39931465567633,36.09693067926868,120.39740612545705,36.09113306860255,120.39762218548188,36.08911650837086,120.39999884575495,36.0859836380109,120.4010071258708,36.080978247435795,120.39258078490263,36.08094223743166,120.38537878407514,36.08303081767163,120.37616022301596,36.082382637597156,120.37342346270151,36.0950221490494",
id: "6e511da6816e53af4cda952365a26eb9",
latitude: 36.072227,
level: "agency",
longitude: 120.389455,
name: "南宁社区",
},
polygonArray: [
@ -153,28 +121,9 @@ const vueGis = {
],
iconArrays: [
{
id: "2a278c0ceb863359d263fda7aabf6752",
latitude: 36.072227,
longitude: 120.389455,
level: "grid",
name: "第三网格",
},
{
id: "2a278c0ceb863359d263fda7aabf6753",
latitude: 36.072227,
longitude: 120.389455,
level: "grid",
name: "南宁第二网格",
},
{
id: "2a278c0ceb863359d263fda7aabf6742",
latitude: 36.072227,
longitude: 120.389455,
level: "grid",
name: "南宁第一网格",
}
],
iconTextStyle: {},
//policon
polIconUrlArray: [
@ -183,11 +132,8 @@ const vueGis = {
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
],
//icon
iconUrlArray: [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
],
iconUrlArray: [],
iconTextColor: '#ffffff',
}
},
@ -197,8 +143,13 @@ const vueGis = {
},
methods: {
//
loadMap (mapInfo) {
loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle) {
this.mapInfo = mapInfo
this.polygonArray = polygonArray
this.polIconUrlArray = polIconUrlArray
this.iconArrays = iconArrays
this.iconUrlArray = iconUrlArray
this.iconTextStyle = iconTextStyle
//
this.initMap()
@ -214,31 +165,37 @@ const vueGis = {
//
this.initPolygonLayer()
//
this.loadPolygon()
this.loadPolIcon()
}
if (this.showIconLayer) {
//icon
this.initIconLayer()
this.loadIcon()
}
},
//
async refreshMap (isRefreshView) {
async refreshMap (polygonArray, iconArrays) {
this.polygonArray = polygonArray
this.iconArrays = iconArrays
//
await this.loadOrgData()
if (this.showPolygonLayer) {
//
this.loadPolygon()
}
if (this.showPolIconLayer) {
//
this.loadPolIcon()
}
//
await this.loadPolygon()
if (this.showIconLayer) {
//
if (isRefreshView) {
this.setMapLocation()
mapView.setCenter(this.centerPoint);
mapView.setZoom(this.zoom);
this.loadIcon()
}
@ -352,15 +309,15 @@ const vueGis = {
if (this.iconArrays && this.iconArrays.length > 0) {
let iconFeatures = [];
this.iconArrays.forEach(oneIcon => {
this.iconArrays.forEach((oneIcon, index) => {
let urlNum = this.getRndBetween(1, 3)
//
let iconItem = new Feature({
geometry: new Point([oneIcon.longitude, oneIcon.latitude]),
id: oneIcon.id,
properties: {
type: "icon",
id: oneIcon.id
info: { ...oneIcon }
}
});
@ -368,9 +325,10 @@ const vueGis = {
image: new Icon({
// anchor: [0.5, 0.5],
// imgSize: [32, 32],
scale: 0.5,
src: iconUrlArray[oneIcon.values_.index - 1]
})
// scale: 0.5,
src: this.iconUrlArray[oneIcon.urlIndex]
}),
text: this.createTextStyle(oneIcon)
});
iconItem.setStyle(iconStyle);
@ -382,6 +340,19 @@ const vueGis = {
}
},
//icon
createTextStyle (feature) {
if (this.iconTextStyle) {
let iconTextStyle = { ...this.iconTextStyle }
iconTextStyle.text = feature.values_.name
return new Text({ ...iconTextStyle })
} else {
return null
}
},
//
initMap () {
this.setMapLocation()
@ -414,9 +385,19 @@ const vueGis = {
//map
})
let that = this
map.on('singleclick', function (e) {
// console.log(e.coordinate)
// console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
const feature = map.forEachFeatureAtPixel(e.pixel, function (feature) {
return feature;
});
if (feature) {
console.log(feature)
that.$emit('clickFeature', feature)
}
})
//
@ -438,16 +419,16 @@ const vueGis = {
this.centerPoint.push(this.mapInfo.latitude)
}
this.setZoom(this.mapInfo.agencyLevel)
this.setZoom(this.mapInfo.level)
},
//
setZoom (agencyLevel) {
if (agencyLevel === 'district') {
setZoom (level) {
if (level === 'district') {
this.zoom = 14
} else if (agencyLevel === 'street') {
} else if (level === 'street') {
this.zoom = 15
} else if (agencyLevel === 'community') {
} else if (level === 'community') {
this.zoom = 16
}
@ -501,6 +482,7 @@ const vueGis = {
map.addLayer(polygonLayer)
map.addInteraction(select);
},
//icon
@ -520,6 +502,7 @@ const vueGis = {
//icon
initIconLayer () {
iconSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
});
@ -530,9 +513,16 @@ const vueGis = {
});
map.addLayer(iconLayer);
// select = new Select({ condition: click, });
// map.addInteraction(select);
// select.on('select', e => {
// this.$emit('clickFeature', e)
// });
},
//
getRndBetween (lowerLimit, upperLimit) {
return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
@ -597,16 +587,20 @@ export default vueGis;
></style>
<style lang="scss" >
.div_content {
.div_content_map {
.ol-viewport {
border-radius: 5px;
}
.div_map {
box-sizing: border-box;
width: 100%;
// padding: 10px 5px 13px;
// margin-top: 8px;
height: 100%;
color: #fff;
}
}
.ol-overlaycontainer-stopevent {
display: none;
}
.el-scrollbar__wrap {
overflow-x: hidden !important;
}
</style>

5
src/views/modules/visual/components/screen-table/index.vue

@ -42,7 +42,7 @@
</span>
</span> -->
</div>
<div v-if="operate" class="td" @click="look(value)">查看</div>
<div v-if="operate" class="td td-btn" @click="look(value)">查看</div>
</div>
<screen-loading v-if="visibleLoading">加载中</screen-loading>
<div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
@ -296,6 +296,9 @@ export default {
}
}
}
.td-btn {
color: #e4dc00;
}
&-tr:nth-child(2n) {
background: rgba(16, 75, 164, 0.24);

0
src/views/modules/visual/cpts/analyse.vue

255
src/views/modules/visual/measure/volunteer.vue

@ -2,7 +2,8 @@
<div class="warning-box">
<cpt-card class="card-wr">
<div class="card-title">
<img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
<img class="title-icon"
src="../../../../assets/img/shuju/title-tip.png" />
<div class="title-label">
志愿者服务情况
</div>
@ -26,11 +27,12 @@
</div>
<div class="echart-wr">
<!-- <div class="echart-cicle"></div> -->
<div id="echartService" class="echart-org"></div>
<div id="echartService"
class="echart-org"></div>
</div>
</div>
</div>
<div class="card-echart">
@ -51,17 +53,19 @@
</div>
<div class="echart-wr">
<!-- <div class="echart-cicle"></div> -->
<div id="echartCount" class="echart-org"></div>
<div id="echartCount"
class="echart-org"></div>
</div>
</div>
</div>
</cpt-card>
<cpt-card class="card-wr">
<cpt-card class="card-wr card-wr-map">
<div class="card-title">
<img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
<img class="title-icon"
src="../../../../assets/img/shuju/title-tip.png" />
<div class="title-label">
多元化治理平面图
</div>
@ -91,7 +95,10 @@
</div>
<div class="card-map">
这里是地图容器
<screen-map class="map"
ref="map"
@clickFeature="clickProject"
:showIconLayer="true"></screen-map>
</div>
</cpt-card>
@ -103,6 +110,7 @@ import { requestPost } from "@/js/dai/request";
import screenTable from "../components/screen-table/index";
import cptCard from "@/views/modules/visual/cpts/card";
import nextTick from "dai-js/tools/nextTick";
import screenMap from "@/views/modules/visual/components/screen-map";
import * as echarts from 'echarts';
export default {
@ -110,8 +118,9 @@ export default {
components: {
cptCard,
screenTable,
screenMap
},
data() {
data () {
return {
warningList: [],
headerList: [
@ -135,16 +144,62 @@ export default {
total: 0,
activeIndex: 0,
activeLevel: "1",
//
isfirstInit: true,//
agencyInfo: {},//level
unitMapList: [],
unitMapList1: [
{
type: '党建楼宇',
name: '建联单位1',
latitude: 36.062227,
longitude: 120.389455,
},
{
type: '党建楼宇',
name: '建联单位2',
latitude: 36.082227,
longitude: 120.389455,
},
{
type: '机关直属部门',
name: '建联单位3',
latitude: 36.062227,
longitude: 120.379455,
},
{
type: '两新党建',
name: '建联单位4',
latitude: 36.082227,
longitude: 120.379455,
},
{
type: '辖区单位',
name: '建联单位5',
latitude: 36.092227,
longitude: 120.379455,
},
{
type: '其他',
name: '建联单位6',
latitude: 36.102227,
longitude: 120.379455,
}
],
};
},
async mounted() {
async mounted () {
await nextTick(100);
this.initCharts()
this.initCount()
this.getBuildingwarnlist();
await this.getWorkUserInfo()
await this.getMapUnitList()
},
methods: {
initCharts() {
initCharts () {
const eId = document.getElementById('echartService')
let _charts = echarts.init(eId)
let option = {
@ -192,21 +247,21 @@ export default {
fontWeight: 'bold'
}
},
data: [
{
value: 104,
name: '党员',
{
value: 104,
name: '党员',
itemStyle: {
color: 'rgba(26, 178, 255, 1)'
}
}
},
{
value: 735,
name: '居民',
{
value: 735,
name: '居民',
itemStyle: {
color: 'rgba(250, 193, 38, 1)'
}
}
}
]
}
@ -215,7 +270,7 @@ export default {
option && _charts.setOption(option);
},
initCount() {
initCount () {
const eId = document.getElementById('echartCount')
let _charts = echarts.init(eId)
let option = {
@ -266,21 +321,21 @@ export default {
fontWeight: 'bold'
}
},
data: [
{
value: 1048,
name: '党员',
{
value: 1048,
name: '党员',
itemStyle: {
color: 'rgba(26, 178, 255, 1)'
}
}
},
{
value: 735,
name: '居民',
{
value: 735,
name: '居民',
itemStyle: {
color: 'rgba(250, 193, 38, 1)'
}
}
}
]
}
@ -289,15 +344,15 @@ export default {
option && _charts.setOption(option);
},
onClickList(index, level) {
onClickList (index, level) {
this.activeIndex = index;
this.activeLevel = level;
this.pageNo = 1;
this.getUserwarnlist();
},
//
async getUserwarnlist() {
async getUserwarnlist () {
const { activeIndex, activeLevel, warningList } = this;
const reqItem = warningList[activeIndex];
let tableData = [];
@ -323,7 +378,7 @@ export default {
}
},
//
async getBuildingwarnlist() {
async getBuildingwarnlist () {
const url = "/epmetuser/statsresiwarn/buildingwarnlist";
let params = {
agencyId: this.$store.state.user.agencyId,
@ -336,14 +391,109 @@ export default {
} else {
}
},
pageSizeChangeHandleNew(val) {
pageSizeChangeHandleNew (val) {
this.pageNo = 1;
this.pageSize = val;
},
pageCurrentChangeHandleNew(val) {
pageCurrentChangeHandleNew (val) {
this.pageNo = val;
this.getUserwarnlist();
},
//
getWorkUserInfo () {
const url = '/epmetuser/customerstaff/staffbasicinfo'
let params = {}
window.app.ajax.post(
url,
params,
(data, rspMsg) => {
this.agencyInfo = data
if (!data.latitude) {
this.agencyInfo.latitude = 36.072227
}
if (!data.longitude) {
this.agencyInfo.longitude = 120.389455
}
if (!data.level) {
this.agencyInfo.level = 'street'
}
},
(rspMsg, data) => {
this.$message.error(rspMsg)
}
)
},
//
async getMapUnitList () {
// const url = "/heart/icpartyunit/distribution"
const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
let params = {
agencyId: this.$store.state.user.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
// this.unitMapList = data
this.unitMapList = this.unitMapList1
this.unitMapList.forEach(item => {
if (item.type === '党建楼宇') {
item.urlIndex = 0
} else if (item.type === '两新党建') {
item.urlIndex = 1
} else if (item.type === '辖区单位') {
item.urlIndex = 2
} else if (item.type === '机关直属部门') {
item.urlIndex = 3
} else if (item.type === '其他') {
item.urlIndex = 4
}
});
this.iconUrlArray = [
require('../../../../assets/img/shuju/measure/ly@2x.png'),//
require('../../../../assets/img/shuju/measure/jgzs@2x.png'),//
require('../../../../assets/img/shuju/measure/lxdj@2x.png'),//
require('../../../../assets/img/shuju/measure/xq@2x.png'),//
require('../../../../assets/img/shuju/measure/qita.png')//
]
//false
this.loadMap()
this.isfirstInit = false
} else {
this.$message.error(msg)
}
},
//
loadMap () {
if (this.isfirstInit) {
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
this.$refs.map.loadMap(this.agencyInfo, null, null, this.unitMapList, this.iconUrlArray, null)
} else {
this.$refs.map.refreshMap(null, this.unitMapList)
}
},
//
clickProject (feature) {
console.log('标注信息', feature.values_.properties)
},
},
};
</script>
@ -383,12 +533,11 @@ export default {
color: #fff;
font-weight: 800;
}
}
.card-echart {
display: flex;
margin-top: 40px;
.card-left {
position: relative;
flex: 1;
@ -432,7 +581,8 @@ export default {
box-sizing: border-box;
margin-top: 20px;
// padding-left: 192px;
background: url('../../../../assets/img/shuju/measure/dangyuan.png') center no-repeat;
background: url("../../../../assets/img/shuju/measure/dangyuan.png") center
no-repeat;
background-size: cover;
.card-count-content {
position: relative;
@ -447,14 +597,14 @@ export default {
.card-count-label {
margin-top: 6px;
font-size: 16px;
color: rgba(255, 255, 255, .72);
color: rgba(255, 255, 255, 0.72);
}
}
.card-count-content::after {
position: absolute;
top: 50%;
left: 0;
content: '';
content: "";
width: 1px;
height: 50px;
margin-top: -25px;
@ -462,7 +612,8 @@ export default {
}
}
.card-count-item:last-child {
background: url('../../../../assets/img/shuju/measure/jumin.png') center no-repeat;
background: url("../../../../assets/img/shuju/measure/jumin.png") center
no-repeat;
}
}
@ -472,6 +623,7 @@ export default {
flex-wrap: wrap;
padding-top: 10px;
padding-bottom: 20px;
.map-tips-item {
display: flex;
align-items: center;
@ -482,7 +634,7 @@ export default {
height: 10px;
box-sizing: border-box;
margin-right: 10px;
background: #DD2719;
background: #dd2719;
border-radius: 2px;
}
.map-tips-label {
@ -492,4 +644,17 @@ export default {
}
}
.card-wr-map {
height: calc(100vh - 110px);
.card-map {
width: 100%;
height: calc(100vh - 255px);
.map {
width: 100%;
height: 100%;
}
}
}
</style>

22
src/views/modules/workSys/demandCate.vue

@ -32,6 +32,7 @@
class="resi-table"
>
<el-table-column label="序号" type="index" align="center" width="50">
<template slot-scope="scope">{{ scope.row.index }}</template>
</el-table-column>
<el-table-column
v-for="item in tableHeader"
@ -401,9 +402,10 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
this.tableData = res.data.list.map(item => {
this.tableData = res.data.list.map((item, index) => {
return {
...item,
index: index + 1,
hasBtn: true,
children: item.children.map(n => {
return {
@ -428,10 +430,20 @@ export default {
<style lang="scss" scoped>
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
// border-right: 1px solid rgba(33, 149, 254, 1);
::v-deep .el-table {
th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
}
.cell {
span:nth-of-type(3) {
display: inline-block;
width: 90%;
word-break: break-all;
}
}
}
}
.resi-table {

Loading…
Cancel
Save