From 539f1f95cc309fb6dc57a6ca349b95e7850c50ca Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 8 Mar 2024 10:41:28 +0800 Subject: [PATCH] =?UTF-8?q?confirm=E7=A1=AE=E8=AE=A4=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=82=B9=E5=87=BB=E9=81=AE=E7=9B=96=E5=B1=82?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/img-upload/Cropper.vue | 1 + src/setting.js | 4 +- src/utils/api.js | 9 +- src/utils/editor.js | 88 +- src/views/course/AddCurriculum.vue | 6 +- src/views/course/contentSettings.vue | 3 +- src/views/customer/AddCustomer.vue | 3 +- src/views/information/addArticle/index.vue | 3 +- src/views/information/columnManage/index.vue | 447 +++++---- src/views/information/contentManage/index.vue | 162 ++-- src/views/information/list/index.vue | 144 +-- src/views/match/add/index.vue | 9 +- src/views/match/add/step1.vue | 2 +- src/views/match/manage/index.vue | 3 +- src/views/match/manage/matchProgress.vue | 447 +++++---- src/views/match/manage/matchRank.vue | 3 +- src/views/match/manage/notice.vue | 266 +++--- src/views/parnerOperation/learnMg.vue | 13 +- src/views/parnerOperation/schemeSet.vue | 9 +- src/views/serve/Configure.vue | 2 +- src/views/serve/addModel.vue | 3 +- src/views/serve/projectAdd.vue | 3 +- src/views/setting/index.vue | 159 ++-- src/views/setting/info.vue | 3 +- src/views/shop/addProduct/index.vue | 10 +- src/views/system/index.vue | 2 +- src/views/system/manageLog.vue | 6 +- src/views/theoreticalCourse/add/index.vue | 6 +- .../contentSettings/index.vue | 3 +- src/views/user/User.vue | 879 ++++++++++-------- vue.config.js | 3 +- 31 files changed, 1427 insertions(+), 1274 deletions(-) diff --git a/src/components/img-upload/Cropper.vue b/src/components/img-upload/Cropper.vue index 6f26d9c..b494dd6 100644 --- a/src/components/img-upload/Cropper.vue +++ b/src/components/img-upload/Cropper.vue @@ -148,6 +148,7 @@ export default { if (type === 'blob') { this.$refs.cropper.getCropBlob(data => { compress(data, 1).then(res => { + debugger that.$emit('upload', res) }) }) diff --git a/src/setting.js b/src/setting.js index e7e7ba3..687f57c 100644 --- a/src/setting.js +++ b/src/setting.js @@ -6,7 +6,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境 const isPro = url.includes('huorantech.cn') //正式服 let jumpPath = `${location.origin}/judgmentPoint` -let sandPath = `${location.origin}/sandbox` // 沙盘地址 +let sandPath = `https://izhixinyun.com/sandbox` // 沙盘地址 let host = `${location.origin}/` if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 @@ -16,7 +16,7 @@ if (isDev) { host = 'http://192.168.31.217:9000/'// 榕 // host = 'http://192.168.31.51:9000/'// 赓 } else if (isPro) { - jumpPath = 'https://www.huorantech.cn/judgmentPoint/' + jumpPath = 'https://judgment.huorantech.cn/' } diff --git a/src/utils/api.js b/src/utils/api.js index a88e23c..b430574 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -1,7 +1,6 @@ import Setting from "@/setting"; -const host = Setting.apiBaseURL -const uploadURL = Setting.uploadURL +const { uploadURL, jumpPath, apiBaseURL: host } = Setting export default { @@ -16,7 +15,7 @@ export default { // 阿里云文件/视频管理 getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证 - staffTemplate: `http://www.huorantech.cn/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板 + staffTemplate: `https://occupationlab.com/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板 checkEmailOrPhone: `occupationlab/occupationlab/architecture/checkEmailOrPhone`, // 新增学生前:校验手机号或者邮箱 checkWorkNumOrAccount: `occupationlab/occupationlab/architecture/checkWorkNumOrAccount`, // 新增/编辑学生前:校验学号或者学生账号 @@ -94,8 +93,8 @@ export default { editProjectDraft: `occupationlab/occupationlab/projectManage/editProjectDraft`, // 修改项目管理 copyProjectManage: `occupationlab/occupationlab/projectManage/copyProjectManage`, // 复制项目管理 // 判分点 - getBcJudgmentPoint: `judgment/judgment/bcJudgmentPoint/getBcJudgmentPoint`, // 获取编程类判分点列表(分页) - getLcJudgmentPoint: `judgment/judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表(分页) + getBcJudgmentPoint: `${jumpPath}judgment/judgment/bcJudgmentPoint/getBcJudgmentPoint`, // 获取编程类判分点列表(分页) + getLcJudgmentPoint: `${jumpPath}judgment/judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表(分页) addProjectJudgment: `occupationlab/occupationlab/projectJudgment/addProjectJudgment`, // 添加项目管理、判分点中间表 updateProjectJudgment: `occupationlab/occupationlab/projectJudgment/updateProjectJudgment`, // 判分点中间表批量更新 deleteProjectJudgment: `occupationlab/occupationlab/projectJudgment/deleteProjectJudgment`, // 判分点中间表批量删除 diff --git a/src/utils/editor.js b/src/utils/editor.js index 71fb9e3..b3f8ca3 100644 --- a/src/utils/editor.js +++ b/src/utils/editor.js @@ -199,93 +199,7 @@ export default { { title: 'Some class', value: 'class-name' } ], //为内容模板插件提供预置模板 - templates: [ - { title: '中文文章模板1', description: '图片文字流', content: ` -
-
-
- -

图片描述

-
-
-

S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。S³FEL为科学家和企业用户提供了一种具有超高时间分辨、空间分辨和能量分辨的新方法、新技术。 S³FEL在量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的应用研究，将为促进我国战略性新兴产业创新发展和关键。S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。S³FEL为科学家和企业用户提供了一种具有超高时间分辨、空间分辨和能量分辨的新方法、新技术。 S³FEL在量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的应用研究，将为促进我国战略性新兴产业创新发展和关键。S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。S³FEL为科学家和企业用户提供了一种具有超高时间分辨、空间分辨和能量分辨的新方法、新技术。 S³FEL在量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的应用研究，将为促进我国战略性新兴产业创新发展和关键。S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。S³FEL在量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的应用研究，将为促进我国战略性新兴产业创新发展和关键。S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。 -

-
-
-
-
- -

图片描述

-
-
-

集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，

-

S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。 S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。 S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。 S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。

-
-
-
- ` - }, - { title: '英文文章模板1', description: '图片文字流', content: ` -
-
-
- -

Picture description

-
-
-

One of the major barriers to treating pain effectively is rooted in providers’ fear of killing their patients. This includes caregivers who may be family or friends. In a 2014 study I led of nonprofessional hospice caregivers, we found that the majority of pain medication errors caregivers made involved administering less than the prescribed dose, which makes it difficult for patients to achieve optimal pain relief.

-

Meanwhile, more than 11 million Americans – often family members or friends – provide unpaid care for people with Alzheimer's or other dementias, according to calculations by the Alzheimer’s Association. In 2021, caregivers for people with Alzheimer’s or other dementias provided an estimated 16 billion hours of unpaid care valued at nearly $272 billion.My father took her to the emergency room. A doctor found a severe knee infection and took her into surgery. She was hospitalized for two weeks, followed by two months of rehabilitation at a skilled nursing facility.

-

If you heated the salt on your kitchen table up to 801 C (1,474 F), it would melt, and you’d have molten salt. However, for making and storing energy, not just any salt will do. Scientists are exploring different combinations of salts to get the exact properties needed to cool and fuel a nuclear power reactor efficiently for decades. These properties include lower melting temperatures, the right consistency, and the ability to absorb high amounts of heat, among others.

-
“We used experimental results to validate our simulation. At the same time, the simulation results provided us more details about which salts to study further. They work with each other.” — Jicheng Guo, chemical engineer at Argonne National Laboratory
-

Which molten salt blueprints will deliver the desired traits for a nuclear reactor? The potential variations are nearly endless. The study set out to determine whether computer simulations driven by machine learning could guide and refine real-world experiments at the Advanced Photon Source (APS), a DOE Office of Science user facility at Argonne. The results were recently published in the journal Physical Review B.

-

“We used experimental results from the APS to validate our simulation. At the same time, the simulation results provided us more details about which salts to study further. They work with each other,” said Jicheng Guo, a chemical engineer at Argonne and the paper’s lead author. “This allows us to study multiple compositions at the same time.”

-
-
-
- ` - }, - { title: '新闻模板', description: '', content: ` -
-
-
- -

图片描述

-
-
-

S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。 S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。 S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。 S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。

-
- Here is a long quotation here is a long quotation here is a long quotation - here is a long quotation here is a long quotation here is a long quotation - here is a long quotation here is a long quotation here is a long quotation. -
-
-
-
-
- -

图片描述

-
-
-
小标题
-

S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。S³FEL为科学家和企业用户提供了一种具有超高时间分辨、空间分辨和能量分辨的新方法、新技术。 S³FEL在量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的应用研究，将为促进我国战略性新兴产业创新发展和关键。S³FEL主要由一台超导直线加速器、波荡器、光束线和实验站组成，可产生重复频率达1MHz、电子束能量达2.5 GeV的软X 射线自由电子激光，可在百飞秒内级实现原子、分子及外壳层电子结构的无损、动态监测，是科学家认识和了解物质微观结构及动态变化的“高速摄像机”。S³FEL为科学家和企业用户提供了一种具有超高时间分辨、空间分辨和能量分辨的新方法、新技术。 S³FEL在量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的应用研究，将为促进我国战略性新兴产业创新发展和关键。 -

-
-
-
- ` - }, - { title: '图片描述', description: '', content: ` -
-
-
- -

图片描述

-
-
-
- ` - } - ], + templates: [], // content_security_policy: "https://cdn.tiny.cloud/1/rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda/tinymce/6/tinymce.min.js", // extended_valid_elements:'script[src]', // diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue index a8e6d3d..e3609a5 100644 --- a/src/views/course/AddCurriculum.vue +++ b/src/views/course/AddCurriculum.vue @@ -1042,7 +1042,8 @@ export default { !fromBack ? this.$confirm("课程创建成功，是否马上进行课程内容设置？", "提示", { type: "success", confirmButtonText: "马上设置", - cancelButtonText: "稍后操作" + cancelButtonText: "稍后操作", + closeOnClickModal: false }).then(() => { this.$router.push(`/contentSettings?cid=${res.cid}`); }).catch(() => { @@ -1064,7 +1065,8 @@ export default { // 更改了信息才需要提示 if ((id && updateTime > 2) || (!id && updateTime)) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.saveAdd(1) }).catch(() => { diff --git a/src/views/course/contentSettings.vue b/src/views/course/contentSettings.vue index 3053163..59e83ec 100644 --- a/src/views/course/contentSettings.vue +++ b/src/views/course/contentSettings.vue @@ -462,7 +462,8 @@ export default { // 已经移动了顺序 if (this.moved) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.saveSort() this.moved = false diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue index f4bdbea..11dc1d4 100644 --- a/src/views/customer/AddCustomer.vue +++ b/src/views/customer/AddCustomer.vue @@ -1331,7 +1331,8 @@ export default { // 更改了信息才需要提示 if ((id && updateTime > 1) || (!id && updateTime)) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.saveAdd(i) }).catch(() => { diff --git a/src/views/information/addArticle/index.vue b/src/views/information/addArticle/index.vue index cd020e7..76f212e 100644 --- a/src/views/information/addArticle/index.vue +++ b/src/views/information/addArticle/index.vue @@ -204,7 +204,8 @@ export default { }, goback () { this.$confirm("确定返回？未更新的信息将不会保存。", "提示", { - type: "warning" + type: "warning", + closeOnClickModal: false }) .then(() => { this.back(); diff --git a/src/views/information/columnManage/index.vue b/src/views/information/columnManage/index.vue index 50ea477..0a059ff 100644 --- a/src/views/information/columnManage/index.vue +++ b/src/views/information/columnManage/index.vue @@ -1,220 +1,257 @@ @@ -242,7 +279,7 @@ export default { &:first-child { padding-left: 23.5vw; - @media(max-width: 1270px) { + @media (max-width: 1270px) { padding-left: 25.5%; } } @@ -257,14 +294,14 @@ export default { /deep/ .el-tree { .el-tree-node__expand-icon { margin-left: 22.5vw; - @media(max-width: 1270px) { + @media (max-width: 1270px) { margin-left: 23.5%; } } .el-tree-node__content { padding: 5px; - border-bottom: 0.0625rem solid #EBEEF5; + border-bottom: 0.0625rem solid #ebeef5; } } @@ -283,7 +320,7 @@ export default { .action { width: 8.5vw; text-align: left; - @media(max-width: 1270px) { + @media (max-width: 1270px) { width: 16%; } } diff --git a/src/views/information/contentManage/index.vue b/src/views/information/contentManage/index.vue index c9352f1..d151c1a 100644 --- a/src/views/information/contentManage/index.vue +++ b/src/views/information/contentManage/index.vue @@ -2,10 +2,19 @@
- +
- +
@@ -15,92 +24,93 @@ import menuTree from '@/components/menuTree' import ContentList from "./contentList"; import Setting from '@/setting' export default { - name: "contentManage", - components: { - menuTree, - ContentList - }, - data() { - return { - menuList: [], - activeName: this.$store.state.columnId, - columnId: "", - ids: [], - curId: '' - }; - }, - mounted() { - this.getMenuData(); - }, - methods: { - getMenuData() { - this.$get(this.api.queryAllColumns, { - school: 0 - }).then(res => { - this.menuList = res.columnTree - const storeId = this.$store.state.columnId - if (this.menuList.length) { - this.getId(this.menuList) - this.columnId = this.menuList[0].id - if (!storeId) { - this.$store.commit('setColumnId', this.columnId) - } else { - this.columnId = storeId - } - } - this.$nextTick(() => { - this.$refs.column.setCurrentKey(this.columnId) - }) - }).catch(err => { - }); - }, - // 递归获取所有栏目id，以方便全部展开 - getId(data) { - data.map(e => { - this.ids.push(e.id) - e.children.length && this.getId(e.children) - }) - }, - setColumnId(id) { - this.columnId = id - this.$store.commit('setColumnId', id) - }, - handleSelect(key) { - const { content } = this.$refs - const { list, originList } = content - // 更改了信息才需要提示 - if (JSON.stringify(list) !== JSON.stringify(originList)) { - this.$confirm(`您已更改了文章排序，是否保存更改？`, '提示', { - type: 'warning' - }).then(() => { - content.sortSubmit() - this.setColumnId(key.id) - }).catch(() => { - this.setColumnId(key.id) - }) + name: "contentManage", + components: { + menuTree, + ContentList + }, + data () { + return { + menuList: [], + activeName: this.$store.state.columnId, + columnId: "", + ids: [], + curId: '' + }; + }, + mounted () { + this.getMenuData(); + }, + methods: { + getMenuData () { + this.$get(this.api.queryAllColumns, { + school: 0 + }).then(res => { + this.menuList = res.columnTree + const storeId = this.$store.state.columnId + if (this.menuList.length) { + this.getId(this.menuList) + this.columnId = this.menuList[0].id + if (!storeId) { + this.$store.commit('setColumnId', this.columnId) } else { - this.setColumnId(key.id) + this.columnId = storeId } } + this.$nextTick(() => { + this.$refs.column.setCurrentKey(this.columnId) + }) + }).catch(err => { + }); + }, + // 递归获取所有栏目id，以方便全部展开 + getId (data) { + data.map(e => { + this.ids.push(e.id) + e.children.length && this.getId(e.children) + }) + }, + setColumnId (id) { + this.columnId = id + this.$store.commit('setColumnId', id) + }, + handleSelect (key) { + const { content } = this.$refs + const { list, originList } = content + // 更改了信息才需要提示 + if (JSON.stringify(list) !== JSON.stringify(originList)) { + this.$confirm(`您已更改了文章排序，是否保存更改？`, '提示', { + type: 'warning', + closeOnClickModal: false + }).then(() => { + content.sortSubmit() + this.setColumnId(key.id) + }).catch(() => { + this.setColumnId(key.id) + }) + } else { + this.setColumnId(key.id) + } } + } }; \ No newline at end of file diff --git a/src/views/information/list/index.vue b/src/views/information/list/index.vue index 473149b..fb8b05a 100644 --- a/src/views/information/list/index.vue +++ b/src/views/information/list/index.vue @@ -1,90 +1,98 @@ \ No newline at end of file diff --git a/src/views/match/add/index.vue b/src/views/match/add/index.vue index 2796fae..29f64d5 100644 --- a/src/views/match/add/index.vue +++ b/src/views/match/add/index.vue @@ -165,7 +165,8 @@ export default { const { updateTime } = this.$refs['step' + this.step] if (updateTime) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.save(0, 1) }).catch(() => { @@ -208,7 +209,8 @@ export default { const { updateTime } = this.$refs['step' + this.step] if (this.step < 4 && updateTime) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.save(0, 3) }).catch(() => { @@ -226,7 +228,8 @@ export default { const { updateTime } = this.$refs['step' + this.step] if (this.step < 4 && updateTime) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.save(0) }).catch(() => { diff --git a/src/views/match/add/step1.vue b/src/views/match/add/step1.vue index bc5ea2d..11cbca4 100644 --- a/src/views/match/add/step1.vue +++ b/src/views/match/add/step1.vue @@ -679,7 +679,7 @@ export default { this.$parent.showLoad() delete form.publishStatus if (status === 1) form.publishStatus = 1 - form.ztOpen = status ? 0 : 1 // 保存则禁用，发布则启用 + form.ztOpen = form.id ? form.ztOpen : (status ? 0 : 1) // 保存则禁用，发布则启用 form.releaseType = releaseType form.id = this.$route.query.id if (form.id) { diff --git a/src/views/match/manage/index.vue b/src/views/match/manage/index.vue index 3c8e24d..74d8d6c 100644 --- a/src/views/match/manage/index.vue +++ b/src/views/match/manage/index.vue @@ -91,7 +91,8 @@ export default { const step = detail.$refs['step' + detail.step] if (detail.step < 4 && step && step.updateTime) { this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { detail.save(1, 1) this.backOrTab(i) diff --git a/src/views/match/manage/matchProgress.vue b/src/views/match/manage/matchProgress.vue index 033dc2e..9a2ea9c 100644 --- a/src/views/match/manage/matchProgress.vue +++ b/src/views/match/manage/matchProgress.vue @@ -1,223 +1,260 @@ diff --git a/src/views/match/manage/matchRank.vue b/src/views/match/manage/matchRank.vue index f85d697..3154ffe 100644 --- a/src/views/match/manage/matchRank.vue +++ b/src/views/match/manage/matchRank.vue @@ -605,7 +605,8 @@ export default { this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => { whetherToPublish ? this.$confirm('排名已经发布，是否直接覆盖？', '提示', { - type: 'success' + type: 'success', + closeOnClickModal: false }).then(() => { this.publishSubmit() }).catch(() => { }) : diff --git a/src/views/match/manage/notice.vue b/src/views/match/manage/notice.vue index ba4ac06..cd09a52 100644 --- a/src/views/match/manage/notice.vue +++ b/src/views/match/manage/notice.vue @@ -1,48 +1,74 @@ \ No newline at end of file diff --git a/src/views/parnerOperation/learnMg.vue b/src/views/parnerOperation/learnMg.vue index 6e1ada6..f3dc136 100644 --- a/src/views/parnerOperation/learnMg.vue +++ b/src/views/parnerOperation/learnMg.vue @@ -376,11 +376,11 @@ export default { // 更改了信息才需要提示 if (this.updateTime) { this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.submit(this.form.isRelease, next) }).catch(() => { - console.log(55) next() }) } else { @@ -473,7 +473,8 @@ export default { const list = this.classifications if (list.find(e => e.edit && e.classificationName)) { this.$confirm('所填写内容暂未保存，是否保存？', '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { list.map(e => { e.edit && e.classificationName && this.submitClass(e, 0) @@ -548,7 +549,8 @@ export default { const list = this.labels if (list.find(e => e.edit && e.labelName)) { this.$confirm('所填写内容暂未保存，是否保存？', '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { list.map(e => { e.edit && e.labelName && this.submitLabel(e, 0) @@ -664,7 +666,8 @@ export default { // 更改了信息才需要提示 if (this.updateTime) { this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.submit(this.form.isRelease) }).catch(() => { diff --git a/src/views/parnerOperation/schemeSet.vue b/src/views/parnerOperation/schemeSet.vue index e6470ec..46a2d68 100644 --- a/src/views/parnerOperation/schemeSet.vue +++ b/src/views/parnerOperation/schemeSet.vue @@ -355,7 +355,8 @@ export default { // 更改了信息才需要提示 if (this.updateTime) { this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.submit(this.form.isRelease, next) }).catch(() => { @@ -450,7 +451,8 @@ export default { const list = this.classifications if (list.find(e => e.edit && e.classificationName)) { this.$confirm('所填写内容暂未保存，是否保存？', '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { list.map(e => { e.edit && e.classificationName && this.submitClass(e, 0) @@ -578,7 +580,8 @@ export default { // 更改了信息才需要提示 if (this.updateTime) { this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.submit(this.form.isRelease) }).catch(() => { diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue index b265bd9..52b7242 100644 --- a/src/views/serve/Configure.vue +++ b/src/views/serve/Configure.vue @@ -99,7 +99,7 @@ diff --git a/src/views/serve/addModel.vue b/src/views/serve/addModel.vue index 7e7ffaf..bb9e509 100644 --- a/src/views/serve/addModel.vue +++ b/src/views/serve/addModel.vue @@ -194,7 +194,8 @@ export default { // 更改了信息才需要提示 if ((id && updateTime > 1) || (!id && updateTime)) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { - type: 'warning' + type: 'warning', + closeOnClickModal: false }).then(() => { this.submit(this.postStatus ? 1 : 0, 1) this.backPage() diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue index d9ac71b..a372687 100644 --- a/src/views/serve/projectAdd.vue +++ b/src/views/serve/projectAdd.vue @@ -870,7 +870,8 @@ export default { // 更改了信息才需要提示 if (this.updateTime) { this.$confirm('编辑的内容未保存，是否保存？', "提示", { - type: "warning" + type: "warning", + closeOnClickModal: false }).then(() => { this.handleSubmit(this.projectManage.state) }).catch(() => { diff --git a/src/views/setting/index.vue b/src/views/setting/index.vue index 8d9ec1e..dfd80bb 100644 --- a/src/views/setting/index.vue +++ b/src/views/setting/index.vue @@ -1,121 +1,132 @@