-
-
+
+
+
+
+
+ {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 保存
+ 删除
+
+
+
+
diff --git a/src/pages/activity/manage/manage/notice.vue b/src/pages/activity/manage/manage/notice.vue
index a532ee3..a867b02 100644
--- a/src/pages/activity/manage/manage/notice.vue
+++ b/src/pages/activity/manage/manage/notice.vue
@@ -1,47 +1,70 @@
-
-
+
+
-
{
this.listData = res.page.records;
this.total = res.page.total;
- }).catch(err => { });
+ this.loading = false
+ }).catch(err => {
+ this.loading = false
+ });
},
initData () {
this.page = 1
diff --git a/src/pages/record/list/practice.vue b/src/pages/record/list/practice.vue
index 0124cd5..fdd4431 100644
--- a/src/pages/record/list/practice.vue
+++ b/src/pages/record/list/practice.vue
@@ -1,6 +1,7 @@
{
this.listData = res.page.records;
this.total = res.page.total;
- }).catch(err => { });
+ this.loading = false
+ }).catch(err => {
+ this.loading = false
+ });
},
initData () {
this.page = 1
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index d895f52..faa6e45 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -187,12 +187,7 @@
-
@@ -355,6 +345,7 @@ export default {
e.lcRuleRecords.map((n, i) => {
e.assessmentPoint += `${i + 1}.${n.name}`
e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
+ if (!n.userAnswer) n.userAnswer = '未填写'
e.answer += `${i + 1}.${n.userAnswer}`
})
})
@@ -384,15 +375,14 @@ export default {
if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/( |&|%s)/g, '').replace(/>/g, '>').replace(/]+>/g, '').replace(/( |&|%s)/g, '').replace(/>/g, '>').replace(/]+>/g, '')
- }
+ // for (const i in form) {
+ // if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+ // }
form.purpose = form.purpose.replace(/<[^>]+>/g, '')
this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
...form,
experimentalData: list
}).then(res => {
- console.log(res)
util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
}).catch(res => { })
},
diff --git a/src/pages/setting/person/index.vue b/src/pages/setting/person/index.vue
index 4e39377..8c1a02a 100644
--- a/src/pages/setting/person/index.vue
+++ b/src/pages/setting/person/index.vue
@@ -1,120 +1,131 @@
-
- 新增
-
+
+
+
-
-
- {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.status ? '已发布' : '草稿' }}
-
-
-
-
- 编辑
- 删除
-
-
-
+
+
+ {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.status ? '已发布' : '草稿' }}
+
+
+
+
+ 编辑
+ 删除
+
+
+
\ No newline at end of file
diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue
index c07ecd1..a73b963 100644
--- a/src/pages/course/details/index.vue
+++ b/src/pages/course/details/index.vue
@@ -218,7 +218,8 @@ export default {
// 如果没登录，直接去登录
if (!util.local.get(Setting.tokenKey) && !util.local.get('oc_server_token') && showConfirm) {
this.$confirm('请先登录，是否直接前往登录？', "提示", {
- type: 'success'
+ type: 'success',
+ closeOnClickModal: false
}).then(() => {
this.SET_COURSE(this.id)
this.$router.push('/login')
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index fbdaf91..1e5fad5 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -1121,7 +1121,8 @@ export default {
}
if (notSave) {
this.$confirm('所填写内容暂未保存，是否保存？', "提示", {
- type: "warning"
+ type: "warning",
+ closeOnClickModal: false
}).then(() => {
// 保存团队名称和邀请码
if (notSave === 1) {
@@ -1269,7 +1270,8 @@ export default {
}
}
this.$confirm(include ? `该成员已被指定参加${include}，踢出后需重新指定成员参加，是否确认踢出团队？` : '确定要踢出该成员吗？', '提示', {
- type: 'warning'
+ type: 'warning',
+ closeOnClickModal: false
}).then(() => {
this.$post(`${this.api.removeTheLine}?teamId=${this.info.teamId}&competitionId=${this.id}&accountId=${row.accountId}`).then(res => {
Util.successMsg('移除成功')
@@ -1645,7 +1647,8 @@ export default {
} else if (status == 1) {
// 已报名，点击取消报名
this.$confirm('是否要取消报名？', '提示', {
- type: 'success'
+ type: 'success',
+ closeOnClickModal: false
}).then(() => {
this.$post(`${this.api.cancelRegistration}?competitionId=${this.id}`).then(res => {
this.status = 2
@@ -1656,7 +1659,8 @@ export default {
}
} else { // 如果没登录，提示去登录
this.$confirm('请先登录，是否直接前往登录？', "提示", {
- type: 'success'
+ type: 'success',
+ closeOnClickModal: false
}).then(() => {
this.SET_SOURCE(this.id)
this.$router.push('/login')
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 651bb76..a88bb7e 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -996,7 +996,8 @@ export default {
}
} else {
this.$confirm('请先登录，是否直接前往登录？', "提示", {
- type: 'success'
+ type: 'success',
+ closeOnClickModal: false
}).then(() => {
this.SET_SOURCE(item.id)
this.$router.push('/login')
diff --git a/src/pages/record/list/ass.vue b/src/pages/record/list/ass.vue
index 7281c34..0e87da5 100644
--- a/src/pages/record/list/ass.vue
+++ b/src/pages/record/list/ass.vue
@@ -3,6 +3,7 @@
+ 新增
+
-
-
-
-
+
+
+
+
-
- {{index+1}}. {{item.userAnswer}}
-
-
- {{index+1}}. 未填写
-
+ {{index+1}}. {{item.userAnswer || '未填写'}}
-
-
-
-
-
- ![]()
-
- 点击更换头像
-
-
-
-
-
-
+
+
+
+
+
+ ![]()
+
+ 点击更换头像
+
+
+
+
+
+