From bda8932ff025ab461109c0b11b715f27ad5b8135 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 21 Nov 2023 10:22:23 +0800
Subject: [PATCH] fix

---
 package-lock.json                 | 13 +++++++
 package.json                      |  2 +
 src/pages/match/details/index.vue | 64 +++++++++++++++++++++++++------
 src/pages/match/list/index.vue    | 15 +++++---
 vue.config.js                     |  1 +
 5 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c682b92..590a685 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1228,6 +1228,14 @@
         }
       }
     },
+    "@tinymce/tinymce-vue": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-5.1.1.tgz",
+      "integrity": "sha512-iO57HOWesFOhsaqjA5Ea6sDvQBmJJH3/dq00Uvg7metlct2kLF+ctRgoDsetLt6gmeZ7COPftr814/XzqnJ/dg==",
+      "requires": {
+        "tinymce": "^6.0.0 || ^5.5.1"
+      }
+    },
     "@types/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
@@ -14075,6 +14083,11 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
+    "tinymce": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.3.tgz",
+      "integrity": "sha512-J7WmYIi/gt1RvZ6Ap2oQiUjzAoiS9pfV+d4GnKuZuPu8agmlAEAInNmMvMjfCNBzHv4JnZXY7qlHUAI0IuYQVA=="
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
diff --git a/package.json b/package.json
index 8163e32..a55f15c 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
+    "@tinymce/tinymce-vue": "^5.1.1",
     "ali-oss": "^6.18.1",
     "axios": "^0.26.1",
     "babel-polyfill": "^6.26.0",
@@ -19,6 +20,7 @@
     "js-cookie": "^2.2.1",
     "jspdf": "^2.5.1",
     "mavon-editor": "^2.10.4",
+    "tinymce": "^6.7.3",
     "vue": "^2.7.10",
     "vue-cropperjs": "^3.0.0",
     "vue-i18n": "^8.27.2",
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 2f95792..176b05c 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -74,7 +74,7 @@
             <template v-if="form.releaseType">
               <div class="l-title"><img src="@/assets/img/label.png"
                      alt=""> 赛程、规则与内容</div>
-              <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
+              <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段<template v-if="info.teamLimit">，同一个团队每个成员只能参加一个阶段赛项</template></h6>
               <div v-for="(rule, i) in form.competitionStage"
                    :key="i"
                    class="rule">
@@ -617,16 +617,15 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="阶段赛名称"
+    <el-dialog :title="curStage ? curStage.stageName : ''"
                :visible.sync="stageVisible"
                :close-on-click-modal="false"
                width="600px"
                @close="stageClose">
       <template v-if="curStage && curStage.competitionStageContentSetting">
-        <div>
+        <div v-if="curStage.competitionStageContentSetting.systemLink">
           <span class="fs-14">进入比赛：</span>
-          <el-button v-if="curStage.competitionStageContentSetting.systemLink"
-                     type="danger"
+          <el-button type="danger"
                      style="font-size: 13px"
                      @click="toOffline">进入{{ curStage.stageName }}</el-button>
         </div>
@@ -643,7 +642,7 @@
             </div>
           </div>
         </div>
-
+        <!-- :http-request="handleRequest" -->
         <div class="flex m-b-20">
           <span class="fs-14">文件上传：</span>
           <el-upload :before-upload="beforeUpload"
@@ -658,13 +657,14 @@
                      :file-list="fileList"
                      name="file">
             <el-button size="small"
-                       type="primary">上传文件</el-button>
+                       type="primary"
+                       :disabled="!!(fileList && fileList.length)">{{ fileList && fileList.length ? '已上传' : '上传文件' }}</el-button>
             <div slot="tip"
                  class="el-upload__tip">
 
-              <el-progress v-if="showProgress"
+              <!-- <el-progress v-if="showProgress"
                            :stroke-width="3"
-                           :percentage="progressPercent"></el-progress>
+                           :percentage="progressPercent"></el-progress> -->
               <p>请上传大小1G以内的文件，支持常见文件格式。</p>
               <p>只允许上传一个文件，如有多个文件则需打包再上传。</p>
             </div>
@@ -689,6 +689,7 @@ import util from '@/libs/util'
 import Setting from "@/setting"
 import Const from '@/const/match'
 import axios from 'axios'
