From 9bf47e32233e113c22983850253099cbf25c4aa9 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 30 Jun 2022 18:48:59 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/public/index.html | 4 ++--
.../components/ResourceAggregation.vue | 15 ++++++++-------
front/src/views/home/apply.vue | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/front/public/index.html b/front/public/index.html
index ffd3a7ac..8cdda9be 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-30 18:01:54
+ * @LastEditTime: 2022-06-30 18:30:56
* @Description: 告诉大家这是什么
-->
@@ -47,7 +47,7 @@
window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
- window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
+ window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 穿透版本
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index b71cd34d..a892d2b9 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -46,7 +46,7 @@
- 汇聚量
+
部门数
@@ -287,11 +287,11 @@
}
//来源部门漏斗图
const funnelPlot = (dataList) => {
- let arr = ['0-5', '5-10', '10-15', '15-20', '20以上']
- dataList.sort((a, b) => {
- console.log(arr.indexOf(a.fanwei), arr.indexOf(b.fanwei))
- return arr.indexOf(b.fanwei) - arr.indexOf(a.fanwei)
- })
+ // let arr = ['0-5', '5-10', '10-15', '15-20', '20以上']
+ // dataList.sort((a, b) => {
+ // console.log(arr.indexOf(a.fanwei), arr.indexOf(b.fanwei))
+ // return arr.indexOf(b.fanwei) - arr.indexOf(a.fanwei)
+ // })
console.log('============》', dataList)
echarts.init(document.getElementById('right')).dispose()
let chartDom = document.getElementById('right')
@@ -324,6 +324,7 @@
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
},
yAxis: {
+ show: false,
type: 'value',
min: 0,
max: 20,
@@ -340,7 +341,7 @@
max: 100,
minSize: '0%',
maxSize: '100%',
- sort: 'none',
+ sort: 'ascending',
gap: 2,
label: {
show: true,
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 3ace864d..d0d5866d 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -84,7 +84,7 @@