Browse Source

bug

feature
tianqian 3 years ago
parent
commit
df087d7cb8
  1. 2
      src/views/dataBoard/sida/cpts/fw03zr.vue
  2. 2
      src/views/dataBoard/sida/cpts/fw04gx.vue
  3. 3
      src/views/dataBoard/sida/cpts/fwqd.vue
  4. 1
      src/views/dataBoard/sida/cpts/xqqd.vue
  5. 22
      src/views/dataBoard/sida/xq/list.vue
  6. 2
      src/views/modules/shequzhili/issue/cpts/add.vue
  7. 7
      src/views/modules/shequzhili/issue/cpts/process-form.vue

2
src/views/dataBoard/sida/cpts/fw03zr.vue

@ -127,7 +127,7 @@
// mockId: 60031937, // mockId: 60031937,
}); });
if (code === 0) { if (code === 0) {
this.info = data[0]; this.info = data[0].slice(0, 10);
this.lineData1 = this.info.child_service_num.map(item => { this.lineData1 = this.info.child_service_num.map(item => {
return { return {
name: item.common_service_type_name, name: item.common_service_type_name,

2
src/views/dataBoard/sida/cpts/fw04gx.vue

@ -89,7 +89,7 @@ export default {
this.$refs.pieChart.hideLoading(); this.$refs.pieChart.hideLoading();
if (code === 0) { if (code === 0) {
if (data && Array.isArray(data) && data.length > 0) { if (data && Array.isArray(data) && data.length > 0) {
let info = data[0]; let info = data[0].slice(0, 10);
this.info = { this.info = {
...this.info, ...this.info,
...info ...info

3
src/views/dataBoard/sida/cpts/fwqd.vue

@ -131,12 +131,13 @@ export default {
this.$refs.pieChart.hideLoading(); this.$refs.pieChart.hideLoading();
if (code === 0) { if (code === 0) {
if (data && Array.isArray(data) && data.length > 0) { if (data && Array.isArray(data) && data.length > 0) {
let info = data[0]; let info = data[0].slice(0, 10);
this.info = { this.info = {
...this.info, ...this.info,
...info ...info
}; };
} }
this.data = data.sort((a, b) => { this.data = data.sort((a, b) => {
return b.count - a.count; return b.count - a.count;
}); });

1
src/views/dataBoard/sida/cpts/xqqd.vue

@ -78,6 +78,7 @@ export default {
type2: item.name, type2: item.name,
start_date: this.searchDate[0], start_date: this.searchDate[0],
end_date: this.searchDate[1] end_date: this.searchDate[1]
} }
}); });
}, },

22
src/views/dataBoard/sida/xq/list.vue

@ -13,13 +13,15 @@
</el-select> </el-select>
<el-select v-model="type2" @change="init" :clearable="true" class="left10"> <el-select v-model="type2" @change="init" :clearable="true" class="left10">
<el-option value="全部">全部</el-option>
<template v-if="listType == '个性需求'"> <template v-if="listType == '个性需求'">
<el-option value="全部">全部</el-option>
<el-option value="商家支撑">商家支撑</el-option> <el-option value="商家支撑">商家支撑</el-option>
<el-option value="服务支撑">服务支撑</el-option> <el-option value="服务支撑">服务支撑</el-option>
<el-option value="政府支撑">政府支撑</el-option> <el-option value="政府支撑">政府支撑</el-option>
</template> </template>
<template v-if="listType == '共性需求'"> <template v-if="listType == '共性需求'">
<el-option value="全部">全部</el-option>
<el-option value="社区养老">社区养老</el-option> <el-option value="社区养老">社区养老</el-option>
<el-option value="社会保障">社会保障</el-option> <el-option value="社会保障">社会保障</el-option>
<el-option value="社区救助">社区救助</el-option> <el-option value="社区救助">社区救助</el-option>
@ -201,16 +203,24 @@ export default {
const end_date = searchDate[1]; const end_date = searchDate[1];
this.loading = true; this.loading = true;
const url = 'need_list'; const url = 'need_list';
let parent_support_type_code=""
if(listType=="个性需求")
{
parent_support_type_code="user_demand"
}else{
parent_support_type_code="common_demand"
}
const { data, code, msg } = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,
{ {
queryParam: { queryParam: {
org_id, org_id,
parent_support_type_code:parent_support_type_code,
type: this.type2, type: this.type2,
page_num, page_num,
page_size, page_size,
start_date, start_date,
end_date end_datem
} }
}, },
{ {
@ -260,12 +270,20 @@ export default {
const start_date = searchDate[0]; const start_date = searchDate[0];
const end_date = searchDate[1]; const end_date = searchDate[1];
const url = 'need_list_num'; const url = 'need_list_num';
let parent_support_type_code=""
if(listType=="个性需求")
{
parent_support_type_code="user_demand"
}else{
parent_support_type_code="common_demand"
}
const { data, code, msg } = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,
{ {
queryParam: { queryParam: {
org_id, org_id,
parent_support_type_code:parent_support_type_code,
type: this.type2, type: this.type2,
start_date, start_date,
end_date end_date

2
src/views/modules/shequzhili/issue/cpts/add.vue

@ -765,7 +765,7 @@ export default {
scoped scoped
></style> ></style>
<style lang="scss"> <style lang="scss" scoped>
.el-dialog__body { .el-dialog__body {
padding: 0 10px 16px !important; padding: 0 10px 16px !important;
} }

7
src/views/modules/shequzhili/issue/cpts/process-form.vue

@ -319,12 +319,13 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/shequzhili/event-info.scss"; @import "@/assets/scss/modules/shequzhili/event-info.scss";
.el-dialog__body {
padding: 0 10px 16px !important;
}
</style> </style>
<style> <style>
.el-dialog__body {
padding: 0 10px 16px !important;
}
</style> </style>

Loading…
Cancel
Save