Merge remote-tracking branch 'origin/dev_2307' into dev_2307

ant-design-vue-jeecg/src/permission.js

@@ -29,6 +29,17 @@ const whiteList = [
   '/cms/home',
   '/cms/major',
   '/cms/detail',
+  '/cms/professionalSummary',
+  '/cms/teacherDemeanor',
+  '/cms/outstandingGraduates',
+  '/cms/teacherDetails',
+  '/cms/teacherOutcomes',
+  '/cms/achievement',
+  '/cms/achievement/teacher',
+  '/cms/dailyteach/courselist',
+  '/cms/dailyteach/coursedetails',
+  '/cms/outstandingStudents',
+  '/cms/personnelTraining',
 ] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {

ant-design-vue-jeecg/src/views/cms/pages/personnelTraining/personnelTraining.vue

@@ -25,7 +25,8 @@
         </div>
       </div>
       <div class="points support_relationships">
-        <h2 class="title">毕业要求对培养目标的支撑关系</h2>
+        <h2 class="title">毕业要求对
+          培养目标的支撑关系</h2>
         <div class="content">
           <div class="table">
             <!-- <el-table :data="support_relationships" :header-cell-style="{
@@ -57,22 +58,22 @@
               <el-table-column prop="request" label="毕业要求" width="150px" />
               <el-table-column prop="targetOne" label="目标一">
                 <template #default="scope">
-                  <input type="checkbox" name="sex" checked v-show="scope.row.targetOne" disabled />
+                  <input type="checkbox" name="sex" checked v-show="scope.row.targetNum&&scope.row.targetNum[0] == '0'" disabled />
                 </template>
               </el-table-column>
               <el-table-column prop="targetTwo" label="目标二">
                 <template #default="scope">
-                  <input type="checkbox" name="sex" checked v-show="scope.row.targetTwo" disabled />
+                  <input type="checkbox" name="sex" checked v-show="scope.row.targetNum&&scope.row.targetNum[1] == '1'" disabled />
                 </template>
               </el-table-column>
               <el-table-column prop="targetThree" label="目标三">
                 <template #default="scope">
-                  <input type="checkbox" name="sex" checked v-show="scope.row.targetThree" disabled />
+                  <input type="checkbox" name="sex" checked v-show="scope.row.targetNum&&scope.row.targetNum[2] == '2'" disabled />
                 </template>
               </el-table-column>
               <el-table-column prop="targetFour" label="目标四">
                 <template #default="scope">
-                  <input type="checkbox" name="sex" checked v-show="scope.row.targetFour" disabled />
+                  <input type="checkbox" name="sex" checked v-show="scope.row.targetNum&&scope.row.targetNum[3] =='3'" disabled />
                 </template>
               </el-table-column>
             </el-table>
@@ -704,10 +705,20 @@ export default {
         // console.log(this.support_relationships.pyGraRequires[0].graduateRequire)
         // console.log(this.support_relationships.pyTrainingObjectives[0].contents)
         let obj = res.result.毕业要求对培养目标的支撑关系.pyGraRequires
+        let obj02 = res.result.毕业要求对培养目标的支撑关系.pyObjectiveGraduates
         console.log('aaaa', obj)
-        for (let i = 0; i < obj.length; i++) {
-          this.support_relationships.requireList.push({ request: obj[i].graduateRequire, targetOne: obj[i].graduateNumber })
-        }
+        console.log('aaaa', obj02)
+        for (let i = 0; i < obj02.length; i++) {
+          let byyqIndex = obj02[i].graduateId-1//毕业要求索引
+          let pymbIndex = obj02[i].objectiveId-1//培养目标索引
+          console.log('索引')
+          obj[byyqIndex].targetNum = []
+          obj[byyqIndex].targetNum.push(pymbIndex)
+        }
+        this.support_relationships.requireList = obj
+        // for (let i = 0; i < obj.length; i++) {
+        //   this.support_relationships.requireList.push({ request: obj[i].graduateRequire, targetOne: obj[i].graduateNumber })
+        // }
         // let obj2 = res.result.毕业要求对培养目标的支撑关系.pyTrainingObjectives
         // for (let i = 0; i < obj2.length; i++) {
         //   this.support_relationships.requireList[i].name = obj2[i].contents