From e6001c4db131e5fee9a950f669faa4d7bb81b899 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Thu, 30 Jun 2022 16:19:57 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/LayerService/LayerServiceUsageMode.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index 2e780bbe..51a3610e 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -28,7 +28,8 @@
- {{ item.contact }}：{{ item.facilitator.values }} + + {{ item.contact }}

From 5ead4f085bc440ccca91797f6fce8816cdddebf2 Mon Sep 17 00:00:00 2001 From: hucongqian Date: Thu, 30 Jun 2022 16:50:01 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/workBench/api.js | 20 +++++- .../workBench/components/lineOption.js | 2 +- .../workBench/components/trend-view.vue | 64 +++++++++++++++---- 3 files changed, 70 insertions(+), 16 deletions(-) diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js index 9e3bf5de..da7c16a2 100644 --- a/back/src/views/modules/workBench/api.js +++ b/back/src/views/modules/workBench/api.js @@ -15,6 +15,20 @@ function Request({ }) }) +} +function RequestPost({ + methods, url, data, success, fali +}) { + return new Promise((resolve, reject) => { + http[methods](url, + data + ).then(res => { + resolve(res) + }, err => { + reject(err) + }) + }) + } // /resource/getByDept:获取当前登录用户所在部门发布的资源 @@ -125,9 +139,9 @@ export const getApplyByDept = (data, success, fail) => { } // 部门发布能力被调用趋势 export const getByDept = (data, success, fail) => { - Request({ - methods: 'get', - url: '/resource/getByDept', + RequestPost({ + methods: 'post', + url: '/resource/trafficDeptResource', data }).then(res => { success && success(res) diff --git a/back/src/views/modules/workBench/components/lineOption.js b/back/src/views/modules/workBench/components/lineOption.js index 75c33e08..cc9a5142 100644 --- a/back/src/views/modules/workBench/components/lineOption.js +++ b/back/src/views/modules/workBench/components/lineOption.js @@ -67,7 +67,7 @@ export const trendLineChart = (id, chartData, _option) => { }, }], series: [{ - name: '合格数据百分比', + name: '使用量', type: 'line', showAllSymbol: true, symbolSize: 0, diff --git a/back/src/views/modules/workBench/components/trend-view.vue b/back/src/views/modules/workBench/components/trend-view.vue index 9b644e34..3ccaf9c1 100644 --- a/back/src/views/modules/workBench/components/trend-view.vue +++ b/back/src/views/modules/workBench/components/trend-view.vue @@ -23,7 +23,14 @@ export default { return { titles: ["近七日", "月度"], selectedTitle: 0, - trendChartData:{} + trendChartData: {}, + startDate: "", + endDate: + new Date().getFullYear() + + "-" + + (new Date().getMonth() + 1) + + "-" + + new Date().getDate() }; }, components: { @@ -32,25 +39,38 @@ export default { mounted() { this.initChart(); }, + watch: { + selectedTitle: { + handler: function(newVal, oldVal) { + this.startDate = this.getData(newVal == 0 ? 7 : 30); + }, + deep: true, + immediate: true + } + }, methods: { //发布动态 initChart() { - let data = { - limit: 10, - page: 1 - }; Apis.getByDept( - data, + { + startDate: this.startDate, + endDate: this.endDate + }, res => { if (res.data.code !== 0) { return; } - this.data = res.data.data.records || []; - let xaxis=[],ydata=[] - this.data.forEach(v=>{ - xaxis.push(v.createDate) - ydata.push(v.visits) - }) + this.data = res.data.data.browseDayList || []; + let xaxis = [], + ydata = []; + this.data.forEach(v => { + Object.keys(v).map((key, value) => { + xaxis.push(key); + ydata.push(value); + }); + }); + console.log(xaxis) + console.log(ydata) this.trendChartData = { xaxis: xaxis, ydata: ydata @@ -66,7 +86,27 @@ export default { }, handleTitleSwitch(idx) { this.selectedTitle = idx; + this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30); + console.log(this.startDate); this.initChart(); + }, + getData(aa) { + let date1 = new Date(), + time1 = + date1.getFullYear() + + "-" + + (date1.getMonth() + 1) + + "-" + + date1.getDate(); //time1表示当前时间 + let date2 = new Date(date1); + date2.setDate(date1.getDate() - aa); + let time2 = + date2.getFullYear() + + "-" + + (date2.getMonth() + 1) + + "-" + + date2.getDate(); + return time2; } } }; From 814ed5ff92c01c27619162b3729b3e124156e470 Mon Sep 17 00:00:00 2001 From: gaoxiaolong <327091900@qq.com> Date: Thu, 30 Jun 2022 17:53:39 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationResources.vue | 610 ++++++++++++------ .../abilityStatistics/componentServices.vue | 593 ++++++++++------- .../views/modules/abilityStatistics/index.vue | 285 ++++---- 3 files changed, 949 insertions(+), 539 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/applicationResources.vue b/back/src/views/modules/abilityStatistics/applicationResources.vue index 2c24531a..aea5855f 100644 --- a/back/src/views/modules/abilityStatistics/applicationResources.vue +++ b/back/src/views/modules/abilityStatistics/applicationResources.vue @@ -1,7 +1,11 @@