6.13 16：52页面样式修改

src/components/SuperComponent.vue

@@ -6,17 +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">
-<<<<<<< HEAD
-          <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>-->
-=======
           <span class="lineStyle" :class="{superactive: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> -->
->>>>>>> 21b8f6891c717d37f8cc05e1f56edb0611d0e08e
       </el-col>
 
       <el-col :span="4" class="aside-right">

src/pages/home/SchoolManager.vue

@@ -40,7 +40,7 @@
                   v-for="(item, k) in options"
                   :key="k"
                   :label="item.label"
-                  :value="item.label"
+                  :value="item.str"
                 ></el-option>
               </el-select>
               <el-select
@@ -54,7 +54,7 @@
                   v-for="(item, k) in grades"
                   :key="k"
                   :label="item.label"
-                  :value="item.label"
+                  :value="item.str"
                 ></el-option>
               </el-select>
               <el-button @click="InfoWatch" slot="append" icon="el-icon-search"></el-button>
@@ -90,7 +90,8 @@
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
                       @click="dropDown(v,k)"
                     ></i>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img" @click="isShow(v,3)">
+                    <img :src="BASE_URL + v.imgUrl" alt class="table-img" v-if="v.imgUrl" @click="isShow(v,3)">
+                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -214,34 +215,6 @@
             <!-- <input type="text" placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-new">
                 <el-button @click="InfoWatchDay"  type="primary"  icon="el-icon-search"></el-button> -->
             <el-input  placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
-              <!-- <el-select
-                v-model="filters1.OptionsValue"
-                @change="InfoWatchDay"
-                slot="prepend"
-                placeholder="选年级"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in options"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select>
-              <el-select
-                v-model="filters1.gradesValue"
-                @change="InfoWatchDay"
-                slot="prepend"
-                placeholder="选科目"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in grades"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select> -->
               <el-button @click="InfoWatchDay" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
@@ -252,7 +225,7 @@
                 v-model="filters1.MaxtimeValue"
                 value-format="yyyy-MM-dd"
                 type="date"
-                placeholder="选择日期"
+                placeholder="filters1.MaxtimeValue"
               ></el-date-picker>
             </div>
           </el-col>
@@ -273,7 +246,8 @@
               <div class="tr" v-for="(v, k) of DayTeacherList.list" :key="k">
                 <div class="tr-first">
                   <div>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img">
+                    <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
+                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -314,34 +288,7 @@
           </el-col>
           <el-col :span="4" :offset="10">
             <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
-              <!-- <el-select
-                v-model="filters2.OptionsValue"
-                @change="InfoWatchMoth"
-                slot="prepend"
-                placeholder="选年级"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in options"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select>
-              <el-select
-                v-model="filters2.gradesValue"
-                @change="InfoWatchMoth"
-                slot="prepend"
-                placeholder="选科目"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in grades"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select> -->
+
               <el-button @click="InfoWatchMoth" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
@@ -352,7 +299,7 @@
                 v-model="filters2.MaxtimeValue"
                 type="month"
                 value-format="yyyy-MM"
-                placeholder="选择月"
+                placeholder="filters2.MaxtimeValue"
               ></el-date-picker>
             </div>
           </el-col>
@@ -395,7 +342,8 @@
               <div class="tr" v-for="(v, k) of MothTeacherList.list" :key="k">
                 <div class="tr-first">
                   <div>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img">
