diff --git a/.env.development b/.env.development index b6488f90..9a63819e 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' @@ -19,7 +19,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit -VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' diff --git a/src/pages/course/components/chartFive.vue b/src/pages/course/components/chartFive.vue index 91475071..34fed902 100644 --- a/src/pages/course/components/chartFive.vue +++ b/src/pages/course/components/chartFive.vue @@ -55,7 +55,7 @@ computed: { dataValue() { // return this.dataList.map(t=>t.anlyGrade) - return this.dataList.map(t=>t.anlyGrade / (t.totalGrade||100) * 100) + return this.dataList.map(t=>t.anlyGrade / (t.totalGrade || t.pct ||100) * 100) }, chartWidth() { return this.size + 'rpx' diff --git a/src/pages/course/components/chartFour.vue b/src/pages/course/components/chartFour.vue index 770d8f02..281de97f 100644 --- a/src/pages/course/components/chartFour.vue +++ b/src/pages/course/components/chartFour.vue @@ -52,7 +52,7 @@ }) const dataValue = computed(() => { // return props.dataList.map(t => t.anlyGrade) - return props.dataList.map(t => t.anlyGrade / (t.totalGrade || 100) * 100) + return props.dataList.map(t => t.anlyGrade / (t.totalGrade || t.pct || 100) * 100) }) const chartWidth = computed(() => props.size + 'rpx') const chartHeight = computed(() => props.size + 'rpx') diff --git a/src/pages/course/components/chartSeven.vue b/src/pages/course/components/chartSeven.vue index dead62d0..203d1852 100644 --- a/src/pages/course/components/chartSeven.vue +++ b/src/pages/course/components/chartSeven.vue @@ -54,7 +54,7 @@ }, computed:{ dataValue(){ - return this.dataList.map(t=>t.anlyGrade / (t.totalGrade||100) * 100) + return this.dataList.map(t=>t.anlyGrade / (t.totalGrade || t.pct ||100) * 100) }, chartWidth(){ return this.size + 'rpx' diff --git a/src/pages/course/components/chartSix.vue b/src/pages/course/components/chartSix.vue index 4a7d55fe..588ce97e 100644 --- a/src/pages/course/components/chartSix.vue +++ b/src/pages/course/components/chartSix.vue @@ -55,7 +55,7 @@ computed:{ dataValue(){ // return this.dataList.map(t=>t.anlyGrade) - return this.dataList.map(t=>t.anlyGrade / (t.totalGrade||100) * 100) + return this.dataList.map(t=>t.anlyGrade / (t.totalGrade || t.pct ||100) * 100) }, chartWidth(){ return this.size + 'rpx' diff --git a/src/pages/course/components/chartThree.vue b/src/pages/course/components/chartThree.vue index 0f189591..96e89d0c 100644 --- a/src/pages/course/components/chartThree.vue +++ b/src/pages/course/components/chartThree.vue @@ -55,7 +55,7 @@ }) const dataValue = computed(() => { // return props.dataList.map(t => t.anlyGrade) - return props.dataList.map(t => t.anlyGrade / (t.totalGrade || 100) * 100) + return props.dataList.map(t => t.anlyGrade / (t.totalGrade || t.pct || 100) * 100) }) let _scale = .9 const chartWidth = computed(() => props.size / _scale + 'rpx') diff --git a/src/pages/sparring/detail.vue b/src/pages/sparring/detail.vue index 5b543183..1bb1291d 100644 --- a/src/pages/sparring/detail.vue +++ b/src/pages/sparring/detail.vue @@ -192,7 +192,7 @@ box-sizing: border-box; font-weight: 500; color: #fff; - top:0; + top: var(--status-bar-height); position: fixed; z-index: 10; @@ -201,7 +201,7 @@ left: 36rpx; top: 20rpx; color: #fff !important; - z-index: 10; + z-index: 10; } .back-icon {