Startsida Utforska Hjälp
Registrera dig Logga in
aijia
/
kmt
2
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

6.21页面样式修改

name 6 år sedan
förälder
b89288b321
incheckning
154aaabfe4
9 ändrade filer med 65 tillägg och 27 borttagningar
Delad Vy Visa Diff Statistik
  1. 1 0
      index.html
  2. 3 0
      src/api/index.js
  3. 1 0
      src/axios/index.js
  4. 9 8
      src/components/SuperComponent.vue
  5. 5 0
      src/pages/Super.vue
  6. 23 15
      src/pages/super/CheckTeacherPay.vue
  7. 3 2
      src/pages/super/HomeworkRecycle.vue
  8. 1 0
      src/store/getters.js
  9. 19 2
      src/store/modules/user.js

+ 1 - 0
index.html
Visa fil 

@@ -4,6 +4,7 @@
 
 <head>
 
   <meta charset="utf-8">
 
   <title>私塾家作业批改后台</title>
 
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
   <!-- <meta name="viewport" content="width=1920, target-densityDpi=device-dpi, user-scalable=no"> -->
 
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />  -->
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

+ 3 - 0
src/api/index.js
Visa fil 

@@ -46,6 +46,8 @@ const GetAllotManagerList = urlFn('/api/kmt/correctSys/getAllotManagerList')
 
 const AllotTeacherToManager = urlFn('/api/kmt/correctSys/allotTeacherToManager')
 
 // 作业回收站列表
 
 const HomeworkRecoveryList = urlFn('/api/kmt/correctSys/homeworkRecoveryList')
 
+// 获取提醒次数
 
+const GetRemindCount = urlFn('/api/kmt/correctSys/getRemindCount')
 
 // 报错警告
 
 const errorWarning = urlFn('/api/kmt/correctSys/errorWarning')
 
 // 报错详情
 
@@ -75,6 +77,7 @@ export {
 
     GetAllotManagerList,
 
     AllotTeacherToManager,
 
     HomeworkRecoveryList,
 
+	GetRemindCount,
 
     errorWarning,
 
     errorDetail,
 
     logout

+ 1 - 0
src/axios/index.js
Visa fil 

@@ -153,6 +153,7 @@ export default {
 
         }).then(checkStatus).then(checkCode)
 
     },
 
     post (url, data) {
 
+		// debugger
 
         if (!accessToken){
 
             accessToken = localStorage.getItem("accessToken");
 
         }

+ 9 - 8
src/components/SuperComponent.vue
Visa fil 

@@ -7,9 +7,9 @@
 
       <el-col :span="3"   v-for="(item, index) of menuData" :key="item.id"
 
       @click.native="secondNavClick(item,index)" style="text-align: center">
 
           <span class="lineStyle" :class="{superactive:index == checkindex,menu_item:true}">{{item.name}}</span>
 
-          <!-- <div class="box" v-if="index==1||index==3">
 
+          <div class="box" v-if="index==1||index==3">
 
             <span class="box-text">{{index==1?2+'项任务':3+'份作业'}}</span>
 
-          </div> -->
 
+          </div>
 
       </el-col>
 
 
       <el-col :span="4" class="aside-right">
 
@@ -56,7 +56,7 @@ export default {
 
   },
 
           {
 
             id: "4",
 
-            name: "作业回收站",
 
+            name: "待分配作业",
 
             href: "HomeworkRecycle",
 
           },
 
  ],
 
@@ -69,6 +69,9 @@ export default {
 
       this.initNav();
 
     }
 
   },
 
+	computed: {
 
+	    ...mapGetters(['name', 'avatar','roles','getRemindCount'])
 
+	  },
 
   methods: {
 
     // 初始化处理
 
     // initNav() {
 
@@ -107,14 +110,12 @@ export default {
 
           // console.log(err)
 
           this.$message("已取消操作!");
 
         });
 
-    }
 
-  },
 
-  computed: {
 
-      ...mapGetters(['name', 'avatar','roles'])
 
     },
 
+  },
 
   mounted() {
 
     this.checkindex = sessionStorage.getItem('tabIndex');
 
-    // this.initNav();
 
+    // this.getRemindCounts();
 
+		// console.log('555555')
 
   }
 
 };
 
 </script>

+ 5 - 0
src/pages/Super.vue
Visa fil 

@@ -135,6 +135,10 @@
 
           self.userAddFormLoading = false;
 
         });
 
       },
 
+				//获取提醒次数
 
+			 getRemindCounts() {
 
+			  this.$store.dispatch("GetRemindCountInfo", {});
 
+			},
 
       //  账号管理、退出登录
 
       handleCommand(command) {
 
         const self = this;
 
@@ -173,6 +177,7 @@
 
       // }
 
     },
 
     mounted() {
 
+			this.getRemindCounts()
 
       // this.userImgPath = this.getUser.imagePath;
 
       this.breadcrumb = this.$route.name;
 
       // this.$nextTick(() => {

+ 23 - 15
src/pages/super/CheckTeacherPay.vue
Visa fil 

@@ -7,18 +7,26 @@
 
       <!--数据监控-->
 
       <el-col :span="20" class="main" :offset="2">
 
         <el-row :gutter="20" class="main-header">
 
-          <el-col :span="3" :offset="1"><div class="main-header-item" >
 
-            <div class="block" >
 
-              <el-date-picker
 
-                v-model="selMonth"
 
-                type="month"
 
-                placeholder="选择月"
 
-                value-format="yyyy-MM"
 
-                @change="GetTeacherSalaryList()">
 
-              </el-date-picker>
 
-            </div>
 
-          </div></el-col>
 
-          <el-col :span="4" :offset="16">
 
+          <el-col :span="3" :offset="1">
 
+						<div class="main-header-item" >
 
+							<div class="block" >
 
+								<el-date-picker
 
+									v-model="selMonth"
 
+									type="month"
 
+									placeholder="选择月"
 
+									value-format="yyyy-MM"
 
+									@change="GetTeacherSalaryList()">
 
+								</el-date-picker>
 
+							</div>
 
+						</div>
 
+					</el-col>
 
+					<el-col :span="3" >
 
+						<el-button type="success" round>手动批改</el-button>
 
+					</el-col>
 
+					<el-col :span="2">
 
+						<el-button round>自动批改</el-button>
 
+					</el-col>
 
+          <el-col :span="4" :offset="10">
 
             <div class="main-header-item">
 
               <i class="el-icon-printer"></i>
 
               <span @click="excel()">导出表格</span>
 
@@ -69,7 +77,7 @@
 
             prop="total"
 
             label="总计"
 
             header-align="center"
 
-            width="450"
 
+            width="400"
 
           >
 
           </el-table-column>
 
         </el-table>
 
@@ -80,7 +88,7 @@
 
             @size-change="handleSizeChange"
 
             @current-change="pageChange"
 
             :page-sizes="[10]"
 
-            layout="total, sizes, prev, pager, next, jumper"
 
+            layout="total,prev, pager, next"
 
             :total= parseInt(getTeacherSalaryList.pages)
 
           ></el-pagination>
 
         </div>
 
@@ -186,7 +194,7 @@
 
             alert("无法启动Excel，请确保电脑中已经安装了Excel!")
 
           } else {
 
             let arr = this.getTeacherSalaryList.list;
 
-            let str = '注册老师,1～2年级0.6元/份,3～4年级0.8元/份,5～6年级1.2元/份,总计/元';
 
+            let str = '注册老师,1～2年级0.2元/张,3～4年级0.3元/张,5～6年级0.4元/张,总计/元';
 
             for (let i = 0; i < arr.length; i++) {
 
               str += "\n" + arr[i].name + ',' + arr[i].lowGradeCount + ',' + arr[i].middleGradeCount + ',' + arr[i].highGradeCount + ',' + arr[i].total
 
             }

+ 3 - 2
src/pages/super/HomeworkRecycle.vue
Visa fil 

@@ -60,13 +60,13 @@
 
           </el-table-column>
 
         </el-table>
 
         <!-- 分页显示 -->
 
-        <div class="page-block" v-if="parseInt(homeworkRecoveryList.pages) > 0">
 
+        <div class="pages" v-if="parseInt(homeworkRecoveryList.pages) > 0">
 
           <el-pagination
 
             background
 
             @size-change="handleSizeChange1"
 
             @current-change="pageChange1"
 
             :page-sizes="[10]"
 
-            layout="total, sizes, prev, pager, next, jumper"
 
+            layout="total,prev, pager, next"
 
             :total= parseInt(homeworkRecoveryList.pages)
 
           ></el-pagination>
 
         </div>
 
@@ -422,4 +422,5 @@
 
   .pages{
 
     margin: 15px 0;
 
   }
 
+
 
 </style>

+ 1 - 0
src/store/getters.js
Visa fil 

@@ -32,5 +32,6 @@ const getters = {
 
   pictureIndex :state => state.user.pictureIndex,
 
   InfoTeacherstatues :state => state.user.InfoTeacherstatues,
 
   GetTeacherstatues :state => state.user.GetTeacherstatues,
 
+  getRemindCount:state => state.user.getRemindCount,
 
 }
 
 export default getters

+ 19 - 2
src/store/modules/user.js
Visa fil 

@@ -3,7 +3,7 @@ import { GET_UUIONID_TOKEN,GET_TOKEN,GetInfo,InfoWatch,InfoWatchDay,
 
   TeacherAllot,UnallotHomeworkList,GetTeacherDetail,
 
   GetStudentDetail,GetManagerDetail,Downgrade,SuperManagerList,
 
   SuperApplyTeacherList,ApplyOperate,GetTeacherSalaryList,DealCorrectTeacher,
 
-  GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList,errorWarning,errorDetail,logout
 
+  GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList,GetRemindCount,errorWarning,errorDetail,logout
 
   } from '@/api'
 
   import { APPOR_BASE_URL } from '@/ImgConfig'
 
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
@@ -39,6 +39,7 @@ const user = {
 
     pictureIndex:0,
 
     InfoTeacherstatues:"",
 
     GetTeacherstatues:"",
 
+		getRemindCount:"",
 
   },
 
 
   mutations: {
 
@@ -123,8 +124,11 @@ const user = {
 
     SET_ERROR_WARING:(state,errorWarningList) => {
 
       state.errorWarningList = errorWarningList
 
     },
 
+		SET_GET_REMIND_COUNT:(state,getRemindCount) => {
 
+		  state.getRemindCount = getRemindCount
 
+		},
 
     SET_ERROR_DETAIL:(state,errorDetailList) => {
 
-      console.log(errorDetailList)
 
+      // console.log(errorDetailList)
 
       state.errorDetailList = errorDetailList
 
     },
 
     SET_ERROR_INDEX:(state,pictureIndex) => {
 
@@ -595,6 +599,19 @@ const user = {
 
         })
 
       })
 
     },
 
+		//获取提醒次数
 
+		GetRemindCountInfo({ commit, state }, data) {
 
+			// debugger
 
+		  return new Promise((resolve, reject) => {
 
+		    axios.post(GetRemindCount, data).then(response => {
 
+		      const data = response.data || { }
 
+		      commit('SET_GET_REMIND_COUNT', data);
 
+		      resolve(response)
 
+		    }).catch(error => {
 
+		      reject(error)
 
+		    })
 
+		  })
 
+		},
 
     // 登出getTeacherSalaryList
 
     LogOut({ commit, state }, data) {
 
       return new Promise((resolve, reject) => {