elink-star
/
epmet-work-pc
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

四大涂层联调，改一些接口

V1.0
tianq 3 years ago
parent
41e4e9e673
commit
805bbf0fe3
21 changed files with 77 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/assets/scss/dataBoard/renfang/index.scss
  2. 27
      src/views/dataBoard/sida/cpts/fwqd.vue
  3. 8
      src/views/dataBoard/sida/cpts/sqpj.vue
  4. 5
      src/views/dataBoard/sida/cpts/wtqd.vue
  5. 5
      src/views/dataBoard/sida/cpts/xqqd.vue
  6. 16
      src/views/dataBoard/sida/cpts/zyqd.vue
  7. 5
      src/views/dataBoard/sida/wt/hiddenDanger-detail.vue
  8. 2
      src/views/dataBoard/sida/wt/hiddenDangerList.vue
  9. 3
      src/views/dataBoard/sida/xq/list.vue
  10. 2
      src/views/dataBoard/sida/zy/gexingDetail.vue
  11. 2
      src/views/dataBoard/sida/zy/gexingList.vue
  12. 2
      src/views/dataBoard/sida/zy/gonggongDetail.vue
  13. 2
      src/views/dataBoard/sida/zy/gonggongList.vue
  14. 2
      src/views/dataBoard/sida/zy/goodsRes-detail.vue
  15. 8
      src/views/dataBoard/sida/zy/goodsResList.vue
  16. 2
      src/views/dataBoard/sida/zy/lianjianDetail.vue
  17. 2
      src/views/dataBoard/sida/zy/lianjianList.vue
  18. 2
      src/views/dataBoard/sida/zy/peopleRes-detail.vue
  19. 15
      src/views/dataBoard/sida/zy/peopleResList.vue
  20. 2
      src/views/dataBoard/sida/zy/placeRes-detail.vue
  21. 2
      src/views/dataBoard/sida/zy/placeResList.vue

20
src/assets/scss/dataBoard/renfang/index.scss
View File

@ -591,43 +591,43 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
&:nth-child(1) .name::before { &:nth-child(10n+1) .name::before {
background: #1a95ff; background: #1a95ff;
} }
&:nth-child(2) .name::before { &:nth-child(10n+2) .name::before {
background: #ff6138; background: #ff6138;
} }
&:nth-child(3) .name::before { &:nth-child(10n+3) .name::before {
background: #2adcea; background: #2adcea;
} }
&:nth-child(4) .name::before { &:nth-child(10n+4) .name::before {
background: #2cc4ad; background: #2cc4ad;
} }
&:nth-child(5) .name::before { &:nth-child(10n+5) .name::before {
background: #7377f5; background: #7377f5;
} }
&:nth-child(6) .name::before { &:nth-child(10n+6) .name::before {
background: #32de66; background: #32de66;
} }
&:nth-child(7) .name::before { &:nth-child(10n+7) .name::before {
background: #8155d4; background: #8155d4;
} }
&:nth-child(8) .name::before { &:nth-child(10n+8) .name::before {
background: #c7ea48; background: #c7ea48;
} }
&:nth-child(9) .name::before { &:nth-child(10n+9) .name::before {
background: #ef47c2; background: #ef47c2;
} }
&:nth-child(10) .name::before { &:nth-child(10n+10) .name::before {
background: #d43349; background: #d43349;
} }

27
src/views/dataBoard/sida/cpts/fwqd.vue
View File

