diff --git a/src/views/dataBoard/sida/cpts/fwqd.vue b/src/views/dataBoard/sida/cpts/fwqd.vue index 42c8d7e46..f814ec3e9 100644 --- a/src/views/dataBoard/sida/cpts/fwqd.vue +++ b/src/views/dataBoard/sida/cpts/fwqd.vue @@ -26,7 +26,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate:Array }, data() { return { @@ -49,10 +50,14 @@ export default { screenEchartsFrame }, mounted() { - this.init(); + // this.init(); }, watch: { orgId() { + this.init(); + }, + searchDate() { + this.init(); } }, @@ -91,7 +96,9 @@ export default { url, { queryParam: { - org_id: this.orgId + org_id: this.orgId, + start_date: this.searchDate[0], + end_date: this.searchDate[1] } }, { diff --git a/src/views/dataBoard/sida/cpts/sqpj.vue b/src/views/dataBoard/sida/cpts/sqpj.vue index 321835eab..21b1ea951 100644 --- a/src/views/dataBoard/sida/cpts/sqpj.vue +++ b/src/views/dataBoard/sida/cpts/sqpj.vue @@ -34,7 +34,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate:Array }, data() { return { @@ -84,13 +85,17 @@ export default { screenEchartsFrame }, mounted() { - this.init(); + // this.init(); }, watch: { currentTab() { // this.getResiCategoryData(); }, orgId() { + this.init(); + }, + searchDate() { + this.init(); } }, @@ -128,7 +133,9 @@ export default { url, { queryParam: { - org_id: this.orgId + org_id: this.orgId, + start_date: this.searchDate[0], + end_date: this.searchDate[1] } }, { diff --git a/src/views/dataBoard/sida/cpts/wtqd.vue b/src/views/dataBoard/sida/cpts/wtqd.vue index 7a7106d2a..b81649896 100644 --- a/src/views/dataBoard/sida/cpts/wtqd.vue +++ b/src/views/dataBoard/sida/cpts/wtqd.vue @@ -27,7 +27,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate:Array }, data() { return { @@ -51,10 +52,14 @@ export default { screenEchartsFrame }, mounted() { - this.init(); + // this.init(); }, watch: { orgId() { + this.init(); + }, + searchDate() { + this.init(); } }, @@ -84,7 +89,9 @@ export default { query: { org_id: this.orgId, type: this.currentTab, - type2: item.name + type2: item.name, + start_date: this.searchDate[0], + end_date: this.searchDate[1] } }); }, diff --git a/src/views/dataBoard/sida/cpts/xqqd.vue b/src/views/dataBoard/sida/cpts/xqqd.vue index 679638ea0..b02552880 100644 --- a/src/views/dataBoard/sida/cpts/xqqd.vue +++ b/src/views/dataBoard/sida/cpts/xqqd.vue @@ -26,7 +26,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate:Array }, data() { return { @@ -45,11 +46,15 @@ export default { screenEchartsFrame }, mounted() { - this.init(); + // console.log("ddd") + // this.init(); }, watch: { orgId() { this.init(); + }, + searchDate() { + this.init(); } }, methods: { @@ -80,13 +85,14 @@ export default { } else { url = 'common_need_view'; } - this.$refs.pieChart.showLoading(); const { data, code, msg } = await requestPostBi( url, { queryParam: { - org_id: this.orgId + org_id: this.orgId, + start_date: this.searchDate[0], + end_date: this.searchDate[1] } }, { diff --git a/src/views/dataBoard/sida/cpts/zyqd.vue b/src/views/dataBoard/sida/cpts/zyqd.vue index 9a3c0398f..d16a162cf 100644 --- a/src/views/dataBoard/sida/cpts/zyqd.vue +++ b/src/views/dataBoard/sida/cpts/zyqd.vue @@ -26,7 +26,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate:Array }, data() { return { @@ -50,10 +51,14 @@ export default { screenEchartsFrame }, mounted() { - this.init(); + // this.init(); }, watch: { orgId() { + this.init(); + }, + searchDate() { + this.init(); } }, @@ -94,7 +99,9 @@ export default { url, { queryParam: { - org_id: this.orgId + org_id: this.orgId, + start_date: this.searchDate[0], + end_date: this.searchDate[1] } }, { diff --git a/src/views/dataBoard/sida/index.vue b/src/views/dataBoard/sida/index.vue index 7ca3eec42..140e93ab7 100644 --- a/src/views/dataBoard/sida/index.vue +++ b/src/views/dataBoard/sida/index.vue @@ -7,21 +7,30 @@
需求清单
-
+
问题清单
-
+
- - 查询 + +
@@ -30,7 +39,7 @@
社区评价
-
+
@@ -44,14 +53,16 @@
服务清单
-
+
+ +
资源清单
-
+
@@ -83,6 +94,7 @@ export default { }, data() { return { + searchDate: ['', ''], loading: false, orgData: { children: [] @@ -92,12 +104,31 @@ export default { }; }, mounted() { - const queryOrgId = getQueryPara('orgId'); - const queryOrgLevel = getQueryPara('orgLevel'); - this.init(queryOrgId, queryOrgLevel); + this.getDate(); }, watch: {}, methods: { + getDate() { + var nowDate = new Date(); + var year = nowDate.getFullYear(); + var month = nowDate.getMonth() + 1; + var day = nowDate.getDate(); + this.searchDate = [`${year}-${1}-${1}`, `${year}-${month}-${day}`]; + console.log(this.searchDate); + const queryOrgId = getQueryPara('orgId'); + const queryOrgLevel = getQueryPara('orgLevel'); + this.init(queryOrgId, queryOrgLevel); + }, + searchDateChang() { + if (this.searchDate == null) { + this.searchDate = ['', '']; + } + }, + search() { + const queryOrgId = getQueryPara('orgId'); + const queryOrgLevel = getQueryPara('orgLevel'); + this.init(queryOrgId, queryOrgLevel); + }, toListPage(type = '', type_name = '') { this.$router.push({ path: '/dataBoard/sida/xq/list', @@ -173,7 +204,7 @@ export default { //获取地图上显示的组织数据 async getMapData() { - console.log('=========================getMapData'); + // console.log('=========================getMapData'); const url = 'org_map'; const { data, code, msg } = await requestPostBi( url, @@ -205,7 +236,7 @@ export default { }, //获取地图上显示的组织数据 async getSubMapData() { - console.log('=========================getSubMapData'); + // console.log('=========================getSubMapData'); const url = 'sub_org_map'; const { data, code, msg } = await requestPostBi( url, @@ -233,7 +264,7 @@ export default { this.orgData = { ...orgData }; - console.log('==========================getSubMapData:result', this.orgData); + // console.log('==========================getSubMapData:result', this.orgData); } else { this.$message.error(msg); }