Quellcode durchsuchen

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc vor 4 Monaten
Ursprung
Commit
7b8e18895e

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.1ed7a1a973ed764b108250d17d3a6c85.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.dfda4edc22817eea7901.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.a436b78c6192f09506fd36e97ea3d034.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3eade43afd174522bb8a.js></script><script type=text/javascript src=./static/js/vendor.6bffbf9058a42e825dbc.js></script><script type=text/javascript src=./static/js/app.e5e64b348dc9224fa748.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.1ed7a1a973ed764b108250d17d3a6c85.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.a436b78c6192f09506fd36e97ea3d034.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.a436b78c6192f09506fd36e97ea3d034.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/0.4f3b05586c3acc102a54.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 1
dist/static/js/app.dfda4edc22817eea7901.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.e5e64b348dc9224fa748.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 1
dist/static/js/app.e5e64b348dc9224fa748.js.map


+ 2 - 2
dist/static/js/manifest.161e82026ac2ae03ab6f.js → dist/static/js/manifest.3eade43afd174522bb8a.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.161e82026ac2ae03ab6f.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"7da288988865a9378b49",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.3eade43afd174522bb8a.js.map

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/manifest.3eade43afd174522bb8a.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/vendor.6bffbf9058a42e825dbc.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/vendor.6bffbf9058a42e825dbc.js.map


+ 0 - 0
src/components/pages/easyAi/addCourse.vue → src/components/pages/aiEasy/addCourse.vue


+ 40 - 3
src/components/pages/course.vue

@@ -32,8 +32,11 @@
               <!-- <div type="primary" @click="goToCourse2()">任务式课程</div> -->
               <!-- <div type="primary" @click="goToCourse()">阶段式课程</div> -->
               <div type="primary" @click="goToCourse4()">阶段式课程</div>
+              
               <!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
               <div type="primary" @click="oepnTemplate()" v-show="orgArray.includes(org) || oidArray.includes(oid)">AI模式</div>
+              <div type="primary" @click="goToCourse6()" v-show="orgArray.includes(org) || oidArray.includes(oid)">上课模式</div>
+              <!-- oepnTemplate2 -->
             </div>
           </button>
         </div>
@@ -181,7 +184,7 @@
               他人课程
             </div>
             <div class="xtCourse" v-else>协同课程</div>
-            <div class="tup">
+            <div class="tup" @click="get(item)">
               <img :src="item.cover != null && item.cover != ''
                 ? JSON.parse(item.cover).length > 0
                   ? JSON.parse(item.cover)[0].url
@@ -205,7 +208,7 @@
               <!-- v-if="item.isCourseType == 2 || groupA == 1" -->
               <div class="kc_t">
                 <span>{{ item.uname }}</span>
-                <span>{{ item.state == 1 ? '阶段模式' : item.state == 2 ? '任务模式' :  item.state == 3 ? '极简模式' : 'AI模式' }}</span>
+                <span>{{ item.state == 1 ? '阶段模式' : item.state == 2 ? '任务模式' :  item.state == 3 ? '极简模式' : item.state == 6 ? '上课模式' : 'AI模式' }}</span>
               </div>
               <div class="kc_time">
                 <span style="color: #717C8D">创建日期:</span>{{ item.time }}
@@ -263,7 +266,13 @@
                 " @click="goToCourse5(item.courseId)">
 									<img src="../../assets/icon/course/edit.svg">
 								</div>
-
+                <div class="t_b_Item" v-if="((item.userid == userid) ||
+                (item.course_teacher &&
+                  item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
+                (item.state == 6)
+                " @click="goToCourse6(item.courseId)">
+									<img src="../../assets/icon/course/edit.svg">
+								</div>
                 <div class="t_b_Item" v-if="((item.userid == userid) ||
                 (item.course_teacher &&
                   item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
@@ -703,6 +712,33 @@ export default {
       }
       // this.$router.push(path);
     },
+    goToCourse6(courseId){
+      if (courseId) {
+        this.$router.push(
+          "/addCourseEAi?cid=" +
+          courseId +
+          "&userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
+        );
+      } else {
+        this.$router.push(
+          "/addCourseEAi?userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
+        );
+      }
+    },
     aiCourse(courseId){
       this.$router.push(
           "/aiAddCourse?userid=" +
@@ -1729,6 +1765,7 @@ export default {
   align-items: center;
   padding: 10px;
   box-sizing: border-box;
+  cursor: pointer;
 }
 
 .tup>img {

+ 2 - 2
src/router/index.js

@@ -102,7 +102,7 @@ import modelReport from '@/components/pages/learnAnalysis/components/modelReport
 import lookModel from '@/components/pages/learnAnalysis/components/lookModel'
 import teacherSource from '@/components/pages/teacherSource/index'
 import addCourseE from '@/components/pages/easy/addCourse'
-import addCourseEAi from '@/components/pages/easyAi/addCourse'
+import addCourseEAi from '@/components/pages/aiEasy/addCourse'
 import addCourseT from '@/components/pages/task/addCourse'
 import addTrainCourseE from '@/components/pages/trainCourse/easy/addCourse'
 import dataBoard from '@/components/pages/dataBoard'
@@ -296,7 +296,7 @@ export default new Router({
             }
         },
         {
-            path: '/course/addCourseEAi',
+            path: '/addCourseEAi',
             component: addCourseEAi,
             meta: {
                 requireAuth: '' // 是否需要判断是否登录,这里是需要判断

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.