Главная Обзор Помощь
Вход
CocoRoboLabs
/
pbl-teacher-table
3
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

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

SanHQin 10 месяцев назад
Родитель
15ed12db51 56daf65782
Сommit
6ae38939af
10 измененных файлов с 134 добавлено и 8 удалено
Разделённый вид Показать статистику Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.8ddeb43b07d6b7a54e81bc31a867a847.css
  3. 0 0
      dist/static/css/app.8ddeb43b07d6b7a54e81bc31a867a847.css.map
  4. 0 0
      dist/static/js/app.41b264ba73a3e8879cc2.js
  5. 0 0
      dist/static/js/app.41b264ba73a3e8879cc2.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 9 3
      src/components/pages/test/add/edit/check/index.vue
  8. 1 0
      src/components/pages/test/add/edit/check/time.vue
  9. 103 0
      src/components/pages/testStudent/view/component/time.vue
  10. 20 4
      src/components/pages/testStudent/view/component/topic.vue

+ 1 - 1
dist/index.html
Просмотреть файл 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.2cea4e38ca8015c61b8487e1459a8bf2.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.3cd0a0187ca1f70ded67.js></script><script type=text/javascript src=./static/js/app.0506704538bc504fc530.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.8ddeb43b07d6b7a54e81bc31a867a847.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.3cd0a0187ca1f70ded67.js></script><script type=text/javascript src=./static/js/app.41b264ba73a3e8879cc2.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/css/app.8ddeb43b07d6b7a54e81bc31a867a847.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/css/app.8ddeb43b07d6b7a54e81bc31a867a847.css.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/app.41b264ba73a3e8879cc2.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/app.41b264ba73a3e8879cc2.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 9 - 3
src/components/pages/test/add/edit/check/index.vue
Просмотреть файл 

@@ -175,21 +175,25 @@ export default {
 
         let checkArray = _json.filter(item => {
 
           if (item.array) {
 
             item.array = item.array.filter((item2) => {
 
-              if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item.type != 7) {
 
+              if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item.type != 7 && item.type != 8) {
 
                 item2.json.answer2 = [];
 
               } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 6) {
 
                 item2.json.answer2 = item2.json.courses[0];
 
               } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 7) {
 
                 item2.json.answer2 = '';
 
+              } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 8) {
 
+                item2.json.answer2 = '';
 
               }
 
               if (item2.array) {
 
                 item2.array = item2.array.filter((item3) => {
 
-                  if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7) {
 
+                  if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 8) {
 
                     item3.json.answer2 = [];
 
                   } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 6) {
 
                     item3.json.answer2 = item3.json.courses[0];
 
                   } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 7) {
 
                     item3.json.answer2 = '';
 
+                  } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 8) {
 
+                    item3.json.answer2 = '';
 
                   }
 
                   return item3;
 
                 });
 
@@ -199,12 +203,14 @@ export default {
 
               );
 
             });
 
           }
 
-          if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7) {
 
+          if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 8) {
 
             item.json.answer2 = [];
 
           } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 6) {
 
             item.json.answer2 = item.json.courses[0];
 
           } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 7) {
 
             item.json.answer2 = '';
 
+          } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 8) {
 
+            item.json.answer2 = '';
 
           }
 
           console.log(item.array);
 
           return (item.ttype != 1 && item.array.length > 0) || item.ttype == 1;

+ 1 - 0
src/components/pages/test/add/edit/check/time.vue
Просмотреть файл 