@ -5,7 +5,7 @@
</div> </div>
<div class="pieMain"> <div class="pieMain">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="'pie' + item.name" v-for="item in pieData" @click="handleClickItem(item)"> <div class="legend-row " :key="'pie' + item.name" v-for="item in pieData" @click="handleClickItem(item)">
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
<div class="content"> <div class="content">
<div class="num">{{ item.value }}</div> <div class="num">{{ item.value }}</div>
@ -13,7 +13,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div> <div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" aria-controls="" ref="pieChart"></screen-echarts-frame></div>
</div> </div>
</div> </div>
</template> </template>
@ -27,7 +27,7 @@ export default {
type: String, type: String,
default: '' default: ''
}, },
searchDate:Array searchDate: Array
}, },
data() { data() {
return { return {
@ -57,7 +57,6 @@ export default {
this.init(); this.init();
}, },
searchDate() { searchDate() {
this.init(); this.init();
} }
}, },
@ -87,13 +86,13 @@ export default {
// 获取房屋总数等 // 获取房屋总数等
async getInfo() { async getInfo() {
let url = ''; let url = '';
let mockId=0; let mockId = 0;
if (this.currentTab == '公共服务') { if (this.currentTab == '公共服务') {
url = 'common_service_view'; url = 'common_service_view';
mockId=66900331; mockId = 66900331;
} else { } else {
url = 'self_service_views'; url = 'self_service_view';
mockId=66902813 mockId = 66902813;
} }
this.$refs.pieChart.showLoading(); this.$refs.pieChart.showLoading();
@ -107,7 +106,7 @@ export default {
} }
}, },
{ {
mockId: mockId, // mockId: mockId,
} }
); );
this.$refs.pieChart.hideLoading(); this.$refs.pieChart.hideLoading();
@ -119,7 +118,7 @@ export default {
...info ...info
}; };
} }
this.data = data.sort((a, b) => { this.data = data.sort((a, b) => {
return b.count - a.count; return b.count - a.count;
}); });
this.setPieData(); this.setPieData();
@ -127,7 +126,7 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
pieInitOk() { pieInitOk() {
this.pieInitState = true; this.pieInitState = true;
}, },
@ -157,8 +156,14 @@ export default {
this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].name = this.currentTab;
this.pieOption.series[0].data = this.pieData; this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(item) {
this.handleClickItem(item);
} }
} }
}; };
</script> </script>
<style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style> <style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
<style lang="scss" scoped>
.pieMain .legend{margin-top:0px;}
</style>

8
src/views/dataBoard/sida/cpts/sqpj.vue
View File

@ -100,10 +100,10 @@ export default {
}, },
methods: { methods: {
async init() { async init() {
if (this.orgId) { // if (this.orgId) {
await this.getResiCategoryData(); // await this.getResiCategoryData();
this.getPie(); // this.getPie();
} // }
}, },
handleClickItem(item) { handleClickItem(item) {

5
src/views/dataBoard/sida/cpts/wtqd.vue
View File

@ -14,7 +14,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div> <div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" @handelClickMyPei="handelClickMyPei" ref="pieChart"></screen-echarts-frame></div>
</div> </div>
</div> </div>
</template> </template>
@ -163,6 +163,9 @@ export default {
this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].name = this.currentTab;
this.pieOption.series[0].data = this.pieData; this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(item){
this.handleClickItem(item)
} }
} }
}; };

5
src/views/dataBoard/sida/cpts/xqqd.vue
View File

@ -13,7 +13,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div> <div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" @handelClickMyPei="handelClickMyPei" ref="pieChart"></screen-echarts-frame></div>
</div> </div>
</div> </div>
</template> </template>
@ -151,6 +151,9 @@ export default {
this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].name = this.currentTab;
this.pieOption.series[0].data = this.pieData; this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(item){
this.handleClickItem(item)
} }
} }
}; };

16
src/views/dataBoard/sida/cpts/zyqd.vue
View File

