sass平台修改

src/components/pages/sassPlatform/index.vue

@@ -5,8 +5,8 @@
 
       </div> -->
       <div class="sp_h_tagArea">
-        <span :class="{tagActive:tagIndex==0}" @click="tagIndex = 0">应用中心</span>
-        <span :class="{tagActive:tagIndex==1}" @click="goTestSmarter()">智能助手</span>
+        <span :class="{tagActive:tagIndex==0}" style="margin-left: 10px;" @click="tagIndex = 0">应用中心</span>
+        <span :class="{tagActive:tagIndex==1}" style="margin-left: 17.5px;" @click="goTestSmarter()">智能助手</span>
       </div>
     </div>
     <div class="sp_bottom">
@@ -146,11 +146,13 @@ export default {
 
 .sp_header{
   width: 100%;
-  height: 70px;
+  height: 54px;
   display: flex;
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
+  padding: 10px 0;
+  box-sizing: border-box;
   border-bottom: solid 1px #BBBBBB;
 }
 
@@ -162,30 +164,31 @@ export default {
 }
 
 .sp_h_tagArea>span{
-  margin-right: 40px;
   cursor: pointer;
   font-size: 20px;
   transition: .2s;
+  color:#999;
   position: relative;
+  padding: 0 15px;
 }
 
 .sp_h_tagArea>span:hover{
-  color: #1684FC;
+  color: #000;
 }
 
 .tagActive{
-  color: #1684FC;
+  font-weight: bold;
+  color: #000 !important;
 }
 
 .tagActive::after{
-  content: '';
-  width: 100%;
-  height: 4px;
-  background-color: #1684FC;
-  position: absolute;
-  bottom: -10px;
-  left: 0;
-  border-radius: 4px;
+    content: "";
+    width: 100%;
+    background: #3681FC;
+    height: 2px;
+    position: absolute;
+    left: 0;
+    bottom: -8px;
 }
 
 .sp_bottom{

src/components/pages/sassPlatform/view/examine/conpoments/targetPage.vue

@@ -294,7 +294,15 @@ export default {
       //2专任教师 1班主任
       type: Number,
       default: 0
-    }
+    },
+    timeA:{
+      type:String,
+      default:""
+    },
+    timeB:{
+      type:String,
+      default:""
+    },
   },
   data() {
     return {
@@ -1345,7 +1353,15 @@ export default {
     pType(newVal, oldVal) {
       this.allData = [];
       this.getPageBase();
-    }
+    },
+    timeA(){
+      this.allData = [];
+      this.getPageBase();
+    },
+    timeB(){
+      this.allData = [];
+      this.getPageBase();
+    },
   },
   mounted() {
     this.getPageBase();

src/components/pages/sassPlatform/view/examine/index.vue

@@ -26,6 +26,31 @@
           @change="selectTeaName"
           placeholder="请输入教师姓名"
         ></el-input>
+
+        <div style="margin: 0 20px;" v-if="timeListA.length>1 && pType == 1 && cutTable!=1">
+          <el-select v-model="timeA" placeholder="请选择">
+            <el-option
+              v-for="item in timeListA"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
+        <div style="margin: 0 20px;" v-if="timeListB.length>1 && pType == 2 && cutTable!=1">
+          <el-select v-model="timeB" placeholder="请选择">
+            <el-option
+              v-for="item in timeListB"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
         <div style="margin: 0 20px;">
           <el-select v-model="cutTable" placeholder="请选择">
             <el-option
@@ -51,7 +76,7 @@
       </div>
     </div>
     <div class="testCon">
-      <targetPage :pType="pType" v-if="cutTable == 0"></targetPage>
+      <targetPage :pType="pType" :timeA="timeA" :timeB="timeB" v-if="cutTable == 0"></targetPage>
       <personPage
         ref="child"
         :pType="pType"
@@ -77,6 +102,10 @@ export default {
       bArray: [],
       oid: this.$route.query.oid,
       org: this.$route.query.org,
+      timeListA:[],
+      timeListB:[],
+      timeA:"",
+      timeB:"",
       pType: 2,
       cutTable: 0,
       teacherName: "",
@@ -101,17 +130,22 @@ export default {
       let params = {
         typ: type,
         org: this.org,
-        oid: this.oid
+        oid: this.oid,
+        time:""
       };
       this.ajax
-        .get(this.$store.state.api + "selectTestExamineBase", params)
+        .get(this.$store.state.api + "selectTestExamineBase2", params)
         .then(res => {
           console.log('1111111111111111111111', res.data);
-          
+
           if(type == 1){
             this.aArray = res.data[0];
+            this.timeListA = this.aArray.map(i=>{return {value:i.time,label:i.timeLabel}})
+            if(this.timeListA.length>0)this.timeA = this.timeListA[0].value;
           }else {
             this.bArray = res.data[0];
+            this.timeListB = this.bArray.map(i=>{return {value:i.time,label:i.timeLabel}})
+            if(this.timeListB.length>0)this.timeB = this.timeListB[0].value;
             if(!this.bArray.length){
               this.pType = 1
             }
@@ -121,6 +155,30 @@ export default {
           console.log(error);
         });
     },
+    // getPageBase2(type) {
+    //   let params = {
+    //     typ: type,
+    //     org: this.org,
+    //     oid: this.oid
+    //   };
+    //   this.ajax
+    //     .get(this.$store.state.api + "selectTestExamineBase", params)
+    //     .then(res => {
+    //       console.log('1111111111111111111111', res.data);
+          
+    //       if(type == 1){
+    //         this.aArray = res.data[0];
+    //       }else {
+    //         this.bArray = res.data[0];
+    //         if(!this.bArray.length){
+    //           this.pType = 1
+    //         }
+    //       }
+    //     })
+    //     .catch(error => {
+    //       console.log(error);
+    //     });
+    // },
     cutPage(e) {
       this.pType = e;
     },

src/components/pages/test/smarter.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="pb_content">
         <div style="width:100%;padding:0;box-sizing: border-box;">
-            <div class="pb_head top">
+            <div class="pb_head top" :style="{justifyContent: back=='sass' ? 'center' : 'flex-start'}">
                 <div class="pb_head_t_left">
                     <span class="subClick" v-if="!back" @click="
                         goTo(