提交test分支最新代码

src/api/index.js

@@ -74,6 +74,13 @@ const MonitorKnowTeacherOneDayList = urlFn('/api/kmt/correctSys/monitorKnowTeach
 const MonitorKnowTeacherOneMonthList = urlFn('/api/kmt/correctSys/monitorKnowTeacherOneMonthList')
 // 未匹配作业列表
 const UnmatchHomeworkList = urlFn('/api/kmt/correctSys/unmatchHomeworkList')
+// 老师薪酬列表导出
+const ExportCorrectSalary = urlFn('/sys/salary/exportCorrectSalary')
+// 匹配老师薪酬列表导出
+const ExportMatchSalary = urlFn('/sys/salary/exportMatchSalary')
+// 老师信息列表导出
+const ExportTeacherInfo = urlFn('/api/sys/salary/exportTeacherInfo')
+
 export {
     GET_TOKEN,
     GET_UUIONID_TOKEN,
@@ -111,4 +118,7 @@ export {
     MonitorKnowTeacherOneDayList,
     MonitorKnowTeacherOneMonthList,
     UnmatchHomeworkList,
+    ExportCorrectSalary,
+    ExportMatchSalary,
+    ExportTeacherInfo
 }

src/axios/index.js

@@ -181,10 +181,15 @@ export default {
         }).then(checkStatus).then(checkCode)
     },
     get (url, params){
+        if (!accessToken){
+            accessToken = localStorage.getItem("accessToken");
+        }
+        const Token = {accessToken};
         return axios({
             method: 'get',
-            url: `${url}?${qs.stringify(params)}`,
+            url: `${url}?${qs.stringify(Token)}`,
             timeout: TIME_OUT,
+            params,
             headers:{
                 'Content-Type':'text/plain',
             },

src/components/MenuComponent.vue

@@ -18,8 +18,7 @@
     <el-col :span="4" :offset="10">
       <div class="loginMock">
         <img class="userstyle" :src="BASE_URL + avatar" alt />
-        <!-- <img class="userstyle" src="../assets/img/user.jpg"> -->
-        <span>{{name}}</span>
+        <span class="logoutName">{{name}}</span>
         <i class="el-icon-caret-bottom"></i>
       </div>
       <div class="out">
@@ -144,6 +143,9 @@ export default {
   height: 80%;
   text-align: center;
   padding-bottom: 19px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+ white-space: nowrap;
   /*display: inline-block;*/
 }
 .menu_item:hover {
@@ -159,6 +161,16 @@ export default {
   line-height: 0 !important;
   padding: 12px 20px !important;
 }
+.logoutName{
+ width:100px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ display:inline-block;
+ white-space: nowrap;
+  height: 30px;
+  line-height:30px;
+  margin-top:30px;
+}
 .navactive {
   color: #52cc60 !important;
   border-bottom: 2px solid #52cc60;

src/components/SuperComponent.vue

@@ -28,10 +28,9 @@
       </el-col>
     </el-col>
       <!-- <div class="logoutBtn"> -->
-          <div class="loginMock">
+        <div class="loginMock">
           <img class="userstyle" :src="BASE_URL + avatar" alt />
-          <!-- <img class="userstyle" src="../assets/img/user.jpg"> -->
-          <span>{{name}}</span>
+          <span class="logoutName">{{name}}</span>
           <i class="el-icon-caret-bottom"></i>
         </div>
         <div class="out">
@@ -189,6 +188,16 @@ export default {
   padding: 0 !important;
   min-height: 980px;
 }
+.logoutName{
+ width:100px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ display:inline-block;
+ white-space: nowrap;
+  height: 30px;
+  line-height:30px;
+  margin-top:30px;
+}
 .menu_item {
   cursor: pointer;
   color: #999999;

src/config/index.js

@@ -14,12 +14,12 @@ if (process.env.NODE_ENV === 'development') {
 } else {
 
 // // 1.测试环境配置
-        //      BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
-        //      APP_ID = "wx3d4605f43beda11a"//测试环境AppId 
-        //      RESET_URL = "https://xtkmt.sharingschool.com/manager/index.html#/" //测试环境微信重定向页面
-        //      TYPE = 0
-        //      IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
-        //      APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
+             BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
+             APP_ID = "wx3d4605f43beda11a"//测试环境AppId 
+             RESET_URL = "https://xtkmt.sharingschool.com/manager/index.html#/" //测试环境微信重定向页面
+             TYPE = 0
+             IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
+             APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
 
 // 1.分表分库测试环境配置
             // BASE_URL = ' https://xt.sharingschool.com/fk' //分表分库测试环境服务器地址
@@ -31,12 +31,12 @@ if (process.env.NODE_ENV === 'development') {
 
 //  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 2.正式环境配置(Kmt)
-          BASE_URL = 'https://api.sharingschool.com/sz'; //正式环境地址 
-          APP_ID = "wxd18ca9555a939281"//正式环境
-          RESET_URL = "https://kmt.sharingschool.com/aijia/manager/index.html#/" //正式环境微信重定向页面
-          TYPE = 0
-          IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
-          APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
+        //   BASE_URL = 'https://api.sharingschool.com/sz'; //正式环境地址 
+        //   APP_ID = "wxd18ca9555a939281"//正式环境
+        //   RESET_URL = "https://kmt.sharingschool.com/aijia/manager/index.html#/" //正式环境微信重定向页面
+        //   TYPE = 0
+        //   IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+        //   APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
 
 // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 3.OSS正式环境(aiKmt)

src/pages/Qualityinspector/AllHomeWorkPictrue.vue

@@ -25,10 +25,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -55,10 +57,12 @@
               <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>
+                   <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -86,10 +90,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -118,10 +124,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -151,10 +159,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -268,15 +278,19 @@ export default {
   position: relative;
   width: 200px;
 }
+.imgLists{
+    position: relative;
+  width: 250px;
+}
 .TeacherWords {
   position: absolute;
   bottom: 0;
   right: 0;
   width: 100%;
-  height: 30px;
+  height: 50px;
   background: #000000;
   text-align: center;
-  line-height: 30px;
+  line-height: 50px;
   opacity: 0.4;
   color: #ffff;
   font-size: 8px;

src/pages/home/AllHomeWorkPictrue.vue

@@ -25,10 +25,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -55,10 +57,12 @@
               <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>
+                     <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -86,10 +90,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -118,10 +124,12 @@
               <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>
+                   <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -151,10 +159,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -268,15 +278,19 @@ export default {
   position: relative;
   width: 200px;
 }
+.imgLists{
+    position: relative;
+  width: 250px;
+}
 .TeacherWords {
   position: absolute;
   bottom: 0;
   right: 0;
   width: 100%;
-  height: 30px;
+  height: 50px;
   background: #000000;
   text-align: center;
-  line-height: 30px;
+  line-height: 50px;
   opacity: 0.4;
   color: #ffff;
   font-size: 8px;

src/pages/home/SchoolManager.vue

@@ -371,7 +371,7 @@
                         style="color:#fbfbfb;font-size:12px;"
                       >报错{{v.wrongCount}}</span>
                     </div>
-                     <div style="width: 15%">
+                     <div style="width: 25%">
                          <span
                          v-if="v.waitingTime"
                         class="WorngCount"
@@ -469,6 +469,9 @@
                     ></el-date-picker>
                   </div>
                 </div>
+                  <div style="margin-left:20px; text-align:center;">
+                    <div class="refreshButton"  @click="RefreshButton()">刷新 <img  id="img" class="icon-select" src="../../assets/img/refreshicon.png"/></div>
+                 </div>
               </div>
             </el-col>
           </el-col>
@@ -477,6 +480,7 @@
               今日报错总次数:
               <span style="color:red;">{{DayTeacherList.wrongCount}}次</span>
             </div>
+    
           </el-col>
         </el-row>
         <el-row :gutter="20" class="main-header">
@@ -516,9 +520,8 @@
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
                   <div style="width:240px;">{{v.avgTime}}</div>
-                  <!-- <div>{{v.attendance}}</div> -->
-                  <!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
-                  <div style="color:#52cc60;" v-if="v.attendance == 未出勤">{{v.attendance}}</div>-->
+                 <!-- <div  style="color:#52cc60;"  v-if="v.lineStatus == 1">正常</div>
+                  <div v-if="v.lineStatus == 0">未出勤</div> -->
                 </div>
               </div>
             </div>
@@ -1502,6 +1505,7 @@ export default {
         originTeacherId: v.teacherId
       });
     },
+    
     // 质检当前作业状态
     async CheackHomeworkStatus(v) {
       let CurrthomeworkIdStatus = v.homeworkId;
@@ -1789,6 +1793,17 @@ export default {
       this.filters1.pageNo = 1;
       this.InfoKonwTeacherDayApprvalList();
     },
+    RefreshButton(){
+      let deg = 0;
+      deg += 280;
+      document.getElementById("img").style.transform = "rotate(" + deg + "deg)";
+      if (!this.DayActiveindex) {
+          this.InfoWatchDay();
+      }
+       if (this.DayActiveindex) {
+          this.InfoKonwTeacherDayApprvalList();
+      }
+    },
     // 当天数据匹配知识点老师
     InfoKonwTeacherDayApprvalList() {
       this.$store.dispatch("MonitorKnowTeacherOneDayInfo", {
@@ -2834,6 +2849,20 @@ el-table {
   height: 40px;
   top: 15px;
 }
+.icon-select:before{
+	transform: rotate(180deg);
+}
+.refreshButton{
+    background-color: #52cc60;
+    height: 40px;
+    width: 100px;
+    line-height:40px;
+    text-align:center;
+    border-radius:20px;
+    color: #ffffff;
+    margin-top:20px;
+    cursor: pointer;
+}
 .DaySeachIcon {
   position: absolute;
   font-size: 20px;

src/pages/super/AllHomeWorkPictrue.vue

@@ -25,10 +25,12 @@
               <div class="studentName">原图</div>
               <ul>
                 <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomework01Detail.originPicList" :key="k">
+                  <div class="imgLists">
                     <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>
+                    <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                    <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -55,10 +57,12 @@
               <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>
+                   <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -86,10 +90,12 @@
               <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>
+                  <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -118,10 +124,12 @@
               <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>
+                   <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -151,10 +159,12 @@
               <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>
+                    <div class="imgLists">
+                      <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 ==22"  class="TeacherWords">作文有评语</div>
+                  </div>
                   <!-- 模糊 -->
                   <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
                   <!-- 不全 -->
@@ -268,15 +278,19 @@ export default {
   position: relative;
   width: 200px;
 }
+.imgLists{
+    position: relative;
+  width: 250px;
+}
 .TeacherWords {
   position: absolute;
   bottom: 0;
   right: 0;
   width: 100%;
-  height: 30px;
+  height: 50px;
   background: #000000;
   text-align: center;
-  line-height: 30px;
+  line-height: 50px;
   opacity: 0.4;
   color: #ffff;
   font-size: 8px;

src/pages/super/CheckTeacherPay.vue

@@ -74,9 +74,9 @@
              <el-col :span="4" :offset="2">
                  <div class="main-header-item">
               <i v-if="ActiveIndex == 0 || ActiveIndex == 1 || ActiveIndex == 2" class="el-icon-printer"></i>
-              <span v-if="ActiveIndex == 0" @click="excel()">导出表格</span>
-              <span v-if="ActiveIndex == 1" @click="ApporvalAutoexcel()">导出表格</span>
-              <span v-if="ActiveIndex == 2" @click="TeacherInfoExcel()">导出表格</span>
+              <span v-if="ActiveIndex == 0" @click="ExportCorrectSalary()">导出表格</span>
+              <span v-if="ActiveIndex == 1" @click="ExportMatchSalary()">导出表格</span>
+              <span v-if="ActiveIndex == 2" @click="ExportTeacherInfo()">导出表格</span>
             </div>
             </el-col>
         
@@ -814,6 +814,31 @@ export default {
         name: this.inputValue
       });
     },
+    // 老师薪资列表导出
+    ExportCorrectSalary() {
+      this.$store.dispatch("ExportCorrectSalaryList", {
+        pageNo: this.filters.pageNo,
+        pageSize: this.filters.pageSize,
+        month: this.selMonth,
+      });
+    },
+     // 匹配老师薪资列表导出
+    ExportMatchSalary() {
+      this.$store.dispatch("ExportMatchSalaryList", {
+        pageNo: this.filters0.pageNo,
+        pageSize: this.filters0.pageSize,
+        month: this.selMonth,
+      });
+    },
+     // 老师信息列表导出
+    ExportTeacherInfo() {
+      this.$store.dispatch("ExportTeacherInfoList", {
+       pageNo: this.filters1.pageNo,
+        pageSize: this.filters1.pageSize,
+        month: this.selMonth,
+      });
+    },
+    
     // 批改明细
     GetGetTeacherCorrectDetailInfo() {
       this.$store.dispatch("GetGetTeacherCorrectDetail", {

src/pages/super/SchoolManager.vue

@@ -358,7 +358,7 @@
                         style="color:#fbfbfb;font-size:12px;"
                       >报错{{v.wrongCount}}</span>
                     </div>
-                    <div style="width: 15%">
+                    <div style="width: 25%">
                          <span
                          v-if="v.waitingTime"
                         class="WorngCount"
@@ -464,6 +464,9 @@
                     >></el-date-picker>
                   </div>
                 </div>
+                <div style="margin-left:20px; text-align:center;">
+                    <div class="refreshButton"  @click="RefreshButton()">刷新 <img  id="img" class="icon-select" src="../../assets/img/refreshicon.png"/></div>
+                 </div>
               </div>
             </el-col>
           </el-col>
@@ -512,8 +515,8 @@
                   <div>{{v.accuracyRate}}</div>
                   <div style="width:240px;">{{v.avgTime}}</div>
                   <!-- <div>{{v.attendance}}</div> -->
-                  <!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
-                  <div style="color:#52cc60;" v-if="v.attendance == 未出勤">{{v.attendance}}</div>-->
+                  <!-- <div  style="color:#52cc60;"  v-if="v.lineStatus == 1">正常</div>
+                  <div v-if="v.lineStatus == 0">未出勤</div> -->
                 </div>
               </div>
             </div>
@@ -1866,6 +1869,17 @@ export default {
         teacherId: v.teacherId
       });
     },
+      RefreshButton(){
+      let deg = 0;
+      deg += 280;
+      document.getElementById("img").style.transform = "rotate(" + deg + "deg)";
+      if (!this.DayActiveindex) {
+          this.InfoWatchDay();
+      }
+       if (this.DayActiveindex) {
+          this.InfoKonwTeacherDayApprvalList();
+      }
+    },
     async pesiorFun() {
       var arr = this.GetTeacherDetail.grade.split(",");
       this.arrPeriod = this.GetTeacherDetail.period.split(",");
@@ -3034,6 +3048,17 @@ ul {
   margin-bottom: 30px;
   /* float:left; */
 }
+.refreshButton{
+    background-color: #52cc60;
+    height: 40px;
+    width: 100px;
+    line-height:40px;
+    text-align:center;
+    border-radius:20px;
+    color: #ffffff;
+    margin-top:20px;
+    cursor: pointer;
+}
 .closeTeacherID {
   display: inline-block;
   height: 40px;

src/pages/super/SuperAdmin.vue

@@ -75,6 +75,7 @@
           <el-table-column prop="groupCount" label="小组人数" header-align="center"></el-table-column>
           <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
           <el-table-column prop="attendanceRate" label="老师出勤率" header-align="center"></el-table-column>
+          <el-table-column prop="guardanceRate" label="在岗率" header-align="center"></el-table-column>
           <el-table-column prop="homeworkPicCount" label="作业批改总张数" header-align="center"></el-table-column>
           <el-table-column prop="avgTime" label="批改平均用时" header-align="center"></el-table-column>
           <el-table-column prop="avgMark" label="家长平均评分" header-align="center"></el-table-column>

src/store/modules/user.js

@@ -5,9 +5,12 @@ import { GET_UUIONID_TOKEN,GET_TOKEN,GET_VERIFICATION_CODE,GET_PHONE_TOKEN,GetIn
   SuperApplyTeacherList,ApplyOperate,GetTeacherSalaryList,DealCorrectTeacher,
   GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList,errorWarning,errorDetail,logout,
   CheckHomeworkStatus,FindSubjectCharts,GetRemindCount,GetKnowledgeTeacherSalaryList,AllTeacherInfoList,MonitorKnowTeacherList, MonitorKnowTeacherOneDayList,UnmatchHomeworkList,
-  MonitorKnowTeacherOneMonthList
+  MonitorKnowTeacherOneMonthList,
+  ExportCorrectSalary,
+  ExportMatchSalary,
+  ExportTeacherInfo
   } from '@/api'
-  import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
+  import { IMG_BASE_URL, APPOR_BASE_URL, BASE_URL } from "@/config";
 // import { getToken, setToken, removeToken } from '@/utils/auth'
 import axios from '@/axios'
 import router from "@/router"
@@ -908,6 +911,24 @@ const user = {
         })
       })
     },
+    // 老师薪酬列表导出
+    ExportCorrectSalaryList({ commit, state }, data) {
+      const { pageSize, pageNo, month } = data
+      const accessToken = localStorage.getItem("accessToken")
+      window.open(`${BASE_URL}/sys/salary/exportCorrectSalary?accessToken=${accessToken}&pageNo=${pageNo}&pageSize=${pageSize}&month=${month}`)
+    },
+      // 匹配老师薪酬列表导出
+      ExportMatchSalaryList({ commit, state }, data) {
+        const { pageSize, pageNo, month } = data
+        const accessToken = localStorage.getItem("accessToken")
+        window.open(`${BASE_URL}/sys/salary/exportMatchSalary?accessToken=${accessToken}&pageNo=${pageNo}&pageSize=${pageSize}&month=${month}`)
+      },
+        // 老师信息列表导出
+        ExportTeacherInfoList({ commit, state }, data) {
+          const { pageSize, pageNo, month } = data
+          const accessToken = localStorage.getItem("accessToken")
+          window.open(`${BASE_URL}/sys/salary/exportTeacherInfo?accessToken=${accessToken}&pageNo=${pageNo}&pageSize=${pageSize}&month=${month}`)
+    },
     //查看申请批改老师列表
     SuperApplyTeacherList({ commit, state }, data) {
       return new Promise((resolve, reject) => {