@ -4,8 +4,8 @@
<div v-for="item in tabList" :key="item" :class="['item', { 'item-sel': currentTab == item }]" @click="handleClick(item)">{{ item }}</div> <div v-for="item in tabList" :key="item" :class="['item', { 'item-sel': currentTab == item }]" @click="handleClick(item)">{{ item }}</div>
</div> </div>
<div class="pieMain"> <div class="pieMain">
<div class="legend"> <div class="legend cur">
<div class="legend-row" :key="'pie' + item.name" v-for="item in pieData" @click="handleClickItem(item)"> <div class="legend-row cur" :key="'pie' + item.name" v-for="item in pieData" @click="handleClickItem(item)">
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
<div class="content"> <div class="content">
<div class="num">{{ item.value }}</div> <div class="num">{{ item.value }}</div>
@ -13,7 +13,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div> <div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" @handelClickMyPei="handelClickMyPei" ref="pieChart"></screen-echarts-frame></div>
</div> </div>
</div> </div>
</template> </template>
@ -79,6 +79,7 @@ export default {
} }
}, },
handleClickItem(item) { handleClickItem(item) {
let typeArr = { "全部": "all", "志愿者": "volunteer", "社区自组织": "community_org", "联建单位": "party_unit" };
// 场所资源 // 场所资源
let path = ''; let path = '';
if (this.currentTab == '人资源') { if (this.currentTab == '人资源') {
@ -94,7 +95,7 @@ export default {
query: { query: {
org_id: this.orgId, org_id: this.orgId,
type: this.currentTab, type: this.currentTab,
type2: item.name, type2: typeArr[item.name],
start_date: this.searchDate[0], start_date: this.searchDate[0],
end_date: this.searchDate[1] end_date: this.searchDate[1]
} }
@ -135,7 +136,7 @@ export default {
...info ...info
}; };
} }
this.data = data.sort((a, b) => { this.data = data.sort((a, b) => {
return b.count - a.count; return b.count - a.count;
}); });
this.setPieData(); this.setPieData();
@ -159,7 +160,7 @@ export default {
setPieData() { setPieData() {
let { data } = this; let { data } = this;
data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value')); data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
console.log('data', data); console.log('pieDataata', data);
this.pieData = data; this.pieData = data;
this.iniPieChart(); this.iniPieChart();
@ -172,6 +173,9 @@ export default {
this.pieOption.series[0].name = this.currentTab; this.pieOption.series[0].name = this.currentTab;
this.pieOption.series[0].data = this.pieData; this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.setOption(this.pieOption);
},
handelClickMyPei(item) {
this.handleClickItem(item);
} }
} }
}; };

5
src/views/dataBoard/sida/wt/hiddenDanger-detail.vue
View File

@ -744,7 +744,8 @@ import { requestPostBi } from '@/js/dai/request-bipass';
export default { export default {
name: 'eventdetail', name: 'eventdetail',
props: { props: {
eventId: { // eventId:
detailId: {
type: String, type: String,
default: '' default: ''
}, },
@ -868,7 +869,7 @@ export default {
gettab2(item) { gettab2(item) {
this.userList = { ...item }; this.userList = { ...item };
console.log("当前人员信息",this.userList) console.log('当前人员信息', this.userList);
let tabList = this.BaseTabList; let tabList = this.BaseTabList;
this.userList.crowd && tabList.push('党员'); this.userList.crowd && tabList.push('党员');
this.userList.srs && tabList.push('保障房'); this.userList.srs && tabList.push('保障房');

2
src/views/dataBoard/sida/wt/hiddenDangerList.vue
View File

@ -156,7 +156,9 @@ export default {
handleSearch() {}, handleSearch() {},
showInfo(index) { showInfo(index) {
let item = this.srcTableData[index]; let item = this.srcTableData[index];
console.log("item",item)
this.detailType = item.danger_name; this.detailType = item.danger_name;
this.detailId = item.hidden_danger_id; this.detailId = item.hidden_danger_id;
}, },

3
src/views/dataBoard/sida/xq/list.vue
View File

@ -176,6 +176,7 @@ export default {
}, },
showInfo(index) { showInfo(index) {
let item = this.srcTableData[index]; let item = this.srcTableData[index];
console.log("index",index)
this.detailType = item.need_type; this.detailType = item.need_type;
this.detailId = item.need_id; this.detailId = item.need_id;
}, },
@ -261,7 +262,7 @@ export default {
{ {
queryParam: { queryParam: {
org_id, org_id,
type: listType, type: this.type2,
start_date, start_date,
end_date end_date
} }

2
src/views/dataBoard/sida/zy/gexingDetail.vue
View File

@ -135,7 +135,7 @@ export default {
user_demand_id: this.detailId user_demand_id: this.detailId
}, },
{ {
mockId: 69964568, // mockId: 69964568,
} }
); );
if (code === 0) { if (code === 0) {

2
src/views/dataBoard/sida/zy/gexingList.vue
View File

@ -128,7 +128,7 @@ export default {
} }
}, },
{ {
mockId: 69844538 // mockId: 69844538
} }
); );

2
src/views/dataBoard/sida/zy/gonggongDetail.vue
View File

@ -112,7 +112,7 @@ export default {
service_record_id: this.detailId service_record_id: this.detailId
}, },
{ {
mockId: 69980718, // mockId: 69980718,
} }
); );
if (code === 0) { if (code === 0) {

2
src/views/dataBoard/sida/zy/gonggongList.vue
View File

@ -131,7 +131,7 @@ export default {
} }
}, },
{ {
mockId: 69852161 // mockId: 69852161
} }
); );

