diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss index 870d934f3..2487c70e8 100644 --- a/src/assets/scss/dataBoard/renfang/index.scss +++ b/src/assets/scss/dataBoard/renfang/index.scss @@ -591,43 +591,43 @@ justify-content: space-between; align-items: center; - &:nth-child(1) .name::before { + &:nth-child(10n+1) .name::before { background: #1a95ff; } - &:nth-child(2) .name::before { + &:nth-child(10n+2) .name::before { background: #ff6138; } - &:nth-child(3) .name::before { + &:nth-child(10n+3) .name::before { background: #2adcea; } - &:nth-child(4) .name::before { + &:nth-child(10n+4) .name::before { background: #2cc4ad; } - &:nth-child(5) .name::before { + &:nth-child(10n+5) .name::before { background: #7377f5; } - &:nth-child(6) .name::before { + &:nth-child(10n+6) .name::before { background: #32de66; } - &:nth-child(7) .name::before { + &:nth-child(10n+7) .name::before { background: #8155d4; } - &:nth-child(8) .name::before { + &:nth-child(10n+8) .name::before { background: #c7ea48; } - &:nth-child(9) .name::before { + &:nth-child(10n+9) .name::before { background: #ef47c2; } - &:nth-child(10) .name::before { + &:nth-child(10n+10) .name::before { background: #d43349; } diff --git a/src/views/dataBoard/sida/cpts/fwqd.vue b/src/views/dataBoard/sida/cpts/fwqd.vue index ab916455d..abfb219ad 100644 --- a/src/views/dataBoard/sida/cpts/fwqd.vue +++ b/src/views/dataBoard/sida/cpts/fwqd.vue @@ -5,7 +5,7 @@
-
+
{{ item.name }}
{{ item.value }}
@@ -13,7 +13,7 @@
-
+
@@ -27,7 +27,7 @@ export default { type: String, default: '' }, - searchDate:Array + searchDate: Array }, data() { return { @@ -57,7 +57,6 @@ export default { this.init(); }, searchDate() { - this.init(); } }, @@ -87,13 +86,13 @@ export default { // 获取房屋总数等 async getInfo() { let url = ''; - let mockId=0; + let mockId = 0; if (this.currentTab == '公共服务') { url = 'common_service_view'; - mockId=66900331; + mockId = 66900331; } else { - url = 'self_service_views'; - mockId=66902813 + url = 'self_service_view'; + mockId = 66902813; } this.$refs.pieChart.showLoading(); @@ -107,7 +106,7 @@ export default { } }, { - mockId: mockId, + // mockId: mockId, } ); this.$refs.pieChart.hideLoading(); @@ -119,7 +118,7 @@ export default { ...info }; } - this.data = data.sort((a, b) => { + this.data = data.sort((a, b) => { return b.count - a.count; }); this.setPieData(); @@ -127,7 +126,7 @@ export default { this.$message.error(msg); } }, - + pieInitOk() { this.pieInitState = true; }, @@ -157,8 +156,14 @@ export default { this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); + }, + handelClickMyPei(item) { + this.handleClickItem(item); } } }; + diff --git a/src/views/dataBoard/sida/cpts/sqpj.vue b/src/views/dataBoard/sida/cpts/sqpj.vue index de8e37751..8faf6c887 100644 --- a/src/views/dataBoard/sida/cpts/sqpj.vue +++ b/src/views/dataBoard/sida/cpts/sqpj.vue @@ -100,10 +100,10 @@ export default { }, methods: { async init() { - if (this.orgId) { - await this.getResiCategoryData(); - this.getPie(); - } + // if (this.orgId) { + // await this.getResiCategoryData(); + // this.getPie(); + // } }, handleClickItem(item) { diff --git a/src/views/dataBoard/sida/cpts/wtqd.vue b/src/views/dataBoard/sida/cpts/wtqd.vue index bf127a3de..fd76f03dd 100644 --- a/src/views/dataBoard/sida/cpts/wtqd.vue +++ b/src/views/dataBoard/sida/cpts/wtqd.vue @@ -14,7 +14,7 @@ -
+
@@ -163,6 +163,9 @@ export default { this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); + }, + handelClickMyPei(item){ + this.handleClickItem(item) } } }; diff --git a/src/views/dataBoard/sida/cpts/xqqd.vue b/src/views/dataBoard/sida/cpts/xqqd.vue index 9a9080da0..8c38fa5b0 100644 --- a/src/views/dataBoard/sida/cpts/xqqd.vue +++ b/src/views/dataBoard/sida/cpts/xqqd.vue @@ -13,7 +13,7 @@ -
+
@@ -151,6 +151,9 @@ export default { this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); + }, + handelClickMyPei(item){ + this.handleClickItem(item) } } }; diff --git a/src/views/dataBoard/sida/cpts/zyqd.vue b/src/views/dataBoard/sida/cpts/zyqd.vue index 237452c4a..74e74e79c 100644 --- a/src/views/dataBoard/sida/cpts/zyqd.vue +++ b/src/views/dataBoard/sida/cpts/zyqd.vue @@ -4,8 +4,8 @@
{{ item }}
-
-
+
+
{{ item.name }}
{{ item.value }}
@@ -13,7 +13,7 @@
-
+
@@ -79,6 +79,7 @@ export default { } }, handleClickItem(item) { + let typeArr = { "全部": "all", "志愿者": "volunteer", "社区自组织": "community_org", "联建单位": "party_unit" }; // 场所资源 let path = ''; if (this.currentTab == '人资源') { @@ -94,7 +95,7 @@ export default { query: { org_id: this.orgId, type: this.currentTab, - type2: item.name, + type2: typeArr[item.name], start_date: this.searchDate[0], end_date: this.searchDate[1] } @@ -135,7 +136,7 @@ export default { ...info }; } - this.data = data.sort((a, b) => { + this.data = data.sort((a, b) => { return b.count - a.count; }); this.setPieData(); @@ -159,7 +160,7 @@ export default { setPieData() { let { data } = this; data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value')); - console.log('data', data); + console.log('pieDataata', data); this.pieData = data; this.iniPieChart(); @@ -172,6 +173,9 @@ export default { this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); + }, + handelClickMyPei(item) { + this.handleClickItem(item); } } }; diff --git a/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue b/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue index 4dd8f124e..9914d411a 100644 --- a/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue +++ b/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue @@ -744,7 +744,8 @@ import { requestPostBi } from '@/js/dai/request-bipass'; export default { name: 'eventdetail', props: { - eventId: { + // eventId: + detailId: { type: String, default: '' }, @@ -868,7 +869,7 @@ export default { gettab2(item) { this.userList = { ...item }; - console.log("当前人员信息",this.userList) + console.log('当前人员信息', this.userList); let tabList = this.BaseTabList; this.userList.crowd && tabList.push('党员'); this.userList.srs && tabList.push('保障房'); diff --git a/src/views/dataBoard/sida/wt/hiddenDangerList.vue b/src/views/dataBoard/sida/wt/hiddenDangerList.vue index 5e0426bd6..85a374140 100644 --- a/src/views/dataBoard/sida/wt/hiddenDangerList.vue +++ b/src/views/dataBoard/sida/wt/hiddenDangerList.vue @@ -156,7 +156,9 @@ export default { handleSearch() {}, showInfo(index) { + let item = this.srcTableData[index]; + console.log("item",item) this.detailType = item.danger_name; this.detailId = item.hidden_danger_id; }, diff --git a/src/views/dataBoard/sida/xq/list.vue b/src/views/dataBoard/sida/xq/list.vue index 5e630bf5c..50ff1e1f6 100644 --- a/src/views/dataBoard/sida/xq/list.vue +++ b/src/views/dataBoard/sida/xq/list.vue @@ -176,6 +176,7 @@ export default { }, showInfo(index) { let item = this.srcTableData[index]; + console.log("index",index) this.detailType = item.need_type; this.detailId = item.need_id; }, @@ -261,7 +262,7 @@ export default { { queryParam: { org_id, - type: listType, + type: this.type2, start_date, end_date } diff --git a/src/views/dataBoard/sida/zy/gexingDetail.vue b/src/views/dataBoard/sida/zy/gexingDetail.vue index 641e10eb4..21d94e9a1 100644 --- a/src/views/dataBoard/sida/zy/gexingDetail.vue +++ b/src/views/dataBoard/sida/zy/gexingDetail.vue @@ -135,7 +135,7 @@ export default { user_demand_id: this.detailId }, { - mockId: 69964568, + // mockId: 69964568, } ); if (code === 0) { diff --git a/src/views/dataBoard/sida/zy/gexingList.vue b/src/views/dataBoard/sida/zy/gexingList.vue index 56f38cce6..68e0e767b 100644 --- a/src/views/dataBoard/sida/zy/gexingList.vue +++ b/src/views/dataBoard/sida/zy/gexingList.vue @@ -128,7 +128,7 @@ export default { } }, { - mockId: 69844538 + // mockId: 69844538 } ); diff --git a/src/views/dataBoard/sida/zy/gonggongDetail.vue b/src/views/dataBoard/sida/zy/gonggongDetail.vue index e8da5c8d8..ddabee70d 100644 --- a/src/views/dataBoard/sida/zy/gonggongDetail.vue +++ b/src/views/dataBoard/sida/zy/gonggongDetail.vue @@ -112,7 +112,7 @@ export default { service_record_id: this.detailId }, { - mockId: 69980718, + // mockId: 69980718, } ); if (code === 0) { diff --git a/src/views/dataBoard/sida/zy/gonggongList.vue b/src/views/dataBoard/sida/zy/gonggongList.vue index c83f5f803..34cac4cce 100644 --- a/src/views/dataBoard/sida/zy/gonggongList.vue +++ b/src/views/dataBoard/sida/zy/gonggongList.vue @@ -131,7 +131,7 @@ export default { } }, { - mockId: 69852161 + // mockId: 69852161 } ); diff --git a/src/views/dataBoard/sida/zy/goodsRes-detail.vue b/src/views/dataBoard/sida/zy/goodsRes-detail.vue index f9956aac5..f12682714 100644 --- a/src/views/dataBoard/sida/zy/goodsRes-detail.vue +++ b/src/views/dataBoard/sida/zy/goodsRes-detail.vue @@ -162,7 +162,7 @@ export default { queryParam: queryParam }, { - mockId: mockId + // mockId: mockId } ); if (code === 0) { diff --git a/src/views/dataBoard/sida/zy/goodsResList.vue b/src/views/dataBoard/sida/zy/goodsResList.vue index 9b03871ef..c58354eaf 100644 --- a/src/views/dataBoard/sida/zy/goodsResList.vue +++ b/src/views/dataBoard/sida/zy/goodsResList.vue @@ -187,8 +187,8 @@ export default { showInfo(index) { let item = this.srcTableData[index]; - // this.detailType = item.child_thing_type; - this.detailType =this.type2; + this.detailType = item.child_thing_type; + // this.detailType =this.type2; this.detailId = item.thing_id; }, @@ -225,7 +225,7 @@ export default { } }, { - mockId: 69679253, + // mockId: 69679253, } ); @@ -263,7 +263,7 @@ export default { const { org_id, listType, page_num, page_size, searchDate } = this; const start_date = searchDate[0]; const end_date = searchDate[1]; - const url = 'thing_resour_list_num'; + const url = 'thing_resour_list_total'; let parent_thing_type = this.type2; const { data, code, msg } = await requestPostBi( url, diff --git a/src/views/dataBoard/sida/zy/lianjianDetail.vue b/src/views/dataBoard/sida/zy/lianjianDetail.vue index 3613bf777..0151f8006 100644 --- a/src/views/dataBoard/sida/zy/lianjianDetail.vue +++ b/src/views/dataBoard/sida/zy/lianjianDetail.vue @@ -141,7 +141,7 @@ export default { service_record_id: this.detailId }, { - mockId: 69994184, + // mockId: 69994184, } ); if (code === 0) { diff --git a/src/views/dataBoard/sida/zy/lianjianList.vue b/src/views/dataBoard/sida/zy/lianjianList.vue index bf383bebb..0cdb70239 100644 --- a/src/views/dataBoard/sida/zy/lianjianList.vue +++ b/src/views/dataBoard/sida/zy/lianjianList.vue @@ -137,7 +137,7 @@ created() { } }, { - mockId: 69950764, + // mockId: 69950764, } ); diff --git a/src/views/dataBoard/sida/zy/peopleRes-detail.vue b/src/views/dataBoard/sida/zy/peopleRes-detail.vue index f57c401e4..0ce5b15b2 100644 --- a/src/views/dataBoard/sida/zy/peopleRes-detail.vue +++ b/src/views/dataBoard/sida/zy/peopleRes-detail.vue @@ -270,7 +270,7 @@ export default { queryParam: queryParam }, { - mockId: mockId + // mockId: mockId } ); if (code === 0) { diff --git a/src/views/dataBoard/sida/zy/peopleResList.vue b/src/views/dataBoard/sida/zy/peopleResList.vue index 28f24a5aa..17abbf0e2 100644 --- a/src/views/dataBoard/sida/zy/peopleResList.vue +++ b/src/views/dataBoard/sida/zy/peopleResList.vue @@ -8,10 +8,11 @@
- 全部 - 志愿者 - 社区自组织 - 联建单位 + + + + +
@@ -215,7 +216,7 @@ export default { } }, { - mockId: 69636829 + // mockId: 69636829 } ); @@ -250,7 +251,7 @@ export default { const { org_id, listType, page_num, page_size, searchDate } = this; const start_date = searchDate[0]; const end_date = searchDate[1]; - const url = 'person_resour_list_num'; + const url = 'person_resour_list_total'; let peop_type = this.type2; const { data, code, msg } = await requestPostBi( url, @@ -266,7 +267,7 @@ export default { // mockId: 63070189, } ); - + console.log(data); if (code === 0) { this.total = parseInt(data[0].total); } else { diff --git a/src/views/dataBoard/sida/zy/placeRes-detail.vue b/src/views/dataBoard/sida/zy/placeRes-detail.vue index 9c40b800f..038317cf0 100644 --- a/src/views/dataBoard/sida/zy/placeRes-detail.vue +++ b/src/views/dataBoard/sida/zy/placeRes-detail.vue @@ -127,7 +127,7 @@ export default { queryParam: queryParam }, { - mockId: 70051004, + // mockId: 70051004, } ); if (code === 0) { diff --git a/src/views/dataBoard/sida/zy/placeResList.vue b/src/views/dataBoard/sida/zy/placeResList.vue index dbb076e2e..c920593c6 100644 --- a/src/views/dataBoard/sida/zy/placeResList.vue +++ b/src/views/dataBoard/sida/zy/placeResList.vue @@ -210,7 +210,7 @@ export default { } }, { - mockId: mockId + // mockId: mockId } );