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'

SanHQin 6 days ago
parent
42cc2524f9 3a9dacdb89
commit
668fde1186
13 changed files with 51 additions and 25 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.css
  3. 0 0
      dist/static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.css.map
  4. 0 0
      dist/static/css/app.befe4f1ca0b69962b53f4d6cd8d00070.css
  5. 0 0
      dist/static/js/app.11b0513dd91ea59bbc4e.js
  6. 0 0
      dist/static/js/app.11b0513dd91ea59bbc4e.js.map
  7. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. 34 11
      src/components/courseDetail.vue
  9. 1 1
      src/components/index.vue
  10. 8 8
      src/components/pptEasyClass/index.vue
  11. 2 1
      src/lang/cn.json
  12. 3 2
      src/lang/en.json
  13. 2 1
      src/lang/hk.json

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.befe4f1ca0b69962b53f4d6cd8d00070.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.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.127921a78d3afd2df4bd.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.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.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.11b0513dd91ea59bbc4e.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


+ 34 - 11
src/components/courseDetail.vue
View File 

@@ -47,8 +47,8 @@
 
             <div class="right_box">
 
               <div class="rightT">
 
                 <div class="right_box_title">{{ courseDetail.title }}</div>
 
-                <div class="jd" v-if="courseDetail.state!=7">{{ chapInfo.length }}{{ lang.ssStageText }}</div>
 
-                <div class="jd" v-if="courseDetail.state!=7">{{ rw }}{{ lang.ssTaskText }}</div>
 
+                <div class="jd" v-if="courseDetail.state!=7">{{ lang.ssStage3.replace(/\*/g, chapInfo.length) }}</div>
 
+                <div class="jd" v-if="courseDetail.state!=7">{{ lang.ssTaskText }}{{ rw }}</div>
 
               </div>
 
               <div class="cType" v-if="courseType.length">
 
                 <div
 
@@ -89,7 +89,7 @@
 
                   <div class="person" style="font-weight: bold; color: #0e1e33">
 
                     {{
 
                       courseDetail.vcount != null ? courseDetail.vcount : 0
 
-                    }}{{ lang.ssPerson }}
 
+                    }} {{ lang.ssPerson }}
 
                   </div>
 
                 </div>
 
               </div>
 
@@ -238,7 +238,7 @@
 
               v-if="((tType == 1 || tType == 4) && type == 2) || tType == 2"
 
               :class="courseDetail.brief != '' ? 'rightTd' : 'noBRight'"
 
               style="width: 100%; padding-top: 20px"
 
-            >     
+            >
 
                 <template v-if="courseDetail.state!=7">
 
                   <div
 
                     class="courseItem"
 
@@ -265,7 +265,7 @@
 
                     </div>
 
                   </div>
 
                 </template>
 
-              
+
 
 
               <div
 
                 class="courseItem"
 
@@ -1954,7 +1954,7 @@ export default {
 
         }
 
         let a = this.inviteCode;
 
         console.log(this.inviteCode);
 
-        this.addInviteCode();
 
+        // this.addInviteCode();
 
       }
 
       this.groupInfo = "";
 
       if (groupData.length) {
 
@@ -2533,7 +2533,9 @@ export default {
 
         }
 
       };
 
     },
 
-    selectClassSuccess(classId){
 
+    async selectClassSuccess(classId){
 
+      let data = await this.addInviteCodeOne(classId)
 
+      console.log("addInviteCodeOne",data)
 
       this.gotoCourse(classId);
 
       this.$refs.selectTeachingClassDialogRef.close();
 
     },
 
@@ -2549,7 +2551,7 @@ export default {
 
         }
 
       })
 
 
-      this.inviteCodeFn();
 
+      //this.inviteCodeFn();
 
     },
 
     // 随机码
 
     async inviteCodeFn(){
 
@@ -2572,9 +2574,30 @@ export default {
 
         }
 
         let a = this.inviteCode;
 
         console.log(this.inviteCode);
 
-        this.addInviteCode();
 
+        // this.addInviteCode();
 
       }
 
-    }
 
+    },
 
+    addInviteCodeOne(cid) {
 
+      return new Promise((resolve)=>{
 
+        let params = [
 
+        {
 
+          courseId: this.id,
 
+          inviteCode: cid,
 
+        },
 
+      ];
 
+      this.ajax
 
+        .post(this.$store.state.api + "add_courseInviteCode2", params)
 
+        .then((res) => {
 
+          console.log(res.data)
 
+          resolve(res.data)
 
+        })
 
+        .catch((err) => {
 
+          resolve(err.messages)
 
+          console.error(err);
 
+        });
 
+      })
 
+    },
 
