提交最新代码

src/components/SeacherHomewrokStatus.vue

@@ -144,7 +144,6 @@
       :total="parseInt(StudentHomeworkNoFeedbackList.pages)"
     ></el-pagination>
     <!--可分配老师-->
-    <!--可分配老师-->
     <div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
     <div class="model" style="width:50%; top:5%;" v-if="hiddenModel">
       <div class="model-text">
@@ -1117,10 +1116,10 @@ el-table {
   justify-content: space-between;
 }
 .model-itemss {
-  padding: 10px 0;
   /*display: flex;*/
   /*justify-content: space-between;*/
   /*display: inline-block;*/
+  height: 100px;
   width: 40%;
   display: inline-block;
 }

src/config/index.js

@@ -31,7 +31,7 @@ if (process.env.NODE_ENV === 'development') {
 
 //  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 2.正式环境配置(Kmt)
-        //   BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址 
+        //   BASE_URL = 'https://api.sharingschool.com/sz'; //正式环境地址 
         //   APP_ID = "wxd18ca9555a939281"//正式环境
         //   RESET_URL = "https://kmt.sharingschool.com/aijia/manager/index.html#/" //正式环境微信重定向页面
         //   TYPE = 0
@@ -40,7 +40,7 @@ if (process.env.NODE_ENV === 'development') {
 
 // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 3.OSS正式环境(aiKmt)
-            // BASE_URL = 'https://t.sharingschool.com/sz'; // OSS正式环境地址
+            // BASE_URL = 'https://api.sharingschool.com/sz'; // OSS正式环境地址
             // APP_ID =  "wx5a83afb22813e986"//OSS正式环境
             // RESET_URL = "https://aikmt.sharingschool.com/manager/index.html#/" //OSS正式环境
             // TYPE = 1

src/pages/Qualityinspector/AllStudentHomework.vue

@@ -23,7 +23,7 @@
         <div>
           <el-table
             style="width: 100%"
-            :data="StudentHomework01List"
+            :data="StudentHomework01List.list"
             :header-cell-class-name="tableheaderClassName"
             :header-cell-style="{
           'background-color': '#F6F7FB',
@@ -34,7 +34,7 @@
             border
             stripe
           >
-            <el-table-column label="注册老师" header-align="center">
+            <el-table-column label="注册学生" header-align="center">
               <template slot-scope="scope">
                 <div class="scope-list">
                   <img
@@ -139,7 +139,7 @@ export default {
         pageSize: this.filters2.pageSize,
         oneMonth: this.selMonth,
         maxCreateTime: this.formatDate(),
-        name: this.inputValue
+        value: this.inputValue
       });
     },
          //年月时间封装

src/pages/Qualityinspector/checkListInfo.vue

@@ -16,7 +16,28 @@
               :class="{Apporvalactive:Activeindex == true,ApporStyles:true}"
             >匹配知识点老师</div>
           </el-col>
-          <el-col :span="10" :offset="2">
+          <el-col :span="14" :offset="0">
+             <div class="selectBox">
+              <div
+                class="Ageclass"
+                @click="choiceclass()"
+                @mouseover="selectStyle0()"
+                @mouseout="outStyle0()"
+              >
+                <span class="age-tip">{{selecttitlteacher}}</span>
+                <span :class="[TeacherTypeListDown ?'el-icon-caret-top':'el-icon-caret-bottom']"></span>
+              </div>
+              <div
+                class="class-download"
+                v-show="TeacherTypeListDown"
+                @mouseover="selectStyle0()"
+                @mouseout="outStyle0()"
+              >
+                <ul v-for="(item, k) in teacherTypes" :key="k">
+                  <li @click="selectTeacherTip(item)">{{item.label}}</li>
+                </ul>
+              </div>
+            </div>
             <div class="selectBox">
               <div
                 class="Ageclass"
@@ -94,6 +115,7 @@
                 <div v-if="this.Activeindex == true">匹配作业数</div>
                 <div>已质检作业数</div>
                 <div>状态</div>
+                 <div></div>
               </div>
               <div class="tr" v-for="(v, k) of TeacherListForChecker.list" :key="k">
                 <!-- 在线 -->
@@ -123,6 +145,9 @@
                   <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>在线</div>
+                  <div v-if="v.tag ==2" class="teacherSignIcon1" ><p class="positionword">放心</p></div>
+                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"><p class="positionword">一般</p></div>
+                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"><p class="positionword">重点</p></div>
                 </div>
                 <!-- 离线 -->
                 <div
@@ -150,6 +175,9 @@
                   <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>离线</div>
+                  <div v-if="v.tag ==2" class="teacherSignIcon1" ><p class="positionword">放心</p></div>
+                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"><p class="positionword">一般</p></div>
+                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"><p class="positionword">重点</p></div>
                 </div>
                 <!-- 封号 -->
                 <div
@@ -177,6 +205,9 @@
                   <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>已封号</div>
+                    <div v-if="v.tag ==2" class="teacherSignIcon1" ><p class="positionword">放心</p></div>
+                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"><p class="positionword">一般</p></div>
+                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"><p class="positionword">重点</p></div>
                 </div>
                 <div
                   class="tr-setNo"
@@ -380,8 +411,10 @@ export default {
       isDown: false,
       gardeListDown: false,
       gardeListDownage: false,
+      TeacherTypeListDown:false,
       selecttitlepag: "选年级",
       selecttitleage: "选时间",
+      selecttitlteacher:"选关注程度",
       teacherRoles: "",
       TeacherType: 8,
       TeacherCheackStyle: 2,
@@ -391,6 +424,27 @@ export default {
           return time.getTime() > Date.now() - 8.64e6;
         }
       },
+      teacherTypes:[
+          {
+          value: "0",
+          label: "全部",
+          str: "0"
+        },
+        {
+          value: "1",
+          label: "重点",
+          str: "1"
+        },
+        {
+          value: "2",
+          label: "放心",
+          str: "2"
+        },  {
+          value: "3",
+          label: "一般",
+          str: "3"
+        }
+      ],
       options: [
         {
           value: "0",
@@ -456,6 +510,7 @@ export default {
         MaxtimeValue: "",
         OptionsValue: "",
         gradesValue: 0,
+        teachertypeValue:"",
         inputValue: "",
         pageNo: 1,
         pageSize: 10,
@@ -505,7 +560,8 @@ export default {
         pageSize: this.filters.pageSize,
         managerId: this.managerId || "",
         type: this.TeacherIdType,
-        selectTime: this.filters.gradesValue
+        selectTime: this.filters.gradesValue,
+        tag: this.filters.teachertypeValue,
       });
     },
     //  // 查看老师批改作业列表
@@ -644,33 +700,36 @@ export default {
       this.filters.pageNo = 1;
       this.InfoWatch();
     },
+      selectStyle0() {
+      this.TeacherTypeListDown = true;
+    },
+    outStyle0() {
+      this.TeacherTypeListDown = false;
+    },
     selectStyle() {
       this.gardeListDown = true;
     },
     outStyle() {
       this.gardeListDown = false;
     },
+    selectTeacherTip(item){
+       this.filters.teachertypeValue = item.str;
+      this.isDown = false;
+      this.InfoWatch();
+      this.selecttitlteacher = item.label;
+      this.TeacherTypeListDown = false;
+    },
     selectTip(item) {
       this.filters.OptionsValue = item.str;
       this.isDown = false;
-      if (this.Activeindex == false) {
-        this.InfoWatch();
-      }
-      if (this.Activeindex == true) {
-        this.InfoWatch();
-      }
+      this.InfoWatch();
       this.selecttitlepag = item.label;
       this.gardeListDown = false;
     },
     selectTipage(item) {
       this.filters.gradesValue = item.str;
       this.isDown = false;
-      if (this.Activeindex == false) {
-        this.InfoWatch();
-      }
-      if (this.Activeindex == true) {
         this.InfoWatch();
-      }
       this.selecttitleage = item.label;
       this.gardeListDownage = false;
     },
@@ -948,6 +1007,23 @@ ul {
   line-height: 0px !important;
   /* padding:0px!important; */
 }
+.teacherSignIcon1{
+ background:url(../../assets/img/Nice.png) no-repeat 10px 10px;
+ color:#ffff;
+}
+.teacherSignIcon2{
+ background:url(../../assets/img/goob.png) no-repeat 10px 10px;
+ color:#ffff;
+}
+.teacherSignIcon3{
+ background:url(../../assets/img/important.png) no-repeat 10px 10px;
+ color:#ffff;
+}
+.positionword{
+  position:relative;
+  left:-40px;
+  top:-10px;
+}
 .tr-secon {
   font-size: 12px;
   text-align: center;

src/pages/home/AllHomeWorkPictrue.vue

@@ -0,0 +1,376 @@
+<!-- 活动解析 -->
+<template>
+  <div>
+    <!-- table 表格 -->
+    <el-row :gutter="24" class="main-items">
+      <el-col :span="24" class="main" :offset="2">
+        <el-row>
+          <el-col :span="24" class :offset="2">
+            <div class="studentInfo">
+              <span class="studentName">{{StudentHomework01Detail.name}}同学/{{StudentHomework01Detail.subject}}作业</span>
+              <span v-if="StudentHomework01Detail.status ==1" style="color:#52cc60;">/未分配</span>
+               <span v-if="StudentHomework01Detail.status ==2" style="color:#52cc60;">/已分配未批改</span>
+             <span v-if="StudentHomework01Detail.status ==3" style="color:#52cc60;">/批改中</span>
+              <br />
+              <span class="timeInfo">{{StudentHomework01Detail.statusTime}}</span>
+            </div>
+          
+          </el-col>
+          <el-col :span="20" class :offset="2">
+            <div class="topLine"></div>
+          </el-col>
+          <el-col :span="20" class="pictrueShowList" :offset="2">
+              <!-- {{StudentHomework01Detail}} -->
+            <div class="beginPictrue" v-if="StudentHomework01Detail.originPicList !== undefined && StudentHomework01Detail.originPicList.length >0">
+              <div class="studentName">原图</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomework01Detail.originPicList" :key="k">
+                    <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                  <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}上传</div>
+                </li>
+              </ul>
+            </div>
+          </el-col>
+          <el-col :span="20" class="pictrueShowList" :offset="2">
+            <div class="beginPictrue" v-if="StudentHomework01Detail.correctPicList !== undefined && StudentHomework01Detail.correctPicList.length >0">
+              <div class="studentName">批改图片</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomework01Detail.correctPicList" :key="k">
+                   <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                     <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}批改完</div>
+                      <div class="operateTime" v-if="v.teacherName">
+                        <span class="teacherImgUrl">
+                          <img :src="BASE_URL + v.teacherImgUrl" alt="">
+                        </span>
+                         <span>{{v.teacherName}}老师批改</span>      
+                      </div>
+                </li>
+              </ul>
+            </div>
+          </el-col>
+           <el-col :span="20" class="pictrueShowList" :offset="2">
+            <div class="beginPictrue" v-if="StudentHomework01Detail.matchPicList !== undefined && StudentHomework01Detail.matchPicList.length >0">
+              <div class="studentName">匹配照片</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomework01Detail.matchPicList" :key="k">
+                   <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                     <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}匹配完</div>
+                     <div class="operateTime" v-if="!v.operateTime">未匹配</div>
+                       <div class="operateTime" v-if="v.teacherName">
+                        <span class="teacherImgUrl">
+                          <img :src="BASE_URL + v.teacherImgUrl" alt="">
+                        </span>
+                         <span>{{v.teacherName}}老师匹配</span>      
+                      </div>
+                </li>
+              </ul>
+            </div>
+          </el-col>
+          <el-col :span="20" class="pictrueShowList" :offset="2">
+            <div class="beginPictrue" v-if="StudentHomework01Detail.checkCorrectPicList !== undefined && StudentHomework01Detail.checkCorrectPicList.length >0">
+              <div class="studentName">作业批改质检</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomework01Detail.checkCorrectPicList" :key="k">
+                   <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                    <!-- 报错 -->
+                  <img v-if="v.type ==23" class="logoPic" src="../../assets/img/wrong (3).png" />
+                     <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
+                     <div class="operateTime" v-if="!v.operateTime">未质检</div>
+                       <div class="operateTime" v-if="v.teacherName">
+                        <span class="teacherImgUrl">
+                          <img :src="BASE_URL + v.teacherImgUrl" alt="">
+                        </span>
+                         <span>{{v.teacherName}}老师质检</span>      
+                      </div>
+                </li>
+              </ul>
+            </div>
+          </el-col>
+          <el-col :span="20" class="pictrueShowList" :offset="2">
+            <div class="beginPictrue" v-if="StudentHomework01Detail.checkMatchPicList !== undefined && StudentHomework01Detail.checkMatchPicList.length >0">
+              <div class="studentName">匹配知识点质检</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomework01Detail.checkMatchPicList" :key="k">
+                   <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                  <!-- 报错 -->
+                  <img v-if="v.type ==23" class="logoPic" src="../../assets/img/wrong (3).png" />
+                  
+                  <div class="operateTime" v-if="v.operateTime">{{v.operateTime}}质检完</div>
+                     <div class="operateTime" v-if="!v.operateTime">未质检</div>
+                       <div class="operateTime" v-if="v.teacherName">
+                        <span class="teacherImgUrl">
+                          <img :src="BASE_URL + v.teacherImgUrl" alt="">
+                        </span>
+                         <span>{{v.teacherName}}老师质检</span>      
+                      </div>
+                </li>
+              </ul>
+            </div>
+          </el-col>
+            <el-col :span="20" class :offset="2">
+            <div style="margin-top:200px; text-align:center;">
+              <el-button @click="routerback()" type="success" round>返回</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <!-- -->
+    <div class="showModel" @click="allShowModel(1)" v-if="PictruePush"></div>
+    <div class="modelspec" v-if="PictruePush">
+      <div class="detaillogo">
+        <img src="../../assets/img/del@2x.png" alt @click="allShowModel(1)" />
+      </div>
+      <img class="LargepictrueStyle" :src="BASE_URL + this.PrewPictrue " />
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters, mapActions } from "vuex";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
+export default {
+  components: {},
+  name: "",
+  props: {},
+  data() {
+    return {
+      BASE_URL: IMG_BASE_URL,
+      PictruePush: false,
+      PrewPictrue:"",
+      homeworkId:""
+    };
+  },
+  created() {
+     const homeworkId = this.$route.query.homeworkId;
+    this.homeworkId = homeworkId;
+  },
+  methods: {
+    pictrueAddView(v) {
+        this.PrewPictrue = v.url
+      this.PictruePush = true;
+    },
+        // 回退
+    routerback() {
+      this.$router.back(-1);
+    },
+    GetStudentHomework01DetailList(){
+          this.$store.dispatch("GetStudentHomework01Detail", {
+        homeworkId: this.homeworkId,
+      });
+    },
+    //关闭弹框
+    allShowModel(str) {
+      let _this = this;
+      if (str == 1) {
+        _this.PictruePush = false;
+      }
+    }
+  },
+  watch: {},
+  mounted() {
+    this.GetStudentHomework01DetailList()
+  },
+  computed: {
+    ...mapGetters(["StudentHomework01Detail"])
+  }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+.main {
+  background-color: #fff;
+  margin-top: 16px;
+  padding: 0 !important;
+  border: 1px solid #e1e1e1;
+  min-height: 980px;
+}
+
+.topLine {
+  width: 100%;
+  background-color: rgba(207, 204, 204, 0.815);
+  height: 1px;
+}
+.picLists {
+  position: relative;
+  width: 200px;
+  height: 200px;
+}
+.TeacherWords {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 30px;
+  background: #000000;
+  text-align: center;
+  line-height: 30px;
+  opacity: 0.4;
+  color: #ffff;
+  font-size: 8px;
+}
+.logoPic {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.userstyle {
+  width: 50px;
+  height: 50px;
+  border-radius: 25px;
+}
+.operateTime{
+  height: 12px;
+  margin-top:10px;
+}
+.studentInfo {
+  display: inline-block;
+  float: left;
+  /* height: 70px; */
+  margin-top: 30px;
+  text-align: left;
+}
+.pictrueShowList{
+  margin-top:100px;
+}
+.loginMock {
+  color: #333333;
+  font-size: 14px;
+  display: inline-block;
+  float: right;
+  margin-top: 30px;
+}
+.timeInfo {
+  color: #999999;
+  font-size: 14px;
+}
+.studentName {
+  font-size: 25px;
+  color: black;
+  width: 160px;
+  text-align: left;
+}
+.teacherImgUrl{
+  height: 30px;
+  width: 30px;
+}
+.teacherImgUrl img{
+  height: 30px;
+  width: 30px;
+  border-radius: 15px;
+}
+.pictrueStyle {
+  width: 200px;
+  height: 200px;
+  border-radius: 5px;
+}
+.beginPictrue ul li {
+  float: left;
+  margin: 15px 20px 15px 0px;
+  cursor: pointer;
+}
+.showModel {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+.modelspec {
+  margin: 0 auto;
+}
+.LargepictrueStyle {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+.modelspec {
+  z-index: 10000;
+  width: 50%;
+  /* height: 100%; */
+  height: auto;
+  position: fixed;
+  top: 10%;
+  left: 25%;
+  bottom: 10%;
+  margin: auto;
+  border-radius: 10px;
+  text-align: center;
+}
+.detaillogo {
+  position: fixed;
+  top: 5%;
+  right: 13%;
+  cursor: pointer;
+}
+</style>

src/pages/home/AllStudentHomework.vue

@@ -0,0 +1,402 @@
+<!-- 活动解析 -->
+<template>
+  <div>
+    <!-- table 表格 -->
+    <el-row :gutter="24" class="main-items">
+      <!--数据监控-->
+      <el-col :span="24" class="main" :offset="0">
+        <el-row :gutter="24" class="main-header">
+          <el-col :span="4" :offset="19">
+            <div class="teach-block">
+              <div class="Dayteach-Allot">
+                <input
+                  type="text"
+                  placeholder="请输入学生名字"
+                  v-model="inputValue"
+                  class="Dayinput-with-Allot"
+                />
+                <span @click="GetGetTeacherCorrectDetailInfo()" class="DaySeachIcon el-icon-search"></span>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+        <div>
+          <el-table
+            style="width: 100%"
+            :data="StudentHomework01List.list"
+            :header-cell-class-name="tableheaderClassName"
+            :header-cell-style="{
+          'background-color': '#F6F7FB',
+          'color': '#393939',
+          'font-size': '16px'
+           }"
+            size="medium"
+            border
+            stripe
+          >
+            <el-table-column label="注册学生" header-align="center">
+              <template slot-scope="scope">
+                <div class="scope-list">
+                  <img
+                    :src="BASE_URL+scope.row.imgUrl"
+                    alt
+                    class="table-img"
+                    v-if="scope.row.imgUrl"
+                  />
+                  <img
+                    src="../../assets/img/user.jpg"
+                    alt
+                    v-if="!scope.row.imgUrl"
+                    class="table-img"
+                  />
+                  <span class="scope-name">{{scope.row.name}}</span>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
+            <el-table-column prop="grade" label="年级" header-align="center"></el-table-column>
+            <el-table-column prop="uploadTime" label="上传时间" header-align="center"></el-table-column>
+            <el-table-column prop="uploadTime" label="作业图片" header-align="center" width="200">
+              <template slot-scope="scope">
+                <span
+                  class="ClickWork"
+                  @click="HomeworkWornglists(scope.row)"
+                >查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!-- 分页显示 -->
+          <el-pagination
+            background
+            @size-change="handleSizeChange3"
+            @current-change="pageChange3"
+            :page-sizes="[10,50,100,200]"
+            :current-page.sync="currentPage"
+            layout="sizes, total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="parseInt(StudentHomework01List.pages)"
+          ></el-pagination>
+        </div>
+      </el-col>
+         <el-col :span="20" class :offset="2">
+            <div style="margin-top:200px; text-align:center;">
+              <el-button @click="routerback()" type="success" round>返回</el-button>
+            </div>
+          </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import { mapGetters, mapActions } from "vuex";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
+export default {
+  components: {},
+  name: "actvResolveLabel",
+  props: {},
+  data() {
+    return {
+      inputValue: "",
+      BASE_URL: IMG_BASE_URL,
+      selMonth:this.monthFormatDate(),
+      currentPage: 1,
+       filters2: {
+        MaxtimeValue: "",
+        oneMonth: "",
+        pageNo: 1,
+        pageSize: 10
+      }
+    };
+  },
+  watch: {},
+  computed: {
+    ...mapGetters([
+     "StudentHomework01List"
+    ])
+  },
+  methods: {
+    ...mapActions(["setUser"]),
+    // 表格头部样式
+    tableheaderClassName({ row, rowIndex }) {
+      return "table-head-th";
+    },
+     // 作业原图
+    HomeworkWornglists(v){
+         this.$router.push({
+        path: "/home/LeaningAllHomeWorkPictrue",
+           query: {
+          homeworkId: v.homeworkId,
+        }
+      });
+    },
+            // 回退
+    routerback() {
+      this.$router.back(-1);
+    },
+    // 批改明细
+    GetGetTeacherCorrectDetailInfo() {
+      this.$store.dispatch("GetStudentHomework01List", {
+        pageNo: this.filters2.pageNo,
+        pageSize: this.filters2.pageSize,
+        oneMonth: this.selMonth,
+        maxCreateTime: this.formatDate(),
+        value: this.inputValue
+      });
+    },
+         //年月时间封装
+    monthFormatDate: function() {
+      let date = new Date();
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      return y + "-" + MM;
+    },
+    //弹框
+    isShow(str, img) {
+      let _this = this;
+      console.log(str);
+      if (str == 1) {
+        _this.hiddenModel = true;
+        _this.isPigai = false;
+      } else if (str == 2) {
+        _this.isPigai = true;
+        _this.hiddenModel = false;
+      } else if (str == 3) {
+        _this.cardShow = true;
+        _this.imgCard = img;
+      }
+    },
+    //关闭弹框
+    allShowModel(str) {
+      let _this = this;
+      if (str == 1) {
+        _this.hiddenModel = false;
+      } else if (str == 2) {
+        _this.isPigai = false;
+      } else if (str == 3) {
+        _this.cardShow = false;
+      }
+    },
+    //时间封装
+    formatDate: 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;
+      let h = date.getHours();
+      h = h < 10 ? "0" + h : h;
+      let m = date.getMinutes();
+      m = m < 10 ? "0" + m : m;
+      let s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      return y + "-" + MM + "-" + d + " " + h + ":" + m + ":" + s;
+    },
+ 
+     pageChange3(val) {
+      this.currentPage = val;
+      this.filters2.pageNo = val;
+      this.GetGetTeacherCorrectDetailInfo();
+    },
+
+    handleSizeChange3(val) {
+      this.filters2.pageSize = val;
+      this.GetGetTeacherCorrectDetailInfo();
+    },
+
+  },
+  mounted() {
+    this.GetGetTeacherCorrectDetailInfo();
+  }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style>
+.main {
+  background-color: #fff;
+  margin-top: 16px;
+  padding: 0 !important;
+  border: 1px solid #e1e1e1;
+  min-height: 980px;
+}
+
+el-table {
+  color: #999999;
+  font-size: 18px;
+}
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #52cc60 !important;
+  color: #fff;
+}
+.main-items {
+  color: #393939;
+  text-align: center;
+  line-height: 80px;
+}
+.main-header-item {
+  cursor: pointer;
+  font-size: 16px;
+  color: #7e7e7e;
+}
+
+.input-with-select .el-input-group__prepend {
+  background-color: #fff;
+}
+
+.table-img {
+  width: 36px;
+  height: 36px;
+  border-radius: 6px;
+}
+.showModel {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+.model {
+  z-index: 1001;
+  width: 40%;
+  height: auto;
+  position: fixed;
+  top: 30%;
+  left: 30%;
+  margin: auto;
+  background: #fff;
+  border-radius: 10px;
+  text-align: center;
+}
+.scope-name {
+  margin-left: 13px;
+}
+.identity-card {
+  width: 52px;
+  height: 51px;
+  border-radius: 4px;
+  margin-right: 17px;
+}
+.model-text {
+  background: rgba(255, 255, 255, 1);
+  border-radius: 10px;
+}
+
+.model-btn {
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 44px;
+}
+.model-btn-info-img {
+  width: 451px;
+  height: 298px;
+}
+.model-btn-items {
+  width: 154px;
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+  font-size: 18px;
+  border-radius: 4px;
+}
+.main-gay {
+  background: rgba(246, 247, 251, 1);
+  color: #7e7e7e;
+}
+.model-grdeen {
+  background-color: #52cc60;
+  color: #fff;
+}
+.model-text-items-close {
+  position: absolute;
+  top: 10px;
+  right: 15px;
+}
+.model-text-items {
+  position: relative;
+  color: #000000;
+  font-size: 24px;
+  text-align: center;
+  padding: 40px 0 50px 0;
+}
+.el-table {
+  margin-top: 50px;
+}
+.el-table .table-head-th {
+  background-color: #f6f7fb;
+  font-size: 16px !important;
+  color: #393939;
+}
+.page-block {
+  text-align: center !important;
+  margin-top: 15px;
+}
+.scope-list {
+  margin-left: 18px;
+  text-align: left;
+}
+.ApporStyles {
+  display: inline-block;
+  width: 200px;
+  height: 40px;
+  line-height: 40px;
+  background-color: #fff;
+  border-radius: 20px;
+  font-size: 16px;
+  color: #7c819d;
+  cursor: pointer;
+}
+.navteacfertypeactive {
+  background-color: #52cc60 !important;
+  color: #fff !important;
+}
+.el-pagination .el-select .el-input {
+  /* width: 120px; */
+  margin: 0 -100px !important;
+}
+.ClickWork {
+  font-size: 16px;
+  text-decoration: underline;
+  cursor: pointer;
+}
+.bank-active {
+  color: #52cc60;
+  font-size: 16px;
+  text-decoration: underline;
+  cursor: pointer;
+}
+.Dayinput-with-Allot {
+  border: #b6b6b6;
+  border-radius: 20px;
+  height: 40px;
+  width: 300px;
+  font-size: 8px;
+  color: #b6b6b6;
+  text-align: left;
+  line-height: 40px;
+  background: #f1f2f4;
+  padding: 0 10px;
+  float: left;
+  outline: none !important;
+  box-shadow: none;
+}
+.Dayteach-Allot {
+  width: 400px;
+  position: relative;
+  height: 40px;
+  top: 15px;
+}
+.DaySeachIcon {
+  position: absolute;
+  font-size: 20px;
+  color: #b6b6b6;
+  right: 30%;
+  margin-top: 10px;
+  cursor: pointer;
+}
+</style>

src/pages/home/SchoolManager.vue

@@ -26,7 +26,13 @@
                 :class="{Apporvalactive:Activeindex == true,ApporStyles:true}"
               >匹配知识点老师</div>
             </el-col>
-            <el-col :span="14" :offset="2">
+            <el-col :span="16" :offset="0">
+              <div style="margin:0 30px;" class="selectBox">
+                <div class="Ageclass" @click="StudentSearchPages()">
+                  <span class="age-tip">搜索学生</span>
+                  <span class="el-icon-search"></span>
+                </div>
+              </div>
               <div class="selectBox">
                 <div
                   class="Ageclass"
@@ -320,12 +326,12 @@
                       v-if="v.status === 3 && v.checkCount < v.picTotal"
                       style="width: 25%"
                     >
-                     <span>{{v.checkCount}}</span>
+                      <span>{{v.checkCount}}</span>
                       <span style="color:#bbbbbb;">/{{v.picTotal}}</span>
                       <el-button type="warning" @click="CheackHomeworkStatus(v)">
                         <span href style="text-decoration:none;color:#ffffff;">去检查</span>
                       </el-button>
-                       <span
+                      <span
                         class="WorngCount"
                         v-if="v.wrongCount > 0"
                         style="color:red;font-size:12px;"
@@ -431,7 +437,7 @@
             </el-col>
           </el-col>
           <el-col :span="6" :offset="0">
-            <div class="main-header-item"   v-if="DayTeacherList.status == 1">
+            <div class="main-header-item" v-if="DayTeacherList.status == 1">
               今日报错总次数:
               <span style="color:red;">{{DayTeacherList.wrongCount}}次</span>
             </div>
@@ -681,7 +687,7 @@
       <TeamWorkLists v-if="modelindex == 3"></TeamWorkLists>
       <!-- 组内排班 -->
       <TeamworkScheduling v-if="this.modelindex == 4"></TeamworkScheduling>
-        <el-col :span="18" class="main" :offset="0" v-if="modelindex == 5">
+      <el-col :span="18" class="main" :offset="0" v-if="modelindex == 5">
         <SeacherHomewrokStatus :SchoolData="SchoolData"></SeacherHomewrokStatus>
       </el-col>
     </el-row>
@@ -1031,7 +1037,12 @@ import TeamWorkLists from "@/components/TeamWorkLists";
 import HomeworkTotalList from "@/components/HomeworkTotalList";
 import { Loading } from "element-ui";
 export default {
-  components: { TeamWorkLists, TeamworkScheduling, HomeworkTotalList,SeacherHomewrokStatus },
+  components: {
+    TeamWorkLists,
+    TeamworkScheduling,
+    HomeworkTotalList,
+    SeacherHomewrokStatus
+  },
   name: "actvResolveLabel",
   props: {},
   data() {
@@ -1181,7 +1192,7 @@ export default {
         {
           text: "组内排班"
         },
-          {
+        {
           text: "未批改/匹配作业"
         }
       ],
@@ -1435,7 +1446,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-          maxCreateTime: this.dayFormatDate(),
+        maxCreateTime: this.dayFormatDate(),
         oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
@@ -1625,7 +1636,7 @@ export default {
     DayhandApor() {
       this.DayActiveindex = false;
       this.filters1.pageNo = 1;
-       this.filters1.MaxtimeValue = this.dayFormatDate();
+      this.filters1.MaxtimeValue = this.dayFormatDate();
       this.filters1.inputValue = "";
       //  this.showApporAways = false;
       this.InfoWatchDay();
@@ -1634,7 +1645,7 @@ export default {
     DayAutoApor() {
       this.DayActiveindex = true;
       // this.showApporAways = true;
-     this.filters1.MaxtimeValue = this.dayFormatDate();
+      this.filters1.MaxtimeValue = this.dayFormatDate();
       this.filters1.inputValue = "";
       this.filters1.pageNo = 1;
       this.InfoKonwTeacherDayApprvalList();
@@ -1645,7 +1656,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-          maxCreateTime: this.dayFormatDate(),
+        maxCreateTime: this.dayFormatDate(),
         oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
@@ -1653,7 +1664,6 @@ export default {
       });
     },
     InfoWatchDayDatas() {
-
       if (this.DayActiveindex == false) {
         this.InfoWatchDay();
       }
@@ -1883,7 +1893,7 @@ export default {
     SearchValueAllot() {
       this.SearchNoapporvalTeacherAllot();
     },
-           //时间封装
+    //时间封装
     formatDate: function() {
       let date = new Date();
       let y = date.getFullYear();
@@ -1978,6 +1988,11 @@ export default {
           break;
       }
     },
+    StudentSearchPages() {
+      this.$router.push({
+        path: "/home/LeaningAllStudentHomework"
+      });
+    },
     handleSizeChange(val) {
       this.filters.pageSize = val;
       this.InfoWatch();
@@ -2143,6 +2158,9 @@ ul {
   padding: 0;
   min-height: 880px;
 }
+.SearchStudent {
+  
+}
 .main {
   background-color: #fff;
   margin: 16px;
@@ -2352,7 +2370,7 @@ el-table {
 .tr-sw180 {
   width: 400px !important;
   text-align: right;
-  padding:0px !important;
+  padding: 0px !important;
 }
 .ApporTeacher {
   width: 400px !important;

src/pages/style/common.styl

@@ -1,102 +0,0 @@
-@import './index.styl'
-	
-/*----------------reset css -------------------*/
-*,
-*:after,
-*:before {
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	margin: 0;
-	padding: 0;
-}
-ul,
-ol,
-li {
-	list-style: none;
-}
-i,
-strong,
-em,
-b,
-u {
-	font-weight: normal;
-	font-style: normal;
-}
-input[type="text"],
-textarea {
-	appearance: none;
-}
-a {
-	text-decoration: none;
-	color: $color-link;
-	-webkit-tap-highlight-color: transparent;
-	-webkit-touch-callout: none;
-	user-select: none;
-	color: inherit;
-}
-img {
-	width: 100%;
-}
-img[lazy='loading'] {
-	display: block;
-	width: 100%;
-	height 100%;
-	margin: auto;
-	object-fit: cover;
-}
-input:focus{
-	outline: none;
-}
-::-webkit-scrollbar {
- 	width: 8px;
-	height 8px;
-}
-::-webkit-scrollbar-track {
-	background-color: rgba(255,255,255,0);
-	-webkit-border-radius: 2em;
-	border-radius:2em;
-	-webkit-transition: all .3s;
-	transition: all .3s;
-}
-:hover::-webkit-scrollbar-track {
-	background-color: rgba(255,255,255,.4);
-}
-::-webkit-scrollbar-thumb {
-	background-color: rgba(0,0,0,0);
-	-webkit-border-radius: 2em;
-	border-radius:2em;
-	-webkit-transition: all .3s;
-	transition: all .3s;
-}
-:hover::-webkit-scrollbar-thumb {
-	background-color: rgba(0,0,0,.1);
-}
-html,
-body,
-#app {
-	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-	-webkit-touch-callout: none;
-	background: $color-bg;
-	font-size: 14px;
-	color:#666;
-	font-family: 'MicrosoftYaHei', '微软雅黑';
-	-ms-overflow-style: -ms-autohiding-scrollbar;
-}
-
-/*--------------------- 公共过渡动画样式 --------------------------*/
-.slide-fade-enter-active {
-	-webkit-transition: all .3s ease;
-    transition: all .3s ease;
-}
-.slide-fade-leave-active {
-	-webkit-transition: all .3s ease;
-    transition: all .3s ease;
-	// -webkit-transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
-    // transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
-}
-.slide-fade-enter, .slide-fade-leave-to {
-	-webkit-transform: translateY(10px);
-	transform: translateY(10px);
-	opacity: 0;
-}

src/pages/style/index.styl

@@ -1,3 +0,0 @@
-// 引入常用的基础文件
-@import './variable'
-@import 'mixin'

src/pages/style/mixin.styl

@@ -1,67 +0,0 @@
-flex-row()
-    display flex
-    justify-content flex-start
-    align-items flex-start
-flex-row-end()
-    display flex
-    justify-content flex-end
-    align-items flex-start
-flex-row-center()
-    display flex
-    justify-content center
-    align-items center
-flex-row-between()
-    display flex
-    justify-content space-between
-    align-items center
-flex-row-around()
-    display flex
-    justify-content space-around
-    align-items center
-flex-row-wrap()
-    display flex
-    flex-wrap wrap
-    justify-content flex-start
-    align-items flex-start
-flex-row-wrap-center()
-    display flex
-    flex-wrap wrap
-    justify-content center
-    align-items center
-flex-row-wrap-between()
-    display flex
-    flex-wrap wrap
-    justify-content space-between
-    align-items center
-flex-row-wrap-around()
-    display flex
-    flex-wrap wrap
-    justify-content space-around
-    align-items center
-flex-col()
-    display flex
-    flex-direction column
-    justify-content flex-start
-    align-items flex-start
-flex-col-end()
-    display flex
-    flex-direction column
-    justify-content flex-end
-    align-items flex-start
-flex-col-center()
-    display flex
-    flex-direction column
-    justify-content center
-    align-items center
-flex-col-between()
-    display flex
-    flex-direction column
-    justify-content space-between
-    align-items center
-flex-col-around()
-    display flex
-    flex-direction column
-    justify-content space-around
-    align-items center
-box-shadow()
-    box-shadow 0px 3px 6px 0px rgba(230, 230, 230, .7)

src/pages/style/variable.styl

@@ -1,63 +0,0 @@
-
-// 根据ui提供的规范定义
-$color-text-black = #000 // 文本颜色
-$color-text = #333
-$color-text-gray = #666
-$color-text-grayer = #999
-$color-text-blue = #1890ff
-$color-text-gray-blue = #7E7E7E
-$color-text-green = #52CC60
-$color-text-green-white = #65B800
-$color-text-yellow = #f2dc3f
-$color-text-white = #ffffff
-$color-text-grey = #cccccc
-$color-text-red = #F04844
-
-$color-as-1 = #f2dc3f; // 辅助色
-$color-as-2 = #FE6196;
-$color-as-3 = #d81e06;
-$color-as-4 = #d63235;
-$color-as-5 = #237ac0
-
-$color-link = #333; // 链接颜色
-
-$color-base-dark = #333; // 基本色
-$color-base-grayer = #666;
-$color-base-gray = #999;
-$color-base-white = #ddd;
-$color-base-bar = #1890ff
-
-$color-bg = #F1F3FA //背景颜色
-$color-bg-black = #9EA7B4
-$color-bg-white = #fff
-$color-bg-gray = #f2f2f2
-$color-bg-gray-white = #F8F8FB
-$color-bg-blue-white = #F7FBFC
-$color-bg-grayer = #e4e4e4 //更灰些
-$color-bg-light-blue = #DADCE5
-$color-bg-main-grayer = #f6f7f9
-$color-bg-gray-white = #FAFAFA
-$color-bg-theme = #232774
-$color-bg-green = #52CC60
-$color-bg-yellow = #f2dc3f
-$color-bg-red = #F04844
-$color-bg-SendCode = #FF00B7FF
-$color-bd-black = #9EA7B4
-$color-bd = #ddd //边框颜色
-$color-bd-gray = #eee
-$color-bd-green = #52CC60
-$color-bd-red = #F04844
-$color-bd-white = #FFFFFF
-
-//字体定义规范
-$font-size-s = 10px
-$font-size-sm = 12px
-$font-size-m = 14px
-$font-size-l = 16px
-$font-size-xl = 18px
-$font-size-xxl = 20px
-$font-size-xxxl = 22px
-
-// 宽度
-$width-max = 1940px
-$width-min = 1040px

src/pages/super/AllStudentHomework.vue

@@ -23,7 +23,7 @@
         <div>
           <el-table
             style="width: 100%"
-            :data="StudentHomework01List"
+            :data="StudentHomework01List.list"
             :header-cell-class-name="tableheaderClassName"
             :header-cell-style="{
           'background-color': '#F6F7FB',
@@ -34,7 +34,7 @@
             border
             stripe
           >
-            <el-table-column label="注册老师" header-align="center">
+            <el-table-column label="注册学生" header-align="center">
               <template slot-scope="scope">
                 <div class="scope-list">
                   <img
@@ -73,7 +73,7 @@
             :page-sizes="[10,50,100,200]"
             :current-page.sync="currentPage"
             layout="sizes, total,prev, pager, next"
-            :hide-on-single-page="true"
+          
             :total="parseInt(StudentHomework01List.pages)"
           ></el-pagination>
         </div>
@@ -130,7 +130,7 @@ export default {
         pageSize: this.filters2.pageSize,
         oneMonth: this.selMonth,
         maxCreateTime: this.formatDate(),
-        name: this.inputValue
+        value: this.inputValue
       });
     },
          //年月时间封装

src/pages/super/CheckTeacherAudit.vue

@@ -76,7 +76,7 @@
                 class="identity-card"
                 v-if="scope.row.idFace"
               />
-              <span class="bank-active" @click="isShow(3,scope.row.idFace)">查看</span>
+              <span class="bank-active" @click="isShow(3,scope.row)">查看</span>
             </template>
           </el-table-column>
           <el-table-column prop label="银行卡" header-align="center" width="120">
@@ -126,6 +126,14 @@
         <div class="model-btn">
           <img :src="BASE_URL+imgCard" alt class="model-btn-info-img" />
         </div>
+           <div class="model-info">
+          <div class="model-info-items">
+            <div class="model-info-items-left">身份证号</div>
+            <div class="model-info-items-right">
+              <span>{{TeacheridNumber}}</span>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <!-- 查看身份证详情-->
@@ -238,6 +246,7 @@ export default {
       cardShow: false,
       cardInfoShow: false,
       imgCard: "",
+      TeacheridNumber:"",
       cardInfo: "",
       isPigai: false,
       options: [
@@ -343,7 +352,8 @@ export default {
         _this.hiddenModel = false;
       } else if (str == 3) {
         _this.cardShow = true;
-        _this.imgCard = res;
+         _this.imgCard = res.idFace;
+        _this.TeacheridNumber = res.idNumber;
       } else if (str == 4) {
         _this.cardInfoShow = true;
         _this.cardInfo = res;
@@ -401,7 +411,8 @@ export default {
             cardholder: res[i].cardholder,
             cardNumber: res[i].cardNumber,
             bankBranch: res[i].bankBranch,
-            regisTime: res[i].regisTime
+            regisTime: res[i].regisTime,
+            idNumber: res[i].idNumber
           });
         }
         return d;

src/pages/super/CheckTeacherPay.vue

@@ -105,26 +105,21 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="basicSalary" label="是否有底薪" header-align="center">
-              <!-- <template slot-scope="scope">
-              <div class="scope-list">
-                <span v-if="scope.row.whetherHaveBasicSalary == 1"  class="scope-name">是</span>
-                  <span v-if="scope.row.whetherHaveBasicSalary == 0"  class="scope-name">无</span>
-              </div>
-              </template>-->
-            </el-table-column>
-            <el-table-column prop label="1～2年级" header-align="center">
-              <el-table-column prop="autoLowGradeCount" label="自动批改(0.2元/张)"></el-table-column>
-              <el-table-column prop="manualLowGradeCount" label="手动批改(0.3元/张)"></el-table-column>
-            </el-table-column>
-            <el-table-column prop label="3～4年级" header-align="center">
-              <el-table-column prop="autoMiddleGradeCount" label="自动批改(0.2元/张)"></el-table-column>
-              <el-table-column prop="manualMiddleGradeCount" label="手动批改(0.4元/张)"></el-table-column>
-            </el-table-column>
-            <el-table-column label="5～6年级" header-align="center">
-              <el-table-column prop="autoHighGradeCount" label="自动批改(0.2元/张)"></el-table-column>
-              <el-table-column prop="manualHighGradeCount" label="手动批改(0.5元/张)"></el-table-column>
-            </el-table-column>
+            <el-table-column prop="identity" label="身份" header-align="center"></el-table-column>
+             <el-table-column prop="manager" label="归属管理员" header-align="center"></el-table-column>
+              <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
+              <el-table-column prop="actualAttendCount" label="实际有效出勤段数" header-align="center"></el-table-column>
+              <el-table-column prop="shouldAttendCount" label="系统排班段数" header-align="center"></el-table-column>
+              <el-table-column prop="attendanceRate" label="出勤率" header-align="center"></el-table-column>
+              <el-table-column prop="accuracy" label="正确率" header-align="center"></el-table-column>
+              <el-table-column prop label="作业批改数量" header-align="center">
+              <el-table-column prop="autoLowGradeCount" label="快对答案张数"></el-table-column>
+              <el-table-column prop="manualLowGradeCount" label="1-2年级手动批改"></el-table-column>
+               <el-table-column prop="manualMiddleGradeCount" label="3-4年级手动批改"></el-table-column>
+              <el-table-column prop="manualHighGradeCount" label="5-6年级手动批改"></el-table-column>
+              </el-table-column>
+              <el-table-column prop="basicSalary" label="底薪金额" header-align="center"></el-table-column>
+              <el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
             <el-table-column prop="total" label="总计" header-align="center"></el-table-column>
           </el-table>
           <!-- 分页显示 -->
@@ -174,15 +169,17 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="basicSalary" label="是否有底薪" header-align="center">
-              <!-- <template slot-scope="scope">
-              <div class="scope-list">
-                <span v-if="scope.row.whetherHaveBasicSalary == 1"  class="scope-name">是</span>
-                  <span v-if="scope.row.whetherHaveBasicSalary == 0"  class="scope-name">无</span>
-              </div>
-              </template>-->
-            </el-table-column>
-            <el-table-column prop="correctCount" label="批改张数(0.1元/张)" header-align="center"></el-table-column>
+            <el-table-column prop="identity" label="身份" header-align="center"></el-table-column>
+             <el-table-column prop="manager" label="归属管理员" header-align="center"></el-table-column>
+              <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
+                <el-table-column prop="subject" label="排班类型" header-align="center"></el-table-column>
+              <el-table-column prop="actualAttendCount" label="实际有效出勤段数" header-align="center"></el-table-column>
+              <el-table-column prop="shouldAttendCount" label="系统排班段数" header-align="center"></el-table-column>
+              <el-table-column prop="attendanceRate" label="出勤率" header-align="center"></el-table-column>
+                 <el-table-column prop="accuracy" label="正确率" header-align="center"></el-table-column>
+                 <el-table-column prop="attendanceRate" label="作业批改数量" header-align="center"></el-table-column>
+              <el-table-column prop="basicSalary" label="底薪金额" header-align="center"></el-table-column>
+              <el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
             <el-table-column prop="total" label="总计" header-align="center"></el-table-column>
           </el-table>
           <!-- 分页显示 -->
@@ -230,6 +227,11 @@
                 </div>
               </template>
             </el-table-column>
+               <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
+                <el-table-column prop="bankName" label="注册时间" header-align="center"></el-table-column>
+                <el-table-column prop="bankName" label="状态" header-align="center"></el-table-column>
+                 <el-table-column prop="bankName" label="手机号码" header-align="center"></el-table-column>
+                  <el-table-column prop="bankName" label="身份证号码" header-align="center"></el-table-column>
             <el-table-column prop="bankName" label="开户行" header-align="center"></el-table-column>
             <el-table-column prop="bankBranch" label="开户支行" header-align="center"></el-table-column>
             <el-table-column prop="cardholder" label="开户人姓名" header-align="center"></el-table-column>

src/pages/super/SchoolManager.vue

@@ -843,7 +843,7 @@
     </div>
     <!-- 老师详情弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="ModelAppor"></div>
-    <div class="model" style="width:40%;left: 32.5%" v-if="ModelAppor">
+    <div class="model" style="width:40%;left: 32.5%;top:5%;" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
           <div v-if="this.Activeindex == false">批改老师</div>

src/router/index.js

@@ -11,6 +11,8 @@ import Error404 from "@/pages/Error404";
 import SchoolManager from "@/pages/home/SchoolManager";
 import TeacherApporval from "@/pages/home/TeacherApporval";
 import TeacherPay from "@/pages/home/TeacherPay";
+import LeaningAllStudentHomework from "@/pages/home/AllStudentHomework";
+import LeaningAllHomeWorkPictrue from "@/pages/home/AllHomeWorkPictrue";
 
 // 超级管理员
 import CheckTeacherAudit from "@/pages/Super/CheckTeacherAudit";
@@ -166,7 +168,18 @@ export const constantRouterMap =
            name: "TeacherPay",
            component: TeacherPay,
            meta: { title: '报错详情', roles: ['2'] }
-         },
+         }, {
+          path: "LeaningAllHomeWorkPictrue",
+          name: "LeaningAllHomeWorkPictrue",
+          component: LeaningAllHomeWorkPictrue,
+          meta: { title: '作业详情', roles: ['2'] }
+        },
+        {
+          path: "LeaningAllStudentHomework",
+          name: "LeaningAllStudentHomework",
+          component: LeaningAllStudentHomework,
+          meta: { title: '作业列表', roles: ['2'] }
+        },
        ]
      },
      //质检员

src/store/modules/scheduling .js

@@ -468,7 +468,7 @@ import {FindCalendarList,FindHaveTeacherList,FindNoHaveTeacherList,
         GetStudentHomework01List({ commit, state }, data) {
             return new Promise((resolve, reject) => {
               axios.post(StudentHomework01List, data).then(response => {
-                const data = response.data.list || {}
+                const data = response.data || {}
                 if (response.code == "999"){
                   commit('SET_STUDENT_HOMEWORK_LIST', data);
                 }