+import OSS from 'ali-oss'
 export default {
   name: 'matchdetail',
   data () {
@@ -922,7 +923,6 @@ export default {
               const e = stages[i]
               const startTime = new Date(e.startTime)
               const endTime = new Date(e.endTime)
-              console.log("🚀 ~ file: index.vue:901 ~ //this.timer=setInterval ~ form.competitionRegistration:", stages, startTime, endTime, now >= startTime && now <= endTime)
               if (now < startTime) { // 阶段比赛未开始，不显示进入比赛按钮
                 endText = '阶段开始'
                 total = startTime - now
@@ -942,7 +942,6 @@ export default {
                   // 当系统链接不为空，且上传文件为否时，点击入口，直接跳转到链接页面，无需弹窗
                   // 当上传文件为是时，点击入口需弹窗，共两种样式
                   this.statusList[4] = '进入' + e.stageName
-                  console.log("🚀 ~ file: index.vue:924 ~ //this.timer=setInterval ~ e:", e, this.playingStages)
                   curStage = e
                 }
                 endText = '阶段结束'
@@ -1456,6 +1455,7 @@ export default {
     },
     // 删除文件表里的文件
     handleRemove () {
+      this.fileList = []
       this.curFileId && this.$post(this.api.cCompetitionStageFileDel, [this.curFileId]).then(res => {
         this.curFileId = ''
       }).catch(res => { })
@@ -1464,6 +1464,10 @@ export default {
       const result = res.filesResult
       // 有上传记录，则删除上次的文件
       this.handleRemove()
+      this.fileList = [{
+        name: result.originalFileName,
+        url: result.fileUrl
+      }]
       this.$post(this.api.cCompetitionStageFileSave, {
         competitionId: this.id,
         fileFormat: result.fileType,
@@ -1478,6 +1482,44 @@ export default {
         util.successMsg(`上传成功！`);
       }).catch(res => { })
     },
+    progress (p, _checkpoint) {
+      // Object的上传进度。
+      console.log(p);
+      // 分片上传的断点信息。
+      console.log(_checkpoint);
+    },
+    // 自定义上传
+    async handleRequest (options) {
+      const { file } = options
+      const headers = {
+        // 指定Object的存储类型。
+        'x-oss-storage-class': 'Standard',
+        // 指定Object的访问权限。
+        // 'x-oss-object-acl': 'private',
+        // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.txt。
+        // 'Content-Disposition': 'attachment; filename="example.txt"',
+        // 设置Object的标签，可同时设置多个标签。
+        'x-oss-tagging': 'Tag1=1&Tag2=2',
+        // 指定PutObject操作时是否覆盖同名目标Object。此处设置为true，表示禁止覆盖同名Object。
+        'x-oss-forbid-overwrite': 'true',
+      };
+      const client = new OSS({
+        region: 'oss-cn-shenzhen',
+        accessKeyId: 'LTAI4FzqQHnk4rozqLZ8jCNj',
+        accessKeySecret: 'mveW7B1OyFoKUkHm8WsxmrjHmkJWHq',
+        bucket: 'huoran'
+      })
+      const res = await client.multipartUpload(file.name, file, {
+        progress: this.progress,
+        // headers,
+        // 指定meta参数，自定义Object的元信息。通过head接口可以获取到Object的meta数据。
+        meta: {
+          year: 2020,
+          people: 'test',
+        }
+      })
+      console.log("🚀 ~ file: index.vue:1505 ~ handleRequest ~ res:", res)
+    },
     // 提交阶段内容
     stageSubmit () {
       if (this.submiting) return false
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index caff19c..fb76add 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -264,16 +264,15 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="阶段赛名称"
+    <el-dialog :title="curStageItem.stageName"
                :visible.sync="stageVisible"
                :close-on-click-modal="false"
                width="600px"
                @close="stageClose">
       <template v-if="curStageItem && curStageItem.competitionStageContentSetting">
-        <div>
+        <div v-if="curStageItem.competitionStageContentSetting.systemLink">
           <span class="fs-14">进入比赛：</span>
-          <el-button v-if="curStageItem.competitionStageContentSetting.systemLink"
-                     type="danger"
+          <el-button type="danger"
                      style="font-size: 13px"
                      @click="toOffline">进入{{ curStageItem.stageName }}</el-button>
         </div>
@@ -305,7 +304,8 @@
                      :file-list="fileList"
                      name="file">
             <el-button size="small"
-                       type="primary">上传文件</el-button>
+                       type="primary"
+                       :disabled="fileList && fileList.length">{{ fileList && fileList.length ? '已上传' : '上传文件' }}</el-button>
             <div slot="tip"
                  class="el-upload__tip">
               <p>请上传大小1G以内的文件，支持常见文件格式。</p>
@@ -778,6 +778,7 @@ export default {
     },
     // 删除文件表里的文件
     handleRemove () {
+      this.fileList = []
       this.curFileId && this.$post(this.api.cCompetitionStageFileDel, [this.curFileId]).then(res => {
         this.curFileId = ''
       }).catch(res => { })
@@ -786,6 +787,10 @@ export default {
       const result = res.filesResult
       // 有上传记录，则删除上次的文件
       this.handleRemove()
+      this.fileList = [{
+        name: result.originalFileName,
+        url: result.fileUrl
+      }]
       this.$post(this.api.cCompetitionStageFileSave, {
         competitionId: this.curItem.id,
         fileFormat: result.fileType,
diff --git a/vue.config.js b/vue.config.js
index 824ccda..88feeb3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,6 +13,7 @@ module.exports = {
     outputDir: Setting.outputDir,
     assetsDir: Setting.assetsDir,
     devServer: {
+			disableHostCheck: true,
       // client: {
       //   webSocketURL: 'ws://0.0.0.0:8082/notice',
       // },