fix

src/setting.js

@@ -12,7 +12,7 @@ if (isDev) {
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
   // host = 'http://192.168.31.151:9000/'// 榕
-  // host = 'http://192.168.31.116:9000/'// 赓
+  host = 'http://192.168.31.116:9000/'// 赓
 } else if (isPro) {
   jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
 }

src/utils/api.js

@@ -1,7 +1,6 @@
 import Setting from "@/setting";
 
 const host = Setting.apiBaseURL
-const host1 = 'http://121.37.12.51/'
 const uploadURL = Setting.uploadURL
 
 export default {
@@ -370,26 +369,26 @@ export default {
     performanceExportFailure: `${host}competition/competition/performance/exportFailure`,
     rankExportFailure: `${host}competition/competition/rank/exportFailure`,
     batchImportRanking: `${host}competition/competition/rank/batchImportRanking`,
-    stageGradeManagementList: `${host1}competition/competition/performance/stageGradeManagementList`,
-    stageRaceRanking: `${host1}competition/competition/rank/stageRaceRanking`,
-    overallStandingsInThePointsRace: `${host1}competition/competition/rank/overallStandingsInThePointsRace`,
-    publishRanking: `${host1}competition/competition/rank/publishRanking`,
-    stageTeamScoreDetails: `${host1}competition/competition/rank/stageTeamScoreDetails`,
-    multipleStageTeamScoreDetails: `${host1}competition/competition/rank/multipleStageTeamScoreDetails`,
-    detailsOfTotalTeamScores: `${host1}competition/competition/rank/detailsOfTotalTeamScores`,
-    cancelRanking: `${host1}competition/competition/rank/cancelRanking`,
-    reportDetail: `${host1}occupationlab/occupationlab/achievement/reportDetail`,
-    deleteLastPublication: `${host1}competition/competition/rank/deleteLastPublication`,
-    whetherToPublish: `${host1}competition/competition/rank/whetherToPublish`,
-    manuallyRankTheUploadList: `${host1}competition/competition/rank/manuallyRankTheUploadList`,
-    queryPublicationSource: `${host1}competition/competition/rank/queryPublicationSource`,
-    releaseVerification: `${host1}competition/competition/rank/releaseVerification`,
-    totalRankingScoreDetails: `${host1}competition/competition/rank/totalRankingScoreDetails`,
-    batchRelease: `${host1}competition/competition/rank/batchRelease`,
-    manuallyUploadedRankings: `${host1}competition/competition/rank/manuallyUploadedRankings`,
-    toggleTheSortingMode: `${host1}competition/competition/rank/toggleTheSortingMode`,
-    selectTheLastSortStatus: `${host1}competition/competition/rank/selectTheLastSortStatus`,
-    cancelImport: `${host1}competition/competition/rank/cancelImport`,
+    stageGradeManagementList: `competition/competition/performance/stageGradeManagementList`,
+    stageRaceRanking: `competition/competition/rank/stageRaceRanking`,
+    overallStandingsInThePointsRace: `competition/competition/rank/overallStandingsInThePointsRace`,
+    publishRanking: `competition/competition/rank/publishRanking`,
+    stageTeamScoreDetails: `competition/competition/rank/stageTeamScoreDetails`,
+    multipleStageTeamScoreDetails: `competition/competition/rank/multipleStageTeamScoreDetails`,
+    detailsOfTotalTeamScores: `competition/competition/rank/detailsOfTotalTeamScores`,
+    cancelRanking: `competition/competition/rank/cancelRanking`,
+    reportDetail: `occupationlab/occupationlab/achievement/reportDetail`,
+    deleteLastPublication: `competition/competition/rank/deleteLastPublication`,
+    whetherToPublish: `competition/competition/rank/whetherToPublish`,
+    manuallyRankTheUploadList: `competition/competition/rank/manuallyRankTheUploadList`,
+    queryPublicationSource: `competition/competition/rank/queryPublicationSource`,
+    releaseVerification: `competition/competition/rank/releaseVerification`,
+    totalRankingScoreDetails: `competition/competition/rank/totalRankingScoreDetails`,
+    batchRelease: `competition/competition/rank/batchRelease`,
+    manuallyUploadedRankings: `competition/competition/rank/manuallyUploadedRankings`,
+    toggleTheSortingMode: `competition/competition/rank/toggleTheSortingMode`,
+    selectTheLastSortStatus: `competition/competition/rank/selectTheLastSortStatus`,
+    cancelImport: `competition/competition/rank/cancelImport`,
     gradeImport: `http://121.37.12.51/template/赛事成绩导入模板.xlsx`,
     rankImportTeam: `http://121.37.12.51/template/赛事排名导入模板(团队赛).xlsx`,
     rankImportPerson: `http://121.37.12.51/template/赛事排名导入模板(个人赛).xlsx`,

src/views/Login.vue

@@ -100,6 +100,7 @@
 <script>
 import vFooter from '../components/Footer'
 import Setting from '@/setting'
+import addRoutes from '@/libs/route/addRoutes'
 export default {
     data: function() {
         var regPhoneOrEmail = (rule, value, callback) => {// 验证手机或邮箱
@@ -199,6 +200,7 @@ export default {
                         sessionStorage.setItem('token',res.data.token)
                         this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
                           const list = res.permissionMenu
+                          addRoutes(res.permissionMenu[0].children)
                           this.$store.commit('setDataPer', res.dataPermissionList)
                           this.$message.success(message);
                           this.$router.push({

src/views/course/AddCurriculum.vue

@@ -313,7 +313,7 @@
                             </el-table-column>
                             <el-table-column label="操作" align="center" width="100">
                                 <template slot-scope="scope">
-                                    <el-button :disabled="scope.row.disabled" @click.native.prevent="handleDelete(scope.$index, assessmentData)">移除</el-button>
+                                    <el-button :disabled="scope.row.disabled" @click.native.prevent="handleDelete(scope.$index, matches)">移除</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>

src/views/join/index.vue

@@ -7,7 +7,7 @@
           <img src="@/assets/img/house.png" alt="">
         </div>
         <p class="text" style="font-size: 16px">城市合伙人计划</p>
-        <p class="text">{{ teamName ? ('加入' + teamName) : '加入并自动为你创建一个团队群组' }}</p>
+        <p class="text">{{ teamName ? (teamName + '邀请你加入他的团队') : '加入并自动为你创建一个团队群组' }}</p>
       </div>
       <div class="inner">
         <el-form class="form" ref="form" :model="form" :rules="rules">

src/views/match/add/set.vue

@@ -191,9 +191,11 @@ export default {
       },
       // 自定义项目
       toProject() {
+        const { form, curStep } = this.$parent
+        form[curStep] = this.form
         this.$store.commit('setCompetitionCache', {
-          form: this.form,
-          curStep: this.$parent.curStep
+          form,
+          curStep
         })
         const item = this.curriculumList.find(e => e.cid == this.form.cid) || {} // 获取选中课程中的系统id
         let systemId = item.sysId || '1'

src/views/match/add/step3.vue

@@ -134,7 +134,7 @@ export default {
       resumeData() {
         if (this.cache) {
           this.curStep = this.cache.curStep
-          if (this.cache.form) this.form[this.curStep] = this.cache.form
+          if (this.cache.form) this.form = this.cache.form
           this.setVisible = true
           this.$store.commit('setCompetitionCache', null)
         }

src/views/match/manage/matchInfo.vue

@@ -81,8 +81,8 @@
                     <template v-if="form.completeCompetitionSetup.competitionType">
                       <th width="110">参赛人数限制</th>
                       <th>允许参赛人员</th>
-                      <th v-if="form.rule === 0">总分</th>
                     </template>
+                    <th v-if="form.rule === 0">总分</th>
                     <th>竞赛成绩</th>
                   </tr>
                   <template v-if="info.stages.length">
@@ -105,10 +105,10 @@
                           <span v-else class="m-r-5">无</span>
                           <i class="el-icon-edit icon" @click="selectPar(item)"></i>
                         </td>
-                        <td v-if="form.rule === 0 && !i" :rowspan="info.stages.length">{{ info.totalScore }}</td>
                       </template>
+                      <td v-if="form.rule === 0 && !i" :rowspan="info.stages.length">{{ info.totalScore }}</td>
                       <td>
-                        <span v-if="item.score > 0" class="m-r-10">分数{{item.score}}</span>
+                        <span v-if="item.score >= 0" class="m-r-10">分数{{item.score}}</span>
                         <el-button type="text" :disabled="item.resultsDetails === 1 || (form.completeCompetitionSetup.competitionType && !item.reportId) || (form.completeCompetitionSetup.competitionType === 0 && !item.reportId)" @click="show(item)">查看成绩详情</el-button>
                       </td>
                     </tr>
@@ -267,7 +267,7 @@ export default {
       this.$once('hook:beforeDestroy', function() {
         clearInterval(this.timer)
         this.timerList.forEach(n => {
-          clearInterval(n)
+          clearTimeout(n)
         })
         this.timerList = []
       })
@@ -320,7 +320,7 @@ export default {
               const endTime = new Date(e.endTime).getTime() + e.resultAnnouncementTime * 3600000 // 阶段结束时间+成绩公布时间（成绩公布时间单位是小时，所以要转化为毫秒）
               if (now > endTime) { // 如果到了公布时间
                 info.stages.find(n => n.stageId == e.stageId).showDetail = 1
-              } else { // 没有到公布时间，则加定时器，到点后调用
+              } else if (endTime - now < 86400000) { // 没有到公布时间，则加定时器，到点后调用
                 this.timerList.push(setTimeout(this.getInfo, endTime - now))
               }
             }
@@ -547,14 +547,14 @@ export default {
           this.memberVisible = true
           const teamId = this.info.teamId
           if (teamId) {
-            this.$post(this.api.stageGradeManagementList, {
+            this.$post(this.api.frontOfficeCompetitionRanking, {
               pageNum: 1,
               pageSize: 1000,
               competitionId: this.id,
-              stageId: row.stageId,
-              isNakadai: 0
-            }).then(({ page }) => {
-              this.members = page.records.filter(e => e.teamId === teamId)
+              isOverallRanking: 0,
+              teamId
+            }).then(({ list }) => {
+              this.members = list
             }).catch(res => {})
           } else {
             this.members = []

src/views/match/manage/matchSignup.vue

@@ -194,6 +194,7 @@ export default {
             },
             originForm: {},
             exitMember: 0,
+            notExit: 0,
             schoolDisable: false
         };
     },
@@ -263,11 +264,13 @@ export default {
         },
         // 新增
         add() {
+          this.notExit = 0
           this.isAdd = true
           this.addVisible = true
         },
         // 编辑
         edit(row) {
+          this.notExit = 0
           this.isAdd = false
           this.addVisible = true
           row.userName = row.username
@@ -287,6 +290,7 @@ export default {
               }
               this.formEnable = !account
             }).catch(res => {
+              if (res.message === '学生不存在') this.notExit = 1
               if (!this.isAdd) this.exitMember = 1
             })
           } else {
@@ -295,6 +299,10 @@ export default {
         },
         // 新增编辑人员
         submitForm() {
+          if (this.notExit) {
+            this.submiting = false
+            return util.errorMsg('学生不存在，无法添加！')
+          }
           if (this.exitMember) {
             this.submiting = false
             return util.errorMsg('学生已存在')

src/views/match/manage/noticeDetail.vue

@@ -159,9 +159,11 @@ export default {
             return this.$confirm(`确定移除 ${file.name}？`);
         },
         handleRemove(file, fileList) {
-          this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {})
-          const id = this.form.announcementAnnexList.find(e => e.fileName === file.name).id
-          this.$post(`${this.api.deleteAnnouncementAnnex}?id=${id}`).then(res => {}).catch(res => {})
+          if (file.url) {
+            this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {})
+            const id = this.form.announcementAnnexList.find(e => e.fileName === file.name).id
+            this.$post(`${this.api.delAnnex}?id=${id}`).then(res => {}).catch(res => {})
+          }
         },
         back() {
           this.$router.back()

src/views/order/AddOrder.vue

@@ -115,7 +115,8 @@
                                     <span>课程权限</span>
                                 </div>
                                 <div>
-                                  <template v-if="!viewDisabled && !renewDisabled && coursePermissions.length">
+                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                                  <template v-if="dispose || coursePermissions.find(e => e.status == 1) || (isAdd && coursePermissions.length)">
                                     <el-button v-if="coursePermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 0)">一键发货</el-button>
                                     <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 0)">取消全部发货</el-button>
                                   </template>
@@ -271,7 +272,8 @@
                                     <span>数据平台权限</span>
                                 </div>
                                 <div>
-                                  <template v-if="!viewDisabled && !renewDisabled && dataPlatformPermissions.length">
+                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                                  <template v-if="dispose || dataPlatformPermissions.find(e => e.status == 1) || (isAdd && dataPlatformPermissions.length)">
                                     <el-button v-if="dataPlatformPermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 1)">一键发货</el-button>
                                     <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 1)">取消全部发货</el-button>
                                   </template>
@@ -448,8 +450,9 @@
                                     <span>职站增值模块权限</span>
                                 </div>
                                 <div>
-                                  <template v-if="!viewDisabled && !renewDisabled && dataPlatformPermissions.length">
-                                    <el-button v-if="dataPlatformPermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 2)">一键发货</el-button>
+                                  <!-- 处理中 || 有未生效的课程 || （新增订单 && 有课程） -->
+                                  <template v-if="dispose || valuePermissions.find(e => e.status == 1) || (isAdd && valuePermissions.length)">
+                                    <el-button v-if="valuePermissions.find(e => !e.ship)" v-auth="'/order:发货'" type="primary" round @click="batchDeliver(1, 2)">一键发货</el-button>
                                     <el-button v-else v-auth="'/order:发货'" type="primary" round @click="batchDeliver(0, 2)">取消全部发货</el-button>
                                   </template>
                                   <el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled" type="primary" round class="mag" @click="addValueJurisdiction()">添加</el-button>
@@ -1435,9 +1438,13 @@ export default {
                     this.coursePermissions.map(e => {
                         res.orderOthers.map(el => {
                             if (el.dataOrCourseId === e.dataOrCourseId && el.authority) {
+                              if (el.endTime) {
                                 let time = new Date(el.endTime)
                                 time = new Date(time.setDate(time.getDate() + 1))
                                 e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+                              } else {
+                                e.startTime = ''
+                              }
                                 e.endTime = "";
                                 e.periodOfUse = "";
                                 e.renew = true;
@@ -1635,7 +1642,11 @@ export default {
         },
         // 一键发货
         batchDeliver(ship, data) {
-          const list = data ? this.dataPlatformPermissions : this.coursePermissions
+          const list = data == 1 ?
+            this.dataPlatformPermissions :
+            data == 2 ?
+              this.valuePermissions :
+              this.coursePermissions
           list.map(e => e.ship = ship)
           if (this.editDisabled) {
             this.refreshCache()
@@ -1749,6 +1760,7 @@ export default {
                 optionsData = 0
             }
             let time = new Date(row.startTime).getTime();
+
             let endTime = time + optionsData
             row.endTime = time + optionsData
             var timestamp =  endTime;

src/views/parner/staff.vue

@@ -436,7 +436,7 @@ export default {
         if (data.isTeam) {
           this.curTeamId = data.id
         } else {
-          this.getTeamId(data.children)
+          // this.getTeamId(data.children)
         }
         if (!this.curTeamId) this.curTeamId = data.id
         this.initData()