Prechádzať zdrojové kódy

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

zengyicheng 2 rokov pred
rodič
commit
127fc104ca

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.0a85f120f50db17207b02e2119120027.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.d2a60cf4f8d4649786e6.js></script><script type=text/javascript src=./static/js/app.29a8207df6755776f2b5.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.50a17334bfb7c37d6ea6aa7f624d8eac.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.d2a60cf4f8d4649786e6.js></script><script type=text/javascript src=./static/js/app.cc482137b2a537b9186d.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.50a17334bfb7c37d6ea6aa7f624d8eac.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.50a17334bfb7c37d6ea6aa7f624d8eac.css.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.29a8207df6755776f2b5.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.cc482137b2a537b9186d.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.cc482137b2a537b9186d.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 2 - 3
src/components/pages/addCourse.vue

@@ -437,8 +437,7 @@
                     简易模式
                   </div>
                 </div>
-                <div class="wordTeacher" @click="checkTemplate4()" >
-                  <!-- v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'" -->
+                <!-- <div class="wordTeacher" @click="checkTemplate4()" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'">
                   <div class="wordPic">
                     <img src="../../assets/icon/wordMub.png" alt />
                   </div>
@@ -453,7 +452,7 @@
                               ">
                     未来小学课程设计
                   </div>
-                </div>
+                </div> -->
                 <!-- <div class="wordTeacher" @click="checkTemplate1()">
                   <div class="wordPic">
                     <img src="../../assets/icon/wordMub.png" alt />

+ 235 - 0
src/components/pages/components/weilaiJiu.js

