From a04cc2f055410506e739383b351ab865f84fc5ef Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Fri, 13 Jan 2023 16:00:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/axios.js | 3 ++- vue.config.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/router/axios.js b/src/router/axios.js index 47ff382..4419e33 100644 --- a/src/router/axios.js +++ b/src/router/axios.js @@ -63,7 +63,8 @@ axios.interceptors.response.use(res => { NProgress.done() const status = Number(res.status) || 200 const message = res.data.msg || errorCode[status] || errorCode['default'] - if (status === 401 || status === 500) { + // || status === 500 + if (status === 401) { idx++ if(idx==1){ Message({ diff --git a/vue.config.js b/vue.config.js index 884fc33..2b82699 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,10 +3,10 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://192.168.31.160:9999' //长龙 -const url = 'http://192.168.31.85:9999' // 胜浩 +// const url = 'http://192.168.31.85:9999' // 胜浩 // const url = 'http://127.0.0.1:9999' // 本地 -// const url = 'http://39.97.244.65:9999' // 测试服务器 +const url = 'http://39.97.244.65:9999' // 测试服务器 // const url = 'http://62.234.122.43:9999' //正式服务器1 // const url = 'https://www.aihxz.com' // 正式域名 From 434846c97197311eaf36eb6bfee8149d26ad9291 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Thu, 9 Feb 2023 14:15:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Statistics/MentoringAbility.vue | 2 ++ src/views/Statistics/TheTeamCompared.vue | 1 + 2 files changed, 3 insertions(+) diff --git a/src/views/Statistics/MentoringAbility.vue b/src/views/Statistics/MentoringAbility.vue index 6f09519..5afd240 100644 --- a/src/views/Statistics/MentoringAbility.vue +++ b/src/views/Statistics/MentoringAbility.vue @@ -575,6 +575,7 @@ export default { statDateEnd: this.statDateEnd, accountId: this.consultantlistid, dateType: this.TimetoAhoose == 7 ? null : this.TimetoAhoose, + marketingBusiness: this.marketingBusiness.join(','), }; exportMethodPost( "autoSR/cusStageStatistics/prohibitedStatisticsExport", @@ -746,6 +747,7 @@ export default { userB: this.Pklistid, type: 3, marketingId: this.teamAllLevelid, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 7) { pamaet.dateType = null; diff --git a/src/views/Statistics/TheTeamCompared.vue b/src/views/Statistics/TheTeamCompared.vue index fd7878d..a6298ed 100644 --- a/src/views/Statistics/TheTeamCompared.vue +++ b/src/views/Statistics/TheTeamCompared.vue @@ -779,6 +779,7 @@ export default { dateType: 0, statDateStart: this.statDateStart, statDateEnd: this.statDateEnd, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 7) { pamaet.dateType = null; From 7f426ba34dd066a002a99b776c04b1ce2d397af1 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Thu, 9 Feb 2023 15:35:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Statistics/TheTeamCompared.vue | 96 +----------------------- 1 file changed, 1 insertion(+), 95 deletions(-) diff --git a/src/views/Statistics/TheTeamCompared.vue b/src/views/Statistics/TheTeamCompared.vue index a6298ed..a514cb8 100644 --- a/src/views/Statistics/TheTeamCompared.vue +++ b/src/views/Statistics/TheTeamCompared.vue @@ -584,101 +584,7 @@ -
-
-
违禁话术雷达图
-
-
-
-
- -
暂无数据
-
-
-
- - -
-
-
-
- 违禁接待次数 - - - -
-
- - - - -
-
-
-
-
团队总数
-
{{ teamobj5.num || 0 }}个
-
-
-
均值
-
{{ teamobj5.avg || 0 }}次
-
-
-
-
-
{{ item.name }}
-
-
-
-
{{ item.zxl }}次
-
-
-
-
- -
暂无数据
-
-
-
-
-
-
违禁话术雷达图
-
-
-
-
- -
暂无数据
-
-
+
From 7a4c73f1dcbebc2b7cca5e40d1f2de27bc5991cc Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Thu, 9 Feb 2023 17:53:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Statistics/MentoringAbility.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/Statistics/MentoringAbility.vue b/src/views/Statistics/MentoringAbility.vue index 5afd240..a44acf7 100644 --- a/src/views/Statistics/MentoringAbility.vue +++ b/src/views/Statistics/MentoringAbility.vue @@ -929,6 +929,7 @@ export default { this.accountData4(); this.accountData5(); this.accountData6(); + this.prohibitedStatistics() }, // 获取一级 From 08e5b8d38abeb30da017e80fa93d53cffd93ccee Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Thu, 9 Feb 2023 19:12:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Statistics/ReceptionOverview.vue | 65 ++++++++++++++++++---- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/src/views/Statistics/ReceptionOverview.vue b/src/views/Statistics/ReceptionOverview.vue index 6120753..81603ac 100644 --- a/src/views/Statistics/ReceptionOverview.vue +++ b/src/views/Statistics/ReceptionOverview.vue @@ -54,6 +54,26 @@ > + +
销讲业务：
+ + + + @@ -355,11 +375,7 @@
@@ -469,11 +485,7 @@
@@ -617,6 +629,9 @@ export default { activeName: localStorage.getItem("activeName") || "0", // 顾问选项卡选中变量值 activeIndex: localStorage.getItem("activeIndex") || "", // 系统访问来源的下标 + + templateList: [], // 销讲业务列表 + marketingBusiness: [], // 选中的销讲业务 }; }, watch: { @@ -641,6 +656,7 @@ export default { this.overviewreceptionOverviewZxl(); this.overviewteamOrAccountSellingTrends(); this.overviewteamOrAccountSellingTrends1(); + this.getMarketingBusiness() } else { this.zkhousePage(); } @@ -659,6 +675,17 @@ export default { } }, methods: { + // 获取销讲业务 + getMarketingBusiness() { + this.$api.http + .marketingBusiness({ houseId: this.houseId }) + .then((res) => { + console.log(res); + if (res.code == 10000) { + this.templateList = res.data; + } + }); + }, // 选项卡切换事件 handleClick(tab) { this.activeName = tab; @@ -735,6 +762,7 @@ export default { dateType: this.TimetoAhoose, statDateStart: this.fromobj.statDateStart, statDateEnd: this.fromobj.statDateEnd, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 8) { parmo.dateType = null; @@ -760,6 +788,7 @@ export default { dateType: this.TimetoAhoose, type: this.activeName, ...this.fromobj, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 8) { parmo.dateType = null; @@ -1000,6 +1029,7 @@ export default { statDateStart: this.fromobj.statDateStart, statDateEnd: this.fromobj.statDateEnd, flag: this.activeIndex, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 8) { parmo.dateType = null; @@ -1042,6 +1072,7 @@ export default { statDateStart: this.fromobj.statDateStart, statDateEnd: this.fromobj.statDateEnd, deptId: this.departmentsri, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 8) { parmo.dateType = null; @@ -1070,6 +1101,7 @@ export default { statDateStart: this.fromobj.statDateStart, statDateEnd: this.fromobj.statDateEnd, accountId: this.consultantsri, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 8) { parmo.dateType = null; @@ -1131,6 +1163,7 @@ export default { dateType: this.TimetoAhoose, statDateStart: this.fromobj.statDateStart, statDateEnd: this.fromobj.statDateEnd, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 8) { parmo.dateType = null; @@ -1149,6 +1182,7 @@ export default { dateType: this.TimetoAhoose, statDateStart: this.fromobj.statDateStart, statDateEnd: this.fromobj.statDateEnd, + marketingBusiness: this.marketingBusiness.join(','), }; if (this.TimetoAhoose == 8) { parmo.dateType = null; @@ -1566,6 +1600,17 @@ export default { this.systemAccessranking(); this.overviewreceptionOverviewZxl(); }, + + packtaps() { + this.overviewreceptionOverview(); + this.overviewreceptionData(); + this.overviewteamOrAccountSellingTrends(); + this.overviewteamOrAccountSellingTrends1(); + this.overviewreceptionRanking(); + this.systemAccessranking(); + this.overviewreceptionOverviewZxl(); + }, + // 计算百分比 dealData(arr) { let num = Math.max.apply( From 62ea1b6c6adef0de747b81bcd4652d12fa741b25 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Mon, 13 Feb 2023 19:08:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Statistics/ConsultantBrand.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Statistics/ConsultantBrand.vue b/src/views/Statistics/ConsultantBrand.vue index ede75e9..74d0e76 100644 --- a/src/views/Statistics/ConsultantBrand.vue +++ b/src/views/Statistics/ConsultantBrand.vue @@ -975,7 +975,7 @@ export default { role: "", templateList: [], // 销讲业务列表 - marketingBusiness: "", // 选中的销讲业务 + marketingBusiness: [], // 选中的销讲业务 }; }, computed: {