Accueil Explorer Aide
Connexion
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

update

lsc il y a 8 mois
Parent
7a4032d72b
commit
d80518173f
23 fichiers modifiés avec 24 ajouts et 17 suppressions
Vue séparée Afficher les stats Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.1a515af65b6637f86e78c85ae8da4eed.css
  3. 0 0
      dist/static/css/app.1a515af65b6637f86e78c85ae8da4eed.css.map
  4. 0 0
      dist/static/css/app.bc54085614270694f2c62849c281c11d.css.map
  5. 0 0
      dist/static/img/videoFile.8b2406f.svg
  6. 0 0
      dist/static/js/0.62586bda94a1b515c352.js.map
  7. 0 0
      dist/static/js/0.7da288988865a9378b49.js
  8. 0 0
      dist/static/js/0.7da288988865a9378b49.js.map
  9. 0 0
      dist/static/js/2.94e1427bfc7ef0b4c685.js
  10. 0 0
      dist/static/js/2.94e1427bfc7ef0b4c685.js.map
  11. 0 0
      dist/static/js/2.96e371dc7fcc92b785ca.js.map
  12. 0 0
      dist/static/js/app.dce4d941cd28a504ae72.js
  13. 0 0
      dist/static/js/app.dce4d941cd28a504ae72.js.map
  14. 2 2
      dist/static/js/manifest.571c38d63f24b1ae9e16.js
  15. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  16. 0 0
      dist/static/js/vendor.ee476e38463461edca63.js
  17. 0 0
      dist/static/js/vendor.ee476e38463461edca63.js.map
  18. 8 3
      src/components/pages/aiAddCourse/addCourse.vue
  19. 3 3
      src/components/pages/dataBoardNew/course/index.vue
  20. 3 3
      src/components/pages/dataBoardNew/project/chartList/bar/teacherStudent.vue
  21. 4 2
      src/components/pages/dataBoardNew/project/index.vue
  22. 2 2
      src/components/pages/dataBoardNew/student/index.vue
  23. 1 1
      src/components/pages/dataBoardNew/teacher/index.vue

+ 1 - 1
dist/index.html
Voir le fichier 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.bc54085614270694f2c62849c281c11d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.949266e941635483ba4e.js></script><script type=text/javascript src=./static/js/vendor.e1cf871eb7c38dbf5c5b.js></script><script type=text/javascript src=./static/js/app.60d3b2661e2a4e0fa3dd.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.1a515af65b6637f86e78c85ae8da4eed.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.ee476e38463461edca63.js></script><script type=text/javascript src=./static/js/app.dce4d941cd28a504ae72.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.1a515af65b6637f86e78c85ae8da4eed.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.1a515af65b6637f86e78c85ae8da4eed.css.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.bc54085614270694f2c62849c281c11d.css.map


+ 0 - 0
dist/static/img/videoFile.2273786.svg → dist/static/img/videoFile.8b2406f.svg
Voir le fichier


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/0.62586bda94a1b515c352.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/2.94e1427bfc7ef0b4c685.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/2.94e1427bfc7ef0b4c685.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/2.96e371dc7fcc92b785ca.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.dce4d941cd28a504ae72.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.dce4d941cd28a504ae72.js.map


+ 2 - 2
dist/static/js/manifest.949266e941635483ba4e.js → dist/static/js/manifest.571c38d63f24b1ae9e16.js
Voir le fichier 

@@ -1,2 +1,2 @@
 
-!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:"62586bda94a1b515c352",1:"d8d4e9b1fe43bbb0a681",2:"96e371dc7fcc92b785ca",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.949266e941635483ba4e.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:"d8d4e9b1fe43bbb0a681",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.571c38d63f24b1ae9e16.js.map

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/vendor.ee476e38463461edca63.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/vendor.ee476e38463461edca63.js.map


+ 8 - 3
src/components/pages/aiAddCourse/addCourse.vue
Voir le fichier 

