From 40327a423fbdda64d561894e6ec208974cd9b4bc Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 23 Oct 2024 15:48:02 +0800
Subject: [PATCH] fix

---
 src/setting.js                       |  2 +-
 src/views/course/AddCurriculum.vue   | 46 +++++++++++++++-------------
 src/views/match/manage/matchInfo.vue |  1 +
 src/views/setting/info.vue           |  8 ++---
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/setting.js b/src/setting.js
index 2278fe9..ab9dacd 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -14,7 +14,7 @@ if (isDev) {
   sandPath = `http://${location.hostname}:9520`
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
-  const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'https://dev.huorantech.cn/']
+  const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/']
   host = ips[+localStorage.getItem('ip')]
 } else if (isPro) {
   sandPath = `https://izhixinyun.com/sandbox`
diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue
index c3049c2..951fc84 100644
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@@ -106,13 +106,13 @@
               @selection-change="handleSelectionPractice">
               <el-table-column type="selection" width="55" align="center"></el-table-column>
               <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-              <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-              <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
-              <el-table-column prop="applicationName" label="系统名称" align="center">
+              <el-table-column prop="projectName" label="项目名称" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                  {{ scope.row.projectName || scope.row.paperName }}
                 </template>
               </el-table-column>
+              <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
+              <el-table-column prop="systemName" label="系统名称" align="center"></el-table-column>
               <el-table-column label="排序" align="center" width="100">
                 <template slot-scope="scope">
                   <el-input v-model.trim="scope.row.sort"
@@ -156,13 +156,13 @@
               @selection-change="handleSelectionAssessment">
               <el-table-column type="selection" width="55" align="center"></el-table-column>
               <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-              <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-              <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
-              <el-table-column prop="applicationName" label="系统名称" align="center">
+              <el-table-column prop="projectName" label="项目名称" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                  {{ scope.row.projectName || scope.row.paperName }}
                 </template>
               </el-table-column>
+              <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
+              <el-table-column prop="systemName" label="系统名称" align="center"></el-table-column>
               <el-table-column label="排序" align="center" width="100">
                 <template slot-scope="scope">
                   <el-input v-model.trim="scope.row.sort"
@@ -205,12 +205,12 @@
               @selection-change="handleSelectionMatch">
               <el-table-column type="selection" width="55" align="center"></el-table-column>
               <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-              <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-              <el-table-column prop="applicationName" label="系统名称" align="center">
+              <el-table-column prop="projectName" label="项目名称" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                  {{ scope.row.projectName || scope.row.paperName }}
                 </template>
               </el-table-column>
+              <el-table-column prop="systemName" label="系统名称" align="center"></el-table-column>
               <el-table-column label="排序" align="center" width="100">
                 <template slot-scope="scope">
                   <el-input v-model.trim="scope.row.sort"
@@ -272,7 +272,7 @@
               @change="val => checkAllChange(val, projects[0].systemId)"></el-checkbox>
             <li v-for="(item, i) in projects" :key="i" :title="item.projectName">
               <el-checkbox v-model="item.check"
-                :label="item.remark ? item.remark + '(' + item.projectName + ')' : item.projectName"
+                :label="item.remark ? item.remark + '(' + item.projectName + ')' : (item.projectName || item.paperName)"
                 @change="val => projectChange(val, item)"></el-checkbox>
             </li>
           </ul>
@@ -287,18 +287,18 @@
             v-model.trim="checkedKeyword" clearable></el-input>
           <el-table :data="checkeds" class="table" stripe header-align="center" max-height="470">
             <el-table-column type="index" width="55" label="序号" align="center"></el-table-column>
-            <el-table-column prop="applicationName" label="系统名称" align="center">
+            <el-table-column prop="systemName" label="系统名称" align="center"></el-table-column>
+            <el-table-column prop="projectName" width="80" label="系统类型" align="center">
               <template slot-scope="scope">
-                {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                {{ scope.row.type === 1 ? '流程类' : scope.row.type === 3 ? '理论' : '编程类' }}
               </template>
             </el-table-column>
-            <el-table-column prop="projectName" width="80" label="系统类型" align="center">
+            <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
+            <el-table-column prop="projectName" label="项目名称" align="center">
               <template slot-scope="scope">
-                {{ scope.row.type ? '流程类' : '编程类' }}
+                {{ scope.row.projectName || scope.row.paperName }}
               </template>
             </el-table-column>
-            <el-table-column prop="remark" label="备注名称" align="center"></el-table-column>
-            <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
             <el-table-column label="操作" align="center" width="55">
               <template slot-scope="scope">
                 <i :class="['el-icon-delete rm', { disabled: scope.row.disabled }]"
@@ -671,8 +671,8 @@ export default {
     },
     // 项目选择回调
     projectChange (val, item) {
-      const { systemId } = item
-      const i = this.checkeds.findIndex(e => e.projectId == item.projectId && e.systemId == systemId)
+      const { systemId, paperId } = item
+      const i = this.checkeds.findIndex(e => (e.projectId == item.projectId && e.systemId == systemId) || e.paperId == paperId)
       // 选中，则push，否则移除
       if (val) {
         this.checkeds.push(item)
@@ -822,7 +822,8 @@ export default {
             form.systemIdByPractice = this.practiceData.map(i => {
               let obj = {
                 isShow: i.isShow,
-                projectId: i.projectId,
+                projectId: i.projectId || '',
+                paperId: i.paperId || '',
                 sort: Number(i.sort),
                 systemId: i.systemId
               };
@@ -838,6 +839,7 @@ export default {
               let obj = {
                 isShow: i.isShow,
                 projectId: i.projectId,
+                paperId: i.paperId || '',
                 sort: Number(i.sort),
                 systemId: i.systemId
               };
@@ -850,6 +852,7 @@ export default {
             let obj = {
               isShow: i.isShow,
               projectId: i.projectId,
+              paperId: i.paperId || '',
               sort: Number(i.sort),
               systemId: i.systemId
             };
@@ -864,6 +867,7 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(0, 0, 0, 0.7)'
           })
+          debugger
           if (form.cid) {
             this.$post(this.api.modifyCourse, form).then((res) => {
               this.$message.success("编辑成功");
diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue
index c2d80e3..a377892 100644
--- a/src/views/match/manage/matchInfo.vue
+++ b/src/views/match/manage/matchInfo.vue
@@ -150,6 +150,7 @@
         <el-table :data="info.teamDetail" stripe header-align="center">
           <el-table-column prop="userName" label="成员姓名" min-width="100" align="center"></el-table-column>
           <el-table-column prop="realSchool" label="学校" min-width="100" align="center"></el-table-column>
+          <el-table-column prop="phone" label="手机号" min-width="100" align="center"></el-table-column>
           <el-table-column prop="workNumber" label="学号" min-width="100" align="center"></el-table-column>
           <el-table-column prop="createTime" label="加入时间" width="180" align="center"></el-table-column>
           <el-table-column label="操作" align="center" width="160">
diff --git a/src/views/setting/info.vue b/src/views/setting/info.vue
index 75847d2..bf7efa2 100644
--- a/src/views/setting/info.vue
+++ b/src/views/setting/info.vue
@@ -191,8 +191,8 @@
         <el-form-item label="验证码">
           <div class="flex">
             <el-input v-model="emailCode" placeholder="请输入验证码" maxlength="6"></el-input>
-            <el-button style="margin-left: 10px" type="text" @click="sendEmailCode"
-              :disabled="emailDisabled">{{ emailBtnText }}</el-button>
+            <el-button style="margin-left: 10px" type="text" @click="sendEmailCode" :disabled="emailDisabled">{{
+              emailBtnText }}</el-button>
           </div>
         </el-form-item>
       </el-form>
@@ -211,8 +211,8 @@
         <el-form-item label="验证码">
           <div class="flex">
             <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
-            <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode"
-              :disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
+            <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{
+              phoneBtnText }}</el-button>
           </div>
         </el-form-item>
       </el-form>