Home Explore Help
Register Sign In
aijia
/
kmt
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

提交最新代码

TheLittlePrince 6 years ago
parent
4a0b919bdd d2902404b9
commit
c5b38ec8a8
11 changed files with 49 additions and 14 deletions
Split View Show Diff Stats
  1. 3 0
      index.html
  2. 2 2
      src/ImgConfig/index.js
  3. 3 0
      src/api/index.js
  4. 1 0
      src/axios/index.js
  5. 4 4
      src/components/SuperComponent.vue
  6. 2 2
      src/config/index.js
  7. 5 0
      src/pages/Super.vue
  8. 3 3
      src/pages/super/CheckTeacherPay.vue
  9. 6 1
      src/pages/super/HomeworkRecycle.vue
  10. 1 0
      src/store/getters.js
  11. 19 2
      src/store/modules/user.js

+ 3 - 0
index.html
View File 

@@ -4,8 +4,11 @@
 
 <head>
 
   <meta charset="utf-8">
 
   <title>私塾家作业批改后台</title>
 
+<<<<<<< HEAD
 
+=======
 
   <link rel=icon href=/favicon.ico>
 
   <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico">
 
+>>>>>>> 5309336df77a73102e1ff47b84ac455ae67d8d75
 
   <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" />  -->

+ 2 - 2
src/ImgConfig/index.js
View File 

@@ -7,9 +7,9 @@ if (process.env.NODE_ENV === 'development') {
 
     // IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
 
     IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
 
 
-    // APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html' //测试环境作业批改地址
 
+    APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html' //测试环境作业批改地址
 
     // APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html'; //正式环境作业批改地址地址;
 
-    APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html' //实习环境作业批改地址
 
+    // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html' //实习环境作业批改地址
 
 }
 
 export {
 
     IMG_BASE_URL,

+ 3 - 0
src/api/index.js
View File 

@@ -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')
 
 // 报错详情
 
@@ -79,6 +81,7 @@ export {
 
     GetAllotManagerList,
 
     AllotTeacherToManager,
 
     HomeworkRecoveryList,
 
+	GetRemindCount,
 
     errorWarning,
 
     errorDetail,
 
     logout,

+ 1 - 0
src/axios/index.js
View File 

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

+ 4 - 4
src/components/SuperComponent.vue
View File 

@@ -16,7 +16,7 @@
 
         :class="{superactive:index == checkindex,menu_item:true}"
 
       >{{item.name}}</span>
 
       <div class="box" v-if="index==1||index==3">
 
-            <span class="box-text">{{index==1?2+'项任务':3+'份作业'}}</span>
 
+            <span class="box-text">{{index==1? getRemindCount.auditCount+'项审核':getRemindCount.distributeCount+'份作业'}}</span>
 
       </div>
 
     </el-col>
 
 
@@ -104,6 +104,9 @@ export default {
 
       this.initNav();
 
     }
 
   },
 
+	computed: {
 
+	    ...mapGetters(['name', 'avatar','roles','getRemindCount'])
 
+	  },
 
   methods: {
 
     // 初始化处理
 
     // initNav() {
 
@@ -157,9 +160,6 @@ export default {
 
         });
 
     }
 
   },
 
-  computed: {
 
-    ...mapGetters(["name", "avatar", "roles"])
 
-  },
 
   mounted() {
 
     this.checkindex = sessionStorage.getItem("tabIndex");
 
     // this.initNav();

+ 2 - 2
src/config/index.js
View File 

@@ -2,9 +2,9 @@ let BASE_URL = ''
 
 if (process.env.NODE_ENV === 'development') {
 
     BASE_URL = 'https://xt.sharingschool.com/sz'
 
 } else {
 
-    // BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
 
+    BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
 
     // BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址
 
-    BASE_URL = 'https://sx.sharingschool.com/sz'  //实习环境地址
 
+    // BASE_URL = 'https://sx.sharingschool.com/sz'  //实习环境地址
 
 }
 
 const TIME_OUT = 10000

+ 5 - 0
src/pages/Super.vue
View File 

@@ -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(() => {

+ 3 - 3
src/pages/super/CheckTeacherPay.vue
View File 

@@ -74,7 +74,7 @@
 
             prop="total"
 
             label="总计"
 
             header-align="center"
 
-            width="450"
 
+            width="400"
 
           >
 
           </el-table-column>
 
         </el-table>
 
@@ -85,7 +85,7 @@
 
             @size-change="handleSizeChange"
 
             @current-change="pageChange"
 
             :page-sizes="[10]"
 
-          layout="total, prev, pager, next"
 
+            layout="total,prev, pager, next"
 
             :total= parseInt(getTeacherSalaryList.pages)
 
           ></el-pagination>
 
         </div>
 
@@ -192,7 +192,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
 
             }

+ 6 - 1
src/pages/super/HomeworkRecycle.vue
View File 

@@ -60,13 +60,17 @@
 
           </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]"
 
+<<<<<<< HEAD
 
+            layout="total,prev, pager, next"
 
+=======
 
            layout="total, prev, pager, next"
 
+>>>>>>> 5309336df77a73102e1ff47b84ac455ae67d8d75
 
             :total= parseInt(homeworkRecoveryList.pages)
 
           ></el-pagination>
 
         </div>
 
@@ -428,4 +432,5 @@
 
   .pages{
 
     margin: 15px 0;
 
   }
 
+
 
 </style>

+ 1 - 0
src/store/getters.js
View File 

@@ -32,6 +32,7 @@ const getters = {
 
   pictureIndex :state => state.user.pictureIndex,
 
   InfoTeacherstatues :state => state.user.InfoTeacherstatues,
 
   GetTeacherstatues :state => state.user.GetTeacherstatues,
 
+  getRemindCount:state => state.user.getRemindCount,
 
   ApporingTeacherstatues :state => state.user.ApporingTeacherstatues,
 
   currtHomeworkStatus :state => state.user.currtHomeworkStatus,
 
   FindSubjectCharts :state => state.user.FindSubjectCharts,

+ 19 - 2
src/store/modules/user.js
View File 

@@ -4,7 +4,7 @@ import { GET_UUIONID_TOKEN,GET_TOKEN,GetInfo,InfoWatch,InfoWatchDay,
 
   GetStudentDetail,GetManagerDetail,Downgrade,SuperManagerList,
 
   SuperApplyTeacherList,ApplyOperate,GetTeacherSalaryList,DealCorrectTeacher,
 
   GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList,errorWarning,errorDetail,logout,
 
-  CheckHomeworkStatus,FindSubjectCharts
 
+  CheckHomeworkStatus,FindSubjectCharts,GetRemindCount
 
   } from '@/api'
 
   import { APPOR_BASE_URL } from '@/ImgConfig'
 
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
@@ -40,6 +40,7 @@ const user = {
 
     pictureIndex:0,
 
     InfoTeacherstatues:"",
 
     GetTeacherstatues:"",
 
+		getRemindCount:"",
 
     ApporingTeacherstatues:"",
 
     currtHomeworkStatus:"",
 
     FindSubjectCharts:[],
 
@@ -132,8 +133,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) => {
 
@@ -683,6 +687,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) => {