Merge remote-tracking branch 'yx/compulsory_professional_skills' into compulsory_professional_skills

src/views/growthpath/EditingTasks.vue

@@ -45,29 +45,27 @@
             </div>
             <div class="handler">
               <div class="item" v-for="(value, key) in TASK_TYPE" :key="key">
-                <template v-if="key < 3">
-                  <component
-                    :ref="(el) => (courseRef['el' + key] = el)"
-                    v-model:taskList="listDatas"
-                    :is="value.component"
-                    :growId="growId"
-                    :id="growId"
-                    :type="value.type"
-                    :activeKey="activeKey"
-                    :infoType="2"
-                    @dataListUp="dataListUp"
-                    @refresh="getListTask(1)"
-                  >
-                    <div class="itcon">
-                      <div class="img">
-                        <img :src="value.img" />
-                      </div>
-                      <div class="text">{{ value.name }}</div>
+                <component
+                  :ref="(el) => (courseRef['el' + key] = el)"
+                  v-model:taskList="listDatas"
+                  :is="value.component"
+                  :growId="growId"
+                  :id="growId"
+                  :type="value.type"
+                  :activeKey="activeKey"
+                  :infoType="2"
+                  @dataListUp="dataListUp"
+                  @refresh="getListTask(1)"
+                >
+                  <div class="itcon">
+                    <div class="img">
+                      <img :src="value.img" />
                     </div>
-                  </component>
-                  <div></div>
-                  <div class="lin"></div>
-                </template>
+                    <div class="text">{{ value.name }}</div>
+                  </div>
+                </component>
+                <div></div>
+                <div class="lin"></div>
               </div>
             </div>
           </div>

src/views/growthpath/GrowthPath.vue

@@ -39,12 +39,12 @@
         </div>
       </div>
     </div>
-    <!-- <div class="btns">
+    <div class="btns">
       <div class="btn btn3" @click="handleOut">
         <div class="search"></div>
         <div class="btnText">创建必修</div>
       </div>
-    </div> -->
+    </div>
     <div class="grow_con">
       <div class="grow_list">
         <div class="grow_table">
@@ -157,7 +157,7 @@
       <div class="bg_main">
         <div class="bg_main_header">
           <div class="bg_main_header_icon"></div>
-          <div>{{editId?'编辑专业力必修':'新增专业力必修'}}</div>
+          <div>{{ editId ? "编辑专业力必修" : "新增专业力必修" }}</div>
           <div class="bg_main_header_close" @click="of_exit"></div>
         </div>
         <div class="bg_body">
@@ -249,7 +249,7 @@
             <div class="bg_body_input">
               <div style="display: flex">
                 <a-tooltip>
-                  <template #title>建议少于16个学习任务时使用</template>
+                  <template #title> 建议多于10个学习任务时使用</template>
                   <div
                     @click="template = 1"
                     class="learnBgItem"
@@ -268,7 +268,7 @@
                 </a-tooltip>
 
                 <a-tooltip>
-                  <template #title>建议多任务时使用</template>
+                  <template #title>建议少于16个学习任务时使用</template>
                   <div
                     slot="reference"
                     @click="template = 2"

src/views/growthpath/PathManage.vue

@@ -224,13 +224,13 @@
                   <a-radio-button value="1">必修</a-radio-button>
                   <a-radio-button value="2">选修</a-radio-button>
                 </a-radio-group>
-                <!-- <div class="switch">
+                <div class="switch">
                   <a-switch
                     @change="sortSwitchChange"
                     v-model:checked="basicData.sortSwitch"
                   />
                   <div style="margin-left: 5px">是否按顺序学习</div>
-                </div> -->
+                </div>
               </div>
               <!-- 无数据显示快速创建 -->
               <div v-if="!listTaskData.length" style="margin-top: 20px">