Prechádzať zdrojové kódy

fix:
CourseDetail.vue
拆分出ProjectTab.vue

mjh 4 rokov pred
rodič
commit
09f178083b

+ 120 - 203
src/views/CoursePage/CourseDetail.vue

@@ -50,7 +50,6 @@
             <el-radio-button label="task" @click="switchTab('task')">任务</el-radio-button>
             <el-radio-button label="courseware" @click="switchTab('courseware')">课件(暂未启用)</el-radio-button>
             <el-radio-button label="notice" @click="switchTab('notice')">通知</el-radio-button>
-            <el-radio-button label="project" @click="switchTab('project')">项目</el-radio-button>
             <el-radio-button label="group" @click="switchTab('group')">团队</el-radio-button>
             <el-radio-button label="comment" @click="switchTab('comment')">评论</el-radio-button>
           </el-radio-group>
@@ -115,10 +114,6 @@
                        :show-file-list="false" action="">
               <el-button plain type="primary">上传课件</el-button>
             </el-upload>
-            <el-button v-else-if="tabName==='project'" @click="projectDialog=true"
-                       plain type="primary">
-              新建项目
-            </el-button>
           </div>
           <!--学生视角-->
           <div v-if="isCourseSelected">
@@ -272,35 +267,6 @@
               </div>
             </div>
           </div>
-          <div v-else-if="tabName==='project'">
-            <el-tabs v-model="projectTabName">
-              <el-tab-pane label="公共项目" name="public">
-                <div v-if="projects!==null">
-                  <div v-if="projects.public.length===0">
-                    当前没有公共项目
-                  </div>
-                  <div v-else>
-                    <project-long-card v-for="item in projects.public" :key="'project'+item.id"
-                                       :project="item" is-public :is-teacher="isCreator"
-                                       @fork="handleForkProject(item.id)"
-                                       @switch="handleSwitchProject(item.id)"/>
-                  </div>
-                </div>
-              </el-tab-pane>
-              <el-tab-pane label="私有项目" name="private">
-                <div v-if="projects!==null">
-                  <div v-if="projects.private.length===0">
-                    当前没有私有项目
-                  </div>
-                  <div v-else>
-                    <project-long-card v-for="item in projects.private" :key="'project'+item.id"
-                                       :project="item" :is-teacher="isCreator"
-                                       @switch="handleSwitchProject(item.id)"/>
-                  </div>
-                </div>
-              </el-tab-pane>
-            </el-tabs>
-          </div>
           <div v-else-if="tabName==='group'">
             <el-table :data="groupTableData" style="width: 100%">
               <el-table-column label="组名">
@@ -324,6 +290,17 @@
             </el-table>
           </div>
         </div>
+        <div class="course-detail-tabs">
+          <el-tabs v-model="tabName" type="card" @tab-click="handleTabsClick">
+            <el-tab-pane label="项目" name="project">
+              <project-tab ref="projectTab"
+                           :course-id="courseInfo.id" :teacher-id="courseInfo.teacher.id"/>
+            </el-tab-pane>
+          </el-tabs>
+          <el-button class="tabs-function-button" type="primary" plain
+                     @click="handleTabButtonClick">{{ tabButtonName }}
+          </el-button>
+        </div>
       </el-card>
     </div>
     <!--发布通知-->
@@ -365,28 +342,6 @@
         <el-button plain type="primary" @click="handleCreateRuleConfirm">确认</el-button>
       </div>
     </el-dialog>
-    <!--新建项目-->
-    <el-dialog v-model="projectDialog" :before-close="handleProjectFormClose" title="新建项目">
-      <el-form :model="projectForm" ref="projectFormRef" label-position="right">
-        <el-form-item label="项目名称" prop="name">
-          <el-input v-model="projectForm.name" placeholder="请输入项目名称"/>
-        </el-form-item>
-        <el-form-item label="项目描述" prop="description">
-          <el-input v-model="projectForm.description" placeholder="请输入项目描述"/>
-        </el-form-item>
-        <el-form-item label="是否公共" prop="isPublic">
-          <el-select v-model="projectForm.isPublic">
-            <el-option label="公共" :value="true"/>
-            <el-option label="私有" :value="false"/>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button type="primary" @click="handleProjectFormConfirm">
-          确认
-        </el-button>
-      </template>
-    </el-dialog>
     <!--组队信息-->
     <el-dialog v-model="createGroupDialog" :before-close="beforeGroupFormClose" :title="createGroupForm.dialogTitle">
       <el-form ref="createGroupFormRef" :model="createGroupForm" label-position="right">
@@ -410,10 +365,11 @@
       </div>
     </el-dialog>
     <!-- 创建Coder考试-->
-    <el-dialog v-model="coderExamDialog" :before-close="handleExamFormCancel" :width="1200" :title="coderExamForm.dialogTitle">
+    <el-dialog v-model="coderExamDialog" :before-close="handleExamFormCancel" :width="1200"
+               :title="coderExamForm.dialogTitle">
       <el-form ref="coderExamFormRef" :model="coderExamForm" :rules="coderExamFormRules" label-width="150px">
         <el-form-item label="所属课程" prop="course">
-          <el-input disabled :placeholder="courseName" />
+          <el-input disabled :placeholder="courseName"/>
         </el-form-item>
         <el-form-item label="测试名称" prop="name">
           <el-input class="course-form-item" v-model="coderExamForm.name" placeholder="请输入课程名称"></el-input>
@@ -424,10 +380,12 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="允许学生查看控制台">
-          <el-switch v-model="coderExamForm.isConsoleOutputShownForStu" :disabled="switchExamDisabled" active-text="开启" inactive-text="不开启"/>
+          <el-switch v-model="coderExamForm.isConsoleOutputShownForStu" :disabled="switchExamDisabled" active-text="开启"
+                     inactive-text="不开启"/>
         </el-form-item>
         <el-form-item label="启用代码分析">
-          <el-switch v-model="coderExamForm.isCodeAnalysisNeeded" :disabled="switchExamDisabled" active-text="开启" inactive-text="不开启"/>
+          <el-switch v-model="coderExamForm.isCodeAnalysisNeeded" :disabled="switchExamDisabled" active-text="开启"
+                     inactive-text="不开启"/>
         </el-form-item>
         <el-form-item label="题目列表">
           <el-button type="text" @click="showProblemDialog">选择题目</el-button>
@@ -435,9 +393,9 @@
         <el-form-item v-if="$store.state.problem.cart.length">
           <el-collapse accordion>
             <el-collapse-item
-                v-for="problem in $store.state.problem.cart"
-                :key="problem.id"
-                :name="problem.id"
+              v-for="problem in $store.state.problem.cart"
+              :key="problem.id"
+              :name="problem.id"
             >
               <template #title>
                 <span>{{ problem.name }}</span>
@@ -447,10 +405,11 @@
               <span class="problem-description">{{ problem.description }}</span>
               <div class="remove-button">
                 <el-button
-                    type="danger"
-                    size="mini"
-                    @click="$store.commit('removeProblem', problem)"
-                >移除该题</el-button
+                  type="danger"
+                  size="mini"
+                  @click="$store.commit('removeProblem', problem)"
+                >移除该题
+                </el-button
                 >
               </div>
             </el-collapse-item>
@@ -470,10 +429,10 @@
       />
       <el-select v-model="dialogProblemTypeStr" style="width: 300px" @change="fetchProblemData(1)">
         <el-option v-for="item in problemTypeOptions" :key="item.value" :value="item.value">
-          {{item.label}}
+          {{ item.label }}
         </el-option>
       </el-select>
-      <el-table :data="problemList" >
+      <el-table :data="problemList">
         <el-table-column type="expand">
           <template #default="props">
             <div>{{ props.row.description }}</div>
@@ -487,39 +446,42 @@
         </el-table-column>
         <el-table-column label="上传时间">
           <template #default="scope">
