6.5页面样式修改

src/components/MenuComponent.vue

@@ -167,7 +167,7 @@ export default {
   display: inline-block;
 }
 .out {
-  margin-left: 20px;
+  margin-left: 40px;
   font-size: 14px;
   color: #666666;
   display: inline-block;

src/components/SuperComponent.vue

@@ -6,8 +6,10 @@
     <!--v-show="roles.indexOf(item.id) >= 0"-->
       <el-col :span="3"   v-for="(item, index) of menuData" :key="item.id"
       @click.native="secondNavClick(item,index)" style="text-align: center">
-        <span class="lineStyle" :class="{active:index == checkindex,menu_item:true}">{{item.name}}</span>
-
+          <span class="lineStyle" :class="{active:index == checkindex,menu_item:true}">{{item.name}}</span>
+          <div class="box" v-if="index==1||index==3">
+            <span class="box-text">{{index==1?2+'项任务':3+'份作业'}}</span>
+          </div>
       </el-col>
 
       <el-col :span="4" class="aside-right">
@@ -151,7 +153,7 @@ export default {
   display: inline-block;
 }
 .out{
-  margin-left: 20px;
+  margin-left: 40px;
   font-size: 14px;
   color: #666666;
   display: inline-block;
@@ -165,4 +167,42 @@ export default {
     float: right;
     margin-right: 0%;
   }
+  .box-items{
+    position: relative;
+  }
+  .box-text{
+    color: #FFFFFF;
+    font-size: 14px;
+    position: absolute;
+    top:-37px;
+    left: 0;
+    height:34px;
+    min-width: 75px;
+    display: inline-block;
+  }
+.box{
+    position: relative;
+    top:0px;
+    left:0px;
+    min-width:75px;
+    height:34px;
+    background: #FF6767;
+   -moz-border-radius: 12px;
+   -webkit-border-radius: 12px;
+   border-radius: 17px;
+   display: inline-block;
+}
+.box:before{
+             position: absolute;
+             content: "";
+             width: 0;
+             height: 0;
+             right: 100%;
+             top: 25px;
+             left: -5px;
+             border-top: 5px solid transparent;
+             border-right: 18px solid #FF6767;
+             border-bottom: 5px solid transparent;
+             transform: rotate(-45deg);
+            }
 </style>

src/pages/home/SchoolManager.vue

@@ -520,7 +520,7 @@
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(3)">
           </div>
         </div>
-        <div class="model-items">
+        <div class="model-items" style="width: 100%">
           <div class="model-items-first">
             <div>
               <img :src="BASE_URL + GetTeacherDetail.imgUrl" v-if="GetTeacherDetail.imgUrl"  alt class="model-items-first-img">
@@ -923,7 +923,6 @@ export default {
       if (this.monitorTeacherList.unCorrectCount == 0){
           this.isNocheck = true;
         var time = setTimeout(function () {
-          console.log('2222')
           this.isNocheck = true;
           clearTimeout(time);
         }, 1000);
@@ -1204,7 +1203,7 @@ el-table {
 width: 60px;
 }
 .tr-sw180{
-  width: 180px;
+  width: 230px;
 }
 .tr-secondsA{
     text-align: center;
@@ -1214,6 +1213,10 @@ width: 60px;
 }
 .tr-w120{
   width:120px;
+  text-align: left;
+  display: inline-block;
+  /*height: 80px;*/
+  /*line-height: 80px;*/
 }
 .tr-second-check {
   color: #3ab548;
@@ -1313,11 +1316,11 @@ width: 60px;
   justify-content: space-between;
 }
 .model-items {
-  padding: 20px;
+  padding: 20px 0;
   display: flex;
   justify-content: space-between;
   display: inline-block;
-  width: 45%;
+  width: 100%;
 }
 .model-items-left-top-img {
   width: 68px;

src/pages/super/CheckTeacherAudit.vue

@@ -108,11 +108,12 @@
       <div class='model-text'>
         <div class="model-text-items">
           <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(2)" class="model-text-items-close"></div>
-          <div>是否要驳回{{userName}}老师的注册申请？</div>
+          <div>审核不通过</div>
+          <textarea placeholder="请输入审核不通过原因" class="textarea" style="border: none" v-model="filters.textareaDesc"></textarea>
         </div>
         <div class="model-btn">
-          <div class="model-btn-items main-gay" @click="ApplyOperate()">是</div>
-          <div class="model-btn-items model-grdeen" @click="allShowModel(2)">否</div>
+          <div class="model-btn-items main-gay" @click="ApplyOperate()">确定</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(2)">取消</div>
         </div>
       </div>
     </div>
@@ -184,6 +185,7 @@
           },
         ],
         filters: {
+          textareaDesc:'',
           actvNm: "",
           actvCrtUserId: "",
           actvType: "",
@@ -265,6 +267,7 @@
         this.$store.dispatch("ApplyOperate", {
           applicantId: this.applicantId,
           operate: this.operate,
+          reason:this.filters.textareaDesc
         });
         this.allShowModel(this.operate)
       },
@@ -461,7 +464,7 @@
   .model-text-items-close{
     position: absolute;
     top: 10px;
-    right: 15px;
+    right: -5px;
   }
   .model-text-items{
     position: relative;
@@ -469,6 +472,7 @@
     font-size: 24px;
     text-align: center;
     padding: 40px 0 50px 0;
+    margin: 0 33px;
   }
   .page-block{
     text-align: center;
@@ -484,6 +488,16 @@
     color: #393939;
 
   }
+  .textarea{
+    background: #F6F7FB !important;
+    font-size: 20px;
+    color: #999999;
+    margin-top: 33px;
+    border: none !important;
+    width: 100%;
+    min-height: 200px;
+    padding: 15px;
+  }
   /*.all_pagination{*/
     /*text-align: center !important;*/
   /*}*/

src/pages/super/HomeWorkRecover.vue

@@ -50,7 +50,7 @@
             background
             @size-change="handleSizeChange"
             @current-change="pageChange"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10]"
             layout="total, sizes, prev, pager, next, jumper"
             :total= parseInt(applyTeacherList.pages)
           ></el-pagination>

src/pages/super/HomeworkRecycle.vue

@@ -11,8 +11,7 @@
           :data="list"
           :header-cell-class-name="tableheaderClassName"
           :header-cell-style="{
-          'background-color': '#F6F7FB',
-          'color': '#393939',
+          'color': '#999999',
           'font-size': '16px'
            }"
           size="medium"

src/pages/super/SchoolManager.vue

@@ -1435,6 +1435,7 @@ width: 60px;
 }
 .tr-w120{
   width:120px;
+  text-align: left;
 }
 .tr-second-check {
   color: #3ab548;

src/pages/super/SuperAdmin.vue

@@ -117,10 +117,10 @@
               </div>
             </div>
             <div>
-              <el-button type="danger" plain round @click="isShow(2,getManagerDetail.name)" icon="el-icon-bottom"><span>降级</span></el-button>
+              <el-button type="danger" plain round @click="isShow(2,getManagerDetail.name)" icon="el-icon-bottom">降级</el-button>
             </div>
           </div>
-          <div class="model-items-other model-active">批改科目 : {{getManagerDetail.subject}}</div> 
+          <div class="model-items-other model-active" >批改科目 : {{getManagerDetail.subject}}</div>
           <div class="model-items-other">批改年级 :<span v-for="(v, k) of arrGrade" :key=k class="grade-name" v-if="k>=0">{{v}}</span></div>
           <div class="model-items-other model-active"><span>可批改时间：</span> <span ><el-button type="info" round v-for="(v, k) of arrPeriod" :key=k v-if="k>=0">{{v}}</el-button></span></div>
           <div class="model-items-other">手机号 : {{getManagerDetail.phone}}</div>