import cptCard from "@/views/modules/visual/cpts/card";
import { requestPost } from "@/js/dai/request";
+import cptTb from "@/views/modules/visual/cpts/tb";
export default {
name: "peopleMore",
@@ -191,6 +238,7 @@ export default {
components: {
cptCard,
+ cptTb,
},
data() {
@@ -206,6 +254,97 @@ export default {
louList: [],
danyuanList: [],
homeList: [],
+
+ natList: [], //核酸信息
+ tripList: [], //行程信息
+
+ natDemand: {
+ loading: false,
+ colList: [
+ {
+ align: "center",
+ width: "10%",
+ },
+ {
+ align: "center",
+ width: "15%",
+ },
+ {
+ align: "center",
+ width: "55%",
+ },
+ {
+ align: "center",
+ width: "10%",
+ },
+ ],
+ header: ["序号", "检测时间", "检测地点", "检测结果"],
+ list: [],
+ srcList: [],
+ },
+ tripDemand: {
+ loading: false,
+ colList: [
+ {
+ align: "center",
+ width: "10%",
+ },
+ {
+ align: "center",
+ width: "30%",
+ },
+ {
+ align: "center",
+ width: "15%",
+ },
+ {
+ align: "center",
+ width: "15%",
+ },
+ {
+ align: "center",
+ width: "15%",
+ },
+ {
+ align: "center",
+ width: "15%",
+ },
+ ],
+ header: [
+ "序号",
+ "来自地区",
+ "来到本地地区",
+ "离开本地地区",
+ "最近一次通知时间",
+ "备注",
+ ],
+ list: [],
+ srcList: [],
+ },
+ vaccineDemand: {
+ loading: false,
+ colList: [
+ {
+ align: "center",
+ width: "10%",
+ },
+ {
+ align: "center",
+ width: "20%",
+ },
+ {
+ align: "center",
+ width: "35%",
+ },
+ {
+ align: "center",
+ width: "35%",
+ },
+ ],
+ header: ["序号", "接种时间", "接种地点", "疫苗厂家"],
+ list: [],
+ srcList: [],
+ },
};
},
@@ -311,6 +450,7 @@ export default {
async getApiData() {
await this.getField();
await this.getInfo();
+ this.getDetailList();
this.getXiaoquList();
this.getLouList();
this.getDanyuanList();
@@ -425,6 +565,78 @@ export default {
}
});
});
+ const arr = [
+ {
+ groupId: "hs123",
+ itemList: [],
+ label: "核酸检测信息",
+ sort: 998,
+ supportAdd: false,
+ tableName: "ic_hs",
+ },
+ {
+ groupId: "hs124",
+ itemList: [],
+ label: "行程信息",
+ sort: 999,
+ supportAdd: false,
+ tableName: "ic_xc",
+ },
+ {
+ groupId: "hs125",
+ itemList: [],
+ label: "疫苗信息",
+ sort: 999,
+ supportAdd: false,
+ tableName: "ic_ym",
+ },
+ ];
+ this.groupList = [...this.groupList, ...arr];
+ } else {
+ this.$message.error(msg);
+ }
+ },
+
+ async getDetailList() {
+ const url = "/epmetuser/epidemicPrevention/info";
+ let params = {
+ id: this.userId,
+ };
+
+ const { data, code, msg } = await requestPost(url, params);
+
+ if (code === 0) {
+ const { natList, tripList, vaccineList } = data;
+
+ this.natList = natList;
+ this.tripList = tripList;
+
+ this.natDemand.list = natList.map((item) => {
+ return [{ type: "index" }, item.testTime, item.address, item.result];
+ });
+ this.natDemand.srcList = natList;
+
+ this.tripDemand.list = tripList.map((item) => {
+ return [
+ { type: "index" },
+ item.fromRegion,
+ item.arrivalTime,
+ item.leaveTime,
+ item.noticeTime,
+ item.remark,
+ ];
+ });
+ this.tripDemand.srcList = tripList;
+
+ this.vaccineDemand.list = vaccineList.map((item) => {
+ return [
+ { type: "index" },
+ item.vaccinateTime,
+ item.address,
+ item.manufactor,
+ ];
+ });
+ this.vaccineDemand.srcList = vaccineList;
} else {
this.$message.error(msg);
}
@@ -500,4 +712,8 @@ export default {
};
-
+
diff --git a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
new file mode 100644
index 000000000..a3b93557b
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
房屋信息
+
+
+
+
+ 所属房屋：
+ {{ formData.neighborHoodName }}-{{ formData. buildingName }}-{{ formData. unitName }}-{{ formData. doorName }}
+
+
+
+
+ 房屋类型：
+ {{ formData.houseTypeName }}
+
+
+
+
+
+ 房屋状态：
+ {{ formData. rentName }}
+
+
+
+
+
+ 房屋用途：
+ {{ formData. purposeName }}
+
+
+
+
+
+ 房主姓名：
+ {{ formData.ownerName?formData.ownerName:'无' }}
+
+
+
+ 房主电话：
+ {{ formData.ownerPhone?formData.ownerPhone:'无' }}
+
+
+
+ 房主身份证：
+ {{ formData. ownerIdCard?formData.ownerIdCard:'无' }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
new file mode 100644
index 000000000..893f8c5bb
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -0,0 +1,650 @@
+
+
+
+
+
+
+ {{item.orgName}}>
+
+ {{orgName}}
+
+
+
+
+
+
+ 人房概览数据统计
+
+
+
本级人房概览数据统计
+
+
+
+
+
+
+
+
+
{{item.name}}
+
![]()
+
+
+
+
+
+
+
+
+
{{houseData.houseTotal}}
+
房屋总数
+
+
+
+
{{houseData.zzHouseTotal}}
+
自住房屋数
+
+
+
{{houseData.czHouseTotal}}
+
出租房屋数
+
+
+
{{houseData.xzHouseTotal}}
+
闲置房屋数
+
+
+
+
+ 加载中
+
+
+
+
+
+
+
+
+
+
{{userData.userTotal}}
+
居民总数
+
+
+
+
{{userData.czUserTotal}}
+
常住人口数
+
+
+
{{userData.ldUserTotal}}
+
流动人口数
+
+
+
+
+
+ 加载中
+
+
+
+
+
+
下级人房概览数据统计
+
+
+
+
+
+
{{item.orgName}}
+
+
+
+
+
+
{{item.houseTotal}}
+
房屋总数
+
+
+
+
{{item.zzHouseTotal}}
+
{{item.zzHouseRatio+'%'}}
+
自住房屋数
+
+
+
{{item.czHouseTotal}}
+
{{item.czHouseRatio+'%'}}
+
出租房屋数
+
+
+
{{item.xzHouseTotal}}
+
{{item.xzHouseRatio+'%'}}
+
闲置房屋数
+
+
+
+
+
{{item.userTotal}}
+
居民总数
+
+
+
+
{{item.czUserTotal}}
+
{{item.czUserRatio+'%'}}
+
常住人口数
+
+
+
{{item.ldUserTotal}}
+
{{item.ldUserRatio+'%'}}
+
流动人口数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/basicinfo/houseStatic/options.js b/src/views/modules/visual/basicinfo/houseStatic/options.js
new file mode 100644
index 000000000..fec2c520b
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/options.js
@@ -0,0 +1,180 @@
+
+export function housePieOption (_charts) {
+ const center= ['50%', '200px']
+ return {
+ title: {
+ text: '0',
+ top: 170,
+ left: 'center',
+ textStyle: {
+ width: '100%',
+ fontSize: 30,
+ 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: ['61%', '61.3%'],
+ label: {
+ show: false
+ },
+ labelLine: {
+ show: false
+ },
+ data: [{
+ value: 360,
+ itemStyle: {
+ color: 'rgba(40, 101, 250, 0)',
+ width:0,
+ borderColor: 'rgba(40, 101, 250, 1)',
+ borderWidth: 1,
+ borderType: 'dotted'
+ }
+ }
+ ]
+ },
+
+ // 突出的
+ {
+ hoverAnimation: false,
+ // name: 'Access From',
+ type: 'pie',
+ center: center,
+ radius: ['40%', '54%'],
+ avoidLabelOverlap: false,
+ // top: top + '%',
+ // height: '80%',
+ selectedMode: 'single',
+ left: 'center',
+ width: 480,
+ label: {
+ // show: false,
+ position: 'outside',
+ alignTo: 'edge',
+ // formatter: '{a|{c}}\n\n{name|{b}}',
+ formatter: '{name|{b}}\n{r|}\n{a|{c}%}',
+ minMargin: 5,
+ edgeDistance: 1,
+ lineHeight: 15,
+ color: '#fff',
+ fontSize: 10,
+ // distanceToLabelLine: -60,
+ rich: {
+ name: {
+ padding: [0, 6, 0, 6]
+ },
+ a: {
+ fontSize: 20,
+ color: '#fff',
+ padding: [16, 0, 6, 6]
+ },
+ r: {
+ backgroundColor: 'auto',
+ borderRadius: 6,
+ width: 6,
+ height: 6,
+ // padding: [3, 3, 0, -12]
+ }
+ }
+ },
+ labelLine: {
+ show: false,
+ smooth: 0.2,
+ length: 50,
+ 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%', '27%'],
+ label: {
+
+ show: false
+
+ },
+ labelLine: {
+
+ show: false
+
+ },
+ data: [{
+ value: 360,
+ itemStyle: {
+ normal: {
+ color: 'rgba(8, 37, 134, 1)',
+
+ }
+ }
+ }
+ ]
+ },
+ ]
+
+ }
+ }
+
\ No newline at end of file
diff --git a/src/views/modules/visual/basicinfo/houseStatic/userOptions.js b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
new file mode 100644
index 000000000..bd6bca771
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/userOptions.js
@@ -0,0 +1,182 @@
+
+export function userPieOption (_charts) {
+ const center= ['50%', '200px']
+ return {
+ title: {
+ text: '0',
+ top: 170,
+ left: 'center',
+ textStyle: {
+ width: '100%',
+ fontSize: 30,
+ color: '#FFFFFF',
+ fontWeight: 400
+ },
+ itemGap: 5,
+ subtext: '居民总数',
+ subtextStyle: {
+ fontSize: 20,
+ color: '#fff',
+ fontWeight: 400
+ }
+ },
+ tooltip: {
+ show: false
+ },
+ // legend: {
+ // orient: 'vertical',
+ // right: 0,
+ // top: 200,
+ // bottom: 20,
+ // itemWidth: 20,
+ // itemHeight: 10,
+ // textStyle: {
+ // color: '#D2E7FF',
+ // fontSize: 16,
+ // lineHeight: 20,
+ // },
+
+ // },
+ series: [
+ // 外侧圆环
+ {
+ type: 'pie',
+ // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+ startAngle: 0,
+ hoverAnimation: false,
+ // tooltip: {
+ // },
+ center: center,
+ radius: ['61%', '61.3%'],
+ label: {
+ show: false
+ },
+ labelLine: {
+ show: false
+ },
+ data: [{
+ value: 360,
+ itemStyle: {
+ color: 'rgba(40, 101, 250, 0)',
+ width:0,
+ borderColor: 'rgba(40, 101, 250, 1)',
+ borderWidth: 1,
+ borderType: 'dotted'
+ }
+ }
+ ]
+ },
+
+ // 突出的
+ {
+ hoverAnimation: false,
+ // name: 'Access From',
+ type: 'pie',
+ center: center,
+ radius: ['40%', '54%'],
+ avoidLabelOverlap: false,
+ // top: top + '%',
+ // height: '80%',
+ selectedMode: 'single',
+ left: 'center',
+ width: 480,
+ label: {
+ // show: false,
+ position: 'outside',
+ alignTo: 'edge',
+ // formatter: '{a|{c}}\n\n{name|{b}}',
+ formatter: '{name|{b}}\n{r|}\n{a|{c}%}',
+ minMargin: 5,
+ edgeDistance: 1,
+ lineHeight: 15,
+ color: '#fff',
+ fontSize: 10,
+ // distanceToLabelLine: -60,
+ rich: {
+ name: {
+ padding: [0, 6, 0, 6]
+ },
+ a: {
+ fontSize: 20,
+ color: '#fff',
+ padding: [16, 0, 6, 6]
+ },
+ r: {
+ backgroundColor: 'auto',
+ borderRadius: 6,
+ width: 6,
+ height: 6,
+ // padding: [3, 3, 0, -12]
+ }
+ }
+ },
+ labelLine: {
+ show: false,
+ smooth: 0.2,
+ length: 50,
+ 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%', '27%'],
+ label: {
+
+ show: false
+
+ },
+ labelLine: {
+
+ show: false
+
+ },
+ data: [{
+ value: 360,
+ itemStyle: {
+ normal: {
+ color: 'rgba(8, 37, 134, 1)',
+
+ }
+ }
+ }
+ ]
+ },
+ ]
+
+ }
+ }
+
\ No newline at end of file
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 74ed24d86..c754ff017 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -1,391 +1,514 @@
-
-
-
-
-
-
-
人员情况
-
查看更多
-
-
-
-
{{ info.name }}
-
+
+
+
+
+ {{ item.meta.title }}
+
+
+
+
+
+
+
+
+
+
+
人员情况
-
-
所属网格
-
-
-
所属网格：
-
- {{ info.gridName }}
-
+
查看更多
+
+
+
+
{{ info.name }}
+
+
+
+
+
所属网格
+
+
+
所属网格：
+
+ {{ info.gridName }}
+
+
-
-
-
-
-
人员类别
-
-
人员类别：
-
- {{
- info.personCategory.length == 0
- ? "--"
- : info.personCategory.join("、")
- }}
-
+
+
+
人员类别
+
+
+
人员类别：
+
+ {{
+ info.personCategory.length == 0
+ ? "--"
+ : info.personCategory.join("、")
+ }}
+
+
-
-
-
-
工作单位
+
+
+
工作单位
-
-
工作单位：
-
- {{ info.workUnit || "--" }}
-
+
+
工作单位：
+
+ {{ info.workUnit || "--" }}
+
+
-
-
-
-
-
志愿者类别
-
-
志愿者类别：
-
- {{
- info.volunteerCategory.length == 0
- ? "--"
- : info.volunteerCategory.join("、")
- }}
-
+
+
+
志愿者类别
+
+
+
志愿者类别：
+
+ {{
+ info.volunteerCategory.length == 0
+ ? "--"
+ : info.volunteerCategory.join("、")
+ }}
+
+
-
-
-
-
房屋信息
+
+
+
房屋信息
+
+
+
房屋信息：
+
+ {{
+ info.houseInfo.length == 0
+ ? "--"
+ : info.houseInfo.join("、")
+ }}
+
+
+
-
-
房屋信息：
-
- {{
- info.houseInfo.length == 0
- ? "--"
- : info.houseInfo.join("、")
- }}
-
+
+
+
经济状况
+
+
+
经济状况：
+
+ 月薪:
+ {{
+ info.financialSituation.monthlyIncome || "--"
+ }}，退休金：{{
+ info.financialSituation.retirementAmount || "--"
+ }}
+
+
+
+
-
-
-
经济状况
+
-
-
经济状况：
-
- 月薪:
+
+
+
+
+
家庭关系
+
+
+
+
+
{{
- info.financialSituation.monthlyIncome || "--"
- }}，退休金：{{
- info.financialSituation.retirementAmount || "--"
+ houseInfo && houseInfo.ownerName
+ ? houseInfo.ownerName
+ : "暂不清楚"
}}
-
+
+
（户主）
-
-
-
-
-
-
-
-
-
-
家庭关系
-
-
-
-
-
{{ houseInfo.ownerName }}
-
（户主）
-
-
-
-
-
-
-
-
{{
- houseInfo.userList[0].relation
- }}
-
（{{ houseInfo.userList[0].userName }}）
+
+
+
+
+
+ {{ houseInfo.userList[0].relation }}
+
+
+ {{ houseInfo.userList[0].userName }}
+
+
-
-
-
-
-
-
{{ houseInfo.userList[1].relation }}
-
{{ houseInfo.userList[1].userName }}
+
+
+
+
+
+ {{ houseInfo.userList[1].relation }}
+
+
+ {{ houseInfo.userList[1].userName }}
+
+
-
-
-
-
-
-
{{ houseInfo.userList[2].relation }}
-
{{ houseInfo.userList[2].userName }}
+
+
+
+
+
+ {{ houseInfo.userList[2].relation }}
+
+
+ {{ houseInfo.userList[2].userName }}
+
+
-
-
-
-
-
-
{{ houseInfo.userList[3].relation }}
-
{{ houseInfo.userList[3].userName }}
+
+
+
+
+
+ {{ houseInfo.userList[3].relation }}
+
+
{{
+ houseInfo.userList[3].userName
+ }}
+
-
-
-
-
-
-
{{ houseInfo.userList[4].relation }}
-
{{ houseInfo.userList[4].userName }}
+
+
+
+
+
+ {{ houseInfo.userList[4].relation }}
+
+
+ {{ houseInfo.userList[4].userName }}
+
+
-
-
-
-
-
-
{{ houseInfo.userList[5].relation }}
-
{{ houseInfo.userList[5].userName }}
+
+
+
+
+
+ {{ houseInfo.userList[5].relation }}
+
+
+ {{ houseInfo.userList[5].userName }}
+
+
-
-
-
-
-
-
-
-
-
-
居民需求
-
-
-
-
-
-
+
+
-
-
-
+
+
-
-
-
-
{{ item.eventContent }}
-
{{ item.reportTime }}
-
-
-
-
-
+
+
+
+
+
+
{{ item.eventContent }}
+
{{ item.reportTime }}
+
+
-
-
-
-
{{ item.topicContent }}
-
{{ item.releaseTime }}
+
-
-
-
-
+
+
+
+
{{ item.topicContent }}
+
{{ item.releaseTime }}
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
积分记录
-
+
+
+
+
积分记录
+
-
-
-
-
-
-
{{ item.title }}
-
{{ item.dateTime }}
+
+
+
+
+
+
+
{{ item.title }}
+
{{ item.dateTime }}
+
-
-
+
-
-
+
+
+
-
-
+
+
-
@@ -401,8 +524,9 @@ import cptTb from "@/views/modules/visual/cpts/tb";
export default {
name: "HomeMap",
- data () {
+ data() {
return {
+ breadList: [],
showedMoreInfo: false,
showedDemandInfo: false,
@@ -520,26 +644,74 @@ export default {
incidentInfo,
topicInfo,
},
-
+ beforeRouteEnter(to, from, next) {
+ console.log("让我看看", to);
+ if (from) {
+ const arr = [{ ...from }, { ...to, meta: { title: "个人详情" } }];
+ next((vm) => {
+ vm.breadList = [...arr];
+ });
+ } else {
+ next();
+ }
+ },
watch: {
- uid (id) {
+ uid(id) {
this.userId = id;
},
- userId () {
+ userId() {
this.getApiData();
window.scrollTo(0, 0);
},
+ $route(route) {
+ // if you go to the redirect page, do not update the breadcrumbs
+ if (route.path.startsWith("/redirect/")) {
+ return;
+ }
+ // this.getBreadcrumb()
+ },
},
- async mounted () {
+ async mounted() {
this.userId = this.uid;
+ console.log(this.$router);
this.getApiData();
},
-
+ deactivated() {
+ this.breadList = [];
+ console.log("breadList-----", this.breadList);
+ },
+ destroyed() {
+ this.breadList = [];
+ console.log("breadList-----", this.breadList);
+ },
methods: {
- handleSearch () { },
+ getBreadcrumb() {
+ // only show routes with meta.title
+ console.log("routest----", this.$route);
+ let matched = this.$route.matched.filter(
+ (item) => item.meta && item.meta.title
+ );
+ const first = matched[0];
+
+ if (!this.isDashboard(first)) {
+ matched = [{ path: "/home", meta: { title: "首页" } }].concat(matched);
+ }
+
+ this.breadList = matched.filter(
+ (item) => item.meta && item.meta.title && item.meta.breadcrumb !== false
+ );
+ },
+ isDashboard(route) {
+ const name = route && route.name;
+ if (!name) {
+ return false;
+ }
+ return name.trim().toLocaleLowerCase() === "Home".toLocaleLowerCase();
+ },
+ handleSearch() {},
- async getApiData () {
+ async getApiData() {
await this.getInfo();
this.getHouseInfo();
this.getDemandData();
@@ -548,12 +720,12 @@ export default {
this.getPointData();
},
- toUserInfo (uid) {
+ toUserInfo(uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
//加载组织数据
- async getInfo () {
+ async getInfo() {
const url = "/epmetuser/icresiuser/persondata";
let params = {
userId: this.userId,
@@ -569,7 +741,7 @@ export default {
},
//加载组织数据
- async getHouseInfo () {
+ async getHouseInfo() {
const url = "/epmetuser/icresiuser/ownerrelation";
let params = {
userId: this.userId,
@@ -584,12 +756,12 @@ export default {
}
},
- handlePageNoChangeDemand (val) {
+ handlePageNoChangeDemand(val) {
this.demand.pageNo = val;
this.getDemandData();
},
- handleOperateDemandList (index, type) {
+ handleOperateDemandList(index, type) {
if (type == "查看") {
this.showedDemandInfo = true;
this.demand.currentIndex = index;
@@ -597,7 +769,7 @@ export default {
},
//加载组织数据
- async getDemandData () {
+ async getDemandData() {
const url = "/heart/userdemand/mydemand";
let params = {
epmetUserIdList: this.info.epmetUserIdList,
@@ -627,18 +799,18 @@ export default {
}
},
- handlePageNoChangeIncident (val) {
+ handlePageNoChangeIncident(val) {
this.incident.pageNo = val;
this.getIncidentData();
},
- handleClickIncident (index) {
+ handleClickIncident(index) {
this.incident.showedInfo = true;
this.incident.currentIndex = index;
},
//加载组织数据
- async getIncidentData () {
+ async getIncidentData() {
const url = "/gov/project/resievent/pageuserreported";
let params = {
epmetUserIdList: this.info.epmetUserIdList,
@@ -658,18 +830,18 @@ export default {
}
},
- handlePageNoChangeTopic (val) {
+ handlePageNoChangeTopic(val) {
this.topic.pageNo = val;
this.getTopicData();
},
- handleClickTopic (index) {
+ handleClickTopic(index) {
this.topic.showedInfo = true;
this.topic.currentIndex = index;
},
//加载组织数据
- async getTopicData () {
+ async getTopicData() {
const url = "/data/aggregator/resigroup/pageusertopic";
let params = {
epmetUserIdList: this.info.epmetUserIdList,
@@ -689,18 +861,18 @@ export default {
}
},
- handlePageNoChangePoint (val) {
+ handlePageNoChangePoint(val) {
this.point.pageNo = val;
this.getPointData();
},
- handleClickPoint (index) {
+ handleClickPoint(index) {
this.point.showedInfo = true;
this.point.currentIndex = index;
},
//加载组织数据
- async getPointData () {
+ async getPointData() {
const url = "/point/resi/point/pageuserpoint";
let params = {
epmetUserIdList: this.info.epmetUserIdList,
@@ -728,3 +900,19 @@ export default {
src="@/assets/scss/modules/visual/people.scss"
scoped
>
+
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
new file mode 100644
index 000000000..abad7f683
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+ {{ item.meta.title }}
+
+
+
+
+
+
+
+
+
+
+
{{tableTitle}}
+
+
+
+
+
+
+
{{item.sort}}
+
{{item.name}}
+
{{item.gridName}}
+
{{item.neighborHoodName + item.buildNum}}
+
+
{{item.mobile}}
+
{{item.idCard}}
+
{{item.gender}}
+
{{item.birthday}}
+
{{'查看'}}
+
+
+
+
+
+ 加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index 19c2d9bcd..c28c2cf3a 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -1,6 +1,21 @@
-
-
+
+
+
+
+
+
+ 人员图谱
+
+
人员图谱>
+
+ 个人档案
+
+
+
+
+
所属网格
所属小区
-
所属楼栋
-
操作
+
所属楼栋
+
操作
-
+
@@ -43,66 +59,92 @@
{{item.name}}
{{item.gridName}}
{{item.neighborHoodName}}
-
{{item.buildNum}}
+
{{item.buildNum}}
{{'查看'}}
+ class="td td1 btn_detail">{{'查看'}}
+
+
+ 加载中
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
index db3501940..0d36a46cc 100644
--- a/src/views/modules/visual/basicinfo/personCategory/recordList.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
@@ -1,4 +1,5 @@
+
-
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
new file mode 100644
index 000000000..53e007da4
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -0,0 +1,785 @@
+
+
+
+
+
多元主体分析
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
{{item.optionLabel}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
new file mode 100644
index 000000000..ae6ffd8ce
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
@@ -0,0 +1,180 @@
+
+export function pieOption (_charts) {
+ const center= ['50%', '150px']
+ return {
+ title: {
+ text: '0',
+ top: 125,
+ left: 'center',
+ textStyle: {
+ width: '100%',
+ fontSize: 26,
+ color: '#FFFFFF',
+ fontWeight: 400
+ },
+ itemGap: 5,
+ subtext: '总数',
+ subtextStyle: {
+ fontSize: 18,
+ color: '#fff',
+ fontWeight: 400
+ }
+ },
+ tooltip: {
+ show: false
+ },
+ legend: {
+ 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: ['53%', '53.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: ['30%', '43%'],
+ avoidLabelOverlap: false,
+ // top: top + '%',
+ // height: '80%',
+ selectedMode: 'single',
+ left: 'center',
+ width: 480,
+ 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: 10,
+ // distanceToLabelLine: -60,
+ rich: {
+ name: {
+ padding: [0, 6, 0, 6]
+ },
+ a: {
+ fontSize: 25,
+ 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: 40,
+ 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) {
+ return params.data.color
+ //自定义颜色
+ 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%', '20%'],
+ label: {
+
+ show: false
+
+ },
+ labelLine: {
+
+ show: false
+
+ },
+ data: [{
+ value: 360,
+ itemStyle: {
+ normal: {
+ color: 'rgba(8, 37, 134, 1)',
+
+ }
+ }
+ }
+ ]
+ },
+ ]
+
+ }
+ }
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 7c2c32763..469b98d5b 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -4,7 +4,7 @@
事件处置分析
-
+
-
+
x.level !== 'grid')
+ newTree.forEach(x => x.subAgencyList && (x.subAgencyList = this.filterTree(x.subAgencyList)))
+ return newTree
+
+ },
+
+
+
//加载项目
async getProjectTotal () {
if (this.$refs.pieChart) {
@@ -370,12 +370,7 @@ export default {
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
@@ -712,4 +707,10 @@ export default {
scoped
>
+
+
diff --git a/src/views/modules/visual/communityGovern/resibuzz copy.vue b/src/views/modules/visual/communityGovern/resibuzz copy.vue
deleted file mode 100644
index 9722a69b9..000000000
--- a/src/views/modules/visual/communityGovern/resibuzz copy.vue
+++ /dev/null
@@ -1,523 +0,0 @@
-
-
-
-
-
居民热议
-
-
-
-
-
-
-
-
-
-
-
-
居民热议分析
-
-
-
-
-
-
@@ -531,5 +532,8 @@ export default {
scoped
>
-
+
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
new file mode 100644
index 000000000..2aed96664
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -0,0 +1,435 @@
+
+
+
+
+
+
+
详情
+
+
+
+
+
+ 所属网格：
+ {{ eventInfo.gridName }}
+
+
+ 发生时间：
+ {{ eventInfo.happenTime }}
+
+
+
+ 事件内容：
+ {{ eventInfo.eventContent }}
+
+
+
+
图片：
+
+
![]()
+
+
+
+
+
+
+ 反映渠道：
+ {{ eventInfo.sourceTypeName || "--" }}
+
+
+ 地址：
+ {{ eventInfo.address || "--" }}
+
+
+ 报事人：
+ {{ eventInfo.name || "--" }}
+
+
+ 手机号：
+ {{ eventInfo.mobile || "--" }}
+
+
+ 身份证号：
+ {{ eventInfo.idCard || "--" }}
+
+
+
+
+
+
处理进展
+
+
+
+
{{ item.processName }}
+
+ {{ item.processTime }}
+
+
+
+
+
处理部门：
+
{{ item.departmentName }}
+
+
+
+
+
+
内部备注：
+
+ {{ item.internalRemark }}
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
new file mode 100644
index 000000000..04b4f9503
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
@@ -0,0 +1,86 @@
+import * as echarts from 'echarts'
+export function lineOption () {
+
+ return {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ label: {
+ backgroundColor: '#6a7985'
+ }
+ }
+ },
+ 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',
+ smooth: true,
+ barWidth: 15,
+ areaStyle: {},
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(
+ 0, 1, 0, 0,
+ [
+ { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+ { offset: 1, color: '#6339FF' }
+ ]
+ )
+ }
+ },
+ // {
+ // data: [820, 932, 901, 934, 1290, 1330, 1320],
+ // type: 'line',
+ // areaStyle: {}
+ // }
+ ]
+
+ }
+}
diff --git a/src/views/modules/visual/communityGovern/resiPieOption copy.js b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
similarity index 77%
rename from src/views/modules/visual/communityGovern/resiPieOption copy.js
rename to src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
index 7d195966b..5eb83badb 100644
--- a/src/views/modules/visual/communityGovern/resiPieOption copy.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js
@@ -1,10 +1,10 @@
export function pieOption (_charts) {
-const center= ['50%', '250px']
+const center= ['50%', '170px']
return {
title: {
text: '0',
- top: 220,
+ top: 140,
left: 'center',
textStyle: {
width: '100%',
@@ -23,18 +23,18 @@ const center= ['50%', '250px']
tooltip: {
show: false
},
- legend: {
- top: 500,
- bottom: 0,
- itemWidth: 20,
- itemHeight: 10,
- textStyle: {
- color: '#D2E7FF',
- fontSize: 16,
- lineHeight: 20,
- },
+ // legend: {
+ // top: 350,
+ // bottom: 0,
+ // itemWidth: 20,
+ // itemHeight: 10,
+ // textStyle: {
+ // color: '#D2E7FF',
+ // fontSize: 16,
+ // lineHeight: 20,
+ // },
- },
+ // },
series: [
// 外侧圆环
{
@@ -45,21 +45,27 @@ const center= ['50%', '250px']
// tooltip: {
// },
center: center,
- radius: ['55%', '55.3%'],
+ radius: ['58%', '58.3%'],
label: {
- show: false
+ normal: {
+ show: false
+ }
},
labelLine: {
- show: false
+ normal: {
+ 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'
+ normal: {
+ color: 'rgba(40, 101, 250, 0)',
+ width:0,
+ borderColor: 'rgba(40, 101, 250, 0.5)',
+ borderWidth: 1,
+ borderType: 'dotted'
+ }
}
}
]
@@ -71,7 +77,7 @@ const center= ['50%', '250px']
// name: 'Access From',
type: 'pie',
center: center,
- radius: ['40%', '60%'],
+ radius: ['35%', '48%'],
avoidLabelOverlap: false,
// top: top + '%',
// height: '80%',
@@ -83,9 +89,9 @@ const center= ['50%', '250px']
position: 'outside',
alignTo: 'edge',
// formatter: '{a|{c}}\n\n{name|{b}}',
- formatter: '{a|{c}}\n{r|}\n{name|{b}}',
+ formatter: '{a|{c}%}\n{r|}\n{name|{b}}',
minMargin: 5,
- edgeDistance: -20,
+ edgeDistance: 1,
lineHeight: 15,
color: '#fff',
fontSize: 12,
@@ -131,13 +137,11 @@ const center= ['50%', '250px']
};
},
itemStyle: {
- // color:function(params) {
- // //自定义颜色
- // var colorList = [
- // '#00FFFF', '#00FF00', '#FFFF00', '#FF8C00', '#FF0000', '#FE8463',
- // ];
- // return colorList[params.dataIndex]
- // }
+ color:function(params) {
+ //自定义颜色
+ var colorList = [ '#FAC126', '#3DDA83'];
+ return colorList[params.dataIndex]
+ }
},
data: [],
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
new file mode 100644
index 000000000..301a60a96
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -0,0 +1,740 @@
+
+
+
+
+
事件处理分析
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{item.name}}
+
![]()
+
+
+
+
+
+
+
+ 加载中
+
+
+
+
+
月度新增事件统计
+
+
+
+ 加载中
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js b/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js
new file mode 100644
index 000000000..942be5dc4
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js
@@ -0,0 +1,179 @@
+
+export function pieOption (_charts) {
+ const center= ['50%', '140px']
+ return {
+ title: {
+ text: '0',
+ top: 115,
+ left: 'center',
+ textStyle: {
+ width: '100%',
+ fontSize: 26,
+ color: '#FFFFFF',
+ fontWeight: 400
+ },
+ itemGap: 5,
+ subtext: '总数',
+ subtextStyle: {
+ fontSize: 18,
+ color: '#fff',
+ fontWeight: 400
+ }
+ },
+ tooltip: {
+ show: false
+ },
+ legend: {
+ bottom: 0,
+ itemWidth: 20,
+ itemHeight: 10,
+ textStyle: {
+ color: '#D2E7FF',
+ fontSize: 14,
+ lineHeight: 20,
+ },
+
+ },
+ series: [
+ // 外侧圆环
+ {
+ type: 'pie',
+ // 起始刻度的角度，默认为 90 度，即圆心的正上方。0 度为圆心的正右方。
+ startAngle: 0,
+ hoverAnimation: false,
+ // tooltip: {
+ // },
+ center: center,
+ radius: ['48%', '48.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: ['25%', '38%'],
+ avoidLabelOverlap: false,
+ // top: top + '%',
+ // height: '80%',
+ selectedMode: 'single',
+ left: 'center',
+ width: 480,
+ 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: 10,
+ // distanceToLabelLine: -60,
+ rich: {
+ name: {
+ padding: [0, 6, 0, 6]
+ },
+ a: {
+ fontSize: 18,
+ 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: 20,
+ 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%', '20%'],
+ label: {
+
+ show: false
+
+ },
+ labelLine: {
+
+ show: false
+
+ },
+ data: [{
+ value: 360,
+ itemStyle: {
+ normal: {
+ color: 'rgba(8, 37, 134, 1)',
+
+ }
+ }
+ }
+ ]
+ },
+ ]
+
+ }
+ }
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
new file mode 100644
index 000000000..f3af070c8
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -0,0 +1,732 @@
+
+
+
+
+
事件分类分析
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index 7466c3d52..32b4aede5 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -3,29 +3,30 @@
事件分类分析
+
@@ -76,7 +77,7 @@
@@ -783,12 +1186,14 @@ export default {
}
.box-right {
flex: 1;
+ height: 100%;
+ margin-left: 10px;
overflow: hidden;
.pagination {
margin-top: 0;
}
.box-map {
- height: 400px;
+ height: 100%;
// border: 1px solid #2865fa;
.map {
@@ -808,6 +1213,9 @@ export default {
}
}
}
+.flex-column {
+ flex-direction: column;
+}
.box-wr-400 {
height: 400px;
.box-left {
@@ -820,7 +1228,43 @@ export default {
}
}
}
-
+.echart-wr {
+ position: relative;
+ flex-shrink: 0;
+ width: 90%;
+ height: 320px;
+ box-sizing: border-box;
+ .echart-org {
+ width: 100%;
+ height: 100%;
+ }
+ .echart-cicle {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 240px;
+ height: 240px;
+ box-sizing: border-box;
+ margin-top: -120px;
+ margin-left: -120px;
+ border: 1px dashed rgba(0, 96, 240, 1);
+ border-radius: 50%;
+ }
+ .echart-cicle0 {
+ left: 80px;
+ margin-left: 0;
+ }
+}
+.table-h {
+ height: calc(100vh - 630px);
+}
+.calc-h {
+ height: calc(100vh - 240px);
+ padding-bottom: 20px;
+}
+.wd50 {
+ width: 50%;
+}
.map-tips {
width: 100%;
display: flex;
@@ -852,4 +1296,10 @@ export default {
}
}
}
+.mt0 {
+ margin: 0;
+}
+.mt40 {
+ margin-top: 40px;
+}
diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue
index 60db4c68c..c4160ff69 100644
--- a/src/views/modules/visual/communityParty/dialogInfo.vue
+++ b/src/views/modules/visual/communityParty/dialogInfo.vue
@@ -11,7 +11,7 @@
-
+
+ 导出
+
+
+ 导出
+
+
+
+
diff --git a/src/views/modules/visual/communityParty/unitInfo.vue b/src/views/modules/visual/communityParty/unitInfo.vue
new file mode 100644
index 000000000..4e3c7c97e
--- /dev/null
+++ b/src/views/modules/visual/communityParty/unitInfo.vue
@@ -0,0 +1,262 @@
+
+
+
+
+
+
+
单位活动
+
+
+
+
+
-->
+ :id="mapId"
+ :ref="mapId">
@@ -79,6 +82,24 @@ let iconSource; // icon
let select;//选中标注
+let iconTextsStyle = {
+ textAlign: undefined,
+ font: "18px Arial",
+ //fontFamily: "Courier New, monospace",
+ // fontWeight: "bold",
+ text: '',
+ backgroundFill: new Fill({
+ color: 'rgba(0, 146, 238, 0.75)'
+ // color: textColorArray[feature.values_.colorIndex]
+ }),
+ padding: [4, 10, 4, 10],
+ //text: "变电站名称",
+ fill: new Fill({ color: "#ffffff" }),
+ // stroke: new Stroke({ color: "#ffffff", width: 3 }),
+ offsetY: -30,
+ offsetX: -50,
+ overflow: true,
+}
let polygonColorArray = [
'rgba(210, 2, 2, 0.24)',
@@ -86,7 +107,19 @@ let polygonColorArray = [
'rgba(183, 185, 0, 0.16)'
];
+//icon文字样式
+let createTextStyle = function (feature) {
+
+ if (iconTextsStyle) {
+ let iconTextsStyles = { ...iconTextsStyle }
+ iconTextsStyles.text = feature.values_ && feature.values_.name || feature.name
+ return new Text({ ...iconTextsStyles })
+ } else {
+ return null
+ }
+
+}
//多边形标注样式
var polygonStyleFunction = (function () {
return function (feature) {
@@ -105,6 +138,8 @@ var polygonStyleFunction = (function () {
};
})()
+
+
const vueGis = {
name: 'HomeMap',
data () {
@@ -151,7 +186,7 @@ const vueGis = {
iconArrays: [
],
- iconTextStyle: {},
+ // iconTextStyle: {},
//policon图标样式
polIconUrlArray: [
@@ -165,12 +200,13 @@ const vueGis = {
distanceMax: null,//显示的坐标距离中心点的范围
input_lat: null,
- input_lon: null
+ input_lon: null,
+
+ isChangeCenter: true,//是否根据多边形改变数组
}
},
async mounted () {
-
},
methods: {
showPosition () {
@@ -181,10 +217,10 @@ const vueGis = {
loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle, distanceMax) {
this.mapInfo = mapInfo
this.polygonArray = polygonArray
- this.polIconUrlArray = polIconUrlArray
+ this.polIconUrlArray = polIconUrlArray || []
this.iconArrays = iconArrays
this.iconUrlArray = iconUrlArray
- this.iconTextStyle = iconTextStyle
+ iconTextsStyle = iconTextStyle || iconTextsStyle
this.distanceMax = distanceMax
// iconArrays.forEach(item => {
@@ -194,21 +230,21 @@ const vueGis = {
//初始化地图
this.initMap()
-
- if (this.showPolygonLayer) {
+ if (this.showPolIconLayer) {
+ console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
//初始化多边形标注图层
- this.initPolygonLayer()
+ this.initPolIconLayer()
//加载当前园区的标注
- this.loadPolygon()
+ // this.loadPolIcon()
}
- if (this.showPolIconLayer) {
-
+ if (this.showPolygonLayer) {
//初始化多边形标注图层
this.initPolygonLayer()
//加载当前园区的标注
- this.loadPolIcon()
+ this.loadPolygon()
}
+
if (this.showIconLayer) {
//初始化icon图层
this.initIconLayer()
@@ -220,41 +256,51 @@ const vueGis = {
this.addOverlay()
}
-
this.addMapClick()
},
- //刷新地图
- async refreshMap (polygonArray, iconArrays) {
-
+ //刷新地图:地图信息，多边形数组，标注数组，是否根据多边形改变中心点
+ async refreshMap (mapInfo, polygonArray, iconArrays, isChangeCenter) {
+ this.mapInfo = mapInfo
+ this.polygonArray = []
this.polygonArray = polygonArray
this.iconArrays = iconArrays
+ this.isChangeCenter = isChangeCenter
+ if (iconSource) {
+ iconSource.clear()
+ }
+ if (polygonSource) {
+ polygonSource.clear()
+ }
+ if (polIconSource) {
+ polIconSource.clear()
+ }
+ this.initPolIconLayer()
if (this.showPolygonLayer) {
-
+ this.initPolygonLayer()
//加载当前园区的标注
this.loadPolygon()
}
if (this.showPolIconLayer) {
-
+ this.initIconLayer()
//加载当前园区的标注
- this.loadPolIcon()
+ // this.loadPolIcon()
}
if (this.showIconLayer) {
this.loadIcon()
}
-
-
+ this.setMapLocation()
+ // gaodeMapLayer.getSource().changed()
},
- //加载多边形
+ //加载区域多边形
loadPolygon () {
-
polygonSource.clear()//清空多边形标注
-
+ // iconSource.clear()
let featureData = []//多边形数据数据
if (this.polygonArray && this.polygonArray.length > 0) {//判断是否存在下级标注
@@ -307,13 +353,16 @@ const vueGis = {
this.loadPolIcon(feature)
}
+
}
},
- //加载多边形的icon
+ //加载区域多边形的icon
loadPolIcon (feature) {
+ polIconSource.clear()
let polyIconFeatures = [];
+ console.log('feature-----', feature)
feature.forEach(oneIcon => {
var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
@@ -330,28 +379,27 @@ const vueGis = {
id: oneIcon.id_
}
});
-
+ // console.log('oneIcon----', oneIcon)
let polyIconStyle = new Style({
image: new Icon({
// anchor: [0.5, 0.5],
// imgSize: [32, 32],
- scale: 0.5,
- src: polIconUrlArray[oneIcon.values_.index - 1]
- })
+ scale: this.areaScale,
+ src: this.polIconUrlArray[0]
+ }),
+ text: createTextStyle(oneIcon)
});
polyIcon.setStyle(polyIconStyle);
polyIconFeatures.push(polyIcon);
});
-
polIconSource.addFeatures(polyIconFeatures);
},
//加载icon图标
loadIcon () {
iconSource.clear()//清空多边形标注
-
if (this.iconArrays && this.iconArrays.length > 0) {
let iconFeatures = [];
@@ -367,15 +415,14 @@ const vueGis = {
info: { ...oneIcon }
}
});
-
let iconStyle = new Style({
image: new Icon({
// anchor: [0.5, 0.5],
// imgSize: [32, 32],
// scale: 0.5,
- src: this.iconUrlArray[oneIcon.urlIndex]
+ src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0]
}),
- text: this.createTextStyle(oneIcon)
+ // text: createTextStyle(oneIcon)
});
iconItem.setStyle(iconStyle);
@@ -397,18 +444,6 @@ const vueGis = {
}
},
- //icon文字样式
- createTextStyle (feature) {
- if (this.iconTextStyle) {
- let iconTextStyle = { ...this.iconTextStyle }
- iconTextStyle.text = feature.values_.name
- return new Text({ ...iconTextStyle })
- } else {
- return null
- }
-
-
- },
//计算和中心点距离
computedDistance (lon, lat, max) {
@@ -425,7 +460,7 @@ const vueGis = {
//初始化地图
initMap () {
- this.setMapLocation()
+ this.firstCentermap()
gaodeMapLayer = new TileLayer({
title: "地图",
source: new XYZ({
@@ -452,7 +487,7 @@ const vueGis = {
layers: [gaodeMapLayer],
//加载瓦片图层数据
view: mapView,
- target: 'map'
+ target: this.mapId
//目标加载到map中
})
@@ -478,8 +513,98 @@ const vueGis = {
},
//设置地图定位的中心点和缩放级别
setMapLocation () {
+ if (!this.zoom) {
+ this.setZoom(this.mapInfo.agencyLevel)
+ }
+ this.centerPoint = []
+
+ //如果存在中心点（返回时赋值）
+ if (this.center && this.center.length > 0) {
+ this.centerPoint = this.center
+ this.centerFlag = 'point'
+ this.center = []
+ } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+ this.centerFlag = 'flag_polygon'
+
+ } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
+ this.centerPoint.push(this.mapInfo.longitude)
+ this.centerPoint.push(this.mapInfo.latitude)
+ this.centerFlag = 'point'
+
+ } else {
+ this.centerPoint = centerPointGlobal
+ this.centerFlag = 'point'
+ }
+ // debugger
+ if (this.centerFlag === 'flag_parent') {
+ let parentFeatures = parentLayer.getSource().getFeatures()[0]
+ let polygon = parentFeatures.getGeometry();
+ map.getView().fit(polygon, map.getSize());
+ this.zoom = map.getView().getZoom() - 1
+
+ } else if (this.centerFlag === 'flag_polygon') {
+ let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+ let polygon = polygonFeatures.getGeometry();
+ map.getView().fit(polygon, map.getSize());
+ this.zoom = map.getView().getZoom() - 1
+
+ } else {
+ mapView.setCenter(this.centerPoint);
+ }
+
+ if (!this.isChangeCenter) {
+ return false
+ }
+ // debugger
+ if (!this.zoom) {
+ this.setZoom(this.mapInfo.agencyLevel)
+ }
+ this.centerPoint = []
+
+ //如果存在中心点（返回时赋值）
+ if (this.center && this.center.length > 0) {
+ this.centerPoint = this.center
+ this.centerFlag = 'point'
+ this.center = []
+
+ } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+ this.centerFlag = 'flag_polygon'
+ this.centerPoint.push(this.mapInfo.longitude)
+ this.centerPoint.push(this.mapInfo.latitude)
+
+ } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
+ this.centerPoint.push(this.mapInfo.longitude)
+ this.centerPoint.push(this.mapInfo.latitude)
+ this.centerFlag = 'point'
+
+ } else {
+ this.centerPoint = centerPointGlobal
+ this.centerFlag = 'point'
+ }
+
+ // debugger
+ if (this.centerFlag === 'flag_parent') {
+ let parentFeatures = parentLayer.getSource().getFeatures()[0]
+ let polygon = parentFeatures.getGeometry();
+ map.getView().fit(polygon, map.getSize());
+ this.zoom = map.getView().getZoom() - 1
+
+ } else if (this.centerFlag === 'flag_polygon') {
+ let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+ let polygon = polygonFeatures.getGeometry();
+ map.getView().fit(polygon, map.getSize());
+ this.zoom = map.getView().getZoom() - 1
+
+ } else {
+ mapView.setCenter(this.centerPoint);
+
+ }
+ mapView.setZoom(this.zoom);
+
+ },
+ firstCentermap () {
if (this.mapInfo.longitude && this.mapInfo.latitude) {
this.centerPoint = []
this.centerPoint.push(this.mapInfo.longitude)
@@ -489,7 +614,7 @@ const vueGis = {
this.centerPoint = centerPointGlobal
}
- this.setZoom(this.mapInfo.level)
+ this.setZoom(this.mapInfo.agencyLevel)
},
//根据组织层级设置缩放级别
@@ -507,7 +632,8 @@ const vueGis = {
//初始化多边形标注图层
initPolygonLayer () {
polygonSource = new VectorSource({
- //features: (new GeoJSON()).readFeatures(geojsonObject)
+ // features: (new GeoJSON()).readFeatures(geojsonObject)
+ wrapX: false
});
polygonLayer = new VectorLayer({
@@ -515,7 +641,7 @@ const vueGis = {
style: polygonStyleFunction,
zIndex: 50
});
-
+ let that = this
//选中多边形后的样式
var overlayStyle = (function () {
@@ -535,7 +661,7 @@ const vueGis = {
})
}),
new Style({
- text: createTextStyle(feature)
+ // text: createTextStyle(feature) // 报错 暂时注掉 zhaotongyao 2022.05.19
})
];
styles['MultiPolygon'] = styles['Polygon'];
@@ -543,13 +669,13 @@ const vueGis = {
};
})();
- select = new Select({
- style: overlayStyle
- });
-
+ // select = new Select({
+ // style: overlayStyle
+ // });
+ // 有BUG 加入多边形选中样式时，如果同时存在icon层和多边形层，点击icon会使icon消失 ---zhaotongyao 2022.06.01
map.addLayer(polygonLayer)
- map.addInteraction(select);
+ // map.addInteraction(select);
},
@@ -558,6 +684,7 @@ const vueGis = {
initPolIconLayer () {
polIconSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
+ wrapX: false
});
polIconLayer = new VectorLayer({
@@ -571,9 +698,9 @@ const vueGis = {
//初始化icon图层
initIconLayer () {
-
iconSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
+ wrapX: false
});
iconLayer = new VectorLayer({
@@ -597,6 +724,7 @@ const vueGis = {
var container = document.getElementById("popup");
var closer = document.getElementById("popup-closer");
var content = document.getElementById("popup-content");
+ var goMore = document.getElementById("popup-goMore") ? document.getElementById("popup-goMore") : null
// 创建一个弹窗 Overlay 对象
this.overlay = new Overlay({
@@ -619,6 +747,11 @@ const vueGis = {
closer.blur();
return false;
};
+ if (goMore) {
+ goMore.onclick = function () {
+ _that.$emit('lookMore')
+ };
+ }
},
//注册地图点击事件
@@ -650,15 +783,27 @@ const vueGis = {
});
},
- handleShowPopup (showData, coordinate) {
+ handleShowPopup (showData, coordinate, isShowMore) {
+ if (isShowMore) {
+ document.getElementById("popup-goMore").style.display = 'block'
+ } else {
+ document.getElementById("popup-goMore").style.display = 'none'
+ }
console.log(this.overlay.getElement())
+ let content = document.getElementById("popup-content");
this.overlay.getElement().style.display = 'block'
this.overlay.getElement().parentNode.style.display = 'block'
this.overlay.getElement().parentNode.parentNode.style.display = 'block'
- var content = document.getElementById("popup-content");
-
content.innerHTML = showData;
- this.overlay.setPosition(coordinate); //把 overlay 显示到指定的 x,y坐标
+ this.overlay.setPosition(coordinate);
+ //把 overlay 显示到指定的 x,y坐标
+
+ },
+ // 关闭弹窗
+ handleClosePopup () {
+ this.overlay.setPosition(undefined);
+ document.getElementById("popup-closer").blur();
+ return false;
},
//取随机数
@@ -685,6 +830,10 @@ const vueGis = {
},
},
props: {
+ mapId: {
+ type: String,
+ default: 'map'
+ },
//是否显示多边形图层
showPolygonLayer: {
type: Boolean,
@@ -711,6 +860,10 @@ const vueGis = {
clickType: {
type: String,
default: 'back'
+ },
+ areaScale: {
+ type: Number,
+ default: 0.5
}
},
@@ -795,8 +948,12 @@ export default vueGis;
.popup-content {
width: 300px;
}
+.popup-goMore {
+ margin: 20px 0;
+}
.ol-popup-closer:after {
content: "✖";
- color: rgba(1, 17, 104, 1);
+ // color: rgba(1, 17, 104, 1);
+ color: #fff;
}
\ No newline at end of file
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index 10c0c5120..b264dfac6 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -2,29 +2,48 @@
-
+
(家属)
{{item.icUserName}}
-
+
-
+
-
-
{{userName}}
-
(案件居民)
+
+
{{userName}}
+
{{userTag}}
+
+
+
{{userName}}
+
{{userTag}}
+
+
+
{{userName}}
+
{{userTag}}
+
+
+
{{userName}}
+
{{userTag}}
@@ -83,7 +102,8 @@
-
+
@@ -111,15 +131,16 @@
+ :key="i"
+ class="item"
+ @click="handleProject(n)">
{{filterStatus(n.status)}}
+ :class="'item-status-'+n.status">{{filterStatus(n.status)}}
{{n.title}}
-
暂无数据
+
暂无数据
+
+
+
+
+
+
{{addressItem.address}}
+
+
暂无数据
@@ -254,6 +284,18 @@ export default {
},
userList: Array, // 默认，必传 单个来源或多个来源
userName: String, // 默认，必传 单个来源或多个来源
+ userTag: { // 默认为案件居民， 单个来源或多个来源
+ type: String,
+ default: '案件居民'
+ },
+ isUserClick: { //中间报事人是否能点击
+ type: Boolean,
+ default: false
+ },
+ bcLimit: { //中间报事人的背景颜色限制
+ type: Number,
+ default: 1
+ },
singleList: Array, // 默认，必传 单个来源或多个来源
},
@@ -265,6 +307,7 @@ export default {
},
created () {
this.tempList = [...this.singleList]
+ console.log(this.tempList)
},
methods: {
@@ -275,7 +318,7 @@ export default {
}
return statusObj[status]
},
- computedPd(list) {
+ computedPd (list) {
if (this.sourceTab == 'group') return '60px'
if (list.length == 1) return '330px'
else if (list.length == 2) return '240px'
@@ -295,6 +338,12 @@ export default {
handleUser (item) {
this.$emit('user', item)
},
+ handleMidderUser (id) {
+ if (this.isUserClick) {
+ this.$emit('toMiddleUserInfo', id)
+ }
+
+ },
handleShow (item) {
item.showItem = !item.showItem
}
@@ -374,6 +423,22 @@ export default {
}
}
+ .analys-person_orange {
+ background: url("../../../../assets/img/shuju/measure/zhuhu_orange.png")
+ no-repeat center;
+ background-size: cover;
+ }
+ .analys-person_yellow {
+ background: url("../../../../assets/img/shuju/measure/zhuhu_yellow.png")
+ no-repeat center;
+ background-size: cover;
+ }
+ .analys-person_red {
+ background: url("../../../../assets/img/shuju/measure/zhuhu_red.png")
+ no-repeat center;
+ background-size: cover;
+ }
+
.analys-cate {
display: flex;
flex-direction: column;
@@ -436,6 +501,10 @@ export default {
margin: 0 auto;
}
}
+
+ // .cate-col {
+ // width: 250px;
+ // }
.cate-col-w100 {
width: 230px;
.cate-list-w0 {
diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue
index 35f141583..7a6e3683d 100644
--- a/src/views/modules/visual/cpts/line-chart.vue
+++ b/src/views/modules/visual/cpts/line-chart.vue
@@ -1,6 +1,6 @@
-
+
@@ -12,6 +12,7 @@ import F2 from "@antv/f2/lib/index-all";
const fontFamily = "PingFang SC";
const fontSize = 14;
+let id = "myChart" + new Date().getDate();
let chart;
let srcData = [];
@@ -69,7 +70,7 @@ const addTextShape = () => {
const iniChart = function (config, srcData) {
chart = new F2.Chart({
- id: "myChart",
+ id,
...config,
});
@@ -203,6 +204,7 @@ export default {
data() {
return {
iniLoading: false,
+ id,
};
},
watch: {
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index f0e903b35..317f438f0 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -18,10 +18,10 @@
|
- {{
- item
- }}
- |
@@ -139,6 +144,11 @@ export default {
handleClickBtn(index, type) {
this.$emit("operate", index, type);
},
+ handleClickPeople(item) {
+ this.$router.push({
+ path: `/main-shuju/visual-basicinfo-people/${item.uid}`,
+ });
+ },
},
};
@@ -150,6 +160,7 @@ export default {
width: 100%;
height: 100%;
border: none;
+ table-layout: fixed;
&-header {
width: 100%;
@@ -179,9 +190,18 @@ export default {
min-height: 50px;
.td {
+ box-sizing: border-box;
text-align: center;
border: none;
- padding: 10px 0;
+ padding: 10px 5px;
+
+ > div {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ word-wrap: normal;
+ }
+
a {
font-size: 16px;
font-weight: 400;
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index b960eb6ba..9e7d4177d 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -104,7 +104,7 @@ export default {
},
{
align: "center",
- width: "30",
+ width: "30%",
},
],
header: ["序号", "网格名称", "活力值"],
@@ -131,7 +131,7 @@ export default {
},
{
align: "center",
- width: "20",
+ width: "20%",
},
],
header: ["序号", "党员姓名", "所属网格", "积分总数"],
@@ -158,7 +158,7 @@ export default {
},
{
align: "center",
- width: "20",
+ width: "20%",
},
],
header: ["序号", "居民姓名", "所属网格", "积分总数"],
@@ -267,6 +267,7 @@ export default {
return [
{ type: "index" },
item.userName,
+ // { type: "people", name: item.userName, uid: item.userId },
item.gridName,
item.pointTotal,
];
@@ -297,6 +298,7 @@ export default {
return [
{ type: "index" },
item.userName,
+ // { type: "people", name: item.userName, uid: item.userId },
item.gridName,
item.pointTotal,
];
diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue
index 1f1faaea2..5ba13eb31 100644
--- a/src/views/modules/visual/measure/dialogInfo.vue
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@@ -92,7 +92,7 @@
-
-->
-
+
需求和资源匹配分析
+
服务清单
导出
@@ -254,7 +255,7 @@ export default {
if (item.legendCode == 'unfinished') {
desc += `
尚有 ${item.serviceDemandTotal} 个需求未完成
`
}else {
- desc += `
共 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个
`
+ desc += `
共有 ${item.totalService} ${unit} ${item.legendName} 完成 ${item.serviceDemandTotal} 个需求
`
}
})
@@ -645,6 +646,25 @@ export default {
}
}
}
+.card-left-title {
+ position: relative;
+ padding-left: 40px;
+ font-size: 16px;
+ font-weight: 500;
+ color: #fff;
+}
+.card-left-title::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 0;
::v-deep .el-input {
@@ -799,5 +819,7 @@ export default {
border: 0;
}
}
-
+.mt30 {
+ margin-top: 30px;
+}
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
new file mode 100644
index 000000000..9cf8ef066
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
更多信息
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/plugin/power/components/info-dialog.vue b/src/views/modules/visual/plugin/power/components/info-dialog.vue
new file mode 100644
index 000000000..eff5c9410
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/components/info-dialog.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
信息详情
+
+
+
+
![]()
+
+
{{infoDetail.name}}
+
手机号：{{infoDetail.mobile}}
+
类别：{{infoDetail.categoryName}}
+
+
+
简介：{{infoDetail.interoduction}}
+
+
+
+
+
+
diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
new file mode 100644
index 000000000..f7e9bb875
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
@@ -0,0 +1,640 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue
new file mode 100644
index 000000000..77263287e
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue
@@ -0,0 +1,409 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{level1.name}}
+
书记: {{level1.leaderName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{level2.name}}
+
书记: {{level2.leaderName}}
+
+
+
+
+
+
+
{{level3.name}}
+
{{level3.leaderName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/plugin/power/components/screen-top-count.vue b/src/views/modules/visual/plugin/power/components/screen-top-count.vue
new file mode 100644
index 000000000..f7c28b338
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/components/screen-top-count.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
new file mode 100644
index 000000000..0fcc6130f
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -0,0 +1,589 @@
+
+
+
+
+
+
+
动力主轴
+
+
+
+
+
+
+
+
+
+ {{item.value}}
+ {{item.title}}
+
+
+
+
+
+ 网格分布
+
+
+
+
+
+
+
+
党群服务站
+
+
+
+
楼院党小组
+
+
+
+
党员中心户
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index 11d0b7831..b0e0df0d6 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -23,33 +23,10 @@
:key="indexs"
:style="tableContentStyle[indexs]"
>
-
@@ -63,16 +40,27 @@
+
+
+
+
diff --git a/src/views/modules/visual/warning/index.vue b/src/views/modules/visual/warning/index.vue
index 269a0369d..6be5ddbcd 100644
--- a/src/views/modules/visual/warning/index.vue
+++ b/src/views/modules/visual/warning/index.vue
@@ -89,7 +89,8 @@ export default {
{ title: "所属网格" },
{ title: "所属小区" },
{ title: "楼号" },
- { title: "姓名" },
+ { title: "预警人数" },
+ { title: "操作" },
],
tableData: [
// [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
@@ -133,7 +134,14 @@ export default {
item.gridName,
item.neighborhoodName,
item.buildingName,
- item.userList || '暂无',
+ item.count,
+ {
+ type: "btn",
+ name: "查看人员",
+ buildingId: item.buildingId,
+ configId: item.configId,
+ gridName: item.gridName,
+ },
]);
});
this.tableData = tableData;
diff --git a/src/views/modules/warning/components/screen-table/index.vue b/src/views/modules/warning/components/screen-table/index.vue
index 9bb544539..833245f6c 100644
--- a/src/views/modules/warning/components/screen-table/index.vue
+++ b/src/views/modules/warning/components/screen-table/index.vue
@@ -24,38 +24,10 @@
:key="indexs"
:style="tableContentStyle[indexs]"
>
-
@@ -66,11 +38,12 @@
-
@@ -78,13 +51,13 @@
+
+
diff --git a/src/views/modules/warning/index.vue b/src/views/modules/warning/index.vue
index 00121565a..aa668dc81 100644
--- a/src/views/modules/warning/index.vue
+++ b/src/views/modules/warning/index.vue
@@ -98,7 +98,8 @@ export default {
{ title: "所属网格" },
{ title: "所属小区" },
{ title: "楼号" },
- { title: "姓名" },
+ { title: "预警人数" },
+ { title: "操作" },
],
tableData: [
// [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
@@ -142,7 +143,14 @@ export default {
item.gridName,
item.neighborhoodName,
item.buildingName,
- item.userList || "暂无",
+ item.count,
+ {
+ type: "btn",
+ name: "查看人员",
+ buildingId: item.buildingId,
+ configId: item.configId,
+ gridName: item.gridName,
+ },
]);
});
this.tableData = tableData;
diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue
index 4f5f7f3c5..5b3528ddb 100644
--- a/src/views/modules/workPc/guidance/DetailForm.vue
+++ b/src/views/modules/workPc/guidance/DetailForm.vue
@@ -133,7 +133,7 @@ import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
-import Tinymce from '@c/tinymce/index.vue'
+import Tinymce from '@c/tinymce2/index.vue'
// import tinymce from 'tinymce/tinymce'
// import Editor from '@tinymce/tinymce-vue'
// import 'tinymce/themes/silver'
diff --git a/src/views/modules/workPc/guidance/categoryList.vue b/src/views/modules/workPc/guidance/categoryList.vue
index d2f8db1e9..775ecd426 100644
--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@@ -123,6 +123,7 @@
@@ -570,14 +590,13 @@ export default {
}
}
.avatar-uploader {
- ::v-deep
- .el-upload {
+ ::v-deep .el-upload {
cursor: pointer;
position: relative;
overflow: hidden;
}
.el-upload:hover {
- border-color: #409EFF;
+ border-color: #409eff;
}
.avatar {
width: 70px;
@@ -595,8 +614,6 @@ export default {
text-align: center;
}
}
-
-
.resi-btns {
margin-top: 20px;
diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue
index 170cb01d8..496ab8392 100644
--- a/src/views/pages/caiji.vue
+++ b/src/views/pages/caiji.vue
@@ -25,7 +25,7 @@
-
{{selBuild.label}}
@@ -142,6 +142,18 @@
type="tel"
v-model="item.mobile">
+
+
+
+
- 居民信息填报
+
+
居民信息填报
-
+
+
提交成功
+
请截图保存，方便核验人员查看
+
+
+
+
所属社区：
+
{{formData.shequName}}
+
+
+
所属房屋：
+
{{formData.address}}
+
+
+
+
房主姓名：
+
{{formData.houseHolderName}}
+
+
+
+
成员{{index+1}}：
+
{{item.name}}
+
+
+
身份证号：
+
{{item.idNum}}
+
+
+
手机号：
+
{{item.mobile}}
+
+
+
+
+
+
+
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index dc3e71118..6db09b136 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -1,55 +1,58 @@
-
+
-
{{ $t('brand.work') }}
+
{{ $t("brand.work") }}
-
+
-
![]()
+
![]()
-
- {{ $t('login.title') }}
+
+ {{ $t("login.title") }}
请使用小程序端的账号密码登录
@@ -60,128 +63,128 @@
-
{{
- item.customerName
- }}
+
+
+
+ {{
+ item.customerName
+ }}
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+ 
-
- 
-
- 
-
- 
{{ index + 1 }}
+ 
+