Browse Source

Merge branch 'dev-shuju' into test

shibei_prod
13176889840 4 years ago
parent
commit
47335df1c5
  1. 4
      .env.development
  2. 4
      .env.production.sit
  3. 4
      public/index.html
  4. BIN
      src/assets/img/shuju/weiwanjie.png
  5. BIN
      src/assets/img/shuju/yiwanjie.png
  6. 135
      src/assets/scss/modules/visual/distributionAnalyze.scss
  7. 65
      src/assets/scss/modules/visual/processAnalyze.scss
  8. 135
      src/assets/scss/modules/visual/typeAnalyze.scss
  9. 2
      src/router/index.js
  10. 16
      src/views/modules/communityService/measure/index.vue
  11. 436
      src/views/modules/visual/communityGovern/distributionAnalyze.vue
  12. 77
      src/views/modules/visual/communityGovern/distributionLineOption.js
  13. 191
      src/views/modules/visual/communityGovern/processAnalyze.vue
  14. 2
      src/views/modules/visual/communityGovern/resiPieOption.js
  15. 21
      src/views/modules/visual/communityGovern/resibuzz.vue
  16. 616
      src/views/modules/visual/communityGovern/typeAnalyze.vue
  17. 179
      src/views/modules/visual/communityGovern/typePieOption.js
  18. 7
      src/views/modules/visual/communityParty/community.vue
  19. 186
      src/views/modules/visual/communityParty/dialogInfo.vue
  20. 105
      src/views/modules/visual/components/screen-map/index.vue
  21. 5
      src/views/modules/visual/components/screen-table/index.vue

4
.env.development

@ -1,6 +1,6 @@
NODE_ENV=development
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
VUE_APP_API_SERVER = http://192.168.1.140/api
VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = http://192.168.51.36:8080/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
VUE_APP_NODE_ENV=dev

4
.env.production.sit

@ -1,5 +1,5 @@
NODE_ENV=production
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
VUE_APP_API_SERVER = http://192.168.1.140/api
VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = http://192.168.1.140/api
VUE_APP_NODE_ENV=prod:sit
VUE_APP_PUBLIC_PATH=epmet-oper

4
public/index.html

@ -36,8 +36,8 @@
<!-- 开发环境 -->
<% 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://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/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

135
src/assets/scss/modules/visual/distributionAnalyze.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%;
}
}

