Domovská stránka Prehľadávať Pomoc
Prihlásiť sa
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Prechádzať zdrojové kódy

gxgx

SanHQin 1 týždeň pred
rodič
2c11a2655c
commit
d0fca22f0d
20 zmenil súbory, kde vykonal 826 pridanie a 19 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.f871644debbe960182cc72562af7bf83.css
  3. 0 0
      dist/static/css/app.f871644debbe960182cc72562af7bf83.css.map
  4. 0 0
      dist/static/js/app.16d46bf2bad512d49a97.js
  5. 0 0
      dist/static/js/app.16d46bf2bad512d49a97.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 10 1
      src/assets/css/button.css
  8. BIN
      src/assets/icon/test/type_clockIn_icon.png
  9. 2 1
      src/components/pages/test/add/addTest.vue
  10. 2 1
      src/components/pages/test/add/components/addCheckPopover.vue
  11. 15 2
      src/components/pages/test/add/components/checkOrder.vue
  12. 10 10
      src/components/pages/test/add/components/evaBox/eva.vue
  13. 204 0
      src/components/pages/test/add/components/punchQRcode/index.vue
  14. 7 1
      src/components/pages/test/add/edit/check/index.vue
  15. 261 0
      src/components/pages/test/add/edit/check/punchQRcode.vue
  16. 16 0
      src/components/pages/test/add/edit/edit/index.vue
  17. 5 1
      src/components/pages/test/add/minxins/minxin.js
  18. 16 0
      src/components/pages/test/check/index.vue
  19. 266 0
      src/components/pages/testStudent/view/component/punchQRcode.vue.vue
  20. 11 1
      src/components/pages/testStudent/view/component/topic.vue

+ 1 - 1
dist/index.html
Zobraziť súbor 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.171dccdf0fb5f4bd938c3cc3ea8231cb.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.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.61cee10ada59877fa3ba.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.f871644debbe960182cc72562af7bf83.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.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.16d46bf2bad512d49a97.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.f871644debbe960182cc72562af7bf83.css


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


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


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


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


+ 10 - 1
src/assets/css/button.css
Zobraziť súbor 

@@ -366,7 +366,8 @@
 
 .pub_test_btn_time::before,
 
 .pub_test_btn_file::before,
 
 .pub_test_btn_sweep::before,
 
