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

Merge branch 'beta'

qgt 4 days ago
parent
4798e76c53 cb39124706
commit
9be44f96ff
10 changed files with 247 additions and 58 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.caf5aed2241c347b7ecb5bde4a14f397.css
  3. 0 0
      dist/static/css/app.caf5aed2241c347b7ecb5bde4a14f397.css.map
  4. 0 0
      dist/static/js/app.bfd13562cfbe19c2115c.js
  5. 0 0
      dist/static/js/app.bfd13562cfbe19c2115c.js.map
  6. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  7. 12 2
      src/components/courseDetail.vue
  8. 165 0
      src/components/dialog/selectTeachingClass.vue
  9. 33 37
      src/components/index.vue
  10. 36 18
      src/components/pptEasyClass/index.vue

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     html,
 
     body{
 
     body{
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.2c2e5dc1e758c038dcaee7a4018ba4ad.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.e613ab6d2e2f77f4fd9c.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.caf5aed2241c347b7ecb5bde4a14f397.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.bfd13562cfbe19c2115c.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.caf5aed2241c347b7ecb5bde4a14f397.css


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


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


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


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


+ 12 - 2
src/components/courseDetail.vue
View File 

@@ -211,7 +211,7 @@
 
             <div v-loading="elLoading" element-loading-text="小可正在努力生成中，请稍等..." ref="chatDialog" class="courseTd vditor-reset" v-html="brief"></div>
 
             <div v-loading="elLoading" element-loading-text="小可正在努力生成中，请稍等..." ref="chatDialog" class="courseTd vditor-reset" v-html="brief"></div>
 
           </div>
 
           </div>
 
           <div :class="courseDetail.brief != '' ? 'rightTd' : 'noBRight'">
 
           <div :class="courseDetail.brief != '' ? 'rightTd' : 'noBRight'">
 
-            <div v-if="tType == 1 || tType == 4" class="checkBox">
 
+            <div v-if="(tType == 1 || tType == 4) && courseDetail.state !=7" class="checkBox">
 
               <span :class="{ active: type == 2 }" @click="type = 2"
 
               <span :class="{ active: type == 2 }" @click="type = 2"
 
                 >阶段选择
 
                 >阶段选择
 
                 <div v-show="false">
 
                 <div v-show="false">
 
@@ -1100,6 +1100,7 @@
 
       </div>
 
       </div>
 
       <div class="cancelDiy" @click="dialogVisibleSk = false">取消</div>
 
       <div class="cancelDiy" @click="dialogVisibleSk = false">取消</div>
 
     </el-dialog>
 
     </el-dialog>
 
+    <!-- <selectTeachingClass ref="selectTeachingClassRef"/> -->
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
@@ -1125,6 +1126,8 @@ let converter = OpenCC.Converter({
 
 		to:'cn'
 
 		to:'cn'
 
 })
 
 })
 
 
 
+// import selectTeachingClass from "./dialog/selectTeachingClass.vue";
 