65
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,8 +87,8 @@
.g-r {
text-align: center;
margin: 20px 19px 20px;
width: calc(100vw - 40px - 800px);
margin: 20px 10px 20px;
width: calc(100vw - 700px);
height: calc(100vh - 180px - 20px);
}
}
@ -172,11 +172,68 @@
}
.g-r {
.m-map {
.r-map {
position: relative;
height: calc(100vh - 180px - 20px - 70px);
width: 100%;
.map {
height: 100%;
width: 100%;
}
.r-status {
position: absolute;
bottom: 0;
right: 0;
display: flex;
.status {
height: 30px;
width: 70px;
line-height: 30px;
font-size: 12px;
font-family: PingFang SC;
font-weight: 400;
color: #d2e7ff;
background-color: #1146c2;
}
.status-closed {
}
.status-pending {
border-radius: 5px 0 0 0;
}
.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%;
}
}

2
src/router/index.js

@ -274,7 +274,7 @@ router.beforeEach((to, from, next) => {
},
{
url: "/visual/communityGovern/distributionAnalyze",
name: "项目分布分析",
name: "事件分类分析",
id: "distributionAnalyze",
},
],

16
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>
@ -448,6 +448,7 @@ export default {
],
reportOptions: [],
demandOptions: [],
searchdemandOptions: [],
demandUserList: [],
optionsG: [],
optionsEditG: [],
@ -918,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)
@ -969,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(() => {

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

@ -0,0 +1,436 @@
<template>
<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 ">
<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>
</div>
<div class="g-cpt-resi">
<div class="g-l">
<screen-echarts-frame class="echart-wr"
@myChartMethod="pieInitOk"
ref="pieChart"></screen-echarts-frame>
</div>
<div class="g-r">
<div class="m-tb">
<div class="tb">
<cpt-tb :col-list="demand.colList"
:loading="demand.loading"
:header="demand.header"
:list="demand.list"></cpt-tb>
<div class="m-pagination">
<el-pagination :current-page="demand.pageNo"
:page-size="demand.pageSize"
:total="demand.total"
background
layout="prev, pager, next"
@current-change="handlePageNoChange_demand">
</el-pagination>
</div>
</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 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 {
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: "10%",
},
{
align: "center",
width: "10%",
},
{
align: "center",
width: "10%",
},
{
align: "center",
width: "5%",
},
{
align: "center",
width: "20%",
},
{
align: "center",
width: "10%",
},
{
align: "center",
width: "10%",
},
],
header: ["序号", "项目编号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"],
list: [],
pageSize: 10,
pageNo: 1,
total: 0,
},
casOptions: [],
agencyIdArray: [],
customerList: [],
iscascaderShow: 0,
optionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
};
},
// mixins: [animate]
beforeDestroy () {
this.timer && clearInterval(this.timer)
},
async mounted () {
this.userId = this.uid;
this.initData()
await this.getAgencylist()//
this.getApiData();
},
methods: {
initData () {
var time = (new Date).getTime() - 24 * 60 * 60 * 1000;
this.dateId = new Date(time); //
},
async getApiData () {
await this.getPie()
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()
},
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 = {
agencyId: this.agencyId,
dateId: this.dateId,
};
const { data, code, msg } = await requestPost(url, params);
// pieChart
if (code === 0) {
// 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);
}
},
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 getTable () {
// const url = "/data/aggregator/project/categoryprojectlist";
const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/categoryprojectlist";
let params = {
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);
this.demand.loading = false;
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.projectCode,
item.categoryNames.join(','),
item.originShow,
item.gridName,
item.statusShow,
item.title,
item.time,
{ type: "operate", list: ["查看"] },
];
});
} else {
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/distributionAnalyze.scss"
scoped
></style>
<style lang=scss scoped>
</style>

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

@ -0,0 +1,77 @@
import * as echarts from 'echarts'
export function lineOption () {
return {
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: [820, 932, 901, 934, 1290, 1330, 1320],
// type: 'line',
// areaStyle: {}
// }
]
}
}

191
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">
@ -54,18 +55,37 @@
</div>
</div>
<div class="g-r">
<screen-map class="m-map"
<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>
<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>
</template>
<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";
@ -82,6 +102,7 @@ export default {
return {
showNoData: false,
timer: null,
isfirstInit: true,
projectTotal: 0,
dateIncr: 0,
@ -110,6 +131,48 @@ export default {
status: 'pending',//: pendingclosed
agencyInfo: {},
projectList: [],
projectList1: [
{
agencyId: '',
projectId: '',
origin: '',
status: 'pending',
title: '南宁第二网格南宁第二网格',
latitude: 36.062227,
longitude: 120.389455,
},
{
agencyId: '',
projectId: '',
origin: '',
status: 'closed',
latitude: 36.082227,
longitude: 120.389455,
title: "南宁第二网格",
}
],
projectList2: [
{
agencyId: '',
projectId: '',
origin: '',
status: 'pending',
title: '山东路山东路',
latitude: 36.062227,
longitude: 120.379455,
},
{
agencyId: '',
projectId: '',
origin: '',
status: 'closed',
latitude: 36.082227,
longitude: 120.379455,
title: "山东路",
}
],
iconUrlArray: [],
iconTextStyle: {},
casOptions: [],
agencyIdArray: [],
@ -134,6 +197,8 @@ export default {
async mounted () {
this.userId = this.uid;
this.initData()
await this.getWorkUserInfo()
await this.getAgencylist()//
this.getApiData();
},
@ -144,12 +209,15 @@ export default {
},
async getApiData () {
await this.getWorkUserInfo()
// await this.getAgencylist()//
await this.getProjectTotal()
await this.loadProjectlist()
await this.getLine()
// await this.getTable();
},
handleChangeDate (value) {
this.dateId = value
this.getApiData()
},
//
@ -177,7 +245,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) {
@ -247,60 +316,85 @@ export default {
if (code === 0) {
// this.projectList = [...data]
if (this.status === 'closed') {
this.projectList = this.projectList1
} else {
this.projectList = this.projectList2
this.projectList = [
{
agencyId: '',
projectId: '',
origin: '',
status: '',
title: '南宁第二网格南宁第二网格',
latitude: 36.072227,
longitude: 120.389455,
},
{
agencyId: '',
projectId: '',
origin: '',
status: '',
latitude: 36.072227,
longitude: 120.389455,
title: "南宁第二网格",
},
{
agencyId: '',
projectId: '',
origin: '',
status: '',
id: "2a278c0ceb863359d263fda7aabf6742",
latitude: 36.072227,
longitude: 120.389455,
title: "南宁第一网格",
}
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'//
]
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'
]
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, iconUrlArray)
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
},
@ -384,7 +478,6 @@ export default {
});
this.pieOption.title.text = this.pieTotal
this.clickPie(0)
@ -431,14 +524,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)

616
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>
</div>
<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>
<span>事件分类分析</span>
<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>
<div class="second-select cascader">
<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>
<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 ">
<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>
<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-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 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="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: {},
components: {
cptCard,
peopleMore,
cptTb,
casOptions: [],
agencyIdArray: [],
customerList: [],
iscascaderShow: 0,
optionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
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";
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()
},
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.info = { ...this.info, ...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);
}
},
//
async getHouseInfo () {
const url = "/epmetuser/icresiuser/ownerrelation";
let params = {
userId: this.userId,
clickPie (seriesIndex) {
this.pieData.forEach((element, index) => {
if (index === seriesIndex) {
element.label = {
show: true,
};
element.labelLine = {
show: true,
lineStyle: {
opacity: 1,
}
const { data, code, msg } = await requestPost(url, params);
};
console.log('zhilma')
if (code === 0) {
this.houseInfo = { ...this.houseInfo, ...data };
} else {
this.$message.error(msg);
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)
},
handlePageNoChange_demand (val) {
this.demand.pageNo = val;
this.getDemandData();
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)',
}
}
}
]
},
]
}
}

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

