Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

build

lsc 2 years ago
parent
7f5cbc4058
commit
c3d1e7d0e5
14 changed files with 102 additions and 32 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.7b597a68972a712387ad158ba60c427b.css
  3. 0 0
      dist/static/css/app.7b597a68972a712387ad158ba60c427b.css.map
  4. 0 0
      dist/static/css/app.d8a76167b38b115fededbdf2ae8b50f5.css.map
  5. 0 0
      dist/static/js/app.54a259fb0e7153304aac.js
  6. 0 0
      dist/static/js/app.54a259fb0e7153304aac.js.map
  7. 0 0
      dist/static/js/app.e96e0dc6cd8a829ba057.js
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. BIN
      src/assets/icon/fourthToolList/cocopi.png
  10. 1 1
      src/components/pages/CaseDesignS.vue
  11. 19 3
      src/components/pages/addCourse.vue
  12. 14 5
      src/components/pages/scourse.vue
  13. 57 17
      src/components/pages/student/addCourse.vue
  14. 10 5
      src/components/pages/student/course.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.d8a76167b38b115fededbdf2ae8b50f5.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.748f10c1abb0af104b93.js></script><script type=text/javascript src=./static/js/app.e96e0dc6cd8a829ba057.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.7b597a68972a712387ad158ba60c427b.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.748f10c1abb0af104b93.js></script><script type=text/javascript src=./static/js/app.54a259fb0e7153304aac.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.7b597a68972a712387ad158ba60c427b.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.7b597a68972a712387ad158ba60c427b.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.d8a76167b38b115fededbdf2ae8b50f5.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.54a259fb0e7153304aac.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.54a259fb0e7153304aac.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.e96e0dc6cd8a829ba057.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


BIN
src/assets/icon/fourthToolList/cocopi.png
View File


+ 1 - 1
src/components/pages/CaseDesignS.vue
View File 

@@ -450,7 +450,7 @@ export default {
 
               for (var ttask = _tasks.length - 1; ttask >= 0; ttask--) {
 
               for (var ttask = _tasks.length - 1; ttask >= 0; ttask--) {
 
                 let _tools = _tasks[ttask].toolArray;
 
                 let _tools = _tasks[ttask].toolArray;
 
                 if (_tools.length) {
 
                 if (_tools.length) {
 
-                  _res[i].lastTask = `第${tk + 1}阶段任务${ttask + 1}步骤${_tools.length - 1}`
 
+                  _res[i].lastTask = `第${tk + 1}阶段任务${ttask + 1}步骤${_tools.length}`
 
                   break;
 
                   break;
 
                 } else {
 
                 } else {
 
                   continue;
 
                   continue;

+ 19 - 3
src/components/pages/addCourse.vue
View File 

@@ -247,9 +247,12 @@
 
                             margin-top: 10px;
 
                             margin-top: 10px;
 
                             font-size: 14px;
 
                             font-size: 14px;
 
                             color: #6e6e6e;
 
                             color: #6e6e6e;
 
-                          ">
 
-                        <span :class="{ tcMember: getMan2(tc) }" v-for="(tc, tcIndex) in checkboxList3" :key="tcIndex">{{
 
-                          getMan2(tc) }}</span>
 
+                            cursor: pointer;
 
+                          "
 
+                          @click="checkBoolean = !checkBoolean"
 
+                          >
 
+                        <span :class="{ tcMember: getMan2(tc) }" v-for="(tc, tcIndex) in checkboxList3.length > 6 && checkBoolean ? checkboxList3 : checkboxList3.slice(0,6)" :key="tcIndex">{{
 
+                          getMan2(tc) }}</span><span class="tcMember" v-if="checkboxList3.length > 6 && !checkBoolean">更多...</span>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                   </div>
 
                   </div>
 
@@ -1524,6 +1527,18 @@
 
                                 </div>
 
                                 </div>
 
                               </div>
 
                               </div>
 
                             </div>
 
                             </div>
 
+                            <div class="tool">
 
+                              <div class="whiteBIcon" @click="addTools(57, itemTaskIndex, toolIndex)">
 
+                                <img src="../../assets/icon/fourthToolList/cocopi.png" alt />
 
+                                <div style="margin: 5px 0">CocoPi</div>
 
+                              </div>
 
+                              <div class="check" @click="addTools(57, itemTaskIndex, toolIndex)">
 
+                                <img src="../../assets/icon/checkNo.png" alt v-if="itemTool.tool.indexOf(57) == -1" />
 
+                                <div class="checkDiv" v-else>
 
+                                  <img src="../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
+                                </div>
 
+                              </div>
 
+                            </div>
 
                           </div>
 
                           </div>
 
                           <div class="toolSort" v-if="itemTool.toolType == 5">
 
                           <div class="toolSort" v-if="itemTool.toolType == 5">
 
                             <div class="tool">
 
                             <div class="tool">
 
@@ -2883,6 +2898,7 @@ export default {
 
       dialogVisibleGroup: false,
 
       dialogVisibleGroup: false,
 
       rightBoxHeight: 0,
 
       rightBoxHeight: 0,
 
       ManAarray: [],
 
       ManAarray: [],
 
+      checkBoolean:false,
 
     };
 
     };
 
   },
 
   },
 
   computed: {
 
   computed: {

+ 14 - 5
src/components/pages/scourse.vue
View File 

@@ -30,7 +30,7 @@
 
               </el-option>
 
               </el-option>
 
             </el-select>
 
             </el-select>
 
           </div>
 
           </div>
 
-          <div @click="clear" class="clear">重置</div>
 
+          <div @click="clear" class="clear" v-if="CourseType.length">重置</div>
 
         </div>
 
         </div>
 
 
 
         <div class="student_right">
 
         <div class="student_right">
 
@@ -46,7 +46,7 @@
 
             <div class="myCourse" v-if="item.userid == userid">
 
             <div class="myCourse" v-if="item.userid == userid">
 
               我的项目
 
               我的项目
 
             </div>
 
             </div>
 
-            <div class="myCourse" v-else-if="item.course_teacher.indexOf(userid) == -1">
 
+            <div class="myCourse" style="background:#4187f0" v-else-if="item.course_teacher.indexOf(userid) == -1">
 
               他人项目
 
               他人项目
 
             </div>
 
             </div>
 
             <div class="xtCourse" v-else>协同项目</div>
 
             <div class="xtCourse" v-else>协同项目</div>
 
@@ -536,10 +536,19 @@ export default {
 
             }
 
             }
 
 
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
-              for (var j = 0; j < res.data[1].length; j++) {
 
-                if (res.data[0][i].id == res.data[1][j].pid) {
 
-                  this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+              // for (var j = 0; j < res.data[1].length; j++) {
 
+              //   if (res.data[0][i].id == res.data[1][j].pid) {
 
+              //     this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+              //   }
 
+              // }
 
+              if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
 
+                for (var j = 0; j < res.data[1].length; j++) {
 
+                  if (res.data[0][i].id == res.data[1][j].pid) {
 
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                  }
 
                 }
 
                 }
 
+              }else{
 
+                this.CourseType = []
 
               }
 
               }
 
             } else {
 
             } else {
 
               if (res.data[2].length > 0) {
 
               if (res.data[2].length > 0) {

+ 57 - 17
src/components/pages/student/addCourse.vue
View File 

@@ -199,7 +199,7 @@
 
                           />
 
                           />
 
                         </div>
 
                         </div>
 
                       </div>
 
                       </div>
 
-                      <div class="both">
 
+                      <div class="both" v-if="CourseType.length">
 
                         <div class="choose">
 
                         <div class="choose">
 
                           <div
 
                           <div
 
                             class="all_choose"
 
                             class="all_choose"
 
@@ -328,14 +328,16 @@
 
                           margin-top: 10px;
 
                           margin-top: 10px;
 
                           font-size: 14px;
 
                           font-size: 14px;
 
                           color: #6e6e6e;
 
                           color: #6e6e6e;
 
+                          cursor:pointer
 
                         "
 
                         "
 
+                        @click="checkBoolean = !checkBoolean"
 
                       >
 
                       >
 
                         <span
 
                         <span
 
                           :class="{ tcMember: getMan2(tc) }"
 
                           :class="{ tcMember: getMan2(tc) }"
 
-                          v-for="(tc, tcIndex) in checkboxList3"
 
+                          v-for="(tc, tcIndex) in checkboxList3.length > 6 && checkBoolean ? checkboxList3 : checkboxList3.slice(0,6)"
 
                           :key="tcIndex"
 
                           :key="tcIndex"
 
                           >{{ getMan2(tc) }}</span
 
                           >{{ getMan2(tc) }}</span
 
-                        >
 
+                        ><span class="tcMember" v-if="checkboxList3.length > 6 && !checkBoolean">更多...</span>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                   </div>
 
                   </div>
 
@@ -1249,7 +1251,7 @@
 
                             <span v-if="itemTool.tool == 54"> 拍照 </span>
 
                             <span v-if="itemTool.tool == 54"> 拍照 </span>
 
                             <span v-if="itemTool.tool == 55"> 压缩文件 </span>
 
                             <span v-if="itemTool.tool == 55"> 压缩文件 </span>
 
                             <span v-if="itemTool.tool == 56"> 投票 </span>
 
                             <span v-if="itemTool.tool == 56"> 投票 </span>
 
-                            <span v-if="itemTool.tool == 57"> cocopi </span>
 
+                            <span v-if="itemTool.tool == 57"> CocoPi </span>
 
                           </div>
 
                           </div>
 
                           <div
 
                           <div
 
                             class="remove"
 
                             class="remove"
 
@@ -2265,6 +2267,17 @@
 
         </el-checkbox-group>
 
         </el-checkbox-group>
 
         <div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
 
         <div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
 
       </div>
 
       </div>
 
+      <div style="margin-top: 10px;">
 
+        <el-pagination
 
+          background
 
+          layout="prev, pager, next"
 
+          :page-size="pageSize"
 
+          :total="total"
 
+          v-if="page && teacherJuri.length"
 
+          style="padding-bottom: 20px"
 
+          @current-change="handleCurrentChange"
 
+        ></el-pagination>
 
+      </div>
 
       <span slot="footer" class="dialog-footer">
 
       <span slot="footer" class="dialog-footer">
 
         <el-button @click="dialogVisibleMember = false">取 消</el-button>
 
         <el-button @click="dialogVisibleMember = false">取 消</el-button>
 
         <el-button type="primary" @click="isAddPPTeacher">确定</el-button>
 
         <el-button type="primary" @click="isAddPPTeacher">确定</el-button>
 
@@ -3228,7 +3241,7 @@
 
                 <div class="tool">
 
                 <div class="tool">
 
                   <div class="whiteBIcon" @click="addToolFun(57)">
 
                   <div class="whiteBIcon" @click="addToolFun(57)">
 
                     <img src="../../../assets/icon/fourthToolList/cocopi.png" alt />
 
                     <img src="../../../assets/icon/fourthToolList/cocopi.png" alt />
 
-                    <div style="margin: 5px 0">cocopi</div>
 
+                    <div style="margin: 5px 0">CocoPi</div>
 
                   </div>
 
                   </div>
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
@@ -4200,6 +4213,10 @@ export default {
 
       checkJson: [],
 
       checkJson: [],
 
       graphJson: {},
 
       graphJson: {},
 
       rightBoxHeight: 0,
 
       rightBoxHeight: 0,
 
+      checkBoolean:false,
 
+      pageSize:20,
 
+      total:0,
 
+      page:0,
 
     };
 
     };
 
   },
 
   },
 
   computed: {
 
   computed: {
 
@@ -4421,6 +4438,11 @@ export default {
 
     },
 
     },
 
   },
 
   },
 
   methods: {
 
   methods: {
 
+    handleCurrentChange(val) {
 
+      // console.log(`当前页: ${val}`);
 
+      this.page = val;
 
+      this.getTeacher();
 
+    },
 
     handleCheckAllChange(val) {
 
     handleCheckAllChange(val) {
 
       this.checkedCities = val ? cityOptions : [];
 
       this.checkedCities = val ? cityOptions : [];
 
       this.isIndeterminate = false;
 
       this.isIndeterminate = false;
 
@@ -4541,6 +4563,9 @@ export default {
 
       if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
       if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
         typeT++;
 
         typeT++;
 
       }
 
       }
 
+      if(this.CourseType.length == 0){
 
+        typeT = 3
 
+      }
 
       if (this.courseName == "" || typeT != 3) {
 
       if (this.courseName == "" || typeT != 3) {
 
         if (typeT != 3) {
 
         if (typeT != 3) {
 
           this.$message.error("分类为必选项目，请将信息补充完整后进行下一步");
 
           this.$message.error("分类为必选项目，请将信息补充完整后进行下一步");
 
@@ -4760,6 +4785,9 @@ export default {
 
       if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
       if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
         typeT++;
 
         typeT++;
 
       }
 
       }
 
+      if(this.CourseType.length == 0){
 
+        typeT = 3
 
+      }
 
       if (this.cidttt == 1) {
 
       if (this.cidttt == 1) {
 
         if (this.steps == 1) {
 
         if (this.steps == 1) {
 
           if (this.courseName != "" && typeT == 3) {
 
           if (this.courseName != "" && typeT == 3) {
 
@@ -6411,17 +6439,20 @@ export default {
 
         oid: this.oid,
 
         oid: this.oid,
 
         cu: "",
 
         cu: "",
 
         cn: this.searchTN,
 
         cn: this.searchTN,
 
+        page: this.page,
 
+        pageSize: this.pageSize,
 
       };
 
       };
 
       this.ajax
 
       this.ajax
 
         .get(
 
         .get(
 
           this.$store.state.api +
 
           this.$store.state.api +
 
             (this.org && this.org != "undefined" && this.org != "null"
 
             (this.org && this.org != "undefined" && this.org != "null"
 
-              ? "selectUserByOidS"
 
-              : "selectUserByOidS"),
 
+              ? "selectUserByOidS2"
 
+              : "selectUserByOidS2"),
 
           params
 
           params
 
         )
 
         )
 
         .then((res) => {
 
         .then((res) => {
 
           let teacherJuri = res.data[0];
 
           let teacherJuri = res.data[0];
 
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           this.teacherJuri2 = JSON.parse(JSON.stringify(res.data[0]));
 
           this.teacherJuri2 = JSON.parse(JSON.stringify(res.data[0]));
 
           for (var i = 0; i < teacherJuri.length; i++) {
 
           for (var i = 0; i < teacherJuri.length; i++) {
 
             if (teacherJuri[i].userid == this.userid) {
 
             if (teacherJuri[i].userid == this.userid) {
 
@@ -8337,16 +8368,20 @@ export default {
 
             }
 
             }
 
 
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
-              for (var j = 0; j < res.data[1].length; j++) {
 
-                if (
 
-                  this.courseTypeId.indexOf(res.data[1][j].id) != -1 &&
 
-                  _courseTypeId.indexOf(res.data[1][j].id) == -1
 
-                ) {
 
-                  _courseTypeId.push(res.data[1][j].id);
 
-                }
 
-                if (res.data[0][i].id == res.data[1][j].pid) {
 
-                  this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+              if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
 
+                for (var j = 0; j < res.data[1].length; j++) {
 
+                  if (
 
+                    this.courseTypeId.indexOf(res.data[1][j].id) != -1 &&
 
+                    _courseTypeId.indexOf(res.data[1][j].id) == -1
 
+                  ) {
 
+                    _courseTypeId.push(res.data[1][j].id);
 
+                  }
 
+                  if (res.data[0][i].id == res.data[1][j].pid) {
 
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                  }
 
                 }
 
                 }
 
+              }else{
 
+                this.CourseType = []
 
               }
 
               }
 
             } else {
 
             } else {
 
               if (res.data[2].length > 0) {
 
               if (res.data[2].length > 0) {
 
@@ -9060,6 +9095,7 @@ export default {
 
     },
 
     },
 
     openMember() {
 
     openMember() {
 
       this.searchTN = "";
 
       this.searchTN = "";
 
+      this.page = 1
 
       this.getTeacher();
 
       this.getTeacher();
 
       this.dialogVisibleMember = true;
 
       this.dialogVisibleMember = true;
 
     },
 
     },
 
@@ -9752,7 +9788,11 @@ export default {
 
   justify-content: flex-start;
 
   justify-content: flex-start;
 
   padding: 10px 0 0 25px;
 
   padding: 10px 0 0 25px;
 
   flex-direction: column;
 
   flex-direction: column;
 
-  flex-wrap: wrap;
 
+  flex-wrap: nowrap;
 
+  height: calc(100% - 140px);
 
+  overflow-y: auto;
 
+  overflow-x: hidden;
 
+  flex-direction: column;
 
 }
 
 }
 
 
 
 .people_name >>> .el-checkbox {
 
 .people_name >>> .el-checkbox {

+ 10 - 5
src/components/pages/student/course.vue
View File 

@@ -30,7 +30,7 @@
 
               </el-option>
 
               </el-option>
 
             </el-select>
 
             </el-select>
 
           </div>
 
           </div>
 
-          <div @click="clear" class="clear">重置</div>
 
+          <div @click="clear" class="clear" v-if="CourseType.length">重置</div>
 
         </div>
 
         </div>
 
 
 
         <div class="student_right">
 
         <div class="student_right">
 
@@ -46,7 +46,7 @@
 
             <div class="myCourse" v-if="item.isCourseType == 1 && groupA == 0">
 
             <div class="myCourse" v-if="item.isCourseType == 1 && groupA == 0">
 
               我的项目
 
               我的项目
 
             </div>
 
             </div>
 
-            <div class="myCourse" v-else-if="groupA == 1">
 
+            <div class="myCourse" style="background:#4187f0" v-else-if="groupA == 1">
 
               他人项目
 
               他人项目
 
             </div>
 
             </div>
 
             <div class="xtCourse" v-else>协同项目</div>
 
             <div class="xtCourse" v-else>协同项目</div>
 
@@ -540,11 +540,16 @@ export default {
 
             }
 
             }
 
 
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
-              for (var j = 0; j < res.data[1].length; j++) {
 
-                if (res.data[0][i].id == res.data[1][j].pid) {
 
-                  this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+              if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
 
+                for (var j = 0; j < res.data[1].length; j++) {
 
+                  if (res.data[0][i].id == res.data[1][j].pid) {
 
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                  }
 
                 }
 
                 }
 
+              }else{
 
+                this.CourseType = []
 
               }
 
               }
 
+
 
             } else {
 
             } else {
 
               if (res.data[2].length > 0) {
 
               if (res.data[2].length > 0) {
 
                 for (var j = 0; j < res.data[2].length; j++) {
 
                 for (var j = 0; j < res.data[2].length; j++) {

Some files were not shown because too many files changed in this diff