From ba7c09ecf84e4003c3c977cc649c83fb4587f89d Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 19 Apr 2024 10:16:33 +0800 Subject: [PATCH] fix --- src/assets/img/exts/pdf.png | Bin 0 -> 371 bytes src/assets/img/exts/pic.png | Bin 0 -> 330 bytes src/assets/img/exts/ppt.png | Bin 0 -> 243 bytes src/assets/img/exts/txt.png | Bin 0 -> 341 bytes src/assets/img/exts/video.png | Bin 0 -> 244 bytes src/assets/img/exts/word.png | Bin 0 -> 437 bytes src/components/Header.vue | 15 +- src/setting.js | 3 +- src/views/match/list/index.vue | 1 + src/views/match/manage/matchSignup.vue | 4 +- src/views/system/taskLog.vue | 13 +- src/views/theoreticalCourse/preview/index.vue | 428 ++++++++++-------- 12 files changed, 267 insertions(+), 197 deletions(-) create mode 100644 src/assets/img/exts/pdf.png create mode 100644 src/assets/img/exts/pic.png create mode 100644 src/assets/img/exts/ppt.png create mode 100644 src/assets/img/exts/txt.png create mode 100644 src/assets/img/exts/video.png create mode 100644 src/assets/img/exts/word.png diff --git a/src/assets/img/exts/pdf.png b/src/assets/img/exts/pdf.png new file mode 100644 index 0000000000000000000000000000000000000000..39e05f16aea5a0173afaa277b82ab775478bf1c7 GIT binary patch literal 371 zcmV-(0gV2MP)Px#pHNIxMgLq}{$5`HUS9rQUjAQS{$ODKVPXDaV*X=e{$^(WYHI##YyNI-{%>#o za&rE8dH#fi{)L79iHZJ-ivEp_{*{&fnVJ5fq5i9@{;sb6wYC1YxBk1k{=UBc#Kiu~ z%l^*J{?E_;(9r(T(f-ub{@2(3+1dWu+Wz6;{^jNV=H~wA=l&@WJUpu3=B-n z%;;jw7yu?DrpbveB&{NVE+nBRh%O{z!iz4%Z_I~bmaYmbst}hxkGdQi2Ro9Gl#Gb1 ziJ_5}GF(X1KvhzROITi80V>3)Xd;g0dLe;PL>6Mi3>?fL1OVx=2~~1< RU#QaFeV{wqX6T`Z5GB1Ig(g2?jSBJyP z?7+zW@G|EkD_oAOa6h`r>)2|)6Kg|GZU{TIG3xZDgtOZ+&hN~;u&dzGo{B36Dy|-w zc<0Q_`xoXuxVZAk_07+3?|ymz@SDd+-#j__?%A1l&(FMn{^Z-Imp{I|{rUa#@1NiP z{Qmv#@1K8v|NaAk|NsBb`ekDUbO2LHkYBLJBL?&CM38elT^vIsF6UnG6l!u1VYzsJ zsf9lWQ{Muod;dH16s%?)i`f_II@7YZNUZyb&t#uVJ9nxInoe*ldAheVW8Sw(>uq^u z_qjS4dv>eOU%ULtzDZmQzLYGyw37MOU5Ddho1_|6Eq}@#zkRxo7H3tDTT5{Aui|rG a4#_t!QaG}Yk*IP>(^zryKq}JMiOZ;lIDX{=B*H>+1CHdt?87fBX0I!{7JT{kpN>*Y&wSPuG9npZsmJ z>(@2LUze$7dZZZv4P+__@(X_Ck#uM37a%X%)5S4F;&O6AN`e!k1LFz~CIuG(2Bjlx zEKV{?C!Ef#dGqGYnlpcrJe+hCCbdsyj_v65W(f8Wi0x>Ol<@56pE`Bw^vTjU-SWi5 p#N+}MxbNzmYUN;OWuB(M!my&5dHY4Hs1Tqv44$rjF6*2Ung9SFXfpr+ literal 0 HcmV?d00001 diff --git a/src/assets/img/exts/txt.png b/src/assets/img/exts/txt.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1276a7fa916d9eed511b4f7394ffbb012d61b5 GIT binary patch literal 341 zcmV-b0jmCqP)Px$4@pEpR7gwRm9c69K@f(&QAr!ifay}Eu?*xfQiN23q)HR}1Q8Ex@&ai@(g-&C z0wIlEKvJYgN&_kE(^%ce$rVa&?{-~IPx#z)(z7MQW=5YN-5bsQqfF{A;NEY^nThs{C=R{Bo@Pbguk$uKakg{Cl$ef3*C8 zwfu&-{D`^yiMsrYyZn#6{FuZ1nZx{=#QdDa{GP`ApvU~8$^5Cz{i)6UtIhqZ&i$;; z{jSjcveNyt(*3v9{kYcszuEo5+x^4b{lwh;$KL(O-~Gzp{mbC})#m-z=l$2`{@CdL z+v@(^>;B;F{^Rcc=kfmR^ZxAg{_ytx^7sDp`2O|z{`dO+`uzU<{r>&_{93i)IzW-a9Nh$!K zN(ul#2><{A03fta)-i0*>><>vKCRz5?j{IsChRYkHLD(igBNB;&t1)DjiB|j;k`2+ zxwwVE!(ivt?vup;0;kt!Q}wd*-G;#S$9 + + 刘榕ip + 陈赓ip +
{ }) }, + + ipChange (val) { + localStorage.setItem('nakadaiIp', val) + location.reload() + }, }, }; diff --git a/src/setting.js b/src/setting.js index 8fb3326..54160c9 100644 --- a/src/setting.js +++ b/src/setting.js @@ -9,12 +9,13 @@ let jumpPath = `${location.origin}/judgmentPoint/` let sandPath = `http://121.37.12.51/sandbox` // 沙盘地址 let host = `${location.origin}/` if (isDev) { + console.log("🚀 ~ localStorage.getItem('nakadaiIp'):",localStorage.getItem('nakadaiIp')) jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 // jumpPath = 'https://judgment.huorantech.cn/' sandPath = `http://${location.hostname}:9520` host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' - host = 'http://192.168.31.217:9000/' + host = localStorage.getItem('nakadaiIp') == 1 ? 'http://192.168.31.51:9000/' : 'http://192.168.31.217:9000/' } else if (isPro) { sandPath = `https://izhixinyun.com/sandbox` jumpPath = 'https://judgment.huorantech.cn/' diff --git a/src/views/match/list/index.vue b/src/views/match/list/index.vue index 392d10b..200b294 100644 --- a/src/views/match/list/index.vue +++ b/src/views/match/list/index.vue @@ -349,6 +349,7 @@ export default { } }, mounted () { + this.$store.commit('SET_M_PAGE', 1) // websocket实时刷新 Bus.$on('matchSocket', () => { this.getData() diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue index 336770c..4acd17b 100644 --- a/src/views/match/manage/matchSignup.vue +++ b/src/views/match/manage/matchSignup.vue @@ -605,7 +605,7 @@ export default { this.form = JSON.parse(JSON.stringify(row)) }, del (row) { - this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '此删除操作不可逆，是否确认删除选中项？' : '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？', "提示", { + this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？' : '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？', "提示", { type: "warning" }).then(() => { this.$post(this.api.batchDeleteApplicants, { registrationVOS: [row] }).then(res => { @@ -852,7 +852,7 @@ export default { // 批量删除 async batchDel () { const list = this.multipleSelection - const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？' : '此删除操作不可逆，是否确认删除选中项？') : '是否确定删除全部报名人员？' + const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？' : '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？') : '删除后参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定删除全部报名人员？' this.$confirm(tips, "提示", { type: "warning" }).then(async () => { diff --git a/src/views/system/taskLog.vue b/src/views/system/taskLog.vue index 1f763e6..01817d3 100644 --- a/src/views/system/taskLog.vue +++ b/src/views/system/taskLog.vue @@ -17,24 +17,33 @@ show-overflow-tooltip> + min-width="90" + align="center" + show-overflow-tooltip> + min-width="300" + align="center" + show-overflow-tooltip>