@@ -10135,7 +10135,7 @@ export default {
 
         delete this.unitJson[i].isUpdate;
 
       }
 
       if(!this.targetCourseText2){
 
-        this.courseText = this.targetCourseText ? JSON.parse(JSON.stringify(this.targetCourseText)) : ''
 
+        this.courseText = this.targetCourseText ? JSON.parse(JSON.stringify(this.targetCourseText)) : this.courseText
 
       }
 
       let params = [
 
         {
 
@@ -10399,7 +10399,7 @@ export default {
 
         delete this.unitJson[i].isUpdate;
 
       }
 
       if(!this.targetCourseText2){
 
-        this.courseText = this.targetCourseText ? JSON.parse(JSON.stringify(this.targetCourseText)) : ''
 
+        this.courseText = this.targetCourseText ? JSON.parse(JSON.stringify(this.targetCourseText)) : this.courseText
 
       }
 
       let params = [
 
         {
 
@@ -16613,7 +16613,12 @@ ${this.courseText && this.aiCallback == 2 ? '注意，优化原有的<参考内
 
               _this.unitJson[0].chapterInfo[0].taskJson[index].eList = _task.elist
 
               _this.unitJson[0].chapterInfo[0].taskJson[index].toolChoose = []
 
               _this.unitJson[0].chapterInfo[0].taskJson[index].chapterData = []
 
-              if (_task.toolChoose.length) {
 
+              if(!_task.toolChoose){
 
+                console.log("error_________________JSON不对重新生成");
 
+                _this.aiGet32(messages, index)
 
+                return;
 
+              }
 
+              if (_task.toolChoose && _task.toolChoose.length) {
 
                 for (var j = 0; j < _task.toolChoose.length; j++) {
 
                   let _json = {
 
                       tool: toolsJson[_task.toolChoose[j].tool] ? [toolsJson[_task.toolChoose[j].tool].tool] : [16],

+ 3 - 3
src/components/pages/dataBoardNew/course/index.vue
Voir le fichier 

@@ -63,7 +63,7 @@
 
             style="cursor: pointer; padding: 0 0 5px 0">
 
             作业数量
 
           </div>
 
-          <el-select v-if="skType == 0" v-model="lType" @change="typeChange1" class="selectBox" style="margin-left: auto">
 
+          <el-select v-if="skType == 0 && !oType" v-model="lType" @change="typeChange1" class="selectBox" style="margin-left: auto">
 
             <!-- <el-option label="全部" value="all"></el-option> -->
 
             <el-option label="年级" value="grade"></el-option>
 
             <el-option label="主题" value="theme"></el-option>
 
@@ -150,8 +150,8 @@
 
             </div>
 
           </div> -->
 
           <div class="dataBoard_check_box" v-if="skType == 0">
 
-            <div class="icon zz_icon2" :class="{ active: !oType }" @click="oType = false"><span>柱状图</span></div>
 
-            <div class="icon rl_icon" :class="{ active: oType }" @click="oType = true"><span>热力图</span></div>
 
+            <div class="icon zz_icon2" :class="{ active: !oType }" @click="oType = false,lType = 'grade',typeChange1()"><span>柱状图</span></div>
 
+            <div class="icon rl_icon" :class="{ active: oType }" @click="oType = true,lType = 'all',typeChange1()"><span>热力图</span></div>
 
           </div>
 
           <div class="dataBoard_check_box" v-if="skType == 1">
 
             <div class="icon zz_icon2" :class="{ active: oType2 }" @click="oType2 = true"><span>柱状图</span></div>

+ 3 - 3
src/components/pages/dataBoardNew/project/chartList/bar/teacherStudent.vue
Voir le fichier 

@@ -72,13 +72,13 @@ export default {
 
                     shadow: false
 
                 },
 
                 series: [{
 
-                    name: '教师负责',
 
+                    name: '教师协同',
 
                     data: []
 
                 }, {
 
-                    name: '学生负责',
 
+                    name: '学生主导',
 
                     data: []
 
                 }, {
 
-                    name: '师生负责',
 
+                    name: '师生主导',
 
                     data: []
 
                 }]
 
             }

+ 4 - 2
src/components/pages/dataBoardNew/project/index.vue
Voir le fichier 

@@ -817,11 +817,13 @@ export default {
 
               _courseArray[i].subject.push({
 
                 name: _subject[j].name,
 
                 id: _subject[j].id,
 
-                course: 0
 
+                course: 0,
 
+                courseArray: []
 
               })
 
               for (var z = 0; z < _course.length; z++) {
 
-                if (_course[z].typeid.indexOf(_subject[j].id) != -1 && _courseArray[i].courseid.indexOf(_course[z].courseid) !== -1) {
 
+                if (_course[z].typeid.indexOf(_subject[j].id) != -1 && _courseArray[i].courseid.indexOf(_course[z].courseid) !== -1 && _courseArray[i].subject[j].courseArray.indexOf(_course[z].courseid) == -1) {
 
                   _courseArray[i].subject[j].course++
 
+                  _courseArray[i].subject[j].courseArray.push(_course[z].courseid)
 
                 }
 
               }
 
             }

+ 2 - 2
src/components/pages/dataBoardNew/student/index.vue
Voir le fichier 

@@ -328,7 +328,7 @@
 
                   ></el-progress>
 
                 </div>
 
               </div>
 
-              <div class="depth">
 
+              <!-- <div class="depth">
 
                 <span>协同合作</span>
 
                 <div>
 
                   <el-progress
 
@@ -340,7 +340,7 @@
 
                     color="#106BFF"
 
                   ></el-progress>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
               <div class="depth">
 
                 <span>互动交流</span>
 
                 <div>

+ 1 - 1
src/components/pages/dataBoardNew/teacher/index.vue
Voir le fichier 

@@ -533,7 +533,7 @@
 
     <div class="right">
 
       <div class="top" style="border-radius: 5px">
 
         <div class="titleBox" style="justify-content: space-between">
 
-          <div class="title">年级占比</div>
 
+          <div class="title">整体分布</div>
 
           <el-select v-model="cType4" @change="typeChange" class="selectBox">
 
             <!-- <el-option label="全部" value=""></el-option> -->
 
             <el-option label="年级" value="grade"></el-option>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff