bug修复

src/api/index.js

@@ -131,6 +131,7 @@ export default {
     addAnnouncement: `occupationlab/contest/announcement/addAnnouncement`,
     amendmentAnnouncement: `occupationlab/contest/announcement/amendmentAnnouncement`,
     deleteAnnouncement: `occupationlab/contest/announcement/deleteAnnouncement`,
+    disableAnnouncement: `occupationlab/contest/announcement/disableAnnouncement`,
     queryAnnouncementByContestId: `occupationlab/contest/announcement/queryAnnouncementByContestId`,
     queryAnnouncementDetails: `occupationlab/contest/announcement/queryAnnouncementDetails`,
     deleteAnnouncementAnnex: `occupationlab/contestAnnouncementAnnex/delete`,

src/pages/match/add/index.vue

@@ -119,7 +119,6 @@
                       :on-error="uploadError"
                       :before-upload="beforeUpload"
                       :on-success="uploadAnnexSuccess"
-                      :before-remove="beforeRemove"
                       :limit="5"
                       :on-exceed="handleExceedAnnex"
                       :action="this.api.fileupload"
@@ -375,7 +374,14 @@ export default {
       },
       // 附件上传前
       beforeUpload(file) {
-        this.fileName = file.name
+        const isLt2M = file.size / 1024 / 1024 < 10
+        if (!isLt2M) util.warningMsg('请上传小于10MB的附件！')
+        if (isLt2M) {
+          this.fileName = file.name
+          return true
+        } else {
+          return false
+        }
       },
       uploadError(err, file, fileList) {
         this.$message({

src/pages/match/list/index.vue

@@ -99,6 +99,7 @@
 
 <script>
 import util from "@/libs/util";
+import Setting from "@/setting";
 
 export default {
     name: "match",
@@ -186,32 +187,37 @@ export default {
         })
     },
     methods: {
-        getData() {
+        getList() {
           const { form } = this
-          // this.timer = setInterval(() => {
+          this.$post(this.api.contestPageConditionQueryByOccupationlab, {
-            this.$post(this.api.contestPageConditionQueryByOccupationlab, {
+            pageNum: this.page,
-              pageNum: this.page,
+            pageSize: this.pageSize,
-              pageSize: this.pageSize,
+            competitionScope: 0, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
-              competitionScope: 0, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+            endTime: form.endTime || null,
-              endTime: form.endTime || null,
+            keyWord: this.keyword || null,
-              keyWord: this.keyword || null,
+            platformSource: 1, // 大赛来源(0中台，1职站)
-              platformSource: 1, // 大赛来源(0中台，1职站)
+            startTime: form.startTime || null,
-              startTime: form.startTime || null,
+            publishStatus: form.publishStatus === '' ? null : form.publishStatus
-              publishStatus: form.publishStatus
+          }).then(({ data }) => {
-            }).then(({ data }) => {
+            const { records } = data
-              const { records } = data
+            records.map(e => {
-              records.map(e => {
+              if (e.ztOpen) e.isOpen = 1
-                if (e.ztOpen) e.isOpen = 1
+            })
-              })
+            this.matchData = records
-              this.matchData = records
+            this.total = data.total
-              this.total = data.total
+            this.$refs.table.clearSelection()
-              this.$refs.table.clearSelection()
+            if (!this.matchData.length && this.total) {
-              if (!this.matchData.length && this.total) {
+              this.page--
-                this.page--
+              this.getData()
-                this.getData()
+            }
-              }
+          }).catch(res => {})
-            }).catch(res => {})
+        },
-          // }, 1000)
+        getData() {
+          this.getList()
+          if (!Setting.isDev) {
+            clearInterval(this.timer)
+            this.timer = setInterval(this.getList, 1000)
+          }
         },
         initData() {
             this.page = 1;

src/pages/match/manage/index.vue

@@ -3,7 +3,7 @@
     <div>
         <el-card shadow="hover" class="m-b-20">
             <div class="flex-between">
-                <el-page-header @back="back" :content="'赛事管理'"></el-page-header>
+                <el-page-header @back="back" :content="name + '/管理'"></el-page-header>
             </div>
         </el-card>
         <div class="page" style="margin-bottom: 24px">
@@ -32,6 +32,7 @@ export default {
     name: "matchManage",
     data() {
         return {
+            name: '',
             active: this.$route.query.tab || "first",
             tabs: {
                 first: "大赛详情",

src/pages/match/manage/matchDetail.vue

@@ -112,7 +112,6 @@
                       :on-error="uploadError"
                       :before-upload="beforeUpload"
                       :on-success="uploadAnnexSuccess"
-                      :before-remove="beforeRemove"
                       :limit="5"
                       :on-exceed="handleExceedAnnex"
                       :action="this.api.fileupload"
@@ -296,6 +295,7 @@ export default {
     methods: {
       getData() {
         this.$post(`${this.api.getContest}?contestId=${this.form.id}`).then(({ contest }) => {
+          this.$parent.name = contest.name
           this.signupTime = [contest.signUpStartTime, contest.signUpEndTime]
           this.playTime = [contest.playStartTime, contest.playEndTime]
           this.sponsorList = contest.sponsor.split(",")
@@ -333,7 +333,7 @@ export default {
           if (rangeName) {
             const range = []
             rangeName.map(e => {
-              range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName)
+              range.push(e.type ? (e.cityName || e.provinceName) : e.schoolName)
             })
             this.rangeName = range.join('，')
           }
@@ -413,7 +413,14 @@ export default {
       },
       // 附件上传前
       beforeUpload(file) {
-        this.fileName = file.name
+        const isLt2M = file.size / 1024 / 1024 < 10
+        if (!isLt2M) util.warningMsg('请上传小于10MB的附件！')
+        if (isLt2M) {
+          this.fileName = file.name
+          return true
+        } else {
+          return false
+        }
       },
       uploadError(err, file, fileList) {
         this.$message({

src/pages/match/manage/notice.vue

@@ -102,7 +102,7 @@ export default {
                 });
         },
         switchOff(val, row, index) {
-            this.$put(`${this.api.disableApplicant}/${row.id}/${val}`)
+            this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`)
                 .then(res => {
                 })
                 .catch(err => {

src/pages/student/list/index.vue

@@ -274,6 +274,7 @@ export default {
                 value: "id",
                 lazy: true,
                 lazyLoad(node, resolve) {
+                  console.log(55, that.cascaderValue)
                     let level = 1;
                     let parentId = "";
                     if (node.data && node.data.level && node.data.id) {

src/setting.js

@@ -32,8 +32,8 @@ if (isHh) {
 } else if (isDev) {
     jumpPath = "http://192.168.31.125:8087/";
     bankPath = `http://192.168.31.125:8093`
-    // host = "http://121.37.12.51:9000/"; // 中台测试服
+    host = "http://121.37.12.51:9000/"; // 中台测试服
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = 'http://192.168.31.137:9000/'; // 赓
 }