合并

src/views/projectcenter/TaskPage.vue

@@ -462,7 +462,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="showAA(item.type)"
+                        @click="showAA(item.name,)"
                         :style="{
                           display:
                             item.type == '6' || item.type == '9'
@@ -489,10 +489,11 @@
                           item.type == '7' ||
                           item.type == '8' ||
                           item.type == '9' ||
-                          item.type == '11'
-                            ? showTime(item.name, item.projectTaskId)
+                          item.type == '11' ||
+                          item.type == '12'
+                            ? showTime(item.name, item.projectTaskId, item.type)
                             : item.type == '5' || item.type == '10'
-                            ? showTest(item.name, item.projectTaskId)
+                            ? showTest(item.name, item.projectTaskId, item.type)
                             : item.type == '2' || item.type == '6'
                             ? showFace(item.name, item.projectTaskId)
                             : item.type == '4'
@@ -657,9 +658,14 @@
                       onChange: onSelectChange,
                     }"
                   />
+                  <!-- 列表无数据样式
                   <div
                     class="nostu"
                     :style="{ display: total > 0 ? 'none' : 'block' }"
+                  >                   -->
+                  <div
+                    class="nostu"
+                    style="display:none"
                   >
                     <div class="nostuimg"></div>
                   </div>
@@ -1080,6 +1086,7 @@
       v-if="visible"
       :projectTaskId="projectTaskId"
       :title="showTimeText"
+      :itemsType="itemstype"
     />
     <!-- 面授管理抽屉 -->
     <face-manage
@@ -1127,12 +1134,7 @@
       :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
-    <test-manage
-      v-model:TMvisible.sync="TMvisible"
-      v-if="TMvisible"
-      :title="showTestText"
-      :projectTaskId="projectTaskId"
-    />
+    <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" :itemsType="itemstype"/>
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
 
@@ -2357,6 +2359,8 @@ export default {
       showWorkText: "",
       //直播、活动页面传递参数
       showkaoqinText: "",
+      //所有抽屉的传过去的type
+      itemstype:null,
 
       //排行榜时间
       rankStartTime: null,
@@ -2371,7 +2375,7 @@ export default {
       sourceBelong: null, //资源归属
       remark: null, //项目说明
       level: null, //项目级别
-      systemId: null, //培训体系
+      systemId: null, //培训分类
       picUrl: null,
       parentId: null,
     });
@@ -2648,11 +2652,12 @@ export default {
       state.TaskFaceImpStuvisible = true;
     };
     //新增
-    const showTime = (name, id) => {
+    const showTime = (name, id, type) => {
       console.log("点击管理并传了id");
       state.visible = true;
       state.showTimeText = name;
       state.projectTaskId = id;
+      state.itemstype = Number(type);
     };
     //新增
     const showFace = (name, id) => {
@@ -2677,9 +2682,9 @@ export default {
       state.chooseGroupId = id;
     };
     //活动考勤的抽屉
-    const showAA = (course) => {
+    const showAA = (title) => {
       state.AAvisible = true;
-      state.showkaoqinText = "【" + course + "】" + "考勤";
+      state.showkaoqinText = title;
     };
     //作业管理的抽屉
     const showWork = (name, id) => {
@@ -2687,11 +2692,12 @@ export default {
       state.showWorkText = name;
       state.projectTaskId = id;
     };
-    //考试管理的抽屉
-    const showTest = (name, id) => {
+    //考试、测评管理的抽屉
+    const showTest = (name, id, type) => {
       state.TMvisible = true;
       state.showTestText = name;
       state.projectTaskId = id;
+      state.itemstype = Number(type);
     };
     const showStuAdd = () => {
       state.Stuvisible = true;
@@ -2829,6 +2835,17 @@ export default {
       state.tabledata = arr;
     };
     studentData();
+    // const studentData = () => {
+    //   let arr = state.tabledata;
+    //   console.log(arr, "学员管理");
+    //   arr.map((value) => {
+    //     value.operation = (
+       
+    //     );
+    //   });
+    //   state.tabledata = arr;
+    // };
+    // studentData();
     const studentColumns = () => {
       const tablecolumns = [
         {
@@ -2935,6 +2952,75 @@ export default {
           // width: 60,
           align: "center",
           className: "h",
+           scopedSlots: { customRender: "action" }, //引入的插槽
+             customRender: (text) => {
+            // console.log(text);
+            return (
+                 <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <div
+              class="studentopea1"
+              onClick={() => {
+                if (text.record.excellent === false) {
+                  state.canclestu = true;
+                  console.log("youxiu", text.record.studentId);
+                  state.changeGoods.push(text.record.studentId);
+                } else if (text.record.excellent === true) {
+                  state.canclestu1 = true;
+                  console.log("youxiu", text.record.studentId);
+                  state.changeGoods.push(text.record.studentId);
+                }
+              }}
+            >
+              {text.record.excellent ? "取消优秀" : "优秀学员"}
+            </div>
+
+            <div
+              class="studentopea2"
+              onClick={() => {
+                state.Seevisible = true;
+                console.log(text.record.studentId, "点击了查看");
+                state.checkStuId = text.record.studentId;
+              }}
+            >
+              查看
+            </div>
+              <div class="studentSelect">
+              <a-select
+                style="width: 50px"
+                value="更多"
+                // options={state.projectNameList}
+                dropdownClassName="tabledropdown"
+              >
+                <a-select-option value="换组" label="换组">
+                  <div
+                    onClick={() => {
+                      state.Changevisible = true;
+                    }}
+                  >
+                    换组
+                  </div>
+                </a-select-option>
+                <a-select-option value="删除" label="删除">
+                  <div
+                    onClick={() => {
+                      // console.log("点击了111", text);
+                      showDeleteOne(text.record.studentId);
+                    }}
+                  >
+                    删除
+                  </div>
+                </a-select-option>
+              </a-select>
+            </div>
+          </div>
+           
+              )}
         },
       ];
       return tablecolumns;
@@ -3203,7 +3289,7 @@ export default {
         if (leng > 0) {
           let arr = res.data.data.rows;
           getTableDataList(arr);
-          studentData();
+          // studentData();
         }
       });
     };
@@ -3631,7 +3717,7 @@ export default {
       createG,
       resetGroupName,
       searchGroup,
-      studentData,
+      // studentData,
       cancelyou,
       cancelcanyou,
       changePaginationStu,