111

package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "axios": "^0.21.4",
         "core-js": "^3.6.5",
+        "default-passive-events": "^2.0.0",
         "element-ui": "^2.15.6",
         "js-cookie": "^3.0.1",
         "node-sass": "^6.0.1",
@@ -5698,6 +5699,11 @@
         "node": ">= 8"
       }
     },
+    "node_modules/default-passive-events": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
+      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
+    },
     "node_modules/defaults": {
       "version": "1.0.3",
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
@@ -19738,6 +19744,11 @@
         }
       }
     },
+    "default-passive-events": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
+      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
+    },
     "defaults": {
       "version": "1.0.3",
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",

package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "axios": "^0.21.4",
     "core-js": "^3.6.5",
+    "default-passive-events": "^2.0.0",
     "element-ui": "^2.15.6",
     "js-cookie": "^3.0.1",
     "node-sass": "^6.0.1",

src/components/index/SignUp/invitation.vue

@@ -131,7 +131,7 @@ export default {
       if (code.indexOf("-") !== -1) {
         //如果是复制过来的带'-'邀请码
         let copyCode = code.split("-");
-        console.log(copyCode, "输入222");
+        // console.log(copyCode, "输入222");
         this.invatation1 = copyCode[0];
         this.invatation2 = copyCode[1];
         this.invatation3 = copyCode[2];

src/main.js

@@ -8,7 +8,7 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import '@/assets/scss/index.scss'
 import {download, upload} from "r/index/network.js";
-
+import 'default-passive-events'
 
 
 Vue.config.productionTip = false

src/router/index.js

@@ -115,22 +115,6 @@ function checkCam(code, cb) {
   }
 
   getCam(code).then((res) => {
-    // console.log(res)
-    // if (res.data.code != 200) {
-    //   Message({
-    //     message: "请访问正确的营地链接地址",
-    //     type: 'waring'
-    //   });
-
-    // if (res.data.code == 400034 || res.data.code == 400035 || res.data.code == 400001 || res.data.code == 400002 || res.data.code == 400003) {
-    //   Message({
-    //     message: res.data.message,
-    //     type: 'waring'
-    //   });
-    //   cb && cb(false);
-    //   return false;
-    // }
-    // }
   
     let root = document.querySelector(":root");
     root.style.setProperty("--color", res.data.system_color);
@@ -158,7 +142,7 @@ function checkCam(code, cb) {
 }
 
 router.beforeEach((to, from, next) => {
-  // console.log(to, 'to')
+  console.log(to, 'to')
   // console.log(from, 'from')
   let
     toLogin = "/login",

src/views/index/camp/Homework.vue

@@ -19,6 +19,10 @@
             <span class="status_1" v-if="item.student_status == 1">待评阅</span>
             <span class="status_2" v-if="item.student_status == 2">已评阅</span>
           </div>
+          <!-- <el-button class="btn_refer" @click="toRefer(item)"
+            >查看作业</el-button
+          > -->
+
           <el-button
             class="btn_refer"
             :disabled="
@@ -58,6 +62,7 @@
     <!-- 下载作业 -->
     <refer
       :dialogVisibleFu="dialogVisibleFu"
+      :timeOut="time_out"
       :work_contexts="work_context"
       :enclosure_urls="enclosure_url"
       :work_nums="work_num"
@@ -86,8 +91,10 @@ export default {
       total: 0,
       homeworkList: [],
       dialogVisibleFu: false,
+      timeOut: 1, //提交作业时间状态
       work_context: "",
       enclosure_url: "",
+      time_out: 0,
       work_num: 0,
       workName: "",
       order_num: 0,
@@ -116,8 +123,12 @@ export default {
     },
     toRefer(item) {
       //time_out：提交作业时间状态
-      if (item.time_out == 1) {
-        if (item.is_submit == 1) {
+      if (item.time_out == 1 || 3) {
+        // if (item.is_submit == 1) {
+        // }
+        if (item.time_out == 3) {
+          this.time_out = item.time_out;
+          console.log(this.timeOut, "this.timeOut ");
         }
         this.dialogVisibleFu = true;
         // console.log(item.work_num,'val')
@@ -129,9 +140,11 @@ export default {
         this.student_status = item.student_status;
       } else if (item.time_out == 2) {
         return this.$message.error("填写作业时间未开始");
-      } else if (item.time_out == 3) {
-        return this.$message.error("填写作业时间已截止");
       }
+
+      // else if (item.time_out == 3) {
+      //   return this.$message.error("填写作业时间已截止");
+      // }
     },
     getTeacherWork() {
       getTeacherWork({ page: this.currentPage }).then((res) => {

src/views/index/camp/homework/refer.vue

@@ -212,12 +212,14 @@
                 <span>评阅结果</span>
               </div>
             </div>
-            <!-- <div class="cont_title_2">导师评分</div>
-          <div class="cont_info">{{ score }}</div> -->
-            <div class="cont_title_2">导师评语</div>
-            <div v-html="teacher_commment" class="cont_info">}</div>
-            <div class="cont_title_2">相关附件</div>
-            <div class="upload_box">
+            <div v-if="this.time_out != 3" class="cont_title_2">导师评分</div>
+            <div v-if="this.time_out != 3" class="cont_info">{{ score }}</div>
+            
+            
+            <div v-if="this.time_out == 3" class="cont_title_2">导师评语</div>
+            <div v-if="this.time_out == 3" v-html="teacher_commment" class="cont_info">}</div>
+            <div v-if="this.time_out != 3" class="cont_title_2">相关附件</div>
+            <div v-if="this.time_out != 3" class="upload_box">
               <div v-if="tea_scoreFileList.length > 0">
                 <div
                   class="img_list"
@@ -270,6 +272,7 @@ export default {
   name: "ReadForm",
   props: {
     dialogVisibleFu: Boolean,
+    timeOut: [Number, String], //判断是超时
     work_contexts: [Number, String], //作业内容
     enclosure_urls: [Object, String], //老师作业地址
     work_nums: [Number],
@@ -315,6 +318,7 @@ export default {
       isUploading: false, // 图片上传蒙层
       work_context: "", //简介
       work_name: "", //作业名称
+      time_out: 1,
       fileImg: fileImg,
       loading: false,
       dialogVisible: this.dialogVisibleFu,
@@ -329,13 +333,14 @@ export default {
       teaFileList: [], // 老师-布置作业附件
       fileList: [], //学生上传的作业文件
       stu_fileList: [], //学生上传的文件(传给接口的格式)
-      // score: "", //老师评分
+      score: "", //老师评分
       teacher_commment: "", //老师评语
       tea_scoreFileList: [], //老师评语的附件
       srcList: [], //在线预览图片-放大
     };
   },
   created() {
+ 
     // console.log(this.formData.stu_enclosure_url);
     let code = this.$store.state.indexIdentity;
     let stu_fileListoss = window.localStorage.getItem(
@@ -347,6 +352,8 @@ export default {
   },
   methods: {
     open() {
+         console.log(this.timeOut)
+    console.log(this.time_out)
       // console.log(this.student_status);
       this.titleName = this.order_nums;
       // console.log(this.student_status);
@@ -458,7 +465,7 @@ export default {
               };
             });
           }
-          // this.score = res.data.data.score; //老师评分
+          this.score = res.data.data.score; //老师评分
           this.teacher_commment = res.data.data.teacher_commment; //老师评语
           // console.log(res.data.data.teacher_commment, " this.teacher_commment");
           let scoreFileList = res.data.data.teacher_url;
@@ -768,6 +775,10 @@ export default {
     workName() {
       this.work_name = this.workName;
     },
+    timeOut() {
+      this.time_out = this.timeOut;
+      console.log(this.time_out, "timeout");
+    },
   },
 };
 </script>