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

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

zengyicheng 2 years ago
parent
d11cf3757d 548d48ae09
commit
677f1ca815
25 changed files with 18127 additions and 42 deletions
Split View Show Diff Stats
  1. 2 2
      config/index.js
  2. 0 0
      dist/511950fb361620b35cec.worker.js
  3. 0 0
      dist/511950fb361620b35cec.worker.js.map
  4. 1 1
      dist/index.html
  5. 0 0
      dist/static/css/app.a721d11a60d8a369a17348057aa32657.css.map
  6. 0 0
      dist/static/css/app.e6eac8167c936c8f232514c96c9f2e86.css
  7. 0 0
      dist/static/css/app.e6eac8167c936c8f232514c96c9f2e86.css.map
  8. 0 0
      dist/static/js/0.86cbf9c691e3dc53b304.js
  9. 0 0
      dist/static/js/0.86cbf9c691e3dc53b304.js.map
  10. 0 0
      dist/static/js/1.994623639438b244a74c.js
  11. 0 0
      dist/static/js/1.994623639438b244a74c.js.map
  12. 0 0
      dist/static/js/app.4cf7796c0421585ece7e.js
  13. 0 0
      dist/static/js/app.afdb26fd8546f35b701c.js
  14. 0 0
      dist/static/js/app.afdb26fd8546f35b701c.js.map
  15. 2 1
      dist/static/js/manifest.85f48b0184f614b2b8d9.js
  16. 0 0
      dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
  17. 0 0
      dist/static/js/vendor.22a004af27240d04b962.js
  18. 0 0
      dist/static/js/vendor.d797842b29c6f5dac7b7.js
  19. 0 0
      dist/static/js/vendor.d797842b29c6f5dac7b7.js.map
  20. 17971 1
      package-lock.json
  21. 2 1
      package.json
  22. BIN
      src/assets/icon/secondToolList/networkPanel.png
  23. BIN
      src/assets/icon/thirdToolList/code.png
  24. 147 34
      src/components/pages/addCourse.vue
  25. 2 2
      src/components/pages/classRoom.vue

+ 2 - 2
config/index.js
View File 

@@ -51,8 +51,8 @@ module.exports = {
 
 
     productionSourceMap: true,
 
     // https://webpack.js.org/configuration/devtool/#production
 
-    // devtool: '#source-map',
 
-    devtool: 'cheap-module-eval-source-map',
 
+    devtool: '#source-map',
 
+    // devtool: 'cheap-module-eval-source-map',
 
 
     // Gzip off by default as many popular static hosts such as
 
     // Surge or Netlify already gzip all static assets for you.

File diff suppressed because it is too large
+ 0 - 0
dist/511950fb361620b35cec.worker.js


File diff suppressed because it is too large
+ 0 - 0
dist/511950fb361620b35cec.worker.js.map


+ 1 - 1
dist/index.html
View File 

@@ -25,4 +25,4 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.a721d11a60d8a369a17348057aa32657.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.22a004af27240d04b962.js></script><script type=text/javascript src=./static/js/app.4cf7796c0421585ece7e.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
 
+    }</style><link href=./static/css/app.e6eac8167c936c8f232514c96c9f2e86.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.d797842b29c6f5dac7b7.js></script><script type=text/javascript src=./static/js/app.afdb26fd8546f35b701c.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>

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


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


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


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


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


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


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


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


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


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


+ 2 - 1
dist/static/js/manifest.85f48b0184f614b2b8d9.js
View File 

@@ -1 +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={4: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:"86cbf9c691e3dc53b304",1:"994623639438b244a74c"}[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}}([]);
 
+!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={4: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:"86cbf9c691e3dc53b304",1:"994623639438b244a74c"}[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.85f48b0184f614b2b8d9.js.map

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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.22a004af27240d04b962.js


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


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


File diff suppressed because it is too large
+ 17971 - 1
package-lock.json


+ 2 - 1
package.json
View File 

@@ -23,12 +23,13 @@
 
     "js-pinyin": "^0.1.9",
 
     "jsmind": "^0.4.8",
 
     "lamejs": "^1.2.1",
 
+    "pdfjs-dist": "^2.5.207",
 
     "qs": "^6.10.1",
 
     "v-viewer": "^1.6.4",
 
     "vant": "^2.12.10",
 
     "vue": "^2.5.2",
 
     "vue-cookies": "^1.7.4",
 
-    "vue-pdf": "^4.3.0",
 
+    "vue-pdf": "^4.2.0",
 
     "vue-router": "^3.0.1",
 
     "vue-video-player": "^5.0.2",
 
     "vuedraggable": "^2.24.3",

BIN
src/assets/icon/secondToolList/networkPanel.png
View File


BIN
src/assets/icon/thirdToolList/code.png
View File


+ 147 - 34
src/components/pages/addCourse.vue
View File 

@@ -937,7 +937,7 @@
 
                               "
 
                               @click="(itemTool.toolType = 0), $forceUpdate()"
 
                             >
 
-                              展示类
 
+                              课程组织类
 
                             </div>
 
                             <div
 
                               :class="
 
@@ -963,6 +963,14 @@
 
                             >
 
                               创作类
 
                             </div>
 
+                            <div
 
+                              :class="
 
+                                itemTool.toolType == 4 ? 'isChooseActive' : ''
 
+                              "
 
+                              @click="(itemTool.toolType = 4), $forceUpdate()"
 
+                            >
 
+                              其他
 
+                            </div>
 
                           </div>
 
                           <div
 
                             class="remove"
 
@@ -991,7 +999,7 @@
 
                                 <img src="../../assets/icon/checkedIs.png" alt v-else />
 
                               </div>
 
                             </div>-->
 
-                            <div class="tool">
 
+                            <!-- <div class="tool">
 
                               <div
 
                                 class="whiteBIcon"
 
                                 @click="addTools(17, itemTaskIndex, toolIndex)"
 
@@ -999,7 +1007,7 @@
 
                                 <img
 
                                   src="../../assets/icon/secondToolList/library.png"
 
                                   alt
 
-                                />
 
+                               />
 
                                 <div style="margin: 5px 0">学习资料</div>
 
                               </div>
 
                               <div
 
@@ -1017,7 +1025,7 @@
 
                                   v-else
 
                                 />
 
                               </div>
 
-                            </div>
 
+                            </div> -->
 
                             <div class="tool">
 
                               <div
 
                                 class="whiteBIcon"
 
@@ -1182,6 +1190,33 @@
 
                                 />
 
                               </div>
 
                             </div>
 
+                            <div class="tool">
 
+                              <div
 
+                                class="whiteBIcon"
 
+                                @click="addTools(31, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/secondToolList/networkPanel.png"
 
+                                  alt
 
+                                />
 
+                                <div style="margin: 5px 0">网络画板</div>
 
+                              </div>
 
+                              <div
 
+                                class="check"
 
+                                @click="addTools(31, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/checkNo.png"
 
+                                  alt
 
+                                  v-if="itemTool.tool.indexOf(31) == -1"
 
+                                />
 
+                                <img
 
+                                  src="../../assets/icon/checkedIs.png"
 
+                                  alt
 
+                                  v-else
 
+                                />
 
+                              </div>
 
+                            </div>
 
                           </div>
 
                           <div class="toolSort" v-if="itemTool.toolType == 2">
 
                             <!-- <div class="tool">
 
@@ -1292,34 +1327,6 @@
 
                                 />
 
                               </div>
 
                             </div>
 
-
 
-                            <div class="tool">
 
-                              <div
 
-                                class="whiteBIcon"
 
-                                @click="addTools(26, itemTaskIndex, toolIndex)"
 
-                              >
 
-                                <img
 
-                                  src="../../assets/icon/thirdToolList/courseDesign.png"
 
-                                  alt
 
-                                />
 
-                                <div style="margin: 5px 0">课程设计</div>
 
-                              </div>
 
-                              <div
 
-                                class="check"
 
-                                @click="addTools(26, itemTaskIndex, toolIndex)"
 
-                              >
 
-                                <img
 
-                                  src="../../assets/icon/checkNo.png"
 
-                                  alt
 
-                                  v-if="itemTool.tool.indexOf(26) == -1"
 
-                                />
 
-                                <img
 
-                                  src="../../assets/icon/checkedIs.png"
 
-                                  alt
 
-                                  v-else
 
-                                />
 
-                              </div>
 
-                            </div>
 
                           </div>
 
                           <div class="toolSort" v-if="itemTool.toolType == 3">
 
                             <div class="tool">
 
@@ -1457,6 +1464,89 @@
 
                                 />
 
                               </div>
 
                             </div>
 
+                            <div class="tool">
 
+                              <div
 
+                                class="whiteBIcon"
 
+                                @click="addTools(32, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/thirdToolList/code.png"
 
+                                  alt
 
+                                />
 
+                                <div style="margin: 5px 0">源码编辑</div>
 
+                              </div>
 
+                              <div
 
+                                class="check"
 
+                                @click="addTools(32, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/checkNo.png"
 
+                                  alt
 
+                                  v-if="itemTool.tool.indexOf(32) == -1"
 
+                                />
 
+                                <img
 
+                                  src="../../assets/icon/checkedIs.png"
 
+                                  alt
 
+                                  v-else
 
+                                />
 
+                              </div>
 
+                            </div>
 
+                          </div>
 
+                          <div class="toolSort" v-if="itemTool.toolType == 4">
 
+                            <div class="tool">
 
+                              <div
 
+                                class="whiteBIcon"
 
+                                @click="addTools(26, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/thirdToolList/courseDesign.png"
 
+                                  alt
 
+                                />
 
+                                <div style="margin: 5px 0">课程设计</div>
 
+                              </div>
 
+                              <div
 
+                                class="check"
 
+                                @click="addTools(26, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/checkNo.png"
 
+                                  alt
 
+                                  v-if="itemTool.tool.indexOf(26) == -1"
 
+                                />
 
+                                <img
 
+                                  src="../../assets/icon/checkedIs.png"
 
+                                  alt
 
+                                  v-else
 
+                                />
 
+                              </div>
 
+                            </div>
 
+                            <div class="tool">
 
+                              <div
 
+                                class="whiteBIcon"
 
+                                @click="addTools(25, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/thirdToolList/evalua.png"
 
+                                  alt
 
+                                />
 
+                                <div style="margin: 5px 0">目标管理</div>
 
+                              </div>
 
+                              <div
 
+                                class="check"
 
+                                @click="addTools(25, itemTaskIndex, toolIndex)"
 
+                              >
 
+                                <img
 
+                                  src="../../assets/icon/checkNo.png"
 
+                                  alt
 
+                                  v-if="itemTool.tool.indexOf(25) == -1"
 
+                                />
 
+                                <img
 
+                                  src="../../assets/icon/checkedIs.png"
 
+                                  alt
 
+                                  v-else
 
+                                />
 
+                              </div>
 
+                            </div>
 
                           </div>
 
                         </div>
 
                       </div>
 
@@ -2041,7 +2131,7 @@
 
                   :class="chapToolsType == 0 ? 'isChooseActive' : ''"
 
                   @click="chapToolsType = 0"
 
                 >
 
-                  展示类
 
+                  课程组织类
 
                 </div>
 
                 <div
 
                   :class="chapToolsType == 1 ? 'isChooseActive' : ''"
 
@@ -2055,6 +2145,12 @@
 
                 >
 
                   评价类
 
                 </div>
 
+                <div
 
+                  :class="chapToolsType == 2 ? 'isChooseActive' : ''"
 
+                  @click="chapToolsType = 2"
 
+                >
 
+                  其他
 
+                </div>
 
               </div>
 
             </div>
 
 
@@ -2158,6 +2254,23 @@
 
                     <img src="../../assets/icon/checkedIs.png" alt v-else />
 
                   </div>
 
                 </div>
 
+                <div class="tool">
 
+                  <div class="whiteBIcon" @click="chapAddTools(31)">
 
+                    <img
 
+                      src="../../assets/icon/secondToolList/networkPanel.png"
 
+                      alt
 
+                    />
 
+                    <div style="margin: 5px 0">网络画板</div>
 
+                  </div>
 
+                  <div class="check" @click="chapAddTools(31)">
 
+                    <img
 
+                      src="../../assets/icon/checkNo.png"
 
+                      alt
 
+                      v-if="itemTools.tools.indexOf(31) == -1"
 
+                    />
 
+                    <img src="../../assets/icon/checkedIs.png" alt v-else />
 
+                  </div>
 
+                </div>
 
               </div>
 
               <div class="toolSort" v-if="chapToolsType == 2">
 
                 <div class="tool">
 
@@ -5382,7 +5495,7 @@ ol {
 
 }
 
 .chooseWho {
 
   display: flex;
 
-  width: 250px;
 
+  width: 300px;
 
   flex-direction: row;
 
   flex-wrap: nowrap;
 
   justify-content: space-between;

+ 2 - 2
src/components/pages/classRoom.vue
View File 

@@ -49,7 +49,7 @@
 
 									)
 
 								"
 
               >开始教学</div>
 
-              <div
 
+              <!-- <div
 
                 @click="
 
 									goTo(
 
 										'/liveRoomKQ?cid=' +
 
@@ -60,7 +60,7 @@
 
 											oid
 
 									)
 
 								"
 
-              >上课预览</div>
 
+              >上课预览</div> -->
 
               <!-- <div v-if="groupA == '0'">修改</div> -->
 
               <div @click="checkData">报告</div>
 
               <!-- <div @click="deleteCourse(item.courseId)">删除</div> -->

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