From d2a246f07a7d1b946247cfa0b720341f7990f6ac Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 22 May 2024 23:11:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 4 ++--
.../personLocation/exam/beginexam/beginexam.vue | 17 ++++++++---------
.../exam/studydetails/studydetails.vue | 2 +-
pages/projectEnd/trainPlan/addPlan.vue | 15 ++++-----------
4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/main.js b/main.js
index dfe20678..f1b57a17 100644
--- a/main.js
+++ b/main.js
@@ -38,11 +38,11 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
- // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
+ Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
- Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
+ // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
diff --git a/pages/personLocation/exam/beginexam/beginexam.vue b/pages/personLocation/exam/beginexam/beginexam.vue
index 7e55c282..dbaab726 100644
--- a/pages/personLocation/exam/beginexam/beginexam.vue
+++ b/pages/personLocation/exam/beginexam/beginexam.vue
@@ -36,16 +36,10 @@
}
},
mounted() {
- var tab = document.querySelector('.uni-progress-inner-bar');
- console.log(tab);
- var p = document.createElement('p');
- p.className = "uni-progress-info"
- p.innerText = ((this.stIndex + 1) * 100).toFixed(0) + '%'
- tab.appendChild(p);
+ this.getDataFn();
},
onLoad(options) {
this.pageData = JSON.parse(options.transportData)
- this.getDataFn();
},
methods: {
getDataFn() {
@@ -61,6 +55,11 @@
console.log('试题信息', res)
if (res.result) {
that.stList = res.result;
+ var tab = document.querySelector('.uni-progress-inner-bar');
+ var p = document.createElement('p');
+ p.className = "uni-progress-info"
+ p.innerText = (((that.stIndex + 1) * 100) / that.stList.length).toFixed(0) + '%'
+ tab.appendChild(p);
that.stList.map(item => {
item.trainRecordId = that.pageData.trainRecordId
})
@@ -70,8 +69,6 @@
},
radioChange(evt) {
console.log(evt)
- var progressTip = document.querySelector('.uni-progress-info');
- progressTip.innerText = ((this.stIndex + 1) * 100).toFixed(0) + '%'
this.stList[this.stIndex].answer = evt.detail.value
let that = this;
// 当到达最后一题时
@@ -81,6 +78,8 @@
uni.showLoading()
setTimeout(function() {
that.stIndex++;
+ var progressTip = document.querySelector('.uni-progress-info');
+ progressTip.innerText = (((that.stIndex + 1) * 100) / that.stList.length).toFixed(0) + '%'
uni.hideLoading()
}, 500)
},
diff --git a/pages/personLocation/exam/studydetails/studydetails.vue b/pages/personLocation/exam/studydetails/studydetails.vue
index 9174bdb8..09c24588 100644
--- a/pages/personLocation/exam/studydetails/studydetails.vue
+++ b/pages/personLocation/exam/studydetails/studydetails.vue
@@ -20,7 +20,7 @@
{{responseData.courseName}}
-
+
diff --git a/pages/projectEnd/trainPlan/addPlan.vue b/pages/projectEnd/trainPlan/addPlan.vue
index 3655330a..a9490687 100644
--- a/pages/projectEnd/trainPlan/addPlan.vue
+++ b/pages/projectEnd/trainPlan/addPlan.vue
@@ -31,7 +31,7 @@
@input='supplementTextarea' :value="form.title" placeholder="请输入">
- *培训课件：
+ 培训课件：
@@ -45,7 +45,7 @@
- *考试试卷：
+ 考试试卷：
@@ -340,16 +340,9 @@
})
return
}
- if(!this.form.courseId){
+ if(!this.form.courseId && !this.form.examPaperId){
uni.showToast({
- title: '请选择培训课件',
- icon: 'none'
- })
- return
- }
- if(!this.form.examPaperId){
- uni.showToast({
- title: '请选择考试试卷',
+ title: '请选择至少选择培训课件或考试试卷一种',
icon: 'none'
})
return