From 5203e4e332eac66949b98d101300999130ae39f2 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 19 Jan 2022 18:33:15 +0800 Subject: [PATCH] tijaio --- pages/center/Piabodata/Groupcontrast.vue | 13 +++++++++++++ pages/center/Piabodata/StaffAnalysis.vue | 17 +++++++++++++++++ pages/mine/details2.vue | 9 +++++++-- utils/domain.js | 8 ++++---- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/pages/center/Piabodata/Groupcontrast.vue b/pages/center/Piabodata/Groupcontrast.vue index c5770b4..5138877 100644 --- a/pages/center/Piabodata/Groupcontrast.vue +++ b/pages/center/Piabodata/Groupcontrast.vue @@ -154,6 +154,7 @@ { let obj={ name:item[0].houseName, @@ -413,10 +424,12 @@ allobj.categories.push(item1.name) } obj.data.push(item1.avgExecutionRate) + if (max < item.avgExecutionRate) max = item.avgExecutionRate; }) allobj.series.push(obj) }) // console.log(allobj) + this.opts.extra.radar.max = max + 25 this.chartData=allobj this.$forceUpdate() }) diff --git a/pages/center/Piabodata/StaffAnalysis.vue b/pages/center/Piabodata/StaffAnalysis.vue index 3c5b7da..77b9501 100644 --- a/pages/center/Piabodata/StaffAnalysis.vue +++ b/pages/center/Piabodata/StaffAnalysis.vue @@ -130,6 +130,7 @@ :canvas2d="true" canvasId="wangxiaohuaerlingeryilinwuycsdx" background="none" + :opts="opts" /> @@ -170,6 +171,14 @@ value:'', label:'平均' }, + opts: { + fontSize: 10, + extra: { + radar: { + max: '' + } + } + }, lastStartDate:'', lastEndDate :'', selindex:[0], @@ -466,6 +475,7 @@ // console.log(res) let first=res.first let second=res.second + let max = first[0].avgExecutionRate this.chartData.categories=[] if(!this.timepickpickisshow){ this.chartData.series=[ @@ -475,6 +485,7 @@ } ] first.map(item=>{ + if (max < item.avgExecutionRate) max = item.avgExecutionRate; this.chartData.categories.push(item.name) this.chartData.series[0].data.push(item.avgExecutionRate) }) @@ -496,7 +507,13 @@ second.map(item=>{ this.chartData.series[1].data.push(item.avgExecutionRate) }) + + let all = [...first, ...second] + all.map(item => { + if (max < item.avgExecutionRate) max = item.avgExecutionRate; + }) } + this.opts.extra.radar.max = max + 25 }) }, diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 49fef74..4b3eb7a 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -18,7 +18,7 @@ @@ -1004,6 +1004,7 @@ this.roleindex = index; this.newluyinList = []; this.fenjiaoseunfo() + this.$forceUpdate() }, //分角色标记刷新 fenjiaoseunfo() { @@ -1042,6 +1043,10 @@ this.roleindexbiaoji = data.data.data.speaker - 1; this.dshfkjsdkksodofydwfkhwdfkjh = data.data.data.speaker - 1; } + if (this.roleindex > this.tablist.length - 1) { + this.roleindex = this.tablist.length - 1 + this.fenjiaoseunfo() + } this.speaker = data.data.data.speaker; @@ -1626,6 +1631,7 @@ }, success: (data) => { this.tablist = []; + this.roleindexbiaoji = 0; let jsonInfo = JSON.parse(data.data.data.audioContent); for (var i = 0; i <= data.data.data.speakerNum; i++) { @@ -1640,7 +1646,6 @@ } } if (data.data.data.speaker == null) { - this.roleindexbiaoji = 0; this.dshfkjsdkksodofydwfkhwdfkjh = 0; } else { this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker] diff --git a/utils/domain.js b/utils/domain.js index b1f4668..0444be1 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,9 +1,9 @@ // http.js使用域名 -const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站 +// const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站 // const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 // const baseUrl = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏 -// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 @@ -12,11 +12,11 @@ const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站 * 小程序配置文件 */ // 此处主机域名修改成腾讯云解决方案分配的域名 -const host = 'http://121.42.63.138:9091/autoSR/api'; // 测试站 +// const host = 'http://121.42.63.138:9091/autoSR/api'; // 测试站 // const host = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 // const host = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪 // const host = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏 -// const host = 'https://zkgj.quhouse.com/api'; // 质控正式 +const host = 'https://zkgj.quhouse.com/api'; // 质控正式 // const host = 'https://hfju.com/api'; // 数智正式