Browse Source

提交一下

1
mo 3 năm trước cách đây
mục cha
commit
470cd8906e

+ 1 - 1
package.json

@@ -5,7 +5,7 @@
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve --hot --inline",
+    "dev": "vue-cli-service serve --hot",
     "build": "vue-cli-service build",
     "preview": "npx http-server ./dist -P http://dev.dayaedu.com",
     "lint": "eslint --ext .js,.vue src",

+ 2 - 0
src/router/index.js

@@ -465,6 +465,8 @@ export const asyncRoutes = {
   baseRulersManager:()=>import('@/views/baseRulersManager'),
   // 监控规则设置
   monitorManager:()=>import('@/views/monitorManager'),
+  // 课程参数设置
+  baseRulesClassSetting:()=>import('@/views/baseRulesClassSetting')
 }
 
 export default router

+ 12 - 8
src/views/baseRulesClassSetting/index.vue

@@ -11,7 +11,7 @@
           label="乐团课程设置"
           lazy
           name="1"
-          v-if="permissionList.typesManager"
+          v-if="permissionList.courseTimerSetting"
         >
           <courseTimerSetting v-if="activeIndex == 1" />
         </el-tab-pane>
@@ -19,7 +19,7 @@
           label="乐团课程价格设置"
           lazy
           name="2"
-          v-if="permissionList.typesManager"
+          v-if="permissionList.musicCourseFee"
         >
           <musicCourseFee v-if="activeIndex == 2" />
         </el-tab-pane>
@@ -27,7 +27,7 @@
           label="乐团收费标准"
           lazy
           name="3"
-          v-if="permissionList.typesManager"
+          v-if="permissionList.chargesList"
         >
           <chargesList v-if="activeIndex == 3" />
         </el-tab-pane>
@@ -35,7 +35,7 @@
           label="VIP课设置"
           lazy
           name="4"
-          v-if="permissionList.typesManager"
+          v-if="permissionList.vipCourseType"
         >
           <vipCourseType v-if="activeIndex == '4'" />
         </el-tab-pane>
@@ -43,7 +43,7 @@
           label="网管课设置"
           lazy
           name="5"
-          v-if="permissionList.typesManager"
+          v-if="permissionList.vipCourseType"
         >
           <audition-setting v-if="activeIndex == '5'" />
         </el-tab-pane>
@@ -56,21 +56,25 @@ import courseTimerSetting from "@/views/categroyManager/specialSetup/courseTimer
 import musicCourseFee from "@/views/categroyManager/specialSetup/musicCourseFee";
 import chargesList from "@/views/categroyManager/specialSetup/chargesList";
 import vipCourseType from "@/views/categroyManager/generalSettings/vipCourseType";
-import auditionSetting from './audition';
+import auditionSetting from "./audition";
+import { permission } from '@/utils/directivePage'
 export default {
   components: {
     courseTimerSetting,
     musicCourseFee,
     chargesList,
     vipCourseType,
-    auditionSetting
+    auditionSetting,
   },
   name: "baseRulersManager",
   data() {
     return {
       activeIndex: "1",
       permissionList: {
-        typesManager: ("/globalConfig/typesManager"),
+        courseTimerSetting: permission("/globalConfig/courseTimerSetting"),
+        musicCourseFee: permission("/globalConfig/musicCourseFee"),
+        chargesList: permission("/globalConfig/chargesList"),
+        vipCourseType: permission("/vipCourseType"),
       },
     };
   },

+ 6 - 5
src/views/categroyManager/generalSettings/earlyWarning.vue

@@ -2,10 +2,6 @@
   <div class=''>
     <!-- <h2>错误类型管理</h2> -->
     <div class="m-core">
-      <auth auths="sysConfig/update/insert" style="margin-bottom: 20px">
-        <el-button type="primary" @click="openTypes('create')">添加</el-button>
-      </auth>
-
       <!-- 搜索标题 -->
       <save-form
         :inline="true"
@@ -19,6 +15,7 @@
             placeholder="请选择分部"
             clearable
             filterable
+            size="mini"
           >
             <el-option
               v-for="item in selects.branchs"
@@ -30,12 +27,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
+          <el-button @click="search" type="danger" size="mini">搜索</el-button>
         </el-form-item>
       </save-form>
+        <auth auths="sysConfig/update/insert" style="margin-bottom: 20px">
+        <el-button size="mini"  icon="el-icon-plus" type="primary"  @click="openTypes('create')">添加</el-button>
+      </auth>
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data='tableList'
+        size="mini"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
                            prop="branchName"

+ 1 - 1
src/views/categroyManager/generalSettings/overallManager.vue

@@ -109,4 +109,4 @@ export default {
   width: 200px;
   margin: 0 20px;
 }
-</style>
+</style>

+ 11 - 16
src/views/monitorManager/index.vue

@@ -11,16 +11,15 @@
           label="课酬预警设置"
           lazy
           name="1"
-          v-if="permissionList.typesManager"
+          v-if="permissionList.earlyWarning"
         >
             <earlyWarning v-if="activeIndex == 1" />
         </el-tab-pane>
-
         <el-tab-pane
           label="乐团异常提醒"
           lazy
           name="2"
-          v-if="permissionList.courseTimerSetting"
+          v-if="permissionList.earlyWarning"
         >
         <teamMinitor />
         </el-tab-pane>
@@ -28,7 +27,7 @@
           label="学员异常提醒"
           lazy
           name="3"
-          v-if="permissionList.discountManage"
+          v-if="permissionList.earlyWarning"
         >
         <studuntMinitor />
         </el-tab-pane>
@@ -36,7 +35,7 @@
           label="服务异常提醒"
           lazy
           name="4"
-          v-if="permissionList.chargesList"
+          v-if="permissionList.earlyWarning"
         >
           <serverMinitor />
         </el-tab-pane>
@@ -44,7 +43,7 @@
           label="日程安排设置"
           lazy
           name="5"
-          v-if="permissionList.chargesList"
+          v-if="permissionList.earlyWarning"
         >
           <schedule />
         </el-tab-pane>
@@ -71,16 +70,12 @@ export default {
   data() {
     return {
       activeIndex: "1",
-      permissionList: {
-        typesManager: 1,
-        cloudTeacherFee: 1,
-        chargesList: 1,
-        jobTemplateSetting: 1,
-        errorManager: 1,
-        musicCourseFee: 1,
-        discountManage: 1,
-        courseTimerSetting: 1,
-      },
+       permissionList: {
+        overallManager: permission("/globalConfig/overallManager"),
+        overallManagerTwo: permission("/globalConfig/overallManagerTwo"),
+        holidaySetting: permission("/globalConfig/holidaySetting"),
+        earlyWarning: permission("/globalConfig/earlyWarning"),
+      }
     };
   },
   methods: {