2
src/views/dataBoard/sida/zy/goodsRes-detail.vue
View File

@ -162,7 +162,7 @@ export default {
queryParam: queryParam queryParam: queryParam
}, },
{ {
mockId: mockId // mockId: mockId
} }
); );
if (code === 0) { if (code === 0) {

8
src/views/dataBoard/sida/zy/goodsResList.vue
View File

@ -187,8 +187,8 @@ export default {
showInfo(index) { showInfo(index) {
let item = this.srcTableData[index]; let item = this.srcTableData[index];
// this.detailType = item.child_thing_type; this.detailType = item.child_thing_type;
this.detailType =this.type2; // this.detailType =this.type2;
this.detailId = item.thing_id; 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 { org_id, listType, page_num, page_size, searchDate } = this;
const start_date = searchDate[0]; const start_date = searchDate[0];
const end_date = searchDate[1]; const end_date = searchDate[1];
const url = 'thing_resour_list_num'; const url = 'thing_resour_list_total';
let parent_thing_type = this.type2; let parent_thing_type = this.type2;
const { data, code, msg } = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,

2
src/views/dataBoard/sida/zy/lianjianDetail.vue
View File

@ -141,7 +141,7 @@ export default {
service_record_id: this.detailId service_record_id: this.detailId
}, },
{ {
mockId: 69994184, // mockId: 69994184,
} }
); );
if (code === 0) { if (code === 0) {

2
src/views/dataBoard/sida/zy/lianjianList.vue
View File

@ -137,7 +137,7 @@ created() {
} }
}, },
{ {
mockId: 69950764, // mockId: 69950764,
} }
); );

2
src/views/dataBoard/sida/zy/peopleRes-detail.vue
View File

@ -270,7 +270,7 @@ export default {
queryParam: queryParam queryParam: queryParam
}, },
{ {
mockId: mockId // mockId: mockId
} }
); );
if (code === 0) { if (code === 0) {

15
src/views/dataBoard/sida/zy/peopleResList.vue
View File

@ -8,10 +8,11 @@
<div class="title_line"></div> <div class="title_line"></div>
<div class="second-select" style="position:absolute;margin-left:300px;"> <div class="second-select" style="position:absolute;margin-left:300px;">
<el-select v-model="type2" @change="init" :clearable="true"> <el-select v-model="type2" @change="init" :clearable="true">
<el-option value="全部">全部</el-option> <!-- all\volunteer\community_org\party_unit -->
<el-option value="志愿者">志愿者</el-option> <el-option value="all" label="全部"></el-option>
<el-option value="社区自组织">社区自组织</el-option> <el-option value="volunteer" label="志愿者"></el-option>
<el-option value="联建单位">联建单位</el-option> <el-option value="community_org" label="社区自组织"></el-option>
<el-option value="party_unit" label="联建单位"></el-option>
</el-select> </el-select>
<div class="m-search2 left10" style="display: inline-block;"> <div class="m-search2 left10" style="display: inline-block;">
@ -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 { org_id, listType, page_num, page_size, searchDate } = this;
const start_date = searchDate[0]; const start_date = searchDate[0];
const end_date = searchDate[1]; const end_date = searchDate[1];
const url = 'person_resour_list_num'; const url = 'person_resour_list_total';
let peop_type = this.type2; let peop_type = this.type2;
const { data, code, msg } = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,
@ -266,7 +267,7 @@ export default {
// mockId: 63070189, // mockId: 63070189,
} }
); );
console.log(data);
if (code === 0) { if (code === 0) {
this.total = parseInt(data[0].total); this.total = parseInt(data[0].total);
} else { } else {

2
src/views/dataBoard/sida/zy/placeRes-detail.vue
View File

@ -127,7 +127,7 @@ export default {
queryParam: queryParam queryParam: queryParam
}, },
{ {
mockId: 70051004, // mockId: 70051004,
} }
); );
if (code === 0) { if (code === 0) {

2
src/views/dataBoard/sida/zy/placeResList.vue
View File

@ -210,7 +210,7 @@ export default {
} }
}, },
{ {
mockId: mockId // mockId: mockId
} }
); );

Write Preview
Loading…
Cancel
Save