+ 加载中
+
+
- {{item.houseName}}
+
![]()
{
let obj = JSON.parse(JSON.stringify(element))
@@ -208,6 +216,7 @@ export default {
this.selBuildingId = this.buildingArray[0].buildingId
this.selBuildingName = this.buildingArray[0].buildingName
+
} else {
this.selBuildingId = ''
this.selBuildingName = ''
@@ -221,6 +230,7 @@ export default {
//加载房间数据
async loadRoom () {
+ this.roomLoaded = true
const url = "/gov/org/ichouse/houselist"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/ichouse/houselist"
let params = {
@@ -228,41 +238,43 @@ export default {
}
const { data, code, msg } = await requestPost(url, params)
-
+ this.roomLoaded = false
if (code === 0) {
- this.roomArray = data
- if (this.roomArray.length > 0) {
+ if (data.length > 0) {
- this.roomArray.forEach(roomItem => {
- let iconArrayShow = JSON.parse(JSON.stringify(roomItem.categoryList))
- let iconArray = []
+ data.forEach((roomItem, index) => {
+ roomItem.showAllUser = false
+
+ let categoryList = JSON.parse(JSON.stringify(roomItem.categoryList))
+
+ roomItem.iconArrayShow = []
- if (iconArrayShow.length > 0) {
- if (iconArrayShow[0].isSpecial === '1') {//第一个图标是党员
+ if (categoryList.length > 0) {
+ if (categoryList[0].isSpecial === '1') {//第一个图标是党员
roomItem.isParty = true
- roomItem.partyUrl = iconArrayShow[0].iconUrl
- iconArrayShow.shift();//删除第一个数据
+ roomItem.partyUrl = categoryList[0].iconUrl
+ categoryList.shift();//删除第一个数据
} else {
roomItem.isParty = false
}
- }
- if (iconArrayShow.length > 4) {//去前四个
- for (let i = 0; i < 4; i++) {
- iconArray.push(iconArrayShow[i])
+
+ let iconNum = categoryList.length > 4 ? 4 : categoryList.length
+
+ for (let i = 0; i < iconNum; i++) {
+ roomItem.iconArrayShow.push(categoryList[i])
}
- } else {
- iconArray = iconArrayShow
}
- this.$nextTick(() => {
- // ref_tree 元素的ref value 绑定的node-key
- roomItem.iconArrayShow = iconArray
- });
- roomItem.showAllUser = false
});
+ this.$nextTick(() => {
+ this.roomArray = [...data]
+ });
+
+ } else {
+ this.roomArray = []
}
@@ -343,7 +355,7 @@ export default {
...mapGetters(["clientHeight"])
},
- components: {},
+ components: { ScreenLoading },
}
@@ -355,6 +367,9 @@ export default {
>
\ No newline at end of file
diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue
index bccd5855..159f4b54 100644
--- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue
@@ -7,7 +7,8 @@
话题详情
-
{{item.houseName}}
+
@@ -15,12 +16,10 @@
话题内容
{{ info.topicContent }}
- ![]()
+ ![]()
发布时间：
@@ -37,65 +36,57 @@
-
+
-
+
{{ item.label }}
-
+
-
+
- 加载中
-
- 
+
-
+
+
-
+
-
+
-
-
议题标题：
@@ -113,7 +104,8 @@
议题发起人：
{{ issueInfo.issueInitiator }}
-
+
议题来源：
{{ issueInfo.topicInfo.groupName }}
@@ -143,22 +135,20 @@
-
+
+
+
-
+
项目标题：
@@ -176,33 +166,36 @@
当前处理部门：
{{ projectInfo.departmentNameList.join("、") }}
-
+
分类：
-
+
-
{{ item.name }}
+
标签：
-
-
+
{{ item.name }}
+
处理进展
-
@@ -84,7 +76,7 @@ import dateFormat from "dai-js/tools/dateFormat";
export default {
name: "heart",
- data() {
+ data () {
return {
agencyId: this.$store.state.user.agencyId,
areaCode: "",
@@ -187,33 +179,33 @@ export default {
},
watch: {
- monthId() {
+ monthId () {
this.getApiData();
},
},
- async mounted() {
+ async mounted () {
this.userId = this.uid;
await nextTick(100);
this.getApiData();
},
methods: {
- handleSearch() {},
+ handleSearch () { },
- async getApiData() {
+ async getApiData () {
//await this.getAgencyInfo();
this.getTb1();
this.getTb2();
this.getTb3();
},
- toUserInfo(uid) {
+ toUserInfo (uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
// 获取当前组织信息
- async getAgencyInfo() {
+ async getAgencyInfo () {
const { data, code, msg } = await requestPost(
"/data/report/screen/agency/agencydetail-multic",
{
@@ -227,7 +219,7 @@ export default {
},
//加载组织数据
- async getTb1() {
+ async getTb1 () {
const { agencyId, areaCode } = this;
const url = "/data/report/screen/index/advancedbranchrank";
let params = {
@@ -252,7 +244,7 @@ export default {
},
//加载组织数据
- async getTb2() {
+ async getTb2 () {
const { agencyId, areaCode } = this;
const url = "/data/report/screen/user/partypointrank";
let params = {
@@ -282,7 +274,7 @@ export default {
},
//加载组织数据
- async getTb3() {
+ async getTb3 () {
const { agencyId, areaCode } = this;
const url = "/data/report/screen/user/userpointrank/withoutpartymember";
let params = {
+
@@ -60,13 +54,11 @@
{{ item.processName }}
@@ -215,20 +208,16 @@
- {{ item.departmentName }}
+
{{ item.publicReply }}
-
- 说 明：
+
-
@@ -276,7 +262,7 @@ import analyse from "@/views/modules/visual/cpts/analyse";
import foldText from "@/views/components/foldText";
import dateFormat from "dai-js/tools/dateFormat";
-function iniData() {
+function iniData () {
return {
groupList: [
{ label: "研判分析" },
@@ -434,7 +420,7 @@ export default {
computed: {},
watch: {
- topicId() {
+ topicId () {
let data = iniData();
Object.keys(data).forEach((k) => {
this[k] = data[k];
@@ -443,16 +429,16 @@ export default {
},
},
- mounted() {
+ mounted () {
this.getApiData();
},
methods: {
- watchImg(src) {
+ watchImg (src) {
window.open(src);
},
- addStartGroupIndex() {
+ addStartGroupIndex () {
const { startGroupIndex, groupList } = this;
if (startGroupIndex < groupList.length - 9) {
this.startGroupIndex = startGroupIndex + 1;
@@ -460,7 +446,7 @@ export default {
this.startGroupIndex = groupList.length - 9;
}
},
- subStartGroupIndex() {
+ subStartGroupIndex () {
const { startGroupIndex, groupList } = this;
if (startGroupIndex > 0) {
this.startGroupIndex = startGroupIndex - 1;
@@ -468,11 +454,11 @@ export default {
this.startGroupIndex = 0;
}
},
- handleClose() {
+ handleClose () {
this.$emit("close");
},
- async getApiData() {
+ async getApiData () {
this.getComment();
await this.getInfo();
await this.getIssueInfo();
@@ -484,7 +470,7 @@ export default {
},
//加载组织数据
- async getInfo() {
+ async getInfo () {
const url = "/resi/group/topic/gettopicdetail";
const { data, code, msg } = await requestPost(url, {
@@ -499,7 +485,7 @@ export default {
},
//加载组织数据
- async getComment() {
+ async getComment () {
const url = "/resi/group/comment/getcommentlistoftopic";
const { data, code, msg } = await requestPost(url, {
@@ -526,7 +512,7 @@ export default {
}
},
- checkTopicCommentImg(index) {
+ checkTopicCommentImg (index) {
const {
comment: { srcList },
} = this;
@@ -536,7 +522,7 @@ export default {
},
//加载组织数据
- async getIssueInfo() {
+ async getIssueInfo () {
const {
info: { issueId },
} = this;
@@ -555,7 +541,7 @@ export default {
},
//加载组织数据
- async getIssueTrend() {
+ async getIssueTrend () {
const {
info: { issueId },
} = this;
@@ -592,7 +578,7 @@ export default {
},
//加载组织数据
- async getProjectProcess() {
+ async getProjectProcess () {
const { issueInfo } = this;
if (!issueInfo || !issueInfo.projectId) return;
const url = "/gov/project/trace/processlist-v2";
@@ -615,7 +601,7 @@ export default {
},
//加载组织数据
- async getProjectInfo() {
+ async getProjectInfo () {
const { issueInfo } = this;
if (!issueInfo || !issueInfo.projectId) return;
const url = "/gov/project/trace/projectdetail";
@@ -631,7 +617,7 @@ export default {
}
},
- async getProjectCate() {
+ async getProjectCate () {
const { issueInfo } = this;
if (!issueInfo || !issueInfo.projectId) return;
const url = "/gov/project/projectcategory/categorytaglist";
@@ -649,7 +635,7 @@ export default {
},
//加载组织数据
- async getYanPan() {
+ async getYanPan () {
const url = "/gov/project/project/topic-research-analysis";
if (!this.issueInfo.projectId) return;
@@ -685,13 +671,13 @@ export default {
}
},
- toUserInfo(item) {
+ toUserInfo (item) {
this.$router.push({
path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
});
},
- toProjectInfo(item) {
+ toProjectInfo (item) {
console.log(item);
this.topicId = item.topicId;
},
diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue
index 2810747b..2645a050 100644
--- a/src/views/modules/visual/communityGovern/cpt/project-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue
@@ -173,7 +173,8 @@
议题发起人：
{{ issueInfo.issueInitiator }}
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index 1267d16b..c22f2dda 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -2,14 +2,12 @@
@@ -41,13 +37,11 @@
议题来源：
{{ issueInfo.topicInfo.groupName }}
diff --git a/src/views/modules/visual/communityGovern/resiPieOption copy.js b/src/views/modules/visual/communityGovern/resiPieOption copy.js
new file mode 100644
index 00000000..7d195966
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/resiPieOption copy.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: -20,
+ 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)',
+
+ }
+ }
+ }
+ ]
+ },
+ ]
+
+ }
+}
diff --git a/src/views/modules/visual/communityGovern/resiPieOption.js b/src/views/modules/visual/communityGovern/resiPieOption.js
index 7d195966..7c66d041 100644
--- a/src/views/modules/visual/communityGovern/resiPieOption.js
+++ b/src/views/modules/visual/communityGovern/resiPieOption.js
@@ -79,7 +79,7 @@ const center= ['50%', '250px']
left: 'center',
width: 400,
label: {
- // show: false,
+ show: true,
position: 'outside',
alignTo: 'edge',
// formatter: '{a|{c}}\n\n{name|{b}}',
diff --git a/src/views/modules/visual/communityGovern/resibuzz copy.vue b/src/views/modules/visual/communityGovern/resibuzz copy.vue
new file mode 100644
index 00000000..9722a69b
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/resibuzz copy.vue
@@ -0,0 +1,523 @@
+
+
+ 
+ 居民热议
+
+
+
+
+ 居民热议
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
时间：
-
+
@@ -22,13 +20,11 @@
-
-
-