+
 
 const getFile = (url) => {
 
 const getFile = (url) => {
 
   return new Promise((resolve, reject) => {
 
   return new Promise((resolve, reject) => {
 
     var credentials = {
 
     var credentials = {
 
@@ -1181,7 +1184,8 @@ export default {
 
   components: {
 
   components: {
 
     Heatmap,
 
     Heatmap,
 
     Group,
 
     Group,
 
-    scoreZong
 
+    scoreZong,
 
+    // selectTeachingClass
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
@@ -1513,6 +1517,7 @@ export default {
 
     goToStudyOrDia(l) {
 
     goToStudyOrDia(l) {
 
       if (l.length > 0) {
 
       if (l.length > 0) {
 
         this.dialogVisibleSk = true;
 
         this.dialogVisibleSk = true;
 
+        // this.$refs.selectTeachingClassRef.open()
 
 				this.insertMemorandum("点击<span class='btn'>以班级授课</span>")
 
 				this.insertMemorandum("点击<span class='btn'>以班级授课</span>")
 
       } else {
 
       } else {
 
 				this.getCourseDetail1().then(_=>{
 
 				this.getCourseDetail1().then(_=>{
 
@@ -1956,6 +1961,11 @@ export default {
 
           }
 
           }
 
         }
 
         }
 
       }
 
       }
 
+
 
+      if(this.courseDetail.state == 7 && this.tType == 2){
 
+        this.goToStudyRate('')
 
+      }
 
+
 
       // debugger
 
       // debugger
 
     },
 
     },
 
     addInviteCode() {
 
     addInviteCode() {

+ 165 - 0
src/components/dialog/selectTeachingClass.vue
View File 

@@ -0,0 +1,165 @@
 
+<template>
 
+	<div>
 
+		<el-dialog
 
+			:center="true"
 
+			:visible.sync="show"
 
+			:close-on-click-modal="false"
 
+			:modal="true"
 
+			width="auto"
 
+			top="2vh"
 
+			height="auto"
 
+			:append-to-body="true"
 
+			class="dialog"
 
+		>
 
+			<div class="box">
 
+				<div class="b_head">
 
+					<span>选择授课班级</span>
 
+					<svg
 
+						@click="close()"
 
+						t="1748587270371"
 
+						class="icon"
 
+						viewBox="0 0 1024 1024"
 
+						version="1.1"
 
+						xmlns="http://www.w3.org/2000/svg"
 
+						p-id="5023"
 
+						width="200"
 
+						height="200"
 
+					>
 
+						<path
 
+							d="M0 0h1024v1024H0z"
 
+							fill="#FF0033"
 
+							fill-opacity="0"
 
+							p-id="5024"
 
+						></path>
 
+						<path
 
+							d="M240.448 168l2.346667 2.154667 289.92 289.941333 279.253333-279.253333a42.666667 42.666667 0 0 1 62.506667 58.026666l-2.133334 2.346667-279.296 279.210667 279.274667 279.253333a42.666667 42.666667 0 0 1-58.005333 62.528l-2.346667-2.176-279.253333-279.253333-289.92 289.962666a42.666667 42.666667 0 0 1-62.506667-58.005333l2.154667-2.346667 289.941333-289.962666-289.92-289.92a42.666667 42.666667 0 0 1 57.984-62.506667z"
 
+							fill="#111111"
 
+							p-id="5025"
 
+						></path>
 
+					</svg>
 
+				</div>
 
+				<div class="b_main" v-loading="loading">
 
+
 
+				</div>
 
+				<div class="b_bottom">
 
+          <el-button size="small" @click="close()">取消</el-button>
 
+					<el-button size="small" type="primary" @click="submit()">确定</el-button>
 
+				</div>
 
+			</div>
 
+		</el-dialog>
 
+	</div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+	data() {
 
+		return {
 
+			loading: false,
 
+			show: false,
 
+			data: null,
 
+			value: "",
 
+		};
 
+	},
 
+	computed: {},
 
+	methods: {
 
+		open(data) {
 
+			this.data = data;
 
+			this.loading = false;
 
+			this.show = true;
 
+		},
 
+		close() {
 
+			this.show = false;
 
+			this.init();
 
+		},
 
+		init() {
 
+			this.data = null;
 
+			this.loading = false;
 
+		},
 
+	},
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+.dialog >>> .el-dialog {
 
+	width: 800px;
 
+	border-radius: 8px;
 
+	padding: 0;
 
+	background-color: #fff;
 
+	overflow: hidden;
 
+}
 
+
 
+.dialog >>> .el-dialog__body {
 
+	width: 800px !important;
 
+	height: auto;
 
+	flex-shrink: 0;
 
+	padding: 0;
 
+	box-sizing: border-box;
 
+	overflow: auto;
 
+}
 
+
 
+.dialog >>> .el-dialog__header {
 
+	display: none !important;
 
+}
 
+
 
+.box {
 
+	width: 100%;
 
+	height: 500px;
 
+	background: #fafafa;
 
+	border-radius: 15px;
 
+	box-shadow: 0px 6px 30px 5px rgba(0, 0, 0, 0.05),
 
+		0px 16px 24px 2px rgba(0, 0, 0, 0.04), 0px 8px 10px -5px rgba(0, 0, 0, 0.08);
 
+}
 
+
 
+.b_head {
 
+	width: 100%;
 
+	height: 50px;
 
+	border-radius: 15px 15px 0 0;
 
+	background: #fff;
 
+	display: flex;
 
+	align-items: center;
 
+	justify-content: space-between;
 
+	box-sizing: border-box;
 
+	padding: 0 20px;
 
+}
 
+
 
+.b_head > span {
 
+	font-size: 18px;
 
+	font-weight: bold;
 
+	color: #000;
 
+}
 
+
 
+.b_head > img {
 
+	width: 20px;
 
+	height: 20px;
 
+	cursor: pointer;
 
+}
 
+
 
+.b_head > svg {
 
+	width: 20px;
 
+	height: 20px;
 
+	cursor: pointer;
 
+}
 
+
 
+.b_main {
 
+	width: 100%;
 
+	height: calc(100% - 70px - 50px);
 
+	background: #fafafa;
 
+	padding: 20px 20px 0 20px;
 
+	box-sizing: border-box;
 
+	display: flex;
 
+	flex-direction: column;
 
+	align-items: center;
 
+	justify-content: center;
 
+}
 
+
 
+.b_bottom {
 
+	width: 100%;
 
+	height: 70px;
 
+	display: flex;
 
+	align-items: center;
 
+	justify-content: flex-end;
 
+	box-sizing: border-box;
 
+	padding: 0 20px;
 
+}
 
+
 
+</style>

+ 33 - 37
src/components/index.vue
View File 

@@ -73,24 +73,22 @@
 
         <div>
 
         <div>
 
           <div class="main_box">
 
           <div class="main_box">
 
             <div style="display:flex;flex-wrap:wrap" v-if="!typeCheck">
 
             <div style="display:flex;flex-wrap:wrap" v-if="!typeCheck">
 
-              <div class="box_course" v-for="(item, index) in zoneClass" :key="index"  @click="
 
-                  goTo(
 
-                    '/courseDetail?courseId=' +
 
-                    item.courseId +
 
-                    '&userid=' +
 
-                    userid +
 
-                    '&oid=' +
 
-                    oid +
 
-                    '&org=' +
 
-                    org +
 
-                    '&cid=' +
 
-                    classId +
 
-                    '&tType=' +
 
-                    tType +
 
-                    '&screenType=' +
 
-                    screenType,item.courseId
 
-                  )
 
-                ">
 
+              <div class="box_course" v-for="(item, index) in zoneClass" :key="index"  @click="goTo(
 
+          '/courseDetail?courseId=' +
 
+          item.courseId +
 
+          '&userid=' +
 
+          userid +
 
+          '&oid=' +
 
+          oid +
 
+          '&org=' +
 
+          org +
 
+          '&cid=' +
 
+          classId +
 
+          '&tType=' +
 
+          tType +
 
+          '&screenType=' +
 
+          screenType,item.courseId
 
+        )">
 
                 <div class="wheel">
 
                 <div class="wheel">
 
                   <img :src="
 
                   <img :src="
 
                     item.cover
 
                     item.cover
 
@@ -149,24 +147,22 @@
 
               <div class="FirstTypeBox" v-for="(type, tindex) in CourseType2" :key="tindex">
 
               <div class="FirstTypeBox" v-for="(type, tindex) in CourseType2" :key="tindex">
 
                 <div class="title">{{ type.name }}</div>
 
                 <div class="title">{{ type.name }}</div>
 
                 <div style="display: flex;flex-flow: wrap;margin-top: 20px;">
 
                 <div style="display: flex;flex-flow: wrap;margin-top: 20px;">
 
-                  <div class="box_course" v-for="(item, index) in type.course" :key="tindex + '-' + index" @click="
 
-                     goTo(
 
-                        '/courseDetail?courseId=' +
 
-                        item.courseId +
 
-                        '&userid=' +
 
-                        userid +
 
-                        '&oid=' +
 
-                        oid +
 
-                        '&org=' +
 
-                        org +
 
-                        '&cid=' +
 
-                        classId +
 
-                        '&tType=' +
 
-                        tType +
 
-                        '&screenType=' +
 
-                        screenType,item.courseId
 
-                      )
 
-                    ">
 
+                  <div class="box_course" v-for="(item, index) in type.course" :key="tindex + '-' + index" @click="goTo(
 
+          '/courseDetail?courseId=' +
 
+          item.courseId +
 
+          '&userid=' +
 
+          userid +
 
+          '&oid=' +
 
+          oid +
 
+          '&org=' +
 
+          org +
 
+          '&cid=' +
 
+          classId +
 
+          '&tType=' +
 
+          tType +
 
+          '&screenType=' +
 
+          screenType,item.courseId
 
+        )">
 
                     <div class="wheel">
 
                     <div class="wheel">
 
                       <img :src="
 
                       <img :src="
 
                         item.cover
 
                         item.cover
 
@@ -532,7 +528,7 @@ export default {
 
           }
 
           }
 
         }
 
         }
 
       }
 
       }
 
-      
+
 
       this.typea = ""
 
       this.typea = ""
 
       this.typeb = ""
 
       this.typeb = ""
 
       this.typed = ""
 
       this.typed = ""

+ 36 - 18
src/components/pptEasyClass/index.vue
View File 

@@ -22,24 +22,7 @@
 
             </el-tooltip>
 
             </el-tooltip>
 
 
 
             <div
 
             <div
 
-              @click.stop="
 
-                goTo(
 
-                  '/courseDetail?userid=' +
 
-                    userid +
 
-                    '&oid=' +
 
-                    oid +
 
-                    '&org=' +
 
-                    org +
 
-                    '&cid=' +
 
-                    classId +
 
-                    '&courseId=' +
 
-                    id +
 
-                    '&tType=' +
 
-                    tType +
 
-                    '&screenType=' +
 
-                    screenType
 
-                )
 
-              "
 
+              @click.stop="back"
 
             >
 
             >
 
               <img src="../../assets/icon/newIcon/return.png" alt="" />
 
               <img src="../../assets/icon/newIcon/return.png" alt="" />
 
               <span style="color: #000">返回</span>
 
               <span style="color: #000">返回</span>
 
@@ -155,6 +138,41 @@ export default {
 
       }
 
       }
 
       return commonElements;
 
       return commonElements;
 
     },
 
     },
 
+    back(){
 
+      if(this.tType!=2){
 
+        this.goTo(
 
+          '/courseDetail?userid=' +
 
+            this.userid +
 
+            '&oid=' +
 
+            this.oid +
 
+            '&org=' +
 
+            this.org +
 
+            '&cid=' +
 
+            this.classId +
 
+            '&courseId=' +
 
+            this.id +
 
+            '&tType=' +
 
+            this.tType +
 
+            '&screenType=' +
 
+            this.screenType
 
+        )
 
+      }else{
 
+        this.goTo(
 
+          '/index?userid=' +
 
+            this.userid +
 
+            '&oid=' +
 
+            this.oid +
 
+            '&org=' +
 
+            this.org +
 
+            '&cid=' +
 
+            this.classId +
 
+            '&tType=' +
 
+            this.tType +
 
+            '&screenType=' +
 
+            this.screenType
 
+        )
 
+      }
 
+    }
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
     this.getCourseDetail();
 
     this.getCourseDetail();

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