-            <span>{{ formatTimestamp(scope.row.createdAt)}}</span>
+            <span>{{ formatTimestamp(scope.row.createdAt) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="200">
           <template #default="scope">
             <el-button
-                type="primary"
-                size="mini"
-                @click="checkDetails"
-            >详情</el-button
+              type="primary"
+              size="mini"
+              @click="checkDetails"
+            >详情
+            </el-button
             >
             <el-button
-                v-if="removeEnable(scope.row)"
-                type="danger"
-                size="mini"
-                @click="$store.commit('removeProblem', scope.row)"
-            >移出试题清单</el-button
+              v-if="removeEnable(scope.row)"
+              type="danger"
+              size="mini"
+              @click="$store.commit('removeProblem', scope.row)"
+            >移出试题清单
+            </el-button
             >
             <el-button
-                v-else-if="addEnable(scope.row)"
-                type="success"
-                size="mini"
-                @click="$store.commit('addProblem', scope.row)"
-            >加入试题清单</el-button
+              v-else-if="addEnable(scope.row)"
+              type="success"
+              size="mini"
+              @click="$store.commit('addProblem', scope.row)"
+            >加入试题清单
+            </el-button
             >
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
-          background
-          layout="prev, pager, next"
-          :total="problemPageInfo.total"
-          @current-change="changePage"
+        background
+        layout="prev, pager, next"
+        :total="problemPageInfo.total"
+        @current-change="changePage"
       />
     </el-dialog>
   </div>
@@ -530,15 +492,15 @@ import NoticeItem from "./components/NoticeItem";
 import FileEntry from "./components/FileEntry";
 import {ElMessageBox, ElMessage} from "element-plus";
 import variables from "@/utils/variables";
-import ProjectLongCard from "@/components/project/ProjectLongCard";
 import {formatTimestamp, problemTypeOptions, problemTypeToTagContent} from "@/utils/coder-utils";
+import ProjectTab from "@/views/CoursePage/tabs/ProjectTab";
 
 export default {
   name: "CourseDetail",
   components: {
+    ProjectTab,
     NoticeItem,
     FileEntry,
-    ProjectLongCard,
   },
   data() {
     const themeColor = {
@@ -613,16 +575,6 @@ export default {
           url: ""
         }],
 
-      // project
-      projects: null,
-      projectTabName: "public",
-      projectDialog: false,
-      projectForm: {
-        name: "",
-        description: "",
-        isPublic: false,
-      },
-
       // groupRule
       isRuleExisted: null,
       ruleFormDialog: false,
@@ -747,6 +699,14 @@ export default {
     },
     problemTypeOptions() {
       return problemTypeOptions(true);
+    },
+    tabButtonName() {
+      switch (this.tabName) {
+        case "project":
+          return "新建项目";
+        default:
+          return "no tab";
+      }
     }
   },
   mounted() {
@@ -763,17 +723,17 @@ export default {
   methods: {
     fetchData() {
       this.$apis.getCourseById(this.$route.params.id)
-          .then(res => {
-            this.courseInfo = res.data.data;
-            this.coderExamForm.course = this.courseInfo.coderId; //当前课程的coderId固定
-            this.$apis.checkCourseSelection(this.$route.params.id, this.$store.state.user.id)
-                .then(res => {
-                  this.isCourseSelected = res.data.data;
-                  if (this.isCreator || this.isCourseSelected) {
-                    this.switchTab(this.tabName);
-                  }
-                });
-          });
+        .then(res => {
+          this.courseInfo = res.data.data;
+          this.coderExamForm.course = this.courseInfo.coderId; //当前课程的coderId固定
+          this.$apis.checkCourseSelection(this.$route.params.id, this.$store.state.user.id)
+            .then(res => {
+              this.isCourseSelected = res.data.data;
+              if (this.isCreator || this.isCourseSelected) {
+                this.switchTab(this.tabName);
+              }
+            });
+        });
     },
     formatTimestamp,
     problemTypeToTagContent,
@@ -1199,74 +1159,6 @@ export default {
         });
     },
 
-    // project
-
-    handleProjectFormClose() {
-      const _this = this;
-      _this.projectDialog = false;
-      _this.$refs.projectFormRef.resetFields();
-    },
-
-    async handleProjectFormConfirm() {
-      const _this = this;
-      const res = (await _this.$apis.createProject({
-        courseId: _this.courseInfo.id,
-        ..._this.projectForm,
-      })).data;
-      if (res.code) {
-        ElMessage.error(res.message);
-      } else {
-        if (_this.projectForm.isPublic) {
-          _this.projects.public.push(res.data);
-        } else {
-          _this.projects.private.push(res.data);
-        }
-        _this.projectDialog = false;
-        _this.$refs.projectFormRef.resetFields();
-      }
-    },
-
-    async handleSwitchProject(id) {
-      const _this = this;
-      const res = (await _this.$apis.updateCourseProjectState(id)).data;
-      if (!res.code) {
-        if (res.data) {
-          removeProject(_this.projects.private, _this.projects.public);
-        } else {
-          removeProject(_this.projects.public, _this.projects.private);
-        }
-      }
-
-      function removeProject(array1, array2) {
-        for (const index in array1) {
-          if (array1[index].id === id) {
-            array2.push(array1[index]);
-            array1.splice(index, 1);
-            return;
-          }
-        }
-      }
-    },
-
-    handleForkProject(id) {
-      const _this = this;
-      ElMessageBox.prompt("请输入新项目名称", "Fork", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        inputPlaceholder: "默认为项目Id-用户Username",
-      })
-        .then(async ({value}) => {
-          const res = (await _this.$apis.forkProject(id, value)).data;
-          if (!res.code) {
-            _this.projects.private.push(res.data);
-            _this.projectTabName = "private";
-            ElMessage.success("Fork完成");
-          } else {
-            ElMessage.error(res.message);
-          }
-        });
-    },
-
     // group rule
 
     beforeRuleFormClose() {
@@ -1386,35 +1278,35 @@ export default {
         type: "warning",
         center: true,
       })
-          .then(() => {
-            this.coderExamDialog = false;
-            // this.clearForm();
-            //TODO 清除表格信息
-            done();
-          })
-          .catch((err) => {
-            console.log(err);
-          });
+        .then(() => {
+          this.coderExamDialog = false;
+          // this.clearForm();
+          //TODO 清除表格信息
+          done();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
 
     // 展示Coder所有的problem题目(代码题)
-    showProblemDialog(){ //打开弹框,获取初始数据
+    showProblemDialog() { //打开弹框,获取初始数据
       this.fetchProblemData();
       this.coderProblemDialog = true;
     },
 
-    fetchProblemData(page=1) { // 按需获得Coder题目
+    fetchProblemData(page = 1) { // 按需获得Coder题目
       this.$apis.retrievePageProblem(page, this.dialogProblemLimit, this.dialogProblemTypeStr, this.dialogProblemName)
-          .then(_res => {
-            this.problemPageInfo = _res.data.page;
-            this.problemList = _res.data.res;
-          }).catch(err => {
+        .then(_res => {
+          this.problemPageInfo = _res.data.page;
+          this.problemList = _res.data.res;
+        }).catch(err => {
         console.log(err);
       });
     },
 
     //验证表单数据,创建考试
-    handleExamCreate(){
+    handleExamCreate() {
       const form = this.$refs.coderExamFormRef;
       form.validate((valid) => {
         if (valid) {
@@ -1427,13 +1319,13 @@ export default {
       });
     },
 
-    createCoderExam(){
+    createCoderExam() {
       //创建Coder考试
       this.$apis.createCoderExam({
         course: this.coderExamForm.course,
         name: this.coderExamForm.name,
-        startAt: this.coderExamForm.range[0].getTime()/1000,
-        endAt: this.coderExamForm.range[1].getTime()/1000,
+        startAt: this.coderExamForm.range[0].getTime() / 1000,
+        endAt: this.coderExamForm.range[1].getTime() / 1000,
         problems: this.$store.state.problem.cart.map((item) => item.id),
         isConsoleOutputShownForStu: this.coderExamForm.isConsoleOutputShownForStu
       }).then(_res => {
@@ -1449,25 +1341,25 @@ export default {
     },
 
     //查看题目详情(暂不支持)
-    checkDetails(){
+    checkDetails() {
       ElMessage.warning("暂不支持查看详情!");
     },
 
     //题目购物车cart
     removeEnable(problem) { //是否可以移除题目
       return this.$store.state.problem.cart.length && this.$store.state.problem.cart
-          .map((item) => item.id)
-          .includes(problem.id);
+        .map((item) => item.id)
+        .includes(problem.id);
     },
     addEnable(problem) { //是否可以添加题目
       return this.$store.getters.isTeacher && problem.modifiedAt;
     },
 
-    changePage(val){
+    changePage(val) {
       this.fetchProblemData(val);
     },
 
-    clearCoderExamForm(){
+    clearCoderExamForm() {
       this.coderExamForm = {
         examType: "coder",
         course: this.courseInfo.coderId,
@@ -1477,10 +1369,35 @@ export default {
         isConsoleOutputShownForStu: false
       };
     },
+
+    handleTabsClick(tab) {
+
+    },
+
+    handleTabButtonClick() {
+      const _this = this;
+      switch (_this.tabName) {
+        case "project":
+          _this.$refs.projectTab.openProjectDialog();
+          break;
+        default:
+          break;
+      }
+    },
   },
 };
 </script>
 
 <style scoped>
 @import "style/CourseDetail.css";
+
+.course-detail-tabs {
+  position: relative;
+}
+
+.tabs-function-button {
+  position: absolute;
+  top: 1px;
+  right: 0;
+}
 </style>

+ 177 - 0
src/views/CoursePage/tabs/ProjectTab.vue

@@ -0,0 +1,177 @@
+<template>
+  <el-tabs v-model="tabName">
+    <el-tab-pane label="公共项目" name="public">
+      <div v-if="projects!==null">
+        <div v-if="projects.public.length===0">
+          当前没有公共项目
+        </div>
+        <div v-else>
+          <project-long-card v-for="item in projects.public" :key="'project'+item.id"
+                             :project="item" is-public :is-teacher="isCreator"
+                             @fork="handleForkProject(item.id)"
+                             @switch="handleSwitchProject(item.id)"/>
+        </div>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane label="私有项目" name="private">
+      <div v-if="projects!==null">
+        <div v-if="projects.private.length===0">
+          当前没有私有项目
+        </div>
+        <div v-else>
+          <project-long-card v-for="item in projects.private" :key="'project'+item.id"
+                             :project="item" :is-teacher="isCreator"
+                             @switch="handleSwitchProject(item.id)"/>
+        </div>
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+  <el-dialog v-model="projectDialog" :before-close="handleProjectFormClose" title="新建项目">
+    <el-form :model="projectForm" ref="projectFormRef" label-position="right">
+      <el-form-item label="项目名称" prop="name">
+        <el-input v-model="projectForm.name" placeholder="请输入项目名称"/>
+      </el-form-item>
+      <el-form-item label="项目描述" prop="description">
+        <el-input v-model="projectForm.description" placeholder="请输入项目描述"/>
+      </el-form-item>
+      <el-form-item label="是否公共" prop="isPublic">
+        <el-select v-model="projectForm.isPublic">
+          <el-option label="公共" :value="true"/>
+          <el-option label="私有" :value="false"/>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" @click="handleProjectFormConfirm">
+        确认
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import ProjectLongCard from "@/components/project/ProjectLongCard";
+import {ElMessage, ElMessageBox} from "element-plus";
+
+export default {
+  name: "ProjectTab",
+  components: {
+    ProjectLongCard,
+  },
+  props: {
+    courseId: {
+      required: true,
+      type: Number,
+    },
+    teacherId: {
+      required: true,
+      type: Number,
+    }
+  },
+  data() {
+    return {
+      tabName: "public",
+      projects: null,
+
+      projectDialog: false,
+      projectForm: {
+        name: "",
+        description: "",
+        isPublic: false,
+      },
+      // todo
+      projectFormRule: {},
+    };
+  },
+  computed: {
+    isCreator() {
+      return Number(this.teacherId) === Number(this.$store.state.user.id);
+    },
+  },
+  async mounted() {
+    const _this = this;
+    const projectRes = (await _this.$apis.findProjectsByCourse(_this.courseId)).data;
+    if (projectRes.code) {
+      ElMessage.error(projectRes.message);
+    } else {
+      _this.projects = projectRes.data;
+    }
+  },
+  methods: {
+    handleForkProject(id) {
+      const _this = this;
+      ElMessageBox.prompt("请输入新项目名称", "Fork", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        inputPlaceholder: "默认为项目Id-用户Username",
+      })
+        .then(async ({value}) => {
+          const res = (await _this.$apis.forkProject(id, value)).data;
+          if (!res.code) {
+            _this.projects.private.push(res.data);
+            _this.projectTabName = "private";
+            ElMessage.success("Fork完成");
+          } else {
+            ElMessage.error(res.message);
+          }
+        });
+    },
+
+    async handleSwitchProject(id) {
+      const _this = this;
+      const res = (await _this.$apis.updateCourseProjectState(id)).data;
+      if (!res.code) {
+        if (res.data) {
+          removeProject(_this.projects.private, _this.projects.public);
+        } else {
+          removeProject(_this.projects.public, _this.projects.private);
+        }
+      }
+
+      function removeProject(array1, array2) {
+        for (const index in array1) {
+          if (array1[index].id === id) {
+            array2.push(array1[index]);
+            array1.splice(index, 1);
+            return;
+          }
+        }
+      }
+    },
+
+    handleProjectFormClose() {
+      const _this = this;
+      _this.projectDialog = false;
+      _this.$refs.projectFormRef.resetFields();
+    },
+
+    async handleProjectFormConfirm() {
+      const _this = this;
+      const res = (await _this.$apis.createProject({
+        courseId: _this.courseId,
+        ..._this.projectForm,
+      })).data;
+      if (res.code) {
+        ElMessage.error(res.message);
+      } else {
+        if (_this.projectForm.isPublic) {
+          _this.projects.public.push(res.data);
+        } else {
+          _this.projects.private.push(res.data);
+        }
+        _this.projectDialog = false;
+        _this.$refs.projectFormRef.resetFields();
+      }
+    },
+
+    openProjectDialog(){
+      const _this = this;
+      _this.projectDialog = true;
+    }
+  },
+};
+</script>
+
+<style scoped>
+
+</style>