Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/system/role/index.vue

@@ -20,6 +20,7 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="openEdit()"
+            v-if="$hasPermission('sys:role:add')"
           >
             添加
           </el-button>
@@ -29,6 +30,7 @@
             icon="el-icon-delete"
             class="ele-btn-icon"
             @click="removeBatch"
+            v-if="$hasPermission('sys:role:delete')"
           >
             删除
           </el-button>
@@ -54,6 +56,7 @@
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit(row)"
+            v-if="$hasPermission('sys:role:update')"
           >
             修改
           </el-link>
@@ -62,6 +65,7 @@
             :underline="false"
             icon="el-icon-finished"
             @click="openAuth(row)"
+            v-if="$hasPermission('sys:role:update')"
           >
             分配权限
           </el-link>
@@ -70,6 +74,7 @@
             :underline="false"
             icon="el-icon-finished"
             @click="openDataAuth(row)"
+            v-if="$hasPermission('sys:role:update')"
           >
             数据权限
           </el-link>
@@ -79,7 +84,7 @@
             @confirm="remove(row)"
           >
             <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
+              <el-link type="danger"  v-if="$hasPermission('sys:role:delete')" :underline="false" icon="el-icon-delete">
                 删除
               </el-link>
             </template>

src/views/system/user/index.vue

@@ -9,7 +9,7 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
-        height="calc(100vh - 335px)"
+        height="calc(100vh - 385px)"
         row-key="id"
         cache-key="systemUserTable"
       >
@@ -31,6 +31,7 @@
             icon="el-icon-delete"
             class="ele-btn-icon"
             @click="removeBatch"
+            v-if="$hasPermission('sys:account:delete')"
           >
             删除
           </el-button>
@@ -63,7 +64,9 @@
         </template>
         <!-- 状态列 -->
         <template v-slot:enable="{ row }">
+
           <el-switch
+            v-if="$hasPermission('sys:account:update')"
             v-model="row.enable"
             active-color="#13ce66"
             inactive-color="#ff4949"
@@ -72,6 +75,7 @@
             @change="changeEnable(row)"
           >
           </el-switch>
+          <span v-else>{{row.enable?'开启':'停用'}}</span>
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
@@ -80,6 +84,7 @@
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit(row)"
+            v-if="$hasPermission('sys:account:update')"
           >
             修改
           </el-link>
@@ -88,6 +93,7 @@
             :underline="false"
             icon="el-icon-key"
             @click="resetPsw(row)"
+            v-if="$hasPermission('sys:account:update')"
           >
             重置密码
           </el-link>
@@ -97,7 +103,7 @@
             @confirm="remove(row)"
           >
             <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
+              <el-link type="danger"  v-if="$hasPermission('sys:account:delete')" :underline="false" icon="el-icon-delete">
                 删除
               </el-link>
             </template>