新增分类管理及修改分类功能

src/components/pages/Ttype.vue

@@ -108,7 +108,7 @@
           <el-table-column prop="date" label="操作" min-width="30">
             <template slot-scope="scope">
               <div class="pb_buttonBox">
-                <el-button size="mini" type="primary" @click="selectType">
+                <el-button size="mini" type="primary" @click="selectType(scope.row.id)">
                   查看分类
                 </el-button>
                 <el-button
@@ -204,7 +204,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="student_page">
+      <div class="student_page" v-if="step == 0">
         <el-pagination
           background
           layout="prev, pager, next"
@@ -214,6 +214,26 @@
           @current-change="handleCurrentChange"
         ></el-pagination>
       </div>
+      <div class="student_page" v-if="step == 1">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :page-size="10"
+          :total="total1"
+          v-if="page1"
+          @current-change="handleCurrentChange1"
+        ></el-pagination>
+      </div>
+      <div class="student_page" v-if="step == 2">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :page-size="10"
+          :total="total2"
+          v-if="page2"
+          @current-change="handleCurrentChange2"
+        ></el-pagination>
+      </div>
     </div>
     <el-dialog
       title="添加学校"
@@ -359,6 +379,10 @@ export default {
       sTypeName: "",
       page: 1,
       total: 0,
+      page1: 1,
+      total1: 0,
+      page2: 1,
+      total2: 0,
       userid: this.$route.query.userid,
       oid: this.$route.query.oid,
       dialogVisible: false,
@@ -366,6 +390,7 @@ export default {
       dialogVisible2: false,
       dialogVisible3: false,
       dialogVisible4: false,
+      updateOid:"",
       dialogVisible5: false,
       step: 0,
       pid: "",
@@ -407,6 +432,14 @@ export default {
       this.page = val;
       this.selectSchool();
     },
+    handleCurrentChange1(val) {
+      this.page1 = val;
+      this.selectType();
+    },
+    handleCurrentChange2(val) {
+      this.page2 = val;
+      this.selectSType();
+    },
     selectSchool() {
       this.isLoading = true;
       let params = {
@@ -416,6 +449,7 @@ export default {
         .get(this.$store.state.api + "selectSchoolName", params)
         .then((res) => {
           this.isLoading = false;
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
           this.tableData = res.data[0];
         })
         .catch((err) => {
@@ -505,14 +539,18 @@ export default {
           console.error(err);
         });
     },
-    selectType() {
+    selectType(id) {
+      this.tableData1 = [];
+      this.tableData2 = [];
       this.step = 1;
+      this.updateOid = id;
       let params = {
-        page: this.page,
+        page: this.page1,
       };
       this.ajax
         .get(this.$store.state.api + "selectPtype", params)
         .then((res) => {
+          this.total1 = res.data[0].length > 0 ? res.data[0][0].num : 0;
           this.tableData1 = res.data[0];
         })
         .catch((err) => {
@@ -526,12 +564,13 @@ export default {
       }
       let params = {
         pid: pid != undefined ? pid : this.pid,
-        oid: this.oid,
-        page: this.page,
+        oid: this.updateOid,
+        page: this.page2,
       };
       this.ajax
         .get(this.$store.state.api + "selectStype", params)
         .then((res) => {
+          this.total2 = res.data[0].length > 0 ? res.data[0][0].num : 0;
           this.tableData2 = res.data[0];
         })
         .catch((err) => {
@@ -607,7 +646,7 @@ export default {
         n: this.sTypeName,
         pid: this.pid,
         uid: this.userid,
-        oid: this.oid,
+        oid: this.updateOid,
       };
       this.ajax
         .get(this.$store.state.api + "addStype", params)

src/components/pages/addCourse.vue

@@ -4311,6 +4311,29 @@ export default {
               }
             }
           }
+          this.selectTypeByOid();
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    selectTypeByOid() {
+      let params = {
+        oid: this.oid,
+      };
+      this.ajax
+        .get(this.$store.state.api + "selectTypeByOid",params)
+        .then((res) => {
+          for (var i = 0; i < res.data[0].length; i++) {
+            for (var j = 0; j < res.data[1].length; j++) {
+              if (res.data[0][i].id == res.data[1][j].pid) {
+                if (!this.CourseTypeJson[res.data[0][i].id]) {
+                  this.CourseTypeJson[res.data[0][i].id] = [];
+                }
+                this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]);
+              }
+            }
+          }
         })
         .catch((err) => {
           console.error(err);

src/components/pages/course.vue

@@ -3,12 +3,15 @@
     <div class="pb_head top">
       <span>项目管理</span>
       <div class="student_button">
-        <el-button type="primary" class="bgColor" @click="openCourse">协同编辑</el-button>
+        <el-button type="primary" class="bgColor" @click="openCourse"
+          >协同编辑</el-button
+        >
         <el-button
           type="primary"
           class="bgColor"
           @click="goTo('/course/addCourse?userid=' + userid + '&oid=' + oid)"
-        >添加项目</el-button>
+          >添加项目</el-button
+        >
       </div>
     </div>
     <div class="pb_content_body" style="height: 100%">
@@ -21,9 +24,17 @@
               <el-option value="1" label="他人课程"></el-option>
             </el-select>
           </div>
-          <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index">
+          <div
+            class="all_choose"
+            v-for="(item, index) in CourseType[0]"
+            :key="index"
+          >
             <span>{{ item.name }}</span>
-            <el-select v-model="courseTypeId[item.id]" placeholder="请选择" @change="getTypeName">
+            <el-select
+              v-model="courseTypeId[item.id]"
+              placeholder="请选择"
+              @change="getTypeName"
+            >
               <el-option label="全部" value="1">全部</el-option>
               <el-option
                 v-for="item1 in CourseTypeJson[item.id]"
@@ -38,8 +49,14 @@
 
         <div class="student_right">
           <div class="head_left">
-            <el-input v-model="courseName" class="student_input" placeholder="请输入课程名称"></el-input>
-            <el-button class="course_button" @click="searchCourse">查询</el-button>
+            <el-input
+              v-model="courseName"
+              class="student_input"
+              placeholder="请输入课程名称"
+            ></el-input>
+            <el-button class="course_button" @click="searchCourse"
+              >查询</el-button
+            >
           </div>
         </div>
       </div>
@@ -60,7 +77,9 @@
             </div>
             <div class="bottom_box">
               <div>{{ item.title }}</div>
-              <div class="kc_t" v-if="groupA == '1'">创建老师：{{ item.uname }}</div>
+              <div class="kc_t" v-if="groupA == '1'">
+                创建老师：{{ item.uname }}
+              </div>
               <div class="kc_time">{{ item.time }}</div>
             </div>
             <div class="three_bottom">
@@ -77,7 +96,9 @@
                       oid
                   )
                 "
-              >修改</div>
+              >
+                修改
+              </div>
               <div
                 @click="
                   goTo(
@@ -89,7 +110,9 @@
                       oid
                   )
                 "
-              >报告</div>
+              >
+                报告
+              </div>
               <div @click="deleteCourse(item.courseId)">删除</div>
             </div>
           </div>
@@ -173,7 +196,9 @@
                     oid
                 )
               "
-            >编辑</div>
+            >
+              编辑
+            </div>
           </div>
         </div>
         <div class="course_empty" v-if="courseTeam.length == 0">暂无数据</div>
@@ -305,13 +330,14 @@ export default {
     },
     //uuid生成
     guid() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (
-        c
-      ) {
-        var r = (Math.random() * 16) | 0,
-          v = c == "x" ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-      });
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
+        /[xy]/g,
+        function (c) {
+          var r = (Math.random() * 16) | 0,
+            v = c == "x" ? r : (r & 0x3) | 0x8;
+          return v.toString(16);
+        }
+      );
     },
     time() {
       if (!this.now) {
@@ -459,6 +485,30 @@ export default {
               }
             }
           }
+          this.selectTypeByOid();
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    selectTypeByOid() {
+      let params = {
+        oid: this.oid,
+      };
+      this.ajax
+        .get(this.$store.state.api + "selectTypeByOid", params)
+        .then((res) => {
+          for (var i = 0; i < res.data[0].length; i++) {
+            for (var j = 0; j < res.data[1].length; j++) {
+              if (res.data[0][i].id == res.data[1][j].pid) {
+                if (!this.CourseTypeJson[res.data[0][i].id]) {
+                  this.CourseTypeJson[res.data[0][i].id] = [];
+                }
+                this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]);
+              }
+            }
+          }
+          this.$forceUpdate();
         })
         .catch((err) => {
           console.error(err);