Merge branch 'online' into 0609temporary

src/App.vue

@@ -63,6 +63,9 @@ body {
 }
 </style>
 <style lang="scss">
+.el-table {
+  width: 99.9% !important;
+}
 .el-tabs__content {
   overflow: auto;
 }

src/store/modules/permission.js

@@ -46,6 +46,7 @@ const mutations = {
     state.permission = permission
   }
 }
+// 路由
 // 递归遍历数组
 function recursionRouter (arr) {
   if (arr.length > 0) {
@@ -90,18 +91,17 @@ function recursionRouter (arr) {
     return newArr
   }
 }
-
+// 权限
 // 递归遍历数组
 let tempArr = []
 function recursionPerission (arr) {
   arr.map(item => {
-    tempArr.push(item.permission)
+    tempArr.push(item.memo)
     if (item.sysMenus && item.sysMenus.length > 0) {
       recursionPerission(item.sysMenus)
     }
   })
 }
-
 const actions = {
   generateRoutes ({ commit }) {
     return new Promise(resolve => {

src/utils/directive.js

@@ -4,42 +4,41 @@ import Vue from 'vue'
 // let permissionArr = store.getters.permission
 
 Vue.directive('permission', {
-    inserted(el, binding) {
-        let value = binding.value
-        let permission = window.localStorage.getItem('permission')
-        permission = permission.split(',')
-        // 如果一个权限判断不了则用两个
-        // 格式： v-permission="{child: 'child', parent: 'parent'}"
-        // 在特殊情况下才会用到两个参数，基本情况只会用到一个标识
-        if(typeof value == 'string') {
-            if(!permission.includes(value)) {
-                // el.style.display = 'none'
-                el.parentNode && el.parentNode.removeChild(el)
-            }
-        } else{
-            if(permission.includes(value.parent) && permission.includes(value.child)) {
-                
-                // el.style.display = 'none'
-            }else{
-                el.parentNode && el.parentNode.removeChild(el)
-            }
-        }
-        
+  inserted (el, binding) {
+    let value = binding.value
+    let permission = window.localStorage.getItem('permission')
+    permission = permission.split(',')
+    // 如果一个权限判断不了则用两个
+    // 格式： v-permission="{child: 'child', parent: 'parent'}"
+    // 在特殊情况下才会用到两个参数，基本情况只会用到一个标识
+    if (typeof value == 'string') {
+      if (!permission.includes(value)) {
+        // el.style.display = 'none'
+        el.parentNode && el.parentNode.removeChild(el)
+      }
+    } else {
+      if (permission.includes(value.parent) && permission.includes(value.child)) {
+        // el.style.display = 'none'
+      } else {
+        el.parentNode && el.parentNode.removeChild(el)
+      }
     }
+
+  }
 })
 
 
-Vue.directive('number',{
-    inserted(el){
-        el.oninput= function(e){
-            let value = '' + e.target.value
-            if (value.indexOf('.') != -1) {
-                let arr = value.split('')
-                arr.splice(arr.length - 1)
-                let str2 = arr.join('')
-                e.target.value = +str2
-                return
-            }
-        }
+Vue.directive('number', {
+  inserted (el) {
+    el.oninput = function (e) {
+      let value = '' + e.target.value
+      if (value.indexOf('.') != -1) {
+        let arr = value.split('')
+        arr.splice(arr.length - 1)
+        let str2 = arr.join('')
+        e.target.value = +str2
+        return
+      }
     }
+  }
 })

src/views/setSilder/addSilder.vue

@@ -33,7 +33,10 @@
                        label="高亮路径">
       </el-table-column>
       <el-table-column prop="permission"
-                       label="权限标识">
+                       label="接口权限">
+      </el-table-column>
+      <el-table-column prop="memo"
+                       label="页面权限">
       </el-table-column>
       <el-table-column prop="hid"
                        width="100px"
@@ -77,11 +80,16 @@
           <el-input v-model.trim="form.path"
                     autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="权限标识"
+        <el-form-item label="接口权限"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.permission"
                     autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item label="页面权限"
+                      :label-width="formLabelWidth">
+          <el-input v-model.trim="form.memo"
+                    autocomplete="off"></el-input>
+        </el-form-item>
         <el-form-item label="高亮路径"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.parentPermission"
@@ -195,7 +203,8 @@ export default {
           hid: row.hid,
           type: Number(row.type),
           parentPermission: row.parentPermission,
-          keepAlive: row.keepAlive
+          keepAlive: row.keepAlive,
+          memo: row.memo
         }
       }
     },
@@ -212,7 +221,8 @@ export default {
           hid: form.hid,
           type: form.type,
           parentPermission: form.parentPermission,
-          keepAlive: form.keepAlive
+          keepAlive: form.keepAlive,
+          memo: rorm.memo
         }).then(res => {
           if (res.code == 200) {
             this.$message.success('添加成功')
@@ -254,7 +264,8 @@ export default {
           hid: res.hid,
           type: res.type,
           keepAlive: res.keepAlive,
-          parentPermission: res.parentPermission
+          parentPermission: res.parentPermission,
+          memo: res.memo
         }
         if (res.sysMenus && res.sysMenus.length > 0) {
           tempList.children = this.setTableData(res.sysMenus)

src/views/teacherManager/teacherDetail/components/teacherNetwork.vue

@@ -3,7 +3,7 @@
   <div class>
     <div class="newBand"
          @click="resetCourses"
-         v-permission="'courseSchedule/practiceGroupTeacherAdjust'">课程移交</div>
+         v-permission="'courseSchedule/batchPracticeGroupTeacherAdjust?t=819'">课程移交</div>
     <div class="m-core">
       <div class="tableWrap">
         <el-table style="width: 100%"
@@ -60,7 +60,7 @@
           <el-table-column label="是否可调整"
                            align="center">
             <template slot-scope="scope">
-              {{ scope.row.hasRestClass>0?'是':'否' }}
+              {{ scope.row.totalClassTimes-scope.row.currentClassTimes>0?'是':'否' }}
             </template>
           </el-table-column>
           <el-table-column label="操作"
@@ -68,8 +68,8 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text"
-                           v-if="scope.row.hasRestClass>0"
-                           v-permission="'courseSchedule/practiceGroupTeacherAdjust'"
+                           v-if="(scope.row.totalClassTimes-scope.row.currentClassTimes)>0"
+                           v-permission="'courseSchedule/batchPracticeGroupTeacherAdjust?t=819'"
                            @click="resetCourse(scope.row)">操作</el-button>
               </div>
             </template>
@@ -164,7 +164,7 @@ export default {
   },
   methods: {
     selectable (row, index) {
-      return row.hasRestClass > 0
+      return row.totalClassTimes - row.currentClassTimes > 0
     },
     init () {
       this.teacherId = this.$route.query.teacherId