lsc 1 年之前
父节点
当前提交
22d53f3453

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.6f1c24a8027a6f7c948089793c3690de.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.76fd85af8d485ac3a12b.js></script><script type=text/javascript src=./static/js/app.ef2eaf8412e1c6ac68b4.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.149d727fa89bdb0a6e9e8d50de254ea5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.76fd85af8d485ac3a12b.js></script><script type=text/javascript src=./static/js/app.40abd4b28168c683a7f9.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.149d727fa89bdb0a6e9e8d50de254ea5.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.149d727fa89bdb0a6e9e8d50de254ea5.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.6f1c24a8027a6f7c948089793c3690de.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.6f1c24a8027a6f7c948089793c3690de.css.map


二进制
dist/static/img/projectName2.8662e29.png


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.40abd4b28168c683a7f9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.40abd4b28168c683a7f9.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 4 - 1
src/common/tools.js

@@ -35,5 +35,8 @@ export const tools = {
     70: { name: "英语口语" },
     25: { name: "目标管理" },
     26: { name: "课程设计" },
-    62: { name: "交互视频" }
+    62: { name: "交互视频" },
+    51: { name: "资源库" },
+    54: { name: "拍照" },
+    56: { name: "投票" }
 };

+ 1 - 1
src/components/pages/dataBoardNew/student/index.vue

@@ -773,7 +773,7 @@ export default {
           let _loginTimeArray = res.data[9]; //在线时间
           let _classList = res.data[8]; //班级
           this.classList = _classList.filter(el => {return el.count > 0});
-          this.cTypeRank = _classList[0].id
+          this.cTypeRank = this.classList[0].id
           let _EloginTimeArray = [];
           for (let i = 0; i < _classList.length; i++) {
             _EloginTimeArray.push({

+ 361 - 82
src/components/pages/scourse.vue

@@ -40,23 +40,50 @@
           </div>
         </div>
         <div class="choose">
-          <!-- <div class="student_search">
-            <span>项目筛选</span>
-            <el-select v-model="groupA" @change="search">
-              <el-option value="0" label="我的项目"></el-option>
-              <el-option value="1" label="他人项目"></el-option>
-            </el-select>
-          </div> -->
           <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index"
-            v-if="CourseTypeJson[item.id].length">
-            <span>{{ item.name }}</span>
-            <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]" :key="item1.id" :label="item1.name" :value="item1.id">
-              </el-option>
-            </el-select>
+            :style="{ margin: !CourseTypeJson[item.id].length && 0 }">
+            <span v-if="CourseTypeJson[item.id].length"><span>{{ item.name }}</span></span>
+            <div class="typeCss" v-if="CourseTypeJson[item.id].length">
+              <div class="cName" @click="getCourse2(item.name, '', item.id, 1)"
+                :class="typeE.indexOf(item.id) != -1 ? 'isCType' : ''">
+                全部
+              </div>
+              <div v-for="(item1, index1) in CourseTypeJson[item.id]" :key="index + '-' + index1" :label="item1.id"
+                @click="getCourse2(item.name, item.id, item1.id, 2)">
+                <div class="cName" :class="typea == item1.id || typeb == item1.id || typed == item1.id || typef == item1.id
+                  ? 'isCType'
+                  : ''
+                  ">
+                  {{ item1.name }}
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="all_choose" v-if="role != '1'">
+            <span><span>所有者</span></span>
+            <div class="typeCss">
+              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
+                全部
+              </div>
+              <div class="cName" :class="groupA == '0' ? 'isCType' : ''" @click="groupA = '0'; search();">
+                我的项目
+              </div>
+              <div class="cName" :class="groupA == '1' ? 'isCType' : ''" @click="groupA = '1'; search();">
+                协同项目
+              </div>
+              <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();" v-if="oid != '1c3b9def-8fbe-11ed-b13d-005056b86db5'">
+                他人项目
+              </div>
+            </div>
+          </div>
+          <div class="all_choose" v-else>
+            <span><span>所有者</span></span>
+            <div class="typeCss">
+              <div class="cName" :class="groupA == '4' ? 'isCType' : ''" @click="groupA = '4'; search();">
+                全部
+              </div>
+            </div>
           </div>
-          <!-- <div @click="clear" class="clear" v-if="CourseType.length">重置</div> -->
         </div>
       </div>
     </div>
@@ -261,6 +288,13 @@ export default {
       isChoose: 0,
       problemCourse: null, //查看提问的项目
       courseTeam: [],
+      typeE: [],
+      typea: "",
+      typeb: "",
+      typed: "",
+      typef: "",
+      pTypeCheck: [],
+      pTypeCheckName: [],
     };
   },
   methods: {
@@ -432,59 +466,256 @@ export default {
       this.getCourse();
     },
     clear() {
-      if (this.CourseType.length) {
-        for (var i = 0; i < this.CourseType[0].length; i++) {
-          this.courseTypeId[this.CourseType[0][i].id] = "";
-        }
-      }
+      // if (this.CourseType.length) {
+      //   for (var i = 0; i < this.CourseType[0].length; i++) {
+      //     this.courseTypeId[this.CourseType[0][i].id] = "";
+      //   }
+      // }
+      this.typeE = []
+      this.typea = ''
+      this.typeb = ''
+      this.typed = ''
+      this.typef = ''
+      this.courseName = ''
+      if (this.role == "1") {
+            this.groupA = "4";
+          } else {
+            this.groupA = "3";
+          }
       this.courseName = ''
       this.getCourse();
     },
-    getCourse() {
-      var typeE = [];
-      var typea, typeb, typec, typed, typef;
-      if (this.isChoose == 1) {
-        for (var i = 0; i < this.CourseType[0].length; i++) {
-          if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
-            typeE.push(this.CourseType[0][i].id);
-          } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
-            if (this.CourseType[0][i].name == "年级") {
-              typea = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "专栏") {
-              typeb = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "栏目") {
-              typeb = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "学院") {
-              typeb = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "新技能") {
-              typec = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "赛道") {
-              typed = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "学科") {
-              typed = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "项目类型") {
-              typed = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "主题") {
-              typef = this.courseTypeId[this.CourseType[0][i].id];
+    getCourse2(typeName, ftypeId, typeid, type) {
+      this.page = 1;
+      if (typeName == "年级" || typeid == "34628934-d02f-11ec-8c78-005056b86db5" || ftypeId == '34628934-d02f-11ec-8c78-005056b86db5') {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typea != "") {
+              this.typea = "";
+            }
+          }
+        } else {
+          if (this.typea == typeid) {
+            this.typea = "";
+          } else {
+            this.typea = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "专栏") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typeb != "") {
+              this.typeb = "";
+            }
+          }
+        } else {
+          if (this.typeb == typeid) {
+            this.typeb = "";
+          } else {
+            this.typeb = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "栏目") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typeb != "") {
+              this.typeb = "";
+            }
+          }
+        } else {
+          if (this.typeb == typeid) {
+            this.typeb = "";
+          } else {
+            this.typeb = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeid == "2f8beae3-d030-11ec-8c78-005056b86db5" || ftypeId == '2f8beae3-d030-11ec-8c78-005056b86db5') {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typef != "") {
+              this.typef = "";
+            }
+          }
+        } else {
+          if (this.typef == typeid) {
+            this.typef = "";
+          } else {
+            this.typef = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeid == "34629ce3-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629ce3-d02f-11ec-8c78-005056b86db5') {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "学科") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "项目类型") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "学院") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typeb != "") {
+              this.typeb = "";
+            }
+          }
+        } else {
+          if (this.typeb == typeid) {
+            this.typeb = "";
+          } else {
+            this.typeb = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "学科") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
             }
-            this.courseTypeSon.push(
-              this.courseTypeId[this.CourseType[0][i].id]
-            );
           }
         }
       }
+      // this.loading = true;
+      this.getCourse();
+    },
+    getCourse() {
+      var typeE = [];
+      // var typea, typeb, typec, typed, typef;
+      // if (this.isChoose == 1) {
+      //   for (var i = 0; i < this.CourseType[0].length; i++) {
+      //     if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
+      //       typeE.push(this.CourseType[0][i].id);
+      //     } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
+      //       if (this.CourseType[0][i].name == "年级") {
+      //         typea = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "专栏") {
+      //         typeb = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "栏目") {
+      //         typeb = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "学院") {
+      //         typeb = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "新技能") {
+      //         typec = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "赛道") {
+      //         typed = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "学科") {
+      //         typed = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "项目类型") {
+      //         typed = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "主题") {
+      //         typef = this.courseTypeId[this.CourseType[0][i].id];
+      //       }
+      //       this.courseTypeSon.push(
+      //         this.courseTypeId[this.CourseType[0][i].id]
+      //       );
+      //     }
+      //   }
+      // }
       this.isLoading = true;
       let params = {
         type: this.groupA,
         uid: this.userid,
         oid: this.oid,
         org: this.org,
-        typea: typea != undefined ? typea : "",
-        typeb: typeb != undefined ? typeb : "",
-        typec: typec != undefined ? typec : "",
-        typed: typed != undefined ? typed : "",
-        typef: typef != undefined ? typef : "",
-        typeE: typeE.join(","),
+        typea: this.typea != undefined ? this.typea : "",
+        typeb: this.typeb != undefined ? this.typeb : "",
+        typec: this.typec != undefined ? this.typec : "",
+        typed: this.typed != undefined ? this.typed : "",
+        typef: this.typef != undefined ? this.typef : "",
+        typeE: this.typeE.join(","),
         cu: "",
         cn: this.courseName,
         page: this.page,
@@ -1206,59 +1437,107 @@ export default {
   line-height: 40px;
 }
 
-.all_choose {
-  margin: 12px 10px 10px 0;
-  height: 20%;
+.typeCss {
   display: flex;
   flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
   align-items: center;
-  /* max-width: calc(100% / 3 - 50px); */
-  width: fit-content;
+}
+
+.choose {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  height: 100%;
+  justify-content: space-evenly;
+  align-items: flex-start;
+  padding: 10px 0;
+}
+
+.all_choose {
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+  margin: 2px 0;
+  width: 100%;
 }
 
 .all_choose>span {
-  min-width: 75px;
+  display: flex;
+  margin-right: 5px;
+}
+
+.all_choose>span>span {
+  min-width: 65px;
+  max-width: 65px;
   display: block;
-  margin-right: 10px;
   text-align-last: justify;
 }
 
-.choose {
+.all_choose>span::after {
+  content: ':';
+}
+
+.all_choose>span:nth-child(1) {
+  font-weight: bold;
+}
+
+.all_choose>>>.el-checkbox-group {
   display: flex;
   flex-direction: row;
+  width: 820px;
   flex-wrap: wrap;
-  align-content: space-between;
-  height: 100%;
+  align-content: center;
   justify-content: flex-start;
-  width: 100%;
-  /* min-width: 868px; */
   align-items: center;
+  margin-top: 3px;
 }
 
-/* .choose>div:nth-child(2) {
-  margin-left: 1%;
-  width: 32.33333%;
+.all_choose>.el-checkbox-group>>>.el-checkbox {
+  margin-bottom: 10px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
 }
 
-.choose>div:nth-child(3) {
-  margin-left: 1%;
-  width: 32.33333%;
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {
+  min-width: 80px;
+  overflow: hidden;
+  width: 80px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.choose>div:nth-child(5) {
-  margin: 5px 0 0 1%;
-} */
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label:hover {
+  width: auto;
+}
 
-.choose>div:nth-child(4)>span {
-  /* width: 74px !important;
-  min-width: 74px; */
+.cName {
+  cursor: pointer;
+  margin: 0 10px 5px 0;
+  color: #b9b6b9;
+  min-width: 80px;
+  width: 80px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
-.choose>div:nth-child(4)>>>.el-select {
-  /* width: 217.5px;
-  min-width: 215.06px; */
+.isCType {
+  color: #6282c2;
 }
 
+.pType_box {
+  margin-top: 0;
+}
+
+.pType_box>>>.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+}
+
+
 .clear {
   width: 70px;
   max-width: 70px;

文件差异内容过多而无法显示
+ 378 - 641
src/components/pages/student/addCourse.vue


文件差异内容过多而无法显示
+ 641 - 378
src/components/pages/student/addCourseJiu.vue


+ 332 - 83
src/components/pages/student/course.vue

@@ -31,23 +31,25 @@
           </div>
         </div>
         <div class="choose">
-          <!-- <div class="student_search">
-            <span>项目筛选</span>
-            <el-select v-model="groupA" @change="search">
-              <el-option value="0" label="我的项目"></el-option>
-              <el-option value="1" label="他人项目"></el-option>
-            </el-select>
-          </div> -->
           <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index"
-            v-if="CourseTypeJson[item.id].length">
-            <span>{{ item.name }}</span>
-            <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]" :key="item1.id" :label="item1.name" :value="item1.id">
-              </el-option>
-            </el-select>
+            :style="{ margin: !CourseTypeJson[item.id].length && 0 }">
+            <span v-if="CourseTypeJson[item.id].length"><span>{{ item.name }}</span></span>
+            <div class="typeCss" v-if="CourseTypeJson[item.id].length">
+              <div class="cName" @click="getCourse2(item.name, '', item.id, 1)"
+                :class="typeE.indexOf(item.id) != -1 ? 'isCType' : ''">
+                全部
+              </div>
+              <div v-for="(item1, index1) in CourseTypeJson[item.id]" :key="index + '-' + index1" :label="item1.id"
+                @click="getCourse2(item.name, item.id, item1.id, 2)">
+                <div class="cName" :class="typea == item1.id || typeb == item1.id || typed == item1.id || typef == item1.id
+                  ? 'isCType'
+                  : ''
+                  ">
+                  {{ item1.name }}
+                </div>
+              </div>
+            </div>
           </div>
-          <!-- <div @click="clear" class="clear" v-if="CourseType.length">重置</div> -->
         </div>
       </div>
     </div>
@@ -268,6 +270,13 @@ export default {
       isChoose: 0,
       problemCourse: null, //查看提问的项目
       courseTeam: [],
+      typeE: [],
+      typea: "",
+      typeb: "",
+      typed: "",
+      typef: "",
+      pTypeCheck: [],
+      pTypeCheckName: [],
     };
   },
   methods: {
@@ -433,59 +442,252 @@ export default {
       this.getCourse();
     },
     clear() {
-      if (this.CourseType.length) {
-        for (var i = 0; i < this.CourseType[0].length; i++) {
-          this.courseTypeId[this.CourseType[0][i].id] = "";
-        }
-      }
+      // if (this.CourseType.length) {
+      //   for (var i = 0; i < this.CourseType[0].length; i++) {
+      //     this.courseTypeId[this.CourseType[0][i].id] = "";
+      //   }
+      // }
+      this.typeE = []
+      this.typea = ''
+      this.typeb = ''
+      this.typed = ''
+      this.typef = ''
+      this.courseName = ''
+      this.groupA = "0";
       this.courseName = ''
       this.getCourse();
     },
-    getCourse() {
-      var typeE = [];
-      var typea, typeb, typec, typed, typef;
-      if (this.isChoose == 1) {
-        for (var i = 0; i < this.CourseType[0].length; i++) {
-          if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
-            typeE.push(this.CourseType[0][i].id);
-          } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
-            if (this.CourseType[0][i].name == "年级") {
-              typea = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "专栏") {
-              typeb = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "栏目") {
-              typeb = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "学院") {
-              typeb = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "新技能") {
-              typec = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
-              typed = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "学科") {
-              typed = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "项目类型") {
-              typed = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5") {
-              typef = this.courseTypeId[this.CourseType[0][i].id];
+    getCourse2(typeName, ftypeId, typeid, type) {
+      this.page = 1;
+      if (typeName == "年级" || typeid == "34628934-d02f-11ec-8c78-005056b86db5" || ftypeId == '34628934-d02f-11ec-8c78-005056b86db5') {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typea != "") {
+              this.typea = "";
+            }
+          }
+        } else {
+          if (this.typea == typeid) {
+            this.typea = "";
+          } else {
+            this.typea = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "专栏") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typeb != "") {
+              this.typeb = "";
+            }
+          }
+        } else {
+          if (this.typeb == typeid) {
+            this.typeb = "";
+          } else {
+            this.typeb = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "栏目") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typeb != "") {
+              this.typeb = "";
+            }
+          }
+        } else {
+          if (this.typeb == typeid) {
+            this.typeb = "";
+          } else {
+            this.typeb = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeid == "2f8beae3-d030-11ec-8c78-005056b86db5" || ftypeId == '2f8beae3-d030-11ec-8c78-005056b86db5') {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typef != "") {
+              this.typef = "";
+            }
+          }
+        } else {
+          if (this.typef == typeid) {
+            this.typef = "";
+          } else {
+            this.typef = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeid == "34629ce3-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629ce3-d02f-11ec-8c78-005056b86db5') {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "学科") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "项目类型") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "学院") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typeb != "") {
+              this.typeb = "";
+            }
+          }
+        } else {
+          if (this.typeb == typeid) {
+            this.typeb = "";
+          } else {
+            this.typeb = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
+            }
+          }
+        }
+      } else if (typeName == "学科") {
+        if (type == 1) {
+          if (this.typeE.indexOf(typeid) != -1) {
+            this.typeE.splice(this.typeE.indexOf(typeid), 1);
+          } else {
+            this.typeE.push(typeid);
+            if (this.typed != "") {
+              this.typed = "";
+            }
+          }
+        } else {
+          if (this.typed == typeid) {
+            this.typed = "";
+          } else {
+            this.typed = typeid;
+            if (this.typeE.indexOf(ftypeId) != -1) {
+              this.typeE.splice(this.typeE.indexOf(ftypeId), 1);
             }
-            this.courseTypeSon.push(
-              this.courseTypeId[this.CourseType[0][i].id]
-            );
           }
         }
       }
