Commit d57a7f40b52b76374edcbf9cfee6ddce3e658b4f

Authored by loveumiko
1 parent 9590a599

fix: 修改权限配置问题

... ... @@ -17,7 +17,8 @@ export enum ConfigurationPermission {
17 17 UPDATE = 'api:yt:dataview:center:update',
18 18 DELETE = 'api:yt:dataview:center:delete',
19 19 SHARE = 'api:yt:dataview:center:share',
20   - DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
  20 + // DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
  21 + DESIGN = 'api:yt:dataview:center:get_dataview_info:design',
21 22 PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
22 23 PUBLISH = 'api:yt:dataview:center:publish',
23 24 // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
... ...
... ... @@ -280,6 +280,7 @@
280 280 </Tooltip>
281 281 <Tooltip v-if="!isCustomerUser" title="设计">
282 282 <AuthIcon
  283 + :auth="ConfigurationPermission.DESIGN"
283 284 :disabled="item.state === 1"
284 285 icon="ant-design:edit-outlined"
285 286 @click="handleDesign(item)"
... ...
... ... @@ -33,9 +33,15 @@
33 33 </Button>
34 34 </Authority>
35 35 <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
36   - <Upload v-if="isShowBtn" :show-upload-list="false" :customRequest="handleImportModel">
37   - <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
38   - </Upload>
  36 + <Authority value="api:yt:things_model:import">
  37 + <Upload
  38 + v-if="isShowBtn"
  39 + :show-upload-list="false"
  40 + :customRequest="handleImportModel"
  41 + >
  42 + <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
  43 + </Upload>
  44 + </Authority>
39 45 </div>
40 46 <div class="flex gap-2">
41 47 <Authority :value="ModelOfMatterPermission.RELEASE">
... ...
... ... @@ -18,6 +18,7 @@
18 18 import { UserDTO } from '/@/api/tenant/tenantInfo';
19 19 import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
20 20 import { chineseAndEnlishRule } from '/@/utils/rules';
  21 + import { getAllRoleList } from '/@/api/system/system';
21 22
22 23 export default defineComponent({
23 24 name: 'TenantAdminFormDrawer',
... ... @@ -106,6 +107,17 @@
106 107 rules: emailRule,
107 108 },
108 109 {
  110 + field: 'roleIds',
  111 + label: '租户角色',
  112 + component: 'ApiSelect',
  113 + componentProps: {
  114 + mode: 'multiple',
  115 + api: getAllRoleList,
  116 + labelField: 'name',
  117 + valueField: 'id',
  118 + },
  119 + },
  120 + {
109 121 field: 'enabled',
110 122 label: '状态',
111 123 required: true,
... ... @@ -159,6 +171,7 @@
159 171 ? values.tenantExpireTime.format('YYYY-MM-DD HH:mm:ss')
160 172 : null,
161 173 tenantId: tenantId.value,
  174 + roleIds: values.roleIds,
162 175 };
163 176 await saveTenantAdmin(requestParams as any as UserDTO);
164 177 closeDrawer(); //关闭侧框
... ...