@ -95,6 +95,10 @@
</div>
</cpt-card>
<dialog-info
v-show="showedMoreInfo"
@close="showedMoreInfo = false"
/>
</div>
</template>
@ -103,15 +107,18 @@ 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'
export default {
name: "warning-box",
components: {
cptCard,
screenTable,
dialogInfo
},
data() {
return {
showedMoreInfo: true,
tableLoading: false,
warningList: [],
headerList: [

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

@ -0,0 +1,186 @@
<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>
</cpt-card>
</div>
</div>
</template>
<script>
import cptCard from "@/views/modules/visual/cpts/card";
import { requestPost } from "@/js/dai/request";
export default {
name: "dialogInfo",
props: {
userId: {
type: String,
default: "",
},
gridName: {
type: String,
default: "",
},
},
components: {
cptCard,
},
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>

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

@ -23,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
@ -50,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,
});
};
//
@ -146,6 +123,7 @@ const vueGis = {
iconArrays: [
],
iconTextStyle: {},
//policon
polIconUrlArray: [
@ -155,6 +133,7 @@ const vueGis = {
],
//icon
iconUrlArray: [],
iconTextColor: '#ffffff',
}
},
@ -164,12 +143,13 @@ const vueGis = {
},
methods: {
//
loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray) {
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()
@ -185,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) {
//
await this.loadPolygon()
this.loadPolygon()
}
if (this.showPolIconLayer) {
//
if (isRefreshView) {
this.setMapLocation()
mapView.setCenter(this.centerPoint);
mapView.setZoom(this.zoom);
//
this.loadPolIcon()
}
if (this.showIconLayer) {
this.loadIcon()
}
@ -323,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",
info: { ...oneIcon.info }
info: { ...oneIcon }
}
});
@ -339,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);
@ -353,6 +340,15 @@ const vueGis = {
}
},
//icon
createTextStyle (feature) {
let iconTextStyle = { ...this.iconTextStyle }
iconTextStyle.text = feature.values_.name
return new Text({ ...iconTextStyle })
},
//
initMap () {
this.setMapLocation()
@ -385,9 +381,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)
}
})
//
@ -472,6 +478,7 @@ const vueGis = {
map.addLayer(polygonLayer)
map.addInteraction(select);
},
//icon
@ -491,6 +498,7 @@ const vueGis = {
//icon
initIconLayer () {
iconSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
});
@ -501,9 +509,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;

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);

Loading…
Cancel
Save