diff --git a/.env.development b/.env.development index 0f8b0cf5..347d9a1e 100644 --- a/.env.development +++ b/.env.development @@ -16,14 +16,14 @@ VUE_APP_PJ = '' # VUE_APP_API_BASEURL = http://127.0.0.1:2226/api #测试环境 - VUE_APP_API_BASEURL = http://10.50.211.228:2250/api +# VUE_APP_API_BASEURL = http://10.50.211.228:2250/api #VUE_APP_API_BASEURL = http://127.0.0.1:2226/api - VUE_APP_BASEURL = http://10.50.211.228:2250 +# VUE_APP_BASEURL = http://10.50.211.228:2250 #VUE_APP_BASEURL = http://127.0.0.1:2226 # #光子 -# VUE_APP_API_BASEURL = http://49.232.14.174:2250/api -# VUE_APP_BASEURL = http://49.232.14.174:2250 +VUE_APP_API_BASEURL = http://49.232.14.174:2226/api +VUE_APP_BASEURL = http://49.232.14.174:2226 # 本地端口 VUE_APP_PORT = 2800 diff --git a/src/views/statistics/task_rate_gx.vue b/src/views/statistics/task_rate_gx.vue index 07aa0d32..ee355c27 100644 --- a/src/views/statistics/task_rate_gx.vue +++ b/src/views/statistics/task_rate_gx.vue @@ -584,7 +584,7 @@ export default { formatter: "{b} : {c} ({d}%)", }, data: [ - { value: 0, name: "已完成" }, + { value: 0, name: "合格数" }, { value: 0, name: "未完成" }, ], }, @@ -681,18 +681,15 @@ export default { that[names] = res; console.log('names',names); console.log('that[names]',that[names]); - let count_ok1 = 0; - let count_notok1 = 0; + let count_jh = 0,count_ok = 0,count_diff = 0; if (res.length > 0) { res.forEach((item) => { - if (item.count_ok >= item.count) { - count_ok1++; - } else { - count_notok1++; - } + count_jh+=item.count; + count_ok+=item.count_ok; }); - option.series.data[0].value = count_ok1; - option.series.data[1].value = count_notok1; + count_diff = count_jh - count_ok; + option.series.data[0].value = count_ok; + option.series.data[1].value = count_diff; let chartId = 'linechart'+mgroup_index; that.setChart(chartId, option); }else{