Merge branch 'TPE/develop' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into TPE/develop

TEAMModelOS/ClientApp/src/store/module/spaceAuth.js

@@ -2,7 +2,7 @@ import apiTools from '@/api'
 export default {
   namespaced: true,
   state: {
-    showMessageNum: 0, //1.回收成功, 2.更新成功
+    showMessageNum: 0, //1.回收成功, 2.更新成功, 3.要設定的空間>目前學校有的 4.有不存在老師的ID
     isLoading: false,
     originalSpace: 0,
     schoolUsedSpace: 0, //學校其他已經使用的空間
@@ -10,8 +10,6 @@ export default {
     maxFixedAssignedValue: 0, //資料進來，可分的最大值
 
     teacherSpaceData: [], //存放目前所有老師的資料狀態，讓前臺能及時給予更新回饋
-
-    currentPeopleNum: 0, //目前套用分配的人數
     currentSelectedTeacherId: [], //目前所選存放的老師的id，勾選給空間用
 
     pieNumData: [
@@ -22,7 +20,7 @@ export default {
     isKeyInSpace: false //存放是否有進行手動輸入
   },
   getters: {
-    getIsKeyInSpace(state){
+    getIsKeyInSpace(state) {
       return state.isKeyInSpace
     },
     getMsgNum(state) {
@@ -48,10 +46,10 @@ export default {
     }
   },
   mutations: {
-    setIsKeyInSpace(state,status){
-      if(status==true)console.log('有進行手動輸入')
-      else console.log('沒有進行手動輸入')
-     state.isKeyInSpace=status
+    setIsKeyInSpace(state, status) {
+      /*if(status==true)console.log('有進行手動輸入')
+      else console.log('沒有進行手動輸入')*/
+      state.isKeyInSpace = status
     },
     setCurrentSelectedTeacherId(state, data) {
       state.currentSelectedTeacherId = data
@@ -72,12 +70,10 @@ export default {
     setTeacherUsedSpaceNum(state, data) {
       let teacherUsedSpaceNum = 0
       data.forEach(element => {
-        if(element.size!='-')
-        teacherUsedSpaceNum += parseInt(element.size)
-        else{
-          teacherUsedSpaceNum +=0
+        if (element.size != '-') teacherUsedSpaceNum += parseInt(element.size)
+        else {
+          teacherUsedSpaceNum += 0
         }
-       
       })
       state.teacherUsedSpaceNum = teacherUsedSpaceNum
     },
@@ -131,10 +127,10 @@ export default {
     //初始化空間
     getInitialSpace(context, params) {
       let schoolCode = params.schoolCode
-      console.log(params)
+      //console.log(params)
       apiTools.spaceAuth.teacherSpace(schoolCode, 'baseSpace').then(
         res => {
-          console.log(res)
+          //console.log(res)
           context.commit('setTeacherUsedSpaceNum', params.originalTeachers)
           context.commit('setPieNumData', res)
           context.commit('setIsLoading', false)
@@ -148,7 +144,7 @@ export default {
     resetAllSpace(context, schoolCode) {
       apiTools.spaceAuth.teacherSpace(schoolCode, 'retract').then(
         res => {
-          console.log(res)
+          //console.log(res)
           context.commit('setTeacherUsedSpaceZero')
           context.commit('setTeacherSpaceUIDataZero')
           context.commit('updatePieNumData')
@@ -166,12 +162,18 @@ export default {
       let teachers = params.teachers
       apiTools.spaceAuth.teacherSpace(schoolCode, 'upd', teachers).then(
         res => {
-          console.log(res)
+          //console.log(res)
           context.commit('updateTeacherSpaceUIData', teachers)
           context.commit('setTeacherUsedSpaceNum', context.state.teacherSpaceData)
           context.commit('updatePieNumData')
           context.commit('setIsLoading', false)
           context.commit('setMsgNum', 2)
+          if(res.status=='1'){
+            context.commit('setMsgNum', 3)
+          }
+          if(res.status=='2'){
+            context.commit('setMsgNum', 4)
+          }
         },
         err => {
           console.log(err)

TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/Index.vue

@@ -1138,7 +1138,7 @@ export default {
     setSingleMockTeacherSpace(id) {
       this.setIsKeyInSpace(true)
       let targetSpace = this.teacherSpaceData[this.findIndex(id)].size
-      console.log('調整ID空間為' + id + ':' + targetSpace + 'G')
+      //console.log('調整ID空間為' + id + ':' + targetSpace + 'G')
 
       //input初步過濾負數與英文
       if (targetSpace == '') {

TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/SubComponent/SpaceAuth.vue

@@ -188,7 +188,7 @@ export default {
         }
       })
       temp.push('教師')
-      console.log(temp)
+      //console.log(temp)
       return temp
     }
   },
@@ -217,6 +217,16 @@ export default {
 
         this.setIsKeyInSpace(false)
       }
+       if (val == 3) {
+        this.$Message.warning('超出該校使用空間')
+
+        this.setIsKeyInSpace(false)
+      }
+      if (val == 4) {
+        this.$Message.warning('有不存在老師的ID')
+
+        this.setIsKeyInSpace(false)
+      }
       this.setMsgNum(0)
       this.tempTeacherAssignedData = []
     }
@@ -234,12 +244,11 @@ export default {
     }),
     confirmSave() {
       this.setCurrentSentData(this.teacherSpaceData)
-      console.log(this.tempTeacherAssignedData)
+      //console.log(this.tempTeacherAssignedData)
       if (this.tempTeacherAssignedData.length != 0) {
         let sentParams = {
           schoolCode: this.schoolCode,
-          teachers: this.tempTeacherAssignedData
-        }
+          teachers: this.teacherSpaceData}
 
         this.$store.dispatch('spaceAuth/setTeacherSpace', sentParams).then(
           res => {
@@ -454,8 +463,11 @@ export default {
       this.$emit('closeSpaceAuth')
       this.$emit('reload') //重新整理
       this.multiAssignValue = '-'
-      this.resetTeacherSpaceUIData()
-      this.updatePieNumData()
+      //如果沒有存檔則重置
+      if (this.isKeyInSpace == true) {
+        this.resetTeacherSpaceUIData()
+        this.updatePieNumData()
+      }
       this.isOpenComfirmClose = false
       this.setIsKeyInSpace(false)
     },