diff --git a/src/api/system/post.js b/src/api/system/post.js
deleted file mode 100644
index 1a8e9ca..0000000
--- a/src/api/system/post.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询岗位列表
-export function listPost(query) {
-  return request({
-    url: '/system/post/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询岗位详细
-export function getPost(postId) {
-  return request({
-    url: '/system/post/' + postId,
-    method: 'get'
-  })
-}
-
-// 新增岗位
-export function addPost(data) {
-  return request({
-    url: '/system/post',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改岗位
-export function updatePost(data) {
-  return request({
-    url: '/system/post',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除岗位
-export function delPost(postId) {
-  return request({
-    url: '/system/post/' + postId,
-    method: 'delete'
-  })
-}
diff --git a/src/components/sc/claTime/addClaTimeAttend.vue b/src/components/sc/claTime/addClaTimeAttend.vue
index da9f2bc..e652764 100644
--- a/src/components/sc/claTime/addClaTimeAttend.vue
+++ b/src/components/sc/claTime/addClaTimeAttend.vue
@@ -247,6 +247,7 @@ export default {
         }
       },
       dataList: [],
+      claStudentList: [],
       chargeTypeOptions: [],
       sexOptions: [],
       // 选择上课的学员
diff --git a/src/components/sc/claTime/claTimeCalendar.vue b/src/components/sc/claTime/claTimeCalendar.vue
index ad371b2..d338860 100644
--- a/src/components/sc/claTime/claTimeCalendar.vue
+++ b/src/components/sc/claTime/claTimeCalendar.vue
@@ -116,14 +116,14 @@
                   </div>
                   <div class="tooltip">
                     <div class="content">
-                      <div class="title">班级{{ claTime.claName }}</div>
-                      <div class="item"><i class="el-icon-collection" /> {{ claTime.courseName }}</div>
-                      <div class="item"><i class="el-icon-notebook-1" /> {{ claTime.claDate }}</div>
-                      <div class="item"><i class="el-icon-mouse" /> {{ claTime.weekDay }}</div>
-                      <div class="item"><i class="el-icon-paperclip" /> {{ claTime.startTime }} ~ {{ claTime.endTime }}</div>
-                      <div class="item"><i class="el-icon-data-analysis" /> {{ claTime.staffName }}</div>
-                      <div class="item"><i class="el-icon-place" /> {{ claTime.studentCount }}人</div>
-                      <div class="item"><i class="el-icon-guide" /> {{ claTime.roomName }}</div>
+                      <div class="title">班级：{{ claTime.claName }}</div>
+                      <div class="item"><i class="el-icon-collection" />课程： {{ claTime.courseName }}</div>
+                      <div class="item"><i class="el-icon-notebook-1" />日期： {{ claTime.claDate }}</div>
+                      <div class="item"><i class="el-icon-mouse" />星期：{{ claTime.weekDay }}</div>
+                      <div class="item"><i class="el-icon-paperclip" />时间： {{ claTime.startTime }} ~ {{ claTime.endTime }}</div>
+                      <div class="item"><i class="el-icon-data-analysis" />教师： {{ claTime.staffName }}</div>
+                      <div class="item"><i class="el-icon-place" />学员： {{ claTime.studentCount }}人</div>
+                      <div class="item"><i class="el-icon-guide" />教室： {{ claTime.roomName }}</div>
                     </div>
                   </div>
                   <div class="mask">
@@ -156,13 +156,13 @@
             <div class="tooltip">
               <div class="content">
                 <div class="title">{{ claTime.claName }}</div>
-                <div class="item"><i class="el-icon-collection" /> {{ claTime.courseName }}</div>
-                <div class="item"><i class="el-icon-notebook-1" /> {{ claTime.claDate }}</div>
-                <div class="item"><i class="el-icon-mouse" /> {{ claTime.weekDay }}</div>
-                <div class="item"><i class="el-icon-paperclip" /> {{ claTime.startTime }} ~ {{ claTime.endTime }}</div>
-                <div class="item"><i class="el-icon-data-analysis" /> {{ claTime.staffName }}</div>
-                <div class="item"><i class="el-icon-place" /> {{ claTime.studentCount }}人</div>
-                <div class="item"><i class="el-icon-guide" /> {{ claTime.roomName }}</div>
+                <div class="item"><i class="el-icon-collection" />课程： {{ claTime.courseName }}</div>
+                <div class="item"><i class="el-icon-notebook-1" />日期： {{ claTime.claDate }}</div>
+                <div class="item"><i class="el-icon-mouse" />星期：{{ claTime.weekDay }}</div>
+                <div class="item"><i class="el-icon-paperclip" />时间： {{ claTime.startTime }} ~ {{ claTime.endTime }}</div>
+                <div class="item"><i class="el-icon-data-analysis" />教师： {{ claTime.staffName }}</div>
+                <div class="item"><i class="el-icon-place" />学员： {{ claTime.studentCount }}人</div>
+                <div class="item"><i class="el-icon-guide" />教室： {{ claTime.roomName }}</div>
               </div>
             </div>
             <div class="mask">
@@ -181,7 +181,7 @@
     <add-cla-time-attend
       ref="addClaTimeAttend"
       :appoint-course-time-id="chooseCourseTimeId"
-      appoint-cla-time
+      :cla-id="chooseClaId"
       @success="handleClaTimeAttendSuccess"
     />
   </div>
@@ -261,7 +261,8 @@ export default {
       calendarEndDate: '',
 
       // 已选择排课
-      chooseCourseTimeId: undefined
+      chooseCourseTimeId: undefined,
+      chooseClaId:undefined
     }
   },
   watch: {
@@ -428,6 +429,7 @@ export default {
     // 记上课
     handleClaTimeAttend(claTime) {
       this.chooseCourseTimeId = claTime.courseTimeId
+      this.chooseClaId = claTime.claId
       this.$refs.addClaTimeAttend.open = true
     },
     // 记上课成功
@@ -565,7 +567,7 @@ export default {
             .title {
               font-size: 14px;
               font-weight: bolder;
-              padding: 8px 0;
+              color:white;
             }
             .item {
               margin-top: 5px;
diff --git a/src/components/sc/claTime/claTimeTable.vue b/src/components/sc/claTime/claTimeTable.vue
index 14a9bda..9969c95 100644
--- a/src/components/sc/claTime/claTimeTable.vue
+++ b/src/components/sc/claTime/claTimeTable.vue
@@ -25,7 +25,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" border :header-cell-style="{'text-align': 'center'}">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column align="center" width="180" prop="realClaDate" label="上课时间" fixed="left">
         <template slot-scope="scope">
@@ -33,9 +33,14 @@
           <span v-else-if="scope.row.status === '1'">{{ scope.row.claDate }} {{ scope.row.startTime.substr(0,5) }}~{{ scope.row.endTime.substr(0,5) }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" width="180" prop="claName" label="上课班级" show-overflow-tooltip />
-      <el-table-column align="center" width="180" prop="courseName" label="所属课程" show-overflow-tooltip />
+      <el-table-column align="center" width="180" prop="courseName" label="课程"  />
+      <el-table-column align="center" width="180" prop="claName" label="上课班级"  />
       <el-table-column align="center" width="180" prop="staffName" label="上课教师" />
+      <el-table-column align="center" width="100" prop="bookAttendCnt" label="预约人数"  />
+      <el-table-column align="center" width="100" prop="realAttendCnt" label="签到人数"  />
+      <el-table-column align="center" width="70" prop="lessCnt" label="最少开课人数"  />
+      <el-table-column align="center" width="70" prop="atClassCnt" label="最多预约人数"  />
+
       <el-table-column align="center"  prop="status" label="状态">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status === '1'" type="danger">待上课</el-tag>
@@ -64,7 +69,7 @@
             type="text"
             icon="el-icon-edit-outline"
             @click="handleUpdateWaitAttend(scope.row)"
-          >详情</el-button>
+          >详情/调课</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/components/sc/claTime/hadClaTimeTable.vue b/src/components/sc/claTime/hadClaTimeTable.vue
index 5015309..553aa09 100644
--- a/src/components/sc/claTime/hadClaTimeTable.vue
+++ b/src/components/sc/claTime/hadClaTimeTable.vue
@@ -25,7 +25,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" border :header-cell-style="{'text-align': 'center'}">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column align="center" width="180" prop="realClaDate" label="上课时间" fixed="left">
         <template slot-scope="scope">
diff --git a/src/components/sc/course/cla/changeCla.vue b/src/components/sc/course/cla/changeCla.vue
index 94a6b4f..74c52fe 100644
--- a/src/components/sc/course/cla/changeCla.vue
+++ b/src/components/sc/course/cla/changeCla.vue
@@ -15,9 +15,9 @@
             <el-form-item label="班级名称:" prop="claName">
               <div class="input-with-color-picker-container">
                 <el-input v-model="form.claName" placeholder="请输入班级名称" />
-                <el-tooltip class="item" effect="dark" content="选择班级颜色,便于课表中区分各班级" placement="right">
-                  <el-color-picker v-model="form.claColor" :predefine="colorArray" />
-                </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="选择班级颜色,便于课表中区分各班级" placement="right">
+                    <el-color-picker v-model="form.claColor" :predefine="colorArray" />
+                  </el-tooltip>
               </div>
             </el-form-item>
           </el-col>
diff --git a/src/components/sc/memberCardTypes/memberCardTypeTable.vue b/src/components/sc/memberCardTypes/memberCardTypeTable.vue
index bddd6ed..99b797b 100644
--- a/src/components/sc/memberCardTypes/memberCardTypeTable.vue
+++ b/src/components/sc/memberCardTypes/memberCardTypeTable.vue
@@ -53,7 +53,10 @@
                 :data="dataList"
                 height="320"
                 @select="handleSelect"
-                @row-click="handleRowClick">
+                @row-click="handleRowClick"
+                border
+                :header-cell-style="{'text-align': 'center'}"
+      >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column prop="courseName" width="300" align="center" label="卡项名称">
           <template slot-scope="scope">
diff --git a/src/styles/dashboard/index.scss b/src/styles/dashboard/index.scss
index e297a39..f6e1dcc 100644
--- a/src/styles/dashboard/index.scss
+++ b/src/styles/dashboard/index.scss
@@ -25,7 +25,7 @@
       flex-wrap: wrap;
 
       .content-item{
-        padding: 8px 40px 8px 16px;
+        padding: 8px 100px 8px 16px;
         display: flex;
         justify-content: center;
         align-content: center;
diff --git a/src/views/courseOrder/index.vue b/src/views/courseOrder/index.vue
index 8403e14..368d026 100644
--- a/src/views/courseOrder/index.vue
+++ b/src/views/courseOrder/index.vue
@@ -67,7 +67,7 @@
         </el-button>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" border :header-cell-style="{'text-align': 'center'}">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="orderId" width="170" align="center" label="订单编号" fixed="left">
         <template slot-scope="scope">
diff --git a/src/views/index.vue b/src/views/index.vue
index 56740dd..9103b36 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -32,19 +32,23 @@
             <div class="icon">
               <svg-icon icon-class="dashboard-student" style="height: 48px;width: 36px;" />
             </div>
+            <el-tooltip  effect="dark" content="实到：签到人数，应到：预约人数" placement="right">
             <div class="txt" style="padding-left: 8px;">
               <div class="value">{{ dashboardData.todayRealAttendCnt }}/{{ dashboardData.todayNeedAttendCnt }}人</div>
               <div class="name">实到/今日应到人次</div>
             </div>
+            </el-tooltip>
           </div>
           <div class="content-item">
             <div class="icon">
               <svg-icon icon-class="dashboard-cla-time" style="height: 48px;width: 32px;" />
             </div>
+            <el-tooltip  effect="dark" content="计算方式：费用=储值会员扣费金额 + 次卡会员单次课价值（缴费金额➗️次数）+ 周期卡会员单天价值（缴费金额➗️天数）" placement="right">
             <div class="txt" style="padding-left: 12px;">
-              <div class="value">{{ dashboardData.todayRealCostHour }}/{{ dashboardData.todayNeedCostHour }}课时</div>
-              <div class="name">实消/今日应消课时</div>
+              <div class="value">{{ dashboardData.todayRealCostHour }}元</div>
+              <div class="name">今日实收费用</div>
             </div>
+            </el-tooltip>
           </div>
           <router-link to="/stu/student">
             <div class="content-item">
@@ -120,7 +124,8 @@
                     <svg-icon icon-class="dashboard-sign-up" style="height: 33px;width: 28px;" />
                   </div>
                   <div class="txt">
-                    <div class="value single">报名</div>
+                    <div class="value">报名</div>
+                    <div class="name">订单数 <span class="cnt">{{ dashboardData.todayOrderCnt }}</span></div>
                   </div>
                 </div>
               </router-link>
diff --git a/src/views/school/course/cla/index.vue b/src/views/school/course/cla/index.vue
index c8c65f0..dd75b01 100644
--- a/src/views/school/course/cla/index.vue
+++ b/src/views/school/course/cla/index.vue
@@ -86,9 +86,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column align="center" width="120" prop="claName" label="班级" fixed="left" show-overflow-tooltip>
         <template slot-scope="scope">
-          <router-link :to="'/edu/cla/detail/' + scope.row.claId" class="link-type">
-            <span>{{ scope.row.claName }}</span>
-          </router-link>
+          <span>{{ scope.row.claName }}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="courseName" label="课程" show-overflow-tooltip />
diff --git a/src/views/school/student/components/studentMemberCard.vue b/src/views/school/student/components/studentMemberCard.vue
index 6ac3bf9..ceef125 100644
--- a/src/views/school/student/components/studentMemberCard.vue
+++ b/src/views/school/student/components/studentMemberCard.vue
@@ -1,11 +1,15 @@
 <template>
   <div >
-    <el-table :data="tableData" v-loading="loading" >
+    <el-table :data="tableData"
+              :height="650"
+              :header-cell-style="{'text-align': 'center'}"
+              border
+              v-loading="loading" >
       <el-table-column type="selection" width="65" align="center" />
-      <el-table-column prop="cardNo" label="卡号" width="180" fixed>
-      </el-table-column>
 
-      <el-table-column prop="memberName" label="会员" width="180">
+      <el-table-column prop="cardNo" label="卡号" align="center" width="160" fixed />
+
+      <el-table-column prop="memberName" label="会员" align="center" width="120" fixed>
         <template slot-scope="scope">
           <div class="member-cell">
             <div class="member-name">{{ scope.row.memberName }}</div>
@@ -13,18 +17,20 @@
           </div>
         </template>
       </el-table-column>
-
-      <el-table-column prop="cardTypeName" label="卡类型" width="160" />
-
-      <el-table-column prop="statusDesc" label="状态" width="160">
+      <el-table-column prop="statusDesc" label="状态" align="center" width="80">
         <template slot-scope="scope">
           <el-tag :type="getStatusTagType(scope.row.status)" size="small">
             {{ scope.row.statusDesc }}
           </el-tag>
         </template>
       </el-table-column>
-
-      <el-table-column prop="chargeType" label="扣费方式" width="250">
+      <el-table-column prop="cardTypeName" label="卡类名称" align="center" width="160" />
+      <el-table-column prop="price" label="实付价格" align="center" width="100">
+        <template slot-scope="scope">
+          ¥{{ scope.row.price }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="chargeType" label="扣费卡类" width="150">
         <template slot-scope="scope">
           <div v-if="scope.row.chargeType=='count'" class="item">
             <div class="item-name">次数卡</div>
@@ -46,30 +52,98 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column prop="chargeType" label="剩余价值" align="center" width="100">
 
-      <el-table-column prop="activationDate" label="激活日期" width="160">
         <template slot-scope="scope">
-            <span >
-              {{ scope.row.activationDate || '-' }}
-            </span>
+          <el-tooltip  effect="dark" content="计算方式：1.次卡会员（缴费金额➗️总次数✖️剩余次数）2. 周期卡会员（缴费金额➗️总天数✖️剩余天数）" placement="right">
+          <div v-if="scope.row.chargeType=='count'" class="item">
+            <div class="item-name">{{ scope.row.price==0?0:scope.row.price/scope.row.totalCount*scope.row.remainingCount  }} 元 </div>
+          </div>
+          <div v-if="scope.row.chargeType=='days'" class="item">
+            <div class="item-name">{{ scope.row.price==0?0:scope.row.price/scope.row.totalDays*scope.row.remainingDays }} 元</div>
+          </div>
+          <div v-if="scope.row.chargeType=='total_fee'" class="item">
+            <div class="item-name">{{ scope.row.remainingTotalFee }} 元</div>
+          </div>
+          </el-tooltip>
+        </template>
+
+      </el-table-column>
+      <el-table-column prop="cardTypes" width="130" label="每节课扣次或费用">
+        <template slot-scope="scope" >
+          <div v-if="scope.row.chargeType=='days'">
+            周期计费
+          </div>
+          <div v-else>
+            <div v-if="scope.row.cardTypes.chargeType=='default'">
+              默认<br>
+              <spa v-if="scope.row.chargeType=='count'">扣{{scope.row.cardTypes.defaultNum}}次 </spa>
+              <spa v-if="scope.row.chargeType=='total_fee'">扣{{scope.row.cardTypes.defaultFee}}元 </spa>
+            </div>
+            <div v-if="scope.row.cardTypes.chargeType=='customize'">
+              <div>
+                <ul>
+                  <li v-for="item in scope.row.cardTypes.feeModeHourList" :key="item.courseTypeId">
+                    {{ item.courseType }} -
+                    <spa v-if="scope.row.chargeType=='count'">扣{{item.cnt}}次 </spa>
+                    <spa v-if="scope.row.chargeType=='total_fee'">扣{{item.totalFee}}元 </spa>
+                  </li>
+                </ul>
+              </div>
+
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="cardTypes" width="180" label="限制课程">
+        <template slot-scope="scope" >
+          <div v-if="scope.row.cardTypes.restrictedCourses=='1'">
+            全部允许<br>
+          </div>
+          <div v-if="scope.row.cardTypes.restrictedCourses=='2'">
+            <div>
+              <ul>
+                <li v-for="item in scope.row.cardTypes.courses" :key="item.id">
+                  {{ item.courseType }} - {{item.courseNames}}
+                </li>
+              </ul>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="cardTypes" width="100" label="限制教练" >
+        <template slot-scope="scope" >
+          {{scope.row.cardTypes.restrictedTeacher=='1'?'全部允许':scope.row.cardTypes.teachersName}}
+        </template>
+      </el-table-column>
+      <el-table-column prop="cardTypes" align="center" width="120" label="预约次数限制" >
+        <template slot-scope="scope" >
+          {{ scope.row.cardTypes.restrictedNum=='1'?'不限预约次数':'限制预约次数'}}<br>
+          <div v-if="scope.row.cardTypes.restrictedNum=='2'">
+            {{scope.row.cardTypes.bookTime}}内只能预约{{scope.row.cardTypes.bookNum}}次
+          </div>
         </template>
       </el-table-column>
 
-      <el-table-column prop="expiryDate" label="到期时间" width="160">
+      <el-table-column prop="activationDate" label="激活日期" width="100">
         <template slot-scope="scope">
-            <span :class="{'expiring': isExpiring(scope.row.expiryDate)}">
-              {{ scope.row.expiryDate || '-' }}
+            <span >
+              {{ scope.row.activationDate || '' }}
             </span>
         </template>
       </el-table-column>
 
-      <el-table-column prop="price" label="实付价格" width="160">
+      <el-table-column prop="expiryDate" label="到期时间" width="100">
         <template slot-scope="scope">
-          ¥{{ scope.row.price }}
+            <span :class="{'expiring': isExpiring(scope.row.expiryDate)}">
+              {{ scope.row.expiryDate || '' }}
+            </span>
         </template>
       </el-table-column>
 
-      <el-table-column prop="purchaseDate" label="办理时间" width="180">
+
+
+      <el-table-column prop="purchaseDate" label="办理时间" width="100">
         <template slot-scope="scope">
           {{ formatDateTime(scope.row.purchaseDate) }}
         </template>
diff --git a/src/views/school/student/studentInfo.vue b/src/views/school/student/studentInfo.vue
index 91106ae..c246dd1 100644
--- a/src/views/school/student/studentInfo.vue
+++ b/src/views/school/student/studentInfo.vue
@@ -7,11 +7,12 @@
           <label class="el-form-item__label" style="width: 80px;">选择学员:</label>
           <student-select @change="handleStudentChange" />
         </div>
-        <div v-if="studentId !== undefined">
-          <span>{{ studentInfo.studentName }}</span>
-        </div>
       </div>
       <div class="cla-base-info">
+        <div class="item">
+          <div class="item-name">姓名:</div>
+          <div class="item-value">{{ studentInfo.studentName }}</div>
+        </div>
         <div class="item">
           <div class="item-name">年龄:</div>
           <div class="item-value">{{ studentInfo.age }}</div>
@@ -25,9 +26,7 @@
         <div class="item">
           <div class="item-name">联系电话:</div>
           <div class="item-value">
-            <el-tooltip effect="dark" :content="contactInfo" placement="top">
-              <span>{{ studentInfo.phone }}</span>
-            </el-tooltip>
+            <span>{{ studentInfo.phone }}</span>
           </div>
         </div>
         <div class="item">
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
deleted file mode 100644
index 28cdae9..0000000
--- a/src/views/system/post/index.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="岗位编码" prop="postCode">
-        <el-input
-          v-model="queryParams.postCode"
-          placeholder="请输入岗位编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="岗位名称" prop="postName">
-        <el-input
-          v-model="queryParams.postName"
-          placeholder="请输入岗位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:post:add']"
-        >新增</el-button>
-      </el-col>
-<!--     -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位编号" align="center" prop="postId" />
-      <el-table-column label="岗位编码" align="center" prop="postCode" />
-      <el-table-column label="岗位名称" align="center" prop="postName" />
-      <el-table-column label="岗位排序" align="center" prop="postSort" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="岗位名称" prop="postName">
-          <el-input v-model="form.postName" placeholder="请输入岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位编码" prop="postCode">
-          <el-input v-model="form.postCode" placeholder="请输入编码名称" />
-        </el-form-item>
-        <el-form-item label="岗位顺序" prop="postSort">
-          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="岗位状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listPost, getPost, delPost, addPost, updatePost } from "@/api/system/post";
-
-export default {
-  name: "Post",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 岗位表格数据
-      postList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        postCode: undefined,
-        postName: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        postName: [
-          { required: true, message: "岗位名称不能为空", trigger: "blur" }
-        ],
-        postCode: [
-          { required: true, message: "岗位编码不能为空", trigger: "blur" }
-        ],
-        postSort: [
-          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询岗位列表 */
-    getList() {
-      this.loading = true;
-      listPost(this.queryParams).then(response => {
-        this.postList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        postId: undefined,
-        postCode: undefined,
-        postName: undefined,
-        postSort: 0,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.postId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加岗位";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const postId = row.postId || this.ids
-      getPost(postId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改岗位";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.postId != undefined) {
-            updatePost(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPost(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const postIds = row.postId || this.ids;
-      this.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function() {
-        return delPost(postIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/post/export', {
-        ...this.queryParams
-      }, `post_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b3c3b4d..23c03b6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -111,16 +111,22 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
-         <template v-if="scope.row.roleId !== 1">
-           <el-button v-if="!(scope.row.roleId == 100 && userId !==1) "
+         <template v-if="scope.row.roleId !== '1'">
+           <el-button v-if="userId ==1 "
              size="mini"
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"
            >修改</el-button>
+           <el-button v-if="userId !=1 "
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit"
+                      @click="handleUpdate(scope.row)"
+           >详情</el-button>
 
-           <el-button v-if="userId==1 ||(userId!==1 && scope.row.roleId>108)"
+           <el-button v-if="userId==1 "
              size="mini"
              type="text"
              icon="el-icon-delete"
@@ -200,7 +206,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button v-if="userId==1"  type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -242,7 +248,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">确 定</el-button>
+        <el-button v-if="userId==1" type="primary"  @click="submitDataScope">确 定</el-button>
         <el-button @click="cancelDataScope">取 消</el-button>
       </div>
     </el-dialog>
@@ -261,6 +267,7 @@ export default {
     return {
       disabledFlag:false,
       userId:this.$store.getters.userId,
+      userRoles:this.$store.getters.roles,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -533,7 +540,7 @@ export default {
             })
           });
         });
-        this.title = "修改角色";
+        this.title = this.userId===1?"修改角色":"角色权限展示";
       });
     },
     /** 选择角色权限范围触发 */