@@ -67,6 +67,7 @@ export default {
 
         depthCopy(s) {
 
             return JSON.parse(JSON.stringify(s));
 
         },
 
+
 
     },
 
     mounted() {
 
         this.checkJson = this.cJson ? this.depthCopy(this.cJson) : undefined

+ 103 - 0
src/components/pages/testStudent/view/component/time.vue
Просмотреть файл 

@@ -0,0 +1,103 @@
 
+<template>
 
+    <div class="c_box">
 
+        <div class="choice_box">
 
+            <div class="title" style="display: flex;">
 
+                <span style="min-width: fit-content;">{{ tindex + 1 + "、" }}</span>
 
+                <span>{{ checkJson.title }}</span>
 
+            </div>
 
+            <div class="detail" v-if="checkJson.detail" v-html="checkJson.detail"
 
+                style="color: #00000099;margin-top: 5px;">
 
+            </div>
 
+            <div style="margin-top: 10px;">
 
+                <el-date-picker
 
+                    v-model="checkJson.answer2"
 
+                    type="date"
 
+                    format="yyyy 年 MM 月 dd 日"
 
+                    value-format="yyyy年MM月dd日"
 
+                    placeholder="年/月/日">
 
+                </el-date-picker>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+
 
+export default {
 
+    props: {
 
+        tindex: {
 
+            type: Number
 
+        },
 
+        cJson: {
 
+            type: Object,
 
+        },
 
+        checktype: {
 
+            type: Number,
 
+            default: 1
 
+        },
 
+        see: {
 
+            type: Boolean,
 
+            default: false
 
+        }
 
+    },
 
+    data() {
 
+        return {
 
+            option: {
 
+                1: { name: '附件' },
 
+            },
 
+            userid: this.$route.query.userid,
 
+            checkJson: undefined,
 
+            progress: 0,
 
+            isFinishSize: 0,
 
+            proVisible: false,
 
+            isAllSize: 0,
 
+            wurl: "",
 
+            isTong: false
 
+        }
 
+    },
 
+    watch: {
 
+        checkJson: {
 
+            handler(newValue) {
 
+                this.$emit('update:cJson', newValue)
 
+            },
 
+            deep: true
 
+        },
 
+    },
 
+    methods: {
 
+        depthCopy(s) {
 
+            return JSON.parse(JSON.stringify(s));
 
+        },
 
+
 
+    },
 
+    mounted() {
 
+        this.checkJson = this.cJson ? this.depthCopy(this.cJson) : undefined
 
+
 
+    }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.c_box {
 
+    width: 100%;
 
+    position: relative;
 
+}
 
+
 
+/* .mask {
 
+    position: absolute;
 
+    height: 100%;
 
+    width: 100%;
 
+    z-index: 2;
 
+} */
 
+
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
+
 
+.choice_box>.title {
 
+    font-weight: bold;
 
+    width: 100%;
 
+    word-break: break-all;
 
+}
 
+
 
+
 
+</style>

+ 20 - 4
src/components/pages/testStudent/view/component/topic.vue
Просмотреть файл 

@@ -23,6 +23,8 @@
 
               :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV>
 
             <evaV :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 7" :see="see"
 
               :isTeacher="isTeacher"></evaV>
 
+            <timeV :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 8" :see="see"
 
+              :isTeacher="isTeacher"></timeV>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -39,6 +41,8 @@
 
                 :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV>
 
               <evaV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 7"
 
                 :see="see" :isTeacher="isTeacher"></evaV>
 
+              <timeV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 8"
 
+                :see="see" :isTeacher="isTeacher"></timeV>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -59,6 +63,8 @@
 
               :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV>
 
             <evaV :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 7" :see="see"
 
               :isTeacher="isTeacher"></evaV>
 
+            <timeV :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 8" :see="see"
 
+              :isTeacher="isTeacher"></timeV>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -75,6 +81,8 @@
 
                 :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV>
 
               <evaV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 7"
 
                 :see="see" :isTeacher="isTeacher"></evaV>
 
+              <timeV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 8"
 
+                :see="see" :isTeacher="isTeacher"></timeV>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -99,6 +107,7 @@ import gapV from './gap.vue';
 
 import fileV from './file.vue';
 
 import courseV from './course.vue';
 
 import evaV from './eva.vue';
 
+import timeV from './time.vue';
 
 export default {
 
   props: {
 
     cJson: {
 
@@ -140,7 +149,8 @@ export default {
 
     gapV,
 
     fileV,
 
     courseV,
 
-    evaV
 
+    evaV,
 
+    timeV
 
   },
 
   data() {
 
     return {
 
@@ -251,21 +261,25 @@ export default {
 
         let checkArray = _json.filter((item) => {
 
           if (item.array) {
 
             item.array = item.array.filter((item2) => {
 
-              if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item.type != 7) {
 
+              if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item.type != 7 && item.type != 8) {
 
                 item2.json.answer2 = [];
 
               } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 6) {
 
                 item2.json.answer2 = this.gcourseid ? this.gcourseid : item2.json.courses[0];
 
               } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 7) {
 
                 item2.json.answer2 = '';
 
+              } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 8) {
 
+                item2.json.answer2 = '';
 
               }
 
               if (item2.array) {
 
                 item2.array = item2.array.filter((item3) => {
 
-                  if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7) {
 
+                  if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 8) {
 
                     item3.json.answer2 = [];
 
                   } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 6) {
 
                     item3.json.answer2 = this.gcourseid ? this.gcourseid : item3.json.courses[0];
 
                   } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.json.answer2 !== 0 && item3.type == 7) {
 
                     item3.json.answer2 = '';
 
+                  } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.json.answer2 !== 0 && item3.type == 8) {
 
+                    item3.json.answer2 = '';
 
                   }
 
                   return item3;
 
                 });
 
@@ -275,12 +289,14 @@ export default {
 
               );
 
             });
 
           }
 
-          if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7) {
 
+          if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 8) {
 
             item.json.answer2 = [];
 
           } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 6) {
 
             item.json.answer2 = this.gcourseid ? this.gcourseid : item.json.courses[0];
 
           } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 7) {
 
             item.json.answer2 = '';
 
+          } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 8) {
 
+            item.json.answer2 = '';
 
           }
 
           console.log(item.array);
 
           return (item.ttype != 1 && item.array.length > 0) || item.ttype == 1;

Некоторые файлы не были показаны из-за большого количества измененных файлов