@@ -0,0 +1,235 @@
+let chapter = [
+  {
+    "dyName": "学生预习",
+    easy: 2,
+    "chapterInfo": [
+      {
+        "isread": false,
+        "chapterid": "65a2f3ce-dc5c-6dae-6d5f-25910f3135c7",
+        "title": "",
+        "courseName": "",
+        "taskJson": [
+          {
+            "task": "预习作业",
+            "taskDetail": "",
+            "chapterData": [],
+            "toolText": "",
+            "toolChoose": [
+              {
+                "tool": [],
+                "toolDetail": "",
+                "toolType": 0,
+                "askCount": 1,
+                "askTitle": "",
+                "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }]
+              }
+            ],
+            "isShowTools": false,
+            "askCount": 1,
+            "isFold": 0,
+            "askTitle": "",
+            "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }],
+            "checkJson": [{ "checkCount": [], "checkPerent": [] }],
+            "homeworkList": [],
+            "proVisible": false,
+            "proVisible2": false
+          }
+        ],
+        "itemCount": 1,
+        "fileList1": [],
+        "video": [],
+        "testData": [],
+        "pData": [],
+        "templateArray": []
+      }
+    ]
+  },
+  {
+    "dyName": "教学设计",
+    "easy": 3,
+    "chapterInfo": [
+      {
+        "isread": false,
+        "chapterid": "5d7b691c-c429-9e4b-56ac-4b156a8e6504",
+        "title": "",
+        "courseName": "",
+        "taskJson": [
+          {
+            "task": "学习问题/任务",
+            "taskDetail": "请输入学习问题/任务设计描述。",
+            "chapterData": [],
+            "toolText": "",
+            "toolChoose": [
+              {
+                "tool": [],
+                "toolDetail": "",
+                "toolType": 0,
+                "askCount": 1,
+                "askTitle": "",
+                "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }]
+              }
+            ],
+            "isShowTools": false,
+            "askCount": 1,
+            "isFold": 0,
+            "askTitle": "",
+            "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }],
+            "checkJson": [{ "checkCount": [], "checkPerent": [] }],
+            "homeworkList": [],
+            "proVisible": false,
+            "proVisible2": false
+          },
+          {
+            "task": "学习活动",
+            "taskDetail": "请输入学习活动设计描述。",
+            "chapterData": [],
+            "toolText": "",
+            "toolChoose": [
+              {
+                "tool": [],
+                "toolDetail": "",
+                "toolType": 0,
+                "askCount": 1,
+                "askTitle": "",
+                "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }]
+              }
+            ],
+            "isShowTools": false,
+            "askCount": 1,
+            "isFold": 0,
+            "askTitle": "",
+            "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }],
+            "checkJson": [{ "checkCount": [], "checkPerent": [] }],
+            "homeworkList": [],
+            "proVisible": false,
+            "proVisible2": false
+          },
+          {
+            "task": "学习成果",
+            "taskDetail": "请输入学习成果设计与展示描述。",
+            "chapterData": [],
+            "toolText": "",
+            "toolChoose": [
+              {
+                "tool": [],
+                "toolDetail": "",
+                "toolType": 0,
+                "askCount": 1,
+                "askTitle": "",
+                "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }]
+              }
+            ],
+            "isShowTools": false,
+            "askCount": 1,
+            "isFold": 0,
+            "askTitle": "",
+            "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }],
+            "checkJson": [{ "checkCount": [], "checkPerent": [] }],
+            "homeworkList": [],
+            "proVisible": false,
+            "proVisible2": false
+          }
+        ],
+        "itemCount": 1,
+        "fileList1": [],
+        "video": [],
+        "testData": [],
+        "pData": [],
+        "templateArray": []
+      }
+    ]
+  },
+  {
+    "dyName": "教学实施",
+    "easy": 1,
+    "chapterInfo": [
+      {
+        "isread": false,
+        "chapterid": "9b584a8d-639b-c05a-2838-75579d12147a",
+        "title": "",
+        "courseName": "",
+        "taskJson": [
+          {
+            "task": "",
+            "taskDetail": "",
+            "chapterData": [],
+            "toolText": "",
+            "toolChoose": [
+              {
+                "tool": [],
+                "toolDetail": "",
+                "toolType": 0,
+                "askCount": 1,
+                "askTitle": "",
+                "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }]
+              }
+            ],
+            "isShowTools": false,
+            "askCount": 1,
+            "isFold": 0,
+            "askTitle": "",
+            "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }],
+            "checkJson": [{ "checkCount": [], "checkPerent": [] }],
+            "homeworkList": [],
+            "proVisible": false,
+            "proVisible2": false
+          }
+        ],
+        "itemCount": 1,
+        "fileList1": [],
+        "video": [],
+        "testData": [],
+        "pData": [],
+        "templateArray": []
+      }
+    ]
+  },
+  {
+    "dyName": "学生练习",
+    "easy": 4,
+    "chapterInfo": [
+      {
+        "isread": false,
+        "chapterid": "298a0497-5695-ebbf-3d89-57d8ce5a27e1",
+        "title": "",
+        "courseName": "",
+        "taskJson": [
+          {
+            "task": "课后作业",
+            "taskDetail": "",
+            "chapterData": [],
+            "toolText": "",
+            "toolChoose": [
+              {
+                "tool": [],
+                "toolDetail": "",
+                "toolType": 0,
+                "askCount": 1,
+                "askTitle": "",
+                "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }]
+              }
+            ],
+            "isShowTools": false,
+            "askCount": 1,
+            "isFold": 0,
+            "askTitle": "",
+            "askJson": [{ "askstitle": "", "askItem": 1, "checkList": [] }],
+            "checkJson": [{ "checkCount": [], "checkPerent": [] }],
+            "homeworkList": [],
+            "proVisible": false,
+            "proVisible2": false
+          }
+        ],
+        "itemCount": 1,
+        "fileList1": [],
+        "video": [],
+        "testData": [],
+        "pData": [],
+        "templateArray": []
+      }
+    ]
+  }
+]
+
+
+export default chapter

+ 4 - 2
src/components/pages/course.vue

@@ -150,7 +150,8 @@
               </div>
             </div>
             <div class="three_bottom">
-              <div @click="jump(item.courseId)">评课</div>
+              <div @click="get(item.courseId)" v-if="role == '1'">预览</div>
+              <div @click="jump(item.courseId)" v-else>评课</div>
               <div v-if="(item.userid == userid || item.course_teacher.indexOf(userid) != -1)" @click="goToCourse(item.courseId)">
                 修改
               </div>
@@ -183,7 +184,8 @@
                 <span style="font-size:18px;font-weight:700">...</span>
                 <div>
                   <span @click="copyCourse(item.courseId)">复制</span>
-                  <span @click="get(item.courseId)">预览</span>
+                  <span @click="jump(item.courseId)" v-if="role == '1'">评课</span>
+                  <span @click="get(item.courseId)" v-else>预览</span>
                   <span @click="getNT(item.courseId)">无终端</span>
                 </div>
               </div>

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov