zhangjie 2 years ago
parent
commit
ba63eb395b

+ 2 - 2
src/constants/privilege.js

@@ -191,7 +191,7 @@ export const privilegeConfig = [
       },
       {
         permission: "DEPLOY_LICENSE_ENTRY",
-        name: "部署证书功能",
+        name: "部署授权管理",
         dataPrivilege: "deploy.id",
       },
       {
@@ -201,7 +201,7 @@ export const privilegeConfig = [
       },
       {
         permission: "DEPLOY_LICENSE_DOWNLOAD",
-        name: "部署证书下载",
+        name: "部署授权下载",
         dataPrivilege: "deploy.id",
       },
     ],

+ 4 - 13
src/modules/admin/app-deploy/AppDeployBindDevice.vue

@@ -3,7 +3,7 @@
     <el-dialog
       class="page-dialog"
       :visible.sync="modalIsShow"
-      title="应用关联设备"
+      title="应用授权管理"
       top="10px"
       width="1000px"
       :close-on-click-modal="false"
@@ -16,7 +16,7 @@
           v-if="checkPrivilege('DEPLOY_LICENSE_DOWNLOAD', instance.id)"
           type="success"
           @click="toExport"
-          >导出通用许可证</el-button
+          >导出通用授权文件</el-button
         >
         <el-button
           v-if="checkPrivilege('DEPLOY_DEVICE_EDIT', instance.id)"
@@ -38,15 +38,7 @@
               scope.row.createTime | timestampFilter
             }}</span>
           </el-table-column>
-          <el-table-column
-            v-if="
-              checkPrivilege('DEPLOY_LICENSE_DOWNLOAD', instance.id) ||
-              checkPrivilege('DEPLOY_DEVICE_EDIT', instance.id)
-            "
-            label="操作"
-            width="200"
-            class-name="action-column"
-          >
+          <el-table-column label="操作" width="220" class-name="action-column">
             <template slot-scope="scope">
               <el-button
                 class="btn-primary"
@@ -59,7 +51,7 @@
                 class="btn-success"
                 type="text"
                 @click="toExport(scope.row)"
-                >导出许可证</el-button
+                >导出授权文件</el-button
               >
               <el-button
                 v-if="checkPrivilege('DEPLOY_DEVICE_EDIT', instance.id)"
@@ -76,7 +68,6 @@
     </el-dialog>
 
     <AppDeployDeviceInfoView
-      v-if="checkPrivilege('DEPLOY_SECRET_VIEW', instance.id)"
       ref="AppDeployDeviceInfoView"
       :device-id="curDeviceId"
     />

+ 1 - 1
src/modules/admin/app-deploy/AppDeployManage.vue

@@ -88,7 +88,7 @@
                 class="btn-primary"
                 type="text"
                 @click="toBindDevice(scope.row)"
-                >关联设备</el-button
+                >授权管理</el-button
               >
             </template>
           </el-table-column>

+ 2 - 2
src/modules/admin/user/UserManage.vue

@@ -67,7 +67,7 @@
           label="姓名"
           min-width="120"
         ></el-table-column>
-        <el-table-column prop="roleNames" label="角色" min-width="200">
+        <el-table-column prop="roleNames" label="角色" width="200">
         </el-table-column>
         <el-table-column prop="enable" label="状态" width="80">
           <span
@@ -91,7 +91,7 @@
           v-if="checkPrivilege('USER_EDIT')"
           class-name="action-column"
           label="操作"
-          width="140"
+          width="230"
           fixed="right"
         >
           <template slot-scope="scope">