+                    <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
+                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                      <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -712,41 +660,45 @@ export default {
       options: [
         {
           value: "0",
-          label: "一年级"
+          label: "1~2年级",
+          str:'一年级,二年级'
         },
         {
           value: "1",
-          label: "二年级"
+          label: "3~4年级",
+          str:'三年级,四年级'
         },
         {
           value: "2",
-          label: "三年级"
+          label: "5~6年级",
+          str:'五年级,六年级'
         },
         {
           value: "3",
-          label: "四年级"
-        },
-        {
-          value: "4",
-          label: "五年级"
-        },
-        {
-          value: "5",
-          label: "六年级"
+          label: "全部",
+          str:''
         }
       ],
       grades: [
         {
           value: "0",
-          label: "语文"
+          label: "语文",
+          str:"语文"
         },
         {
           value: "1",
-          label: "数学"
+          label: "数学",
+          str:"数学"
         },
         {
           value: "2",
-          label: "英语"
+          label: "英语",
+          str:"数学"
+        },
+        {
+          value: "3",
+          label: "全部",
+          str:""
         }
       ],
       ItemList: [
@@ -777,7 +729,7 @@ export default {
       filters1: {
         //超级管理员的当天数据
         // 排序
-        MaxtimeValue: "",
+        MaxtimeValue: this.dayFormatDate(),
         OptionsValue: "",
         gradesValue: "",
         inputValue: "",
@@ -790,7 +742,7 @@ export default {
       filters2: {
         //超级管理员的当月数据
         // 排序
-        MaxtimeValue: "",
+        MaxtimeValue: this.monthFormatDate(),
         OptionsValue: "",
         gradesValue: "",
         inputValue: "",
@@ -886,8 +838,7 @@ export default {
     },
     // 点击下拉
     dropDown(v, k) {
-      this.isDown = !this.isDown;
-      console.log(this.isDown)
+      this.isDown = true;
       //  console.log(!this.isDown)
       this.isDownindex = k;
       // if (this.isDown = true){
@@ -1118,7 +1069,24 @@ export default {
       }
 
     },
-
+    //年月日时间封装
+    dayFormatDate: function () {
+      let date = new Date();
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? ('0' + MM) : MM;
+      let d = date.getDate();
+      d = d < 10 ? ('0' + d) : d;
+      return y + '-' + MM + '-' + d;
+    },
+    //年月时间封装
+    monthFormatDate: function () {
+      let date = new Date();
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? ('0' + MM) : MM;
+      return y + '-' + MM;
+    },
     //关闭弹框
     allShowModel(str) {
       let _this = this;
@@ -1315,7 +1283,7 @@ el-table {
 }
 .el-select {
   width: 100px;
-  margin: 0 5px;
+  margin: -10px!important;
 }
 .input-with-select .el-input-group__prepend {
   background-color: #fff;

src/pages/super/CheckTeacherAudit.vue

@@ -47,8 +47,8 @@
             label="批改年级"
             header-align="center">
               <template slot-scope="scope">
-                <div v-if="v">
-                    <div v-for="(v, k) of scope.row.gradeList" :key=k>{{v}}</div>
+                <div >
+                    <div v-for="(v, k) of scope.row.gradeList" :key=k v-if="v">{{v}}</div>
                 </div>
               </template>
           </el-table-column>
@@ -56,10 +56,11 @@
             prop=""
             label="可批改时间"
             header-align="center"
+            width="500"
           >
             <template slot-scope="scope">
-                  <div v-if="v">
-                    <el-button type="info" round v-for="(v, k) of scope.row.periodList" :key=k>{{v}}</el-button>
+                  <div>
+                    <el-button type="info" round v-for="(v, k) of scope.row.periodList" :key=k v-if="v">{{v}}</el-button>
                 </div>
             </template>
           </el-table-column>
@@ -244,13 +245,13 @@
           pageNo: this.filters.pageNo,
           pageSize: this.filters.pageSize
         });
-        console.log(this.applyTeacherList)
+        // console.log(this.applyTeacherList)
         this.applyTeacherList.list = (res => {
           const d = []
           for (let i in res) {
             d.push( {
               gradeList: this.gradeBag(i),
-              periodList: res[i].period.split(';'),
+              periodList: res[i].period.split(','),
               imgUrl: res[i].imgUrl,
               name: res[i].name,
               school:res[i].school,
@@ -270,7 +271,8 @@
           operate: this.operate,
           reason:this.filters.textareaDesc
         });
-        this.allShowModel(this.operate)
+        this.allShowModel(this.operate);
+        this.SuperApplyTeacherList()
       },
       //时间封装
       formatDate: function () {
@@ -373,7 +375,7 @@
       sessionStorage.setItem('tabIndex',1);
       this.SuperApplyTeacherList();
 
-      console.log(this.list)
+      // console.log(this.list)
     }
   };
 </script>

src/pages/super/SchoolManager.vue

@@ -33,28 +33,28 @@
                 v-model="filters.OptionsValue"
                 @change="InfoWatch"
                 slot="prepend"
-                placeholder="选年级"
+                placeholder="全部"
                 maxlength="20"
               >
                 <el-option
                   v-for="(item, k) in options"
                   :key="k"
                   :label="item.label"
-                  :value="item.label"
+                  :value="item.str"
                 ></el-option>
               </el-select>
               <el-select
                 v-model="filters.gradesValue"
                 @change="InfoWatch"
                 slot="prepend"
-                placeholder="选科目"
+                placeholder="全部"
                 maxlength="20"
               >
                 <el-option
                   v-for="(item, k) in grades"
                   :key="k"
                   :label="item.label"
-                  :value="item.label"
+                  :value="item.str"
                 ></el-option>
               </el-select>
               <el-button @click="InfoWatch" slot="append" icon="el-icon-search"></el-button>
@@ -90,7 +90,8 @@
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
                       @click="dropDown(v,k)"
                     ></i>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img" @click="isShow(v,3)">
+                    <img :src="BASE_URL + v.imgUrl" alt class="table-img" v-if="v.imgUrl" @click="isShow(v,3)">
+                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -134,6 +135,7 @@
                   <div class="tr-setNo" v-if="isDownindex === k && isDown && TeacherHomeworkList.list.length == 0">
                     暂无数据!
                 </div>
+                <!--&& isDown-->
                 <div v-if="isDownindex === k && isDown">
                   <div class="tr-second" v-for="(v, k) of TeacherHomeworkList.list" :key="k">
                     <div class="tr-seconds" style="width:16px;">{{k+1}}</div>
@@ -201,34 +203,7 @@
           </el-col>
           <el-col :span="4" :offset="10">
             <el-input placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
-              <!-- <el-select
-                v-model="filters1.OptionsValue"
-                @change="InfoWatchDay"
-                slot="prepend"
-                placeholder="选年级"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in options"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select>
-              <el-select
-                v-model="filters1.gradesValue"
-                @change="InfoWatchDay"
-                slot="prepend"
-                placeholder="选科目"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in grades"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select> -->
+
               <el-button @click="InfoWatchDay" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
@@ -237,9 +212,9 @@
               <el-date-picker
                 @change="InfoWatchDay"
                 v-model="filters1.MaxtimeValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
                 type="date"
-                placeholder="选择日期"
+                placeholder="filters1.MaxtimeValue"
               ></el-date-picker>
             </div>
           </el-col>
@@ -260,7 +235,8 @@
               <div class="tr" v-for="(v, k) of DayTeacherList.list" :key="k">
                 <div class="tr-first">
                   <div>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img">
+                    <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
+                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                      <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -303,34 +279,6 @@
           </el-col>
           <el-col :span="4" :offset="10">
             <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
-              <!-- <el-select
-                v-model="filters2.OptionsValue"
-                @change="InfoWatchMoth"
-                slot="prepend"
-                placeholder="选年级"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in options"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select>
-              <el-select
-                v-model="filters2.gradesValue"
-                @change="InfoWatchMoth"
-                slot="prepend"
-                placeholder="选科目"
-                minlength="20"
-              >
-                <el-option
-                  v-for="(item, k) in grades"
-                  :key="k"
-                  :label="item.label"
-                  :value="item.label"
-                ></el-option>
-              </el-select> -->
               <el-button @click="InfoWatchMoth" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
@@ -341,7 +289,7 @@
                 v-model="filters2.MaxtimeValue"
                  type="month"
                  value-format="yyyy-MM"
-                placeholder="选择月"
+                placeholder="filters2.MaxtimeValue"
               ></el-date-picker>
             </div>
           </el-col>
@@ -388,7 +336,8 @@
               <div class="tr" v-for="(v, k) of MothTeacherList.list" :key="k">
                 <div class="tr-first">
                   <div>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img">
+                    <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
+                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                      <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -803,41 +752,45 @@ export default {
       options: [
         {
           value: "0",
-          label: "一年级"
+          label: "1~2年级",
+          str:'一年级,二年级'
         },
         {
           value: "1",
-          label: "二年级"
+          label: "3~4年级",
+          str:'三年级,四年级'
         },
         {
           value: "2",
-          label: "三年级"
+          label: "5~6年级",
+          str:'五年级,六年级'
         },
         {
           value: "3",
-          label: "四年级"
-        },
-        {
-          value: "4",
-          label: "五年级"
-        },
-        {
-          value: "5",
-          label: "六年级"
+          label: "全部",
+          str:''
         }
       ],
       grades: [
         {
           value: "0",
-          label: "语文"
+          label: "语文",
+          str:"语文"
         },
         {
           value: "1",
-          label: "数学"
+          label: "数学",
+          str:"数学"
         },
         {
           value: "2",
-          label: "英语"
+          label: "英语",
+          str:"数学"
+        },
+        {
+          value: "3",
+          label: "全部",
+          str:""
         }
       ],
       ItemList: [
@@ -868,7 +821,7 @@ export default {
       filters1: {
         //超级管理员的当天数据
         // 排序
-        MaxtimeValue: "",
+        MaxtimeValue:this.dayFormatDate(),
         OptionsValue: "",
         gradesValue: "",
         inputValue: "",
@@ -881,7 +834,7 @@ export default {
       filters2: {
         //超级管理员的当月数据
         // 排序
-        MaxtimeValue: "",
+        MaxtimeValue: this.monthFormatDate(),
         OptionsValue: "",
         gradesValue: "",
         inputValue: "",
@@ -956,7 +909,7 @@ export default {
     ...mapActions(["setUser"]),
     // 点击下拉
     dropDown(v, k) {
-      this.isDown = !this.isDown;
+      this.isDown = true;
       this.isDownindex = k;
       this.TeacherHomework(v);
     },
@@ -1383,7 +1336,25 @@ export default {
       this.filters.orderField = sort.prop;
       this.filters.orderAD = sort.order != null ? sort.order : "";
       this.itemListReshow();
-    }
+    },
+    //年月日时间封装
+    dayFormatDate: function () {
+      let date = new Date();
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? ('0' + MM) : MM;
+      let d = date.getDate();
+      d = d < 10 ? ('0' + d) : d;
+      return y + '-' + MM + '-' + d;
+    },
+    //年月时间封装
+    monthFormatDate: function () {
+      let date = new Date();
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? ('0' + MM) : MM;
+      return y + '-' + MM;
+    },
     // 获取创建人列表
     // async getUserNameList() {
     //   let {
@@ -1427,13 +1398,14 @@ body {
 .aside {
   background-color: #fff;
   margin-top: 16px;
+  margin-right: 16px;
   padding: 0;
   min-height: 880px;
 }
 .main {
   background-color: #fff;
-  margin: 16px;
   padding: 0 !important;
+  margin-top: 16px;
   min-height: 980px;
 }
 .table-aside {
@@ -1474,7 +1446,7 @@ el-table {
 }
 .el-select {
   width: 100px;
-  margin: 0 5px;
+  margin: -10px!important;
 }
 .input-with-select .el-input-group__prepend {
   background-color: #fff;
@@ -1484,7 +1456,8 @@ el-table {
   color: #fff;
 }
 .el-input__inner {
-  height: 32px;
+  height: 45px;
+  /*margin: 0 5px !important;*/
 }
 
 .table-img {