+      // this.loading = true;
+      this.getCourse();
+    },
+    getCourse() {
+      var typeE = [];
+      // var typea, typeb, typec, typed, typef;
+      // if (this.isChoose == 1) {
+      //   for (var i = 0; i < this.CourseType[0].length; i++) {
+      //     if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
+      //       typeE.push(this.CourseType[0][i].id);
+      //     } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
+      //       if (this.CourseType[0][i].name == "年级") {
+      //         typea = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "专栏") {
+      //         typeb = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "栏目") {
+      //         typeb = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "学院") {
+      //         typeb = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "新技能") {
+      //         typec = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
+      //         typed = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "学科") {
+      //         typed = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].name == "项目类型") {
+      //         typed = this.courseTypeId[this.CourseType[0][i].id];
+      //       } else if (this.CourseType[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5") {
+      //         typef = this.courseTypeId[this.CourseType[0][i].id];
+      //       }
+      //       this.courseTypeSon.push(
+      //         this.courseTypeId[this.CourseType[0][i].id]
+      //       );
+      //     }
+      //   }
+      // }
       this.isLoading = true;
       let params = {
         type: this.groupA,
         uid: this.userid,
         oid: this.oid,
         org: this.org,
-        typea: typea != undefined ? typea : "",
-        typeb: typeb != undefined ? typeb : "",
-        typec: typec != undefined ? typec : "",
-        typed: typed != undefined ? typed : "",
-        typef: typef != undefined ? typef : "",
-        typeE: typeE.join(","),
+        typea: this.typea != undefined ? this.typea : "",
+        typeb: this.typeb != undefined ? this.typeb : "",
+        typec: this.typec != undefined ? this.typec : "",
+        typed: this.typed != undefined ? this.typed : "",
+        typef: this.typef != undefined ? this.typef : "",
+        typeE: this.typeE.join(","),
         cu: "",
         cn: this.courseName,
         page: this.page,
@@ -1198,58 +1400,105 @@ export default {
   line-height: 40px;
 }
 
-.all_choose {
-  margin: 12px 10px 10px 0;
-  height: 20%;
+.typeCss {
   display: flex;
   flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
   align-items: center;
-  width: fit-content;
+}
+
+.choose {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  height: 100%;
+  justify-content: space-evenly;
+  align-items: flex-start;
+  padding: 10px 0;
+}
+
+.all_choose {
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+  margin: 2px 0;
+  width: 100%;
 }
 
 .all_choose>span {
-  min-width: 75px;
+  display: flex;
+  margin-right: 5px;
+}
+
+.all_choose>span>span {
+  min-width: 65px;
+  max-width: 65px;
   display: block;
-  margin-right: 10px;
   text-align-last: justify;
 }
 
-.choose {
+.all_choose>span::after {
+  content: ':';
+}
+
+.all_choose>span:nth-child(1) {
+  font-weight: bold;
+}
+
+.all_choose>>>.el-checkbox-group {
   display: flex;
   flex-direction: row;
+  width: 820px;
   flex-wrap: wrap;
-  align-content: space-between;
-  height: 100%;
+  align-content: center;
   justify-content: flex-start;
-  width: 100%;
-  /* min-width: 868px; */
   align-items: center;
+  margin-top: 3px;
 }
 
-/* .choose>div:nth-child(2) {
-  margin-left: 1%;
-  width: 32.33333%;
-} */
+.all_choose>.el-checkbox-group>>>.el-checkbox {
+  margin-bottom: 10px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
 
-/* .choose>div:nth-child(4) {
-  margin-right: 1%;
-  width: 32.33333%;
-} */
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {
+  min-width: 80px;
+  overflow: hidden;
+  width: 80px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 
-/* .choose>div:nth-child(5) {
-  margin: 5px 0 0 1%;
-} */
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label:hover {
+  width: auto;
+}
 
-.choose>div:nth-child(4)>span {
-  /* width: 74px !important;
-  min-width: 74px; */
+.cName {
+  cursor: pointer;
+  margin: 0 10px 5px 0;
+  color: #b9b6b9;
+  min-width: 80px;
+  width: 80px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
-.choose>div:nth-child(4)>>>.el-select {
-  /* width: 217.5px;
-  min-width: 215.06px; */
+.isCType {
+  color: #6282c2;
 }
 
+.pType_box {
+  margin-top: 0;
+}
+
+.pType_box>>>.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+}
 .clear {
   width: 70px;
   height: 35px;

部分文件因为文件数量过多而无法显示