zhangjie 2 éve
szülő
commit
0065d80d9a

+ 0 - 4
src/modules/admin/app-config/AppConfigManage.vue

@@ -260,7 +260,6 @@ export default {
       curGroupForAdd: null,
       groupConfigList: [],
       hideReadonly: true,
-      user: {},
     };
   },
   computed: {
@@ -268,9 +267,6 @@ export default {
       return this.filter.envId === null;
     },
   },
-  created() {
-    this.user = this.$ls.get("user", {});
-  },
   methods: {
     isEmpty(val) {
       return val === null || val === "" || val === undefined;

+ 19 - 2
src/modules/admin/app-deploy/AppDeployBindDevice.vue

@@ -18,7 +18,12 @@
           @click="toExport"
           >导出通用许可证</el-button
         >
-        <el-button type="primary" @click="toUpload">上传设备信息</el-button>
+        <el-button
+          v-if="checkPrivilege('DEPLOY_DEVICE_EDIT', instance.id)"
+          type="primary"
+          @click="toUpload"
+          >上传设备信息</el-button
+        >
       </div>
       <div class="part-box part-box-pad">
         <el-table ref="TableList" :data="dataList">
@@ -33,7 +38,16 @@
               scope.row.createTime | timestampFilter
             }}</span>
           </el-table-column>
-          <el-table-column label="操作" width="200" class-name="action-column">
+          <el-table-column
+            v-if="
+              checkPrivilege('DEPLOY_SECRET_VIEW', instance.id) ||
+              checkPrivilege('DEPLOY_LICENSE_DOWNLOAD', instance.id) ||
+              checkPrivilege('DEPLOY_DEVICE_EDIT', instance.id)
+            "
+            label="操作"
+            width="200"
+            class-name="action-column"
+          >
             <template slot-scope="scope">
               <el-button
                 v-if="checkPrivilege('DEPLOY_SECRET_VIEW', instance.id)"
@@ -50,6 +64,7 @@
                 >导出许可证</el-button
               >
               <el-button
+                v-if="checkPrivilege('DEPLOY_DEVICE_EDIT', instance.id)"
                 class="btn-danger"
                 type="text"
                 @click="toDelete(scope.row)"
@@ -63,11 +78,13 @@
     </el-dialog>
 
     <AppDeployDeviceInfoView
+      v-if="checkPrivilege('DEPLOY_SECRET_VIEW', instance.id)"
       ref="AppDeployDeviceInfoView"
       :device-id="curDeviceId"
     />
     <!-- AppDeployDeviceUpload -->
     <AppDeployDeviceUpload
+      v-if="checkPrivilege('DEPLOY_DEVICE_EDIT', instance.id)"
       ref="AppDeployDeviceUpload"
       :deploy-id="instance.id"
       @modified="getList"

+ 15 - 2
src/modules/admin/app-deploy/AppDeployBindOrg.vue

@@ -14,6 +14,7 @@
       <h3>应用关联机构</h3>
       <div>
         <el-button
+          v-if="checkPrivilege('DEPLOY_ORG_EDIT', instance.id)"
           size="mini"
           type="primary"
           :disabled="isSubmit"
@@ -51,7 +52,12 @@
               {{ scope.row.selected ? "已选择" : "未选择" }}
             </span>
           </el-table-column>
-          <el-table-column label="操作" width="80" class-name="action-column">
+          <el-table-column
+            v-if="checkPrivilege('DEPLOY_ORG_EDIT', instance.id)"
+            label="操作"
+            width="80"
+            class-name="action-column"
+          >
             <div slot-scope="scope">
               <el-button
                 class="btn-danger"
@@ -64,7 +70,10 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane name="resource">
+      <el-tab-pane
+        v-if="checkPrivilege('DEPLOY_ORG_EDIT', instance.id)"
+        name="resource"
+      >
         <span slot="label">机构筛选</span>
 
         <div class="part-box-filter" style="padding: 0 0 5px">
@@ -224,6 +233,10 @@ export default {
       if (this.curSelectedOrgs && this.curSelectedOrgs.length) {
         this.tabType = "selected";
       } else {
+        if (!this.checkPrivilege("DEPLOY_ORG_EDIT", this.instance.id)) {
+          this.tabType = "selected";
+          return;
+        }
         this.tabType = "resource";
         this.toPage(this.current);
       }

+ 0 - 2
src/modules/admin/app-deploy/AppDeployManage.vue

@@ -59,14 +59,12 @@
                 >编辑</el-button
               >
               <el-button
-                v-if="checkPrivilege('DEPLOY_ORG_EDIT', scope.row.id)"
                 class="btn-primary"
                 type="text"
                 @click="toBindOrg(scope.row)"
                 >关联机构</el-button
               >
               <el-button
-                v-if="checkPrivilege('DEPLOY_DEVICE_EDIT', scope.row.id)"
                 class="btn-primary"
                 type="text"
                 @click="toBindDevice(scope.row)"

+ 0 - 15
src/modules/admin/app-env/ModifyAppEnv.vue

@@ -45,13 +45,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="userId" label="维护人:">
-        <user-select
-          v-model="modalForm.userId"
-          placeholder="请选择维护人"
-          :filter-data="{ enable: true }"
-        ></user-select>
-      </el-form-item>
     </el-form>
     <div slot="footer">
       <el-button type="danger" @click="cancel" plain>取消</el-button>
@@ -71,7 +64,6 @@ const initModalForm = {
   name: "",
   code: "",
   type: "",
-  userId: null,
 };
 
 export default {
@@ -135,13 +127,6 @@ export default {
             trigger: "change",
           },
         ],
-        userId: [
-          {
-            required: true,
-            message: "请选择维护人",
-            trigger: "change",
-          },
-        ],
       },
     };
   },

+ 0 - 14
src/modules/admin/app/AppManage.vue

@@ -50,12 +50,6 @@
         </el-table-column>
         <el-table-column label="管理" width="360" class-name="action-column">
           <template slot-scope="scope">
-            <!-- <el-button
-              class="btn-primary"
-              type="text"
-              @click="toEditUser(scope.row)"
-              >用户</el-button
-            > -->
             <el-button
               class="btn-primary"
               type="text"
@@ -116,8 +110,6 @@
       @modified="getList"
     >
     </modify-app>
-    <!-- AppUserManage -->
-    <app-user-manage ref="AppUserManage" :app="curRow"></app-user-manage>
     <!-- AppDeployManage -->
     <app-deploy-manage ref="AppDeployManage" :app="curRow"></app-deploy-manage>
     <!-- AppModuleManage -->
@@ -140,7 +132,6 @@
 <script>
 import { appQuery } from "../api";
 import ModifyApp from "./ModifyApp";
-import AppUserManage from "../app-user/AppUserManage.vue";
 import AppDeployManage from "../app-deploy/AppDeployManage.vue";
 import AppModuleManage from "../app-module/AppModuleManage.vue";
 import AppVersionManage from "../app-version/AppVersionManage.vue";
@@ -152,7 +143,6 @@ export default {
   name: "app-manage",
   components: {
     ModifyApp,
-    AppUserManage,
     AppDeployManage,
     AppModuleManage,
     AppVersionManage,
@@ -203,10 +193,6 @@ export default {
       this.curRow = row;
       this.$refs.ModifyApp.open();
     },
-    toEditUser(row) {
-      this.curRow = row;
-      this.$refs.AppUserManage.open();
-    },
     toEditDeploy(row) {
       this.curRow = row;
       this.$refs.AppDeployManage.open();