SanHQin 11 hours ago
parent
commit
3544f846c4

+ 1 - 1
dist/index.html

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

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


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


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


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


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


+ 30 - 1
src/components/pages/test/check/index.vue

@@ -2192,6 +2192,7 @@ export default {
       examineData:null,
       disableBack: this.$route.query.disableBack === 'true',
       timeLimit:this.$route.query.timeLimit,
+      sortTime:[],
     };
   },
   watch: {},
@@ -2372,6 +2373,16 @@ export default {
               }
             })
           }
+          if(this.sortTime.length>0){
+            this.sortTime.forEach(i=>{
+              _result.shortcuts.push({
+                text:i.title?i.title:"-",
+                onClick(picker){
+                  picker.$emit('pick', [new Date(i.time[0]), new Date(i.time[1])]);
+                }
+              })
+            })
+          }
         }
         return _result;
       }
@@ -4549,7 +4560,24 @@ ${JSON.stringify(item.array)}
     //查看文件列表
     checkFileListOpen(list){
       this.$refs.checkFileListDialogRef.open(list);
-    }
+    },
+    getClassSortTime(){
+      let params = {
+        pid:"11"
+      }
+      this.ajax.get(this.$store.state.api+"select_ClassByParentid",params).then(res=>{
+        let _data = res.data[0];
+        if(_data.length>0){
+          _data.forEach(i=>{
+            if(i.value){
+              this.sortTime.push(JSON.parse(i.value))
+            }
+          })
+        }
+      }).catch(e=>{
+        console.log(e);
+      })
+    },
   },
 
   beforeDestroy() {
@@ -4574,6 +4602,7 @@ ${JSON.stringify(item.array)}
       // this.getClass2()
       this.changeHeight();
     });
+    // this.getClassSortTime();
   },
 };
 </script>

+ 12 - 3
src/components/pages/testPerson/examine/index.vue

@@ -157,13 +157,13 @@
                         class="orgData"
                       >
                         <div @click="lookPrize(item2.courseId)">
-                          {{ item2.title }}:{{ item2.num }}份
+                          <!-- {{ item2.title }} -->
+                          查看:{{ item2.num }}份
                         </div>
                         <div
-                          style="color: black;"
                           @click="goFillIn(item2.courseId)"
                         >
-                          填写
+                          填写
                         </div>
                       </div>
                     </div>
@@ -182,6 +182,10 @@
       </div>
     </div>
 
+    <div class="brief" v-if="brief">
+      <span v-html="brief" style="white-space: pre-wrap;word-break: break-all;"></span>
+    </div>
+
     <!-- 点击数据来源 -->
     <el-dialog
       title=""
@@ -242,6 +246,7 @@ export default {
       timeA:"",
       timeB:"",
       testExamineBaseList:[],
+      brief:"",
     };
   },
   watch: {
@@ -418,7 +423,9 @@ export default {
           console.log("getTestExamineByUserId", res);
 
           if (res.data[0].length > 0) {
+
             this.allData = res.data[0][0];
+
             let val = JSON.parse(res.data[0][0].json);
 
             this.PageBaseData.forEach(e => {
@@ -471,6 +478,8 @@ export default {
           // console.log("resresresres", res.data[0]);
           // this.allData = res.data[0][0];
           let testExamineBaseList = res.data[0];
+          console.log("res.data[0][0]", res.data[0][0]);
+          this.brief = res.data[0][0].brief;
           this.testExamineBaseList = testExamineBaseList;
           console.log("selectTestExamineBase", res.data[0][0]);
           this.PageBaseData = JSON.parse(res.data[0][0].json);

+ 3 - 1
src/components/pages/workPage/index.vue

@@ -487,7 +487,9 @@ export default {
 <style scoped>
 .workPage {
   width: 100%;
-  height: 100%;
+  height: auto;
+  min-height: 100%;
+
   background-color: #fff;
   overflow: auto;
   display: flex;

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