-.pub_test_btn_number::before {
 
+.pub_test_btn_number::before,
 
+.pub_test_btn_clockIn::before {
 
   content: "";
 
   width: 18px;
 
   height: 18px;
 
@@ -414,6 +415,10 @@
 
 	background-image: url(../icon/test/type_number_icon.png);
 
 }
 
 
+.pub_test_btn_clockIn::before{
 
+	background-image: url(../icon/test/type_clockIn_icon.png);
 
+}
 
+
 
 .test_icon{
 
   display: inline-block;
 
   width: 18px;
 
@@ -455,6 +460,10 @@
 
   background-image: url('../icon/test/type_number_icon.png');
 
 }
 
 
+.test_icon_clockIn{
 
+  background-image: url('../icon/test/type_clockIn_icon.png');
 
+}
 
+
 
 .dataBoard_check_box {
 
   display: flex;
 
   align-items: center;

BIN
src/assets/icon/test/type_clockIn_icon.png
Zobraziť súbor


+ 2 - 1
src/components/pages/test/add/addTest.vue
Zobraziť súbor 

@@ -122,6 +122,7 @@ export default {
 
                     type: "warning",
 
                 })
 
                 .then(() => {
 
+                  console.log(this.back)
 
                         if(!this.back){
 
                           this.goTo(
 
                             "/test?userid=" +
 
@@ -133,7 +134,7 @@ export default {
 
                             "&role=" +
 
                             this.role
 
                         );
 
-                        }else if(back == 'sass'){
 
+                        }else if(this.back == 'sass'){
 
                           this.goTo(
 
                             "/sassPlatform?userid=" +
 
                             this.userid +

+ 2 - 1
src/components/pages/test/add/components/addCheckPopover.vue
Zobraziť súbor 

@@ -27,7 +27,8 @@
 
                   pub_test_btn_time: item.value == 8,
 
                   pub_test_btn_choose2: item.value == 9,
 
 									pub_test_btn_sweep: item.value == 12,
 
-                  pub_test_btn_number:item.value == 13
 
+                  pub_test_btn_number:item.value == 13,
 
+                  pub_test_btn_clockIn:item.value == 14
 
                 }"
 
               >
 
                 {{ item.label }}

+ 15 - 2
src/components/pages/test/add/components/checkOrder.vue
Zobraziť súbor 

@@ -126,6 +126,9 @@
 
                                 <div v-if="item3.type == 13">
 
 																	<number :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 13 && checkC === `x${index1}-${index2}-${index3}`"/>
 
 																</div>
 
+                                <div v-if="item3.type == 14">
 
+																	<punchQRcode :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 14 && checkC === `x${index1}-${index2}-${index3}`"/>
 
+																</div>
 
                             </div>
 
 														<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}-${index3}` && etype==='edit'" @click.stop="">
 
 															<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
@@ -175,6 +178,9 @@
 
                         <div v-else-if="item2.type == 13">
 
 													<number :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 13 && checkC === `x${index1}-${index2}`"/>
 
 												</div>
 
+                        <div v-else-if="item2.type == 14">
 
+													<punchQRcode :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 14 && checkC === `x${index1}-${index2}`"/>
 
+												</div>
 
                     </div>
 
 										<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}` && etype==='edit'" @click.stop="">
 
 											<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
@@ -224,6 +230,9 @@
 
                 <div v-else-if="item1.type == 13">
 
 									<number :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 13 && checkC === `x${index1}`"/>
 
 								</div>
 
+                <div v-else-if="item1.type == 14">
 
+									<punchQRcode :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 14 && checkC === `x${index1}`"/>
 
+								</div>
 
             </div>
 
 						<div class="addCheckBox" v-if="checkC === `x${index1}` && etype==='edit'" @click.stop="">
 
 							<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
@@ -269,6 +278,7 @@ import courseX2 from './course2/course.vue'
 
 import addCheckPopover from './addCheckPopover.vue'
 
 import sweep from './sweep/index'
 
 import number from './number/index.vue'
 
+import punchQRcode from './punchQRcode/index.vue'
 
 export default {
 
     mixins: [minxinVue],
 
     components: {
 
@@ -288,7 +298,8 @@ export default {
 
         courseX2,
 
 				addCheckPopover,
 
 				sweep,
 
-        number
 
+        number,
 
+        punchQRcode
 
     },
 
     props: {
 
         checkJson: {
 
@@ -309,7 +320,7 @@ export default {
 
         return {
 
             manualJson: [],
 
             isdrag: "",
 
-            canEdit: [1, 3, 5, 6, 7, 8, 11,12,13],
 
+            canEdit: [1, 3, 5, 6, 7, 8, 11,12,13,14],
 
             ctype: "",
 
             dragType: "",
 
             oldIndex: "",
 
@@ -348,6 +359,8 @@ export default {
 
 												className += " test_icon_sweep"
 
 										}else if(item.type==13){
 
                         className += ' test_icon_number'
 
+                    }else if(item.type==14){
 
+                        className += ' test_icon_clockIn'
 
                     }
 
 										let itemType = item.type;
 
 										if(itemType===1){

+ 10 - 10
src/components/pages/test/add/components/evaBox/eva.vue
Zobraziť súbor 

@@ -165,16 +165,16 @@ export default {
 
     }
 
   },
 
   mounted() {
 
-    // if (!this.cJson || Object.keys(this.cJson).length == 0) {
 
-    //   this.checkJson = {
 
-    //     title: "标题",
 
-    //     detail: "",
 
-    //     small: 0,
 
-    //     big: 10
 
-    //   };
 
-    // } else {
 
-    //   this.checkJson = this.depthCopy(this.cJson2);
 
-    // }
 
+    if (!this.cJson || Object.keys(this.cJson).length == 0) {
 
+      this.checkJson = {
 
+        title: "标题",
 
+        detail: "",
 
+        small: 0,
 
+        big: 10
 
+      };
 
+    } else {
 
+      this.checkJson = this.depthCopy(this.cJson);
 
+    }
 
   }
 
 };
 
 </script>

+ 204 - 0
src/components/pages/test/add/components/punchQRcode/index.vue
Zobraziť súbor 

@@ -0,0 +1,204 @@
 
+<template>
 
+  <div class="c_box">
 
+    <div class="mask" v-if="!isOpen"></div>
 
+    <!-- <div v-if="!cJson">暂未设置题目</div> -->
 
+    <div class="punchQRcode">
 
+      <div class="title" style="display: flex;">
 
+        <span v-if="!updateList.title" @click.stop="updateTitle()">{{
 
+          cJson.title ? cJson.title : "输入问题"
 
+        }}</span>
 
+        <input
 
+          v-if="updateList.title"
 
+          ref="titleRef"
 
+          class="editInput"
 
+          v-model="checkJson.title"
 
+          @blur="save"
 
+          @keyup.enter="save"
 
+          placeholder="输入问题"
 
+        />
 
+      </div>
 
+      <div
 
+        class="detail"
 
+        v-if="!updateList.detail"
 
+        @click.stop="updateDetail()"
 
+      >
 
+        {{ cJson.detail ? cJson.detail : "暂无描述" }}
 
+      </div>
 
+      <input
 
+        v-if="updateList.detail"
 
+        ref="detailRef"
 
+        class="editInput"
 
+        v-model="checkJson.detail"
 
+        @blur="save"
 
+        style="margin-top: 10px;color: rgb(136, 139, 146);"
 
+        @keyup.enter="save"
 
+        placeholder="请填写描述说明"
 
+      />
 
+
 
+     <div class="endTime">
 
+      <span>过期时间（分）：</span>
 
+      <input
 
+        class="binfo_input"
 
+        type="value"
 
+        placeholder="请设置过期时间"
 
+        v-model="checkJson.minutes"
 
+        @change="minutesChange"
 
+      />
 
+     </div>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  props: {
 
+    cJson: {
 
+      type: Object
 
+    },
 
+    cJson2: {
 
+      type: Object
 
+    },
 
+    isOpen: {
 
+      type: Boolean,
 
+      default: false
 
+    },
 
+    index: {
 
+      type: String,
 
+      default: ""
 
+    }
 
+  },
 
+  data() {
 
+    return {
 
+      option: {
 
+        1: { name: "附件" }
 
+        // 2: { name: '多选题' }
 
+      },
 
+      checkJson: {},
 
+      updateList: {
 
+        title: false,
 
+        detail: false
 
+      }
 
+    };
 
+  },
 
+  watch: {
 
+    checkJson: {
 
+      handler(newVal) {
 
+        this.$emit("setJson", newVal, this.index);
 
+      },
 
+      deep: true
 
+    },
 
+    isOpen(newValue) {
 
+      if (newValue) {
 
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
 
+          this.checkJson = {
 
+            title: "标题",
 
+            type: 1,
 
+            answer: ""
 
+          };
 
+        } else {
 
+          this.checkJson = this.depthCopy(this.cJson2);
 
+        }
 
+      }
 
+    }
 
+  },
 
+  methods: {
 
+    depthCopy(s) {
 
+      console.log("4",s)
 
+      return JSON.parse(JSON.stringify(s));
 
+    },
 
+    save() {
 
+      for (let key in this.updateList) {
 
+        this.updateList[key] = false;
 
+      }
 
+    },
 
+    updateTitle() {
 
+      this.updateList.title = true;
 
+      this.$nextTick(() => {
 
+        this.$refs["titleRef"].focus();
 
+      });
 
+    },
 
+    updateDetail() {
 
+      this.updateList.detail = true;
 
+      this.$nextTick(() => {
 
+        this.$refs["detailRef"].focus();
 
+      });
 
+    },
 
+    minutesChange() {
 
+      if (/[^\d]/.test(this.checkJson.minutes) || this.checkJson.minutes < 0) {
 
+        this.$message.error("请输入大于0的整数数字");
 
+        this.checkJson.minutes = 0;
 
+      } else if (this.checkJson.minutes === "") {
 
+        this.checkJson.minutes = 0;
 
+      }
 
+    },
 
+
 
+  },
 
+  mounted() {
 
+    if (!this.cJson || Object.keys(this.cJson).length == 0) {
 
+      this.checkJson = {
 
+        title: "",
 
+        detail: "",
 
+        answer: "", //内容
 
+        answer2: "", //内容
 
+        minutes: 5, //设置的分钟
 
+      };
 
+    } else {
 
+      console.log("2", this.cJson);
 
+      this.checkJson = this.depthCopy(this.cJson);
 
+      console.log("3",this.checkJson)
 
+      this.$forceUpdate();
 
+    }
 
+  }
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+@import "../../global_styles.css";
 
+
 
+.punchQRcode > .detail {
 
+  width: 100%;
 
+  word-break: break-all;
 
+  color: rgb(136, 139, 146);
 
+  margin: 10px 0 0;
 
+}
 
+
 
+.binfo_input {
 
+  width: 180px;
 
+  height: 40px;
 
+  border-radius: 5px;
 
+  background: #fff;
 
+  font-size: 16px;
 
+  font-family: "Microsoft YaHei";
 
+  /* border: 1px solid #3682fc00; */
 
+  border: 1.5px solid #e0e0e0;
 
+  text-indent: 1em;
 
+  outline-color: rgb(64, 158, 255);
 
+  outline-offset: 1px;
 
+
 
+}
 
+
 
+.binfo_input > div {
 
+  border: 1.5px dashed #dfdfdf;
 
+  height: 120px;
 
+  width: 100%;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  background: rgb(249, 250, 251);
 
+  color: rgb(124, 124, 124);
 
+  border-radius: 5px;
 
+}
 
+
 
+.endTime{
 
+  display: flex;
 
+  justify-content: flex-end;
 
+  align-items: center;
 
+  margin-top: 10px;
 
+
 
+}
 
+
 
+.endTime>span{
 
+  display: flex;
 
+  align-items: center;
 
+}
 
+</style>

+ 7 - 1
src/components/pages/test/add/edit/check/index.vue
Zobraziť súbor 

@@ -16,6 +16,7 @@
 
             <courseV2 :tindex="index" :cJson.sync="item.json" v-if="item.type == 11"></courseV2>
 
 						<sweep :tindex="index" :cJson.sync="item.json" v-if="item.type == 12"/>
 
             <number :tindex="index" :cJson.sync="item.json" v-if="item.type == 13"/>
 
+            <punchQRcode :tindex="index" :cJson.sync="item.json" v-if="item.type == 14"/>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -30,6 +31,7 @@
 
               <courseV2 :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 11"></courseV2>
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 12"></sweep>
 
               <number :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 13"></number>
 
+              <punchQRcode :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 14"></punchQRcode>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -48,6 +50,7 @@
 
             <courseV2 :tindex="index" :cJson.sync="item.json" v-if="item.type == 11"></courseV2>
 
 						<sweep :tindex="index" :cJson.sync="item.json" v-if="item.type == 12"></sweep>
 
             <number :tindex="index" :cJson.sync="item.json" v-if="item.type == 13"></number>
 
+            <punchQRcode :tindex="index" :cJson.sync="item.json" v-if="item.type == 14"></punchQRcode>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -62,6 +65,7 @@
 
               <courseV2 :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 11"></courseV2>
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 12"></sweep>
 
               <number :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 13"></number>
 
+              <punchQRcode :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 14"></punchQRcode>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -88,6 +92,7 @@ import timeV from './time.vue';
 
 import courseV2 from './course2.vue';
 
 import sweep from './sweep.vue'
 
 import number from './number.vue';
 
+import punchQRcode from './punchQRcode.vue';
 
 export default {
 
   props: {
 
     cJson: {
 
@@ -106,7 +111,8 @@ export default {
 
     timeV,
 
     courseV2,
 
 		sweep,
 
-    number
 
+    number,
 
+    punchQRcode
 
   },
 
   data() {
 
     return {

+ 261 - 0
src/components/pages/test/add/edit/check/punchQRcode.vue
Zobraziť súbor 

@@ -0,0 +1,261 @@
 
+<template>
 
+  <div class="c_box">
 
+    <div class="choice_box">
 
+      <div class="title" style="display: flex;align-items: center;">
 
+        <span class="g_t_index" 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: #00000066;margin-top: 5px;"
 
+      ></div>
 
+			<div
 
+        class="detail"
 
+         v-if="checkJson.answer2 && typeof checkJson.answer2=='string'"
 
+        v-html="checkJson.answer2"
 
+        style="color: #000000;margin-top: 5px;"
 
+      ></div>
 
+			<el-button style="margin-top: 10px;" type="primary" size="mini" @click="sweepBtn">扫一扫</el-button>
 
+    </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,
 
+      courseDetail: [],
 
+    };
 
+  },
 
+  computed: {},
 
+  watch: {
 
+    checkJson: {
 
+      handler(newValue) {
 
+        this.$emit("update:cJson", newValue);
 
+      },
 
+      deep: true
 
+    }
 
+  },
 
+  methods: {
 
+    depthCopy(s) {
 
+      return JSON.parse(JSON.stringify(s));
 
+    },
 
+		sweepBtn(){
 
+			this.$message.error("请到手机端内扫码")
 
+		}
 
+  },
 
+  mounted() {
 
+    this.checkJson = this.cJson ? this.depthCopy(this.cJson) : undefined;
 
+  }
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+.c_box {
 
+  width: 100%;
 
+  position: relative;
 
+  padding-left: 45px;
 
+  overflow: visible;
 
+}
 
+
 
+/* .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;
 
+}
 
+
 
+.choice_box > .choices {
 
+  margin-top: 10px;
 
+}
 
+
 
+.choices > .page {
 
+  margin-top: 10px;
 
+  display: flex;
 
+  align-items: center;
 
+}
 
+
 
+.p_page {
 
+  margin: 0 10px;
 
+}
 
+
 
+.course {
 
+  display: flex;
 
+  align-items: center;
 
+  cursor: pointer;
 
+}
 
+
 
+.course + .course {
 
+  margin-top: 10px;
 
+}
 
+
 
+.course > .banner {
 
+  width: 200px;
 
+  height: 120px;
 
+  border-radius: 5px;
 
+  overflow: hidden;
 
+  border: 1px solid #3896fc;
 
+  box-sizing: border-box;
 
+  padding: 5px;
 
+  margin-right: 15px;
 
+}
 
+.course > .banner > img {
 
+  width: 100%;
 
+  height: 100%;
 
+  object-fit: cover;
 
+}
 
+.course > .content {
 
+}
 
+.course > .content > .c_c {
 
+}
 
+.course > .content > .c_c + .c_c {
 
+  margin-top: 5px;
 
+}
 
+.course > .content > .c_c span:nth-child(1) {
 
+}
 
+.course > .content > .c_c span:nth-child(2) {
 
+}
 
+
 
+.g_t_index {
 
+  color: #3681fc;
 
+  font-size: 28px;
 
+  font-weight: bold;
 
+  position: relative;
 
+  margin-right: 30px;
 
+  margin-left: -40px;
 
+}
 
+
 
+.g_t_index + span {
 
+  font-weight: bold;
 
+  font-size: 18px;
 
+}
 
+
 
+.g_t_index::after {
 
+  content: "";
 
+  width: 18px;
 
+  height: 2px;
 
+  position: absolute;
 
+  right: -18px;
 
+  top: 50%;
 
+  transform: translateY(-50%);
 
+  background: #3681fc;
 
+}
 
+
 
+.g_t_index::before {
 
+  content: "";
 
+  width: 6px;
 
+  height: 6px;
 
+  border-right: 2px solid #3681fc;
 
+  border-top: 2px solid #3681fc;
 
+  position: absolute;
 
+  right: -15px;
 
+  top: 50%;
 
+  transform: rotate(45deg) translateY(-5px);
 
+}
 
+
 
+.c_list {
 
+  width: calc(100% - 10px);
 
+  min-height: 200px;
 
+  height: auto;
 
+  border: 1px solid #e7e7e7;
 
+  border-radius: 5px;
 
+  box-sizing: border-box;
 
+  padding: 10px;
 
+  display: flex;
 
+  flex-wrap: wrap;
 
+  /* overflow: auto; */
 
+}
 
+
 
+.c_l_add1 {
 
+  width: 100%;
 
+  height: 200px;
 
+  background-color: #F9FAFB;
 
+	border: 1.5px dashed #dfdfdf;
 
+  display: flex;
 
+  justify-content: center;
 
+  align-items: center;
 
+  color: #00000066;
 
+  border-radius: 5px;
 
+  font-size: 18px;
 
+  cursor: pointer;
 
+}
 
+
 
+.c_l_add2{
 
+	width: 230px;
 
+  height: 200px;
 
+	background-color: #F9FAFB;
 
+	border: 1.5px dashed #dfdfdf;
 
+  display: flex;
 
+  justify-content: center;
 
+  align-items: center;
 
+  color: #00000066;
 
+  border-radius: 5px;
 
+  font-size: 18px;
 
+  cursor: pointer;
 
+}
 
+
 
+.c_l_item {
 
+  width: 230px;
 
+  height: 200px;
 
+  margin-right: 10px;
 
+  box-sizing: border-box;
 
+  border: solid 1px #3896FC;
 
+  border-radius: 5px;
 
+	cursor: pointer;
 
+	box-sizing: border-box;
 
+	padding: 5px;
 
+}
 
+
 
+.c_l_item > img {
 
+  width: 100%;
 
+  height: 110px;
 
+  object-fit: cover;
 
+	margin-bottom: 5px;
 
+}
 
+
 
+.c_l_item > div {
 
+  width: 210px;
 
+  display: block;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  white-space: nowrap;
 
+  font-size: 14px; /* 设置字体大小 */
 
+  color: #333; /* 设置字体颜色 */
 
+	box-sizing: border-box;
 
+}
 
+</style>

+ 16 - 0
src/components/pages/test/add/edit/edit/index.vue
Zobraziť súbor 

@@ -491,6 +491,14 @@ export default {
 
             detail: "",
 
             type:'1'
 
           };
 
+        }else if(topicType == 14){
 
+          json.json = {
 
+            title: "",
 
+              detail: "",
 
+              answer:"",//内容
 
+              answer2:"",//内容
 
+              minutes:"5",//设置的分钟
 
+          };
 
         }
 
         if (_json.array) {
 
           if (type == 3 && _check.length == 2) {
 
@@ -621,6 +629,14 @@ export default {
 
               answer:'',
 
               type:"1",//1：整数、2：保留一位小数、3：保留两位小数 4：百分数
 
             };
 
+          }else if (topicType == 14) {
 
+            json1.json = {
 
+              title: "",
 
+              detail: "",
 
+              answer:"",//内容
 
+              answer2:"",//内容
 
+              minutes:"5",//设置的分钟
 
+            };
 
           }
 
           this.manualJson.push(json1);
 
           this.$forceUpdate();

+ 5 - 1
src/components/pages/test/add/minxins/minxin.js
Zobraziť súbor 

@@ -55,6 +55,9 @@ const minxin = {
 
 				},{
 
           value:13,
 
           label:"数字"
 
+        },{
 
+          value:14,
 
+          label:"打卡"
 
         }
 
       ]))),
 
       optionsPin:JSON.parse(converter(JSON.stringify([
 
@@ -80,7 +83,8 @@ const minxin = {
 
         10: "多选",
 
         11: "课程",
 
 				12:"扫一扫",
 
-        13:"数字"
 
+        13:"数字",
 
+        14:"打卡"
 
       }))),
 
       buttonOptions: JSON.parse(converter(JSON.stringify([
 
         { name: "分组", type: 1 },

+ 16 - 0
src/components/pages/test/check/index.vue
Zobraziť súbor 

@@ -279,6 +279,9 @@
 
                       test_course_file: item.type == 6 || item.type == 11,
 
                       test_eva_file: item.type == 7,
 
                       test_icon_time: item.type == 8,
 
+                      test_icon_sweep:item.type == 12,
 
+                      test_icon_number:item.type == 13,
 
+                      test_icon_clockIn:item.type == 14
 
                     }"
 
                   ></span>
 
                 </el-tooltip>
 
@@ -1357,6 +1360,12 @@
 
                   >
 
                     {{ scope.row.array[index].json.answer2 }}<span>{{  scope.row.array[index].json.type=='4'?'%':'' }}</span>
 
                   </div>
 
+                  <div
 
+                    v-if="scope.row.array[index].type == 14"
 
+                    style="display: flex; flex-wrap: wrap"
 
+                  >
 
+                    {{ scope.row.array[index].json.answer2 }}
 
+                  </div>
 
                 </template>
 
               </el-table-column>
 
               <el-table-column
 
@@ -2392,6 +2401,7 @@ export default {
 
             let cJson = this.setJSON(
 
               JSON.parse(JSON.stringify(JSON.parse(this.works[i].courseJson)))
 
             );
 
+            console.log(cJson,'===',chapters)
 
             if (JSON.stringify(cJson) == JSON.stringify(chapters)) {
 
               let _json = this.JSONSetting(
 
                 JSON.parse(JSON.stringify(JSON.parse(this.works[i].courseJson)))
 
@@ -2479,6 +2489,7 @@ export default {
 
             }
 
             for (var j = 0; j < array.length; j++) {
 
               let el2 = array[j];
 
+              console.log("==>",el2)
 
               if (topic.type == 1) {
 
                 let _answer = el2.array[i].json.answer2;
 
                 for (var k = 0; k < _answer.length; k++) {
 
@@ -2562,6 +2573,8 @@ export default {
 
                   }
 
                   topic.count++;
 
                 }
 
+              }else if(topic.type==14){
 
+                console.log("===",el2)
 
               }
 
             }
 
             console.log("topictopictopictopic", topic);
 
@@ -2698,6 +2711,7 @@ export default {
 
               delete item2.json.answer2;
 
               delete item2.json.score2;
 
               delete item2.json.file;
 
+              delete item2.json.codeScanningTime
 
             }
 
             if (item2.array) {
 
               item2.array = item2.array.filter((item3) => {
 
@@ -2705,6 +2719,7 @@ export default {
 
                   delete item3.json.answer2;
 
                   delete item3.json.score2;
 
                   delete item3.json.file;
 
+                  delete item3.json.codeScanningTime
 
                 }
 
                 return item3;
 
               });
 
@@ -2715,6 +2730,7 @@ export default {
 
           delete item.json.answer2;
 
           delete item.json.score2;
 
           delete item.json.file;
 
+          delete item.json.codeScanningTime
 
         }
 
         return item;
 
         console.log(item.array);

+ 266 - 0
src/components/pages/testStudent/view/component/punchQRcode.vue.vue
Zobraziť súbor 

@@ -0,0 +1,266 @@
 
+<template>
 
+  <div class="c_box">
 
+    <div class="choice_box">
 
+      <div class="title" style="display: flex;align-items: center;">
 
+        <span class="g_t_index" 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: #00000066;margin-top: 5px;"
 
+      ></div>
 
+
 
+			<div
 
+        class="detail"
 
+        v-if="checkJson.answer2 && typeof checkJson.answer2=='string'"
 
+        v-html="checkJson.answer2"
 
+        style="color: #000000;margin-top: 5px;"
 
+      ></div>
 
+			<el-button @click="sweepBtn" type="primary" size="mini" style="margin-top: 10px;">扫一扫</el-button>
 
+    </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: {
 
+				title:"",
 
+				detail:""
 
+			},
 
+    };
 
+  },
 
+  watch: {
 
+    checkJson: {
 
+      handler(newValue) {
 
+        this.$emit("update:cJson", newValue);
 
+      },
 
+      deep: true
 
+    }
 
+  },
 
+  methods: {
 
+
 
+    depthCopy(s) {
 
+      return JSON.parse(JSON.stringify(s));
 
+    },
 
+
 
+		sweepBtn(){
 
+			this.$message.error("请到手机端内扫码")
 
+		}
 
+  },
 
+  mounted() {
 
+    this.checkJson = this.cJson ? this.depthCopy(this.cJson) : undefined;
 
+  }
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+.c_box {
 
+  width: 100%;
 
+  position: relative;
 
+	padding-left: 45px;
 
+}
 
+
 
+/* .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;
 
+}
 
+
 
+.choice_box > .choices {
 
+  margin-top: 10px;
 
+}
 
+
 
+.choices > .page {
 
+  margin-top: 10px;
 
+  display: flex;
 
+  align-items: center;
 
+}
 
+
 
+.p_page {
 
+  margin: 0 10px;
 
+}
 
+
 
+.course {
 
+  display: flex;
 
+  align-items: center;
 
+  cursor: pointer;
 
+}
 
+
 
+.course + .course {
 
+  margin-top: 10px;
 
+}
 
+
 
+.course > .banner {
 
+  width: 200px;
 
+  height: 120px;
 
+  border-radius: 5px;
 
+  overflow: hidden;
 
+  border: 1px solid #3896fc;
 
+  box-sizing: border-box;
 
+  padding: 5px;
 
+  margin-right: 15px;
 
+}
 
+.course > .banner > img {
 
+  width: 100%;
 
+  height: 100%;
 
+  object-fit: cover;
 
+}
 
+.course > .content {
 
+}
 
+.course > .content > .c_c {
 
+}
 
+.course > .content > .c_c + .c_c {
 
+  margin-top: 5px;
 
+}
 
+.course > .content > .c_c span:nth-child(1) {
 
+}
 
+.course > .content > .c_c span:nth-child(2) {
 
+}
 
+
 
+.g_t_index {
 
+  color: #3681fc;
 
+  font-size: 28px;
 
+  font-weight: bold;
 
+  position: relative;
 
+  margin-right: 30px;
 
+  margin-left: -40px;
 
+}
 
+
 
+.g_t_index + span {
 
+  font-weight: bold;
 
+  font-size: 18px;
 
+}
 
+
 
+.g_t_index::after {
 
+  content: "";
 
+  width: 18px;
 
+  height: 2px;
 
+  position: absolute;
 
+  right: -18px;
 
+  top: 50%;
 
+  transform: translateY(-50%);
 
+  background: #3681fc;
 
+}
 
+
 
+.g_t_index::before {
 
+  content: "";
 
+  width: 6px;
 
+  height: 6px;
 
+  border-right: 2px solid #3681fc;
 
+  border-top: 2px solid #3681fc;
 
+  position: absolute;
 
+  right: -15px;
 
+  top: 50%;
 
+  transform: rotate(45deg) translateY(-5px);
 
+}
 
+
 
+.c_list {
 
+  width: calc(100% - 10px);
 
+  min-height: 200px;
 
+  height: auto;
 
+  border: 1px solid #e7e7e7;
 
+  border-radius: 5px;
 
+  box-sizing: border-box;
 
+  padding: 10px;
 
+  display: flex;
 
+  flex-wrap: wrap;
 
+  /* overflow: auto; */
 
+}
 
+
 
+.c_l_add1 {
 
+  width: 100%;
 
+  height: 200px;
 
+  background-color: #F9FAFB;
 
+	border: 1.5px dashed #dfdfdf;
 
+  display: flex;
 
+  justify-content: center;
 
+  align-items: center;
 
+  color: #00000066;
 
+  border-radius: 5px;
 
+  font-size: 18px;
 
+  cursor: pointer;
 
+}
 
+
 
+.c_l_add2{
 
+	width: 230px;
 
+  height: 200px;
 
+	background-color: #F9FAFB;
 
+	border: 1.5px dashed #dfdfdf;
 
+  display: flex;
 
+  justify-content: center;
 
+  align-items: center;
 
+  color: #00000066;
 
+  border-radius: 5px;
 
+  font-size: 18px;
 
+  cursor: pointer;
 
+}
 
+
 
+.c_l_item {
 
+  width: 230px;
 
+  height: 200px;
 
+  margin-right: 10px;
 
+  box-sizing: border-box;
 
+  border: solid 1px #3896FC;
 
+  border-radius: 5px;
 
+	cursor: pointer;
 
+	box-sizing: border-box;
 
+	padding: 5px;
 
+}
 
+
 
+.c_l_item > img {
 
+  width: 100%;
 
+  height: 110px;
 
+  object-fit: cover;
 
+	margin-bottom: 5px;
 
+}
 
+
 
+.c_l_item > div {
 
+  width: 210px;
 
+  display: block;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  white-space: nowrap;
 
+  font-size: 14px; /* 设置字体大小 */
 
+  color: #333; /* 设置字体颜色 */
 
+	box-sizing: border-box;
 
+}
 
+</style>

+ 11 - 1
src/components/pages/testStudent/view/component/topic.vue
Zobraziť súbor 

@@ -31,6 +31,8 @@
 
 							:see="see" :isTeacher="isTeacher"></sweep>
 
               <number :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 13"
 
 							:see="see" :isTeacher="isTeacher"></number>
 
+              <punchQRcodeVue :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 14"
 
+							:see="see" :isTeacher="isTeacher"></punchQRcodeVue>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -53,6 +55,8 @@
 
 								:see="see" :isTeacher="isTeacher"></sweep>
 
                 <number :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 13"
 
 								:see="see" :isTeacher="isTeacher"></number>
 
+                <punchQRcodeVue :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 14"
 
+								:see="see" :isTeacher="isTeacher"></punchQRcodeVue>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -81,6 +85,8 @@
 
                :see="see" :isTeacher="isTeacher"></sweep>
 
                <number :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 13"
 
                :see="see" :isTeacher="isTeacher"></number>
 
+               <punchQRcodeVue :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 14"
 
+               :see="see" :isTeacher="isTeacher"></punchQRcodeVue>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -105,6 +111,8 @@
 
                :see="see" :isTeacher="isTeacher"></sweep>
 
                <number :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 13"
 
                :see="see" :isTeacher="isTeacher"></number>
 
+               <punchQRcodeVue :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 14"
 
+               :see="see" :isTeacher="isTeacher"></punchQRcodeVue>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -133,6 +141,7 @@ import timeV from './time.vue';
 
 import courseV2 from './course2.vue';
 
 import sweep from './sweep'
 
 import number from "./number.vue";
 
+import punchQRcodeVue from "./punchQRcode.vue.vue";
 
 export default {
 
   props: {
 
     cJson: {
 
@@ -178,7 +187,8 @@ export default {
 
     timeV,
 
     courseV2,
 
 		sweep,
 
-    number
 
+    number,
 
+    punchQRcodeVue
 
   },
 
   data() {
 
     return {

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