+
 
   },
 
   created() {
 
     // if(this.tType == 1 || this.tType == 4){
 
@@ -3014,7 +3037,7 @@ export default {
 
   border-radius: 4px;
 
   font-size: 14px;
 
   color: #3d3d3d;
 
-  width: 90px;
 
+  width: 105px;
 
   height: 28px;
 
   text-align: center;
 
   line-height: 28px;

+ 1 - 1
src/components/index.vue
View File 

@@ -796,7 +796,7 @@ export default {
 
       let params = {
 
         org: this.org && this.org != "" ? this.org : "",
 
         oid: this.oid && this.oid != "" ? this.oid : "",
 
-        stand: "cn"
 
+        stand: this.lang.lang
 
       };
 
       this.ajax
 
         .get(this.$store.state.api + "selectAllTypeStand", params)

+ 8 - 8
src/components/pptEasyClass/index.vue
View File 

@@ -20,16 +20,16 @@
 
             <span>{{ courseDetail.title }}</span>
 
           </div>
 
           <div class="free-browse-switch" v-if="courseDetail.userid == userid">
 
-            <span class="switch-label" :class="{ active: freeBrowse }">{{ freeBrowse ? '自由浏览' : '跟随模式' }}</span>
 
             <el-switch
 
               v-model="freeBrowse"
 
-              :active-value="true"
 
-              :inactive-value="false"
 
+              :active-value="false"
 
+              :inactive-value="true"
 
               class="custom-switch"
 
-              active-color="#FCCF00"
 
-              inactive-color="#F53F3F"
 
+              active-color="#03ae2b"
 
+              inactive-color="#d8d8d8"
 
               @change="onFreeBrowseChange"
 
             ></el-switch>
 
+            <span class="switch-label" :class="{ active: freeBrowse }">{{ freeBrowse ? '自由浏览' : '跟随模式' }}</span>
 
           </div>
 
           <div class="free-browse-switch" v-if="tType == 2">
 
             <span class="switch-label" :class="{ active: freeBrowse }">{{ freeBrowse ? '自由浏览' : '跟随模式' }}</span>
 
@@ -459,9 +459,9 @@ export default {
 
 }
 
 
 .switch-label {
 
-  background: linear-gradient(to right, #F53F3F, #FCCF00);
 
-  -webkit-background-clip: text;
 
-  color: transparent;
 
+  /* background: linear-gradient(to right, #F53F3F, #FCCF00); */
 
+  /* -webkit-background-clip: text; */
 
+  color: #000;
 
 }
 
 
 .refresh_icon {

+ 2 - 1
src/lang/cn.json
View File 

@@ -228,5 +228,6 @@
 
   "ssSelectClass": "选择班级",
 
   "ssAllGrades": "全部年级",
 
   "ssClass": "班级",
 
-  "ssNoData": "暂无数据"
 
+  "ssNoData": "暂无数据",
 
+  "ssStage3": "* 阶段"
 
 }

+ 3 - 2
src/lang/en.json
View File 

@@ -171,7 +171,7 @@
 
   "ssSimpleMode": "Simple Mode",
 
   "ssAiMode": "AI Mode",
 
   "ssClassMode": "Class Mode",
 
-  "ssCourseAnalysis": "Analysis",
 
+  "ssCourseAnalysis": "Analyse",
 
   "ssCourseEvaluation": "Evaluation",
 
   "ssStageNum": "Phase *",
 
   "ssTaskView": "Task View",
 
@@ -228,5 +228,6 @@
 
   "ssSelectClass": "Select Class",
 
   "ssAllGrades": "All Grades",
 
   "ssClass": "Class",
 
-  "ssNoData": "No Data"
 
+  "ssNoData": "No Data",
 
+  "ssStage3": "* Phrase（s）"
 
 }

+ 2 - 1
src/lang/hk.json
View File 

@@ -228,5 +228,6 @@
 
   "ssSelectClass": "選擇班級",
 
   "ssAllGrades": "全部年級",
 
   "ssClass": "班級",
 
-  "ssNoData": "暫無數據"
 
+  "ssNoData": "暫無數據",
 
+  "ssStage3": "* 階段"
 
 }

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