简柏林 / thingskit-front · Commits

Commit b5a297e709c3171aceab05758e26e05c7156e28e

Authored by ww
1 parent 8db91834

fix: 修复组态权限区分

Inline Side-by-side
Showing 3 changed files with 17 additions and 33 deletions
@@ -13,13 +13,14 @@ @@ -13,13 +13,14 @@
13 <script lang="ts"> 13 <script lang="ts">
14 import { defineComponent, ref, computed, unref } from 'vue'; 14 import { defineComponent, ref, computed, unref } from 'vue';
15 import { BasicForm, useForm } from '/@/components/Form'; 15 import { BasicForm, useForm } from '/@/components/Form';
16 - import { formSchema, PC_DEFAULT_CONTENT, PHONE_DEFAULT_CONTENT, Platform } from './center.data'; 16 + import { formSchema } from './center.data';
17 import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; 17 import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
18 import { useMessage } from '/@/hooks/web/useMessage'; 18 import { useMessage } from '/@/hooks/web/useMessage';
19 import { saveOrUpdateConfigurationCenter } from '/@/api/configuration/center/configurationCenter'; 19 import { saveOrUpdateConfigurationCenter } from '/@/api/configuration/center/configurationCenter';
20 import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue'; 20 import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
21 import { buildUUID } from '/@/utils/uuid'; 21 import { buildUUID } from '/@/utils/uuid';
22 import { getDeviceProfile } from '/@/api/alarm/position'; 22 import { getDeviceProfile } from '/@/api/alarm/position';
  23 + import { PC_DEFAULT_CONTENT, PHONE_DEFAULT_CONTENT, Platform } from '../center/center.data';
23 24
24 export default defineComponent({ 25 export default defineComponent({
25 name: 'ConfigurationDrawer', 26 name: 'ConfigurationDrawer',
@@ -5,28 +5,17 @@ import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter @@ -5,28 +5,17 @@ import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter
5 import { useComponentRegister } from '/@/components/Form'; 5 import { useComponentRegister } from '/@/components/Form';
6 import { OrgTreeSelect } from '../../common/OrgTreeSelect'; 6 import { OrgTreeSelect } from '../../common/OrgTreeSelect';
7 import { getDeviceProfile } from '/@/api/alarm/position'; 7 import { getDeviceProfile } from '/@/api/alarm/position';
  8 +import { Platform } from '../center/center.data';
8 9
9 useComponentRegister('OrgTreeSelect', OrgTreeSelect); 10 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
10 -export enum Platform {  
11 - PHONE = 'phone',  
12 - PC = 'pc',  
13 -}  
14 11
15 -export enum ConfigurationPermission {  
16 - CREATE = 'api:yt:configuration:center:post',  
17 - UPDATE = 'api:yt:configuration:center:update',  
18 - DELETE = 'api:yt:configuration:center:delete',  
19 - DESIGN = 'api:yt:configuration:center:get_configuration_info:design',  
20 - PREVIEW = 'api:yt:configuration:center:get_configuration_info:preview',  
21 - SHARE = 'api:yt:configuration:center:share',  
22 - UN_SHARE = 'api:yt:configuration:center:monopoly', 12 +export enum ConfigurationTemplatePermission {
  13 + CREATE = 'api:yt:configuration:template:center:post',
  14 + UPDATE = 'api:yt:configuration:template:center:update',
  15 + DELETE = 'api:yt:configuration:template:center:delete',
  16 + DESIGN = 'api:yt:configuration:template:center:get_configuration_info:design',
  17 + PREVIEW = 'api:yt:configuration:template:center:get_configuration_info:preview',
23 } 18 }
24 -  
25 -export const PC_DEFAULT_CONTENT =  
26 - '<mxfile><diagram>dZHBDsIgDIafhvuEzOh5Tr142sEzGXWQsHVhmKFP7xbAidMT5fv/UtoSVrTuZHgvLyhAE5oJR9iBUMrybT4dM3l4stnTzJPGKBHYAir1hACj7a4EDInRImqr+hTW2HVQ24RxY3BMbTfUadWeN7ACVc31ml6VsPK7jVk4g2pkLJ3tgtLy6A5gkFzg+IFYSVhhEK2PWleAnscXB+Pzjn/U988MdPZHwhQsb0+XZEesfAE=</diagram></mxfile>';  
27 -  
28 -export const PHONE_DEFAULT_CONTENT =  
29 - '<mxfile><diagram>dZHBEoIgEEC/hru6lXU2q0snD50Z2YQZdB2k0fr6dMCMsU4sb9+ysDDI6uFseCuvJFCzJBIDgyNLkjjdw7hM5OnIYRc5UBklvLSAQr3Qw1l7KIFdIFoibVUbwpKaBksbMG4M9aF2Jx12bXmFK1CUXK/pTQkrHd3E24VfUFXSd04hdYmaz65/SCe5oP4LQc4gM0TWRfWQoZ5mN4/F1Z3+ZD/3MtjYHwVjsJw9boIPgvwN</diagram></mxfile>';  
30 // 表格列数据 19 // 表格列数据
31 export const columns: BasicColumn[] = [ 20 export const columns: BasicColumn[] = [
32 { 21 {
@@ -6,12 +6,11 @@ @@ -6,12 +6,11 @@
6 import { 6 import {
7 deleteConfigurationCenter, 7 deleteConfigurationCenter,
8 getPage, 8 getPage,
9 - shareConfiguration,  
10 } from '/@/api/configuration/center/configurationCenter'; 9 } from '/@/api/configuration/center/configurationCenter';
11 import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal'; 10 import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal';
12 import { PageWrapper } from '/@/components/Page'; 11 import { PageWrapper } from '/@/components/Page';
13 import { BasicForm, useForm } from '/@/components/Form'; 12 import { BasicForm, useForm } from '/@/components/Form';
14 - import { ConfigurationPermission, Platform, searchFormSchema } from './center.data'; 13 + import { searchFormSchema, ConfigurationTemplatePermission } from './center.data';
15 import { useMessage } from '/@/hooks/web/useMessage'; 14 import { useMessage } from '/@/hooks/web/useMessage';
16 import { Authority } from '/@/components/Authority'; 15 import { Authority } from '/@/components/Authority';
17 import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue'; 16 import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
@@ -22,10 +21,10 @@ @@ -22,10 +21,10 @@
22 import { usePermission } from '/@/hooks/web/usePermission'; 21 import { usePermission } from '/@/hooks/web/usePermission';
23 import { AuthIcon, CardLayoutButton } from '/@/components/Widget'; 22 import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
24 import AuthDropDown from '/@/components/Widget/AuthDropDown.vue'; 23 import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
25 - import { ShareModal } from '/@/views/common/ShareModal';  
26 import { useRole } from '/@/hooks/business/useRole'; 24 import { useRole } from '/@/hooks/business/useRole';
27 import { Icon } from '/@/components/Icon'; 25 import { Icon } from '/@/components/Icon';
28 import { createScadaPageLink, ScadaModeEnum } from './help'; 26 import { createScadaPageLink, ScadaModeEnum } from './help';
  27 + import { Platform } from '../center/center.data';
29 28
30 const listColumn = ref(5); 29 const listColumn = ref(5);
31 30
@@ -102,11 +101,11 @@ @@ -102,11 +101,11 @@
102 const { hasPermission } = usePermission(); 101 const { hasPermission } = usePermission();
103 102
104 const getPreviewFlag = computed(() => { 103 const getPreviewFlag = computed(() => {
105 - return hasPermission(ConfigurationPermission.PREVIEW); 104 + return hasPermission(ConfigurationTemplatePermission.PREVIEW);
106 }); 105 });
107 106
108 const getDesignFlag = computed(() => { 107 const getDesignFlag = computed(() => {
109 - return hasPermission(ConfigurationPermission.DESIGN); 108 + return hasPermission(ConfigurationTemplatePermission.DESIGN);
110 }); 109 });
111 110
112 const handleCreateOrUpdate = (record?: ConfigurationCenterItemsModal) => { 111 const handleCreateOrUpdate = (record?: ConfigurationCenterItemsModal) => {
@@ -185,7 +184,7 @@ @@ -185,7 +184,7 @@
185 > 184 >
186 <template #header> 185 <template #header>
187 <div class="flex gap-3 justify-end"> 186 <div class="flex gap-3 justify-end">
188 - <Authority v-if="!isCustomerUser" :value="ConfigurationPermission.CREATE"> 187 + <Authority v-if="!isCustomerUser" :value="ConfigurationTemplatePermission.CREATE">
189 <Button type="primary" @click="handleCreateOrUpdate()">新增模板</Button> 188 <Button type="primary" @click="handleCreateOrUpdate()">新增模板</Button>
190 </Authority> 189 </Authority>
191 <CardLayoutButton v-model:value="listColumn" @change="handleCardLayoutChange" /> 190 <CardLayoutButton v-model:value="listColumn" @change="handleCardLayoutChange" />
@@ -225,7 +224,7 @@ @@ -225,7 +224,7 @@
225 <template class="ant-card-actions" #actions> 224 <template class="ant-card-actions" #actions>
226 <Tooltip v-if="!isCustomerUser" title="设计"> 225 <Tooltip v-if="!isCustomerUser" title="设计">
227 <AuthIcon 226 <AuthIcon
228 - :auth="ConfigurationPermission.DESIGN" 227 + :auth="ConfigurationTemplatePermission.DESIGN"
229 class="!text-lg" 228 class="!text-lg"
230 icon="ant-design:edit-outlined" 229 icon="ant-design:edit-outlined"
231 @click="handleDesign(item)" 230 @click="handleDesign(item)"
@@ -236,14 +235,14 @@ @@ -236,14 +235,14 @@
236 :dropMenuList="[ 235 :dropMenuList="[
237 { 236 {
238 text: '编辑', 237 text: '编辑',
239 - auth: ConfigurationPermission.UPDATE, 238 + auth: ConfigurationTemplatePermission.UPDATE,
240 icon: 'clarity:note-edit-line', 239 icon: 'clarity:note-edit-line',
241 event: '', 240 event: '',
242 onClick: handleCreateOrUpdate.bind(null, item), 241 onClick: handleCreateOrUpdate.bind(null, item),
243 }, 242 },
244 { 243 {
245 text: '删除', 244 text: '删除',
246 - auth: ConfigurationPermission.DELETE, 245 + auth: ConfigurationTemplatePermission.DELETE,
247 icon: 'ant-design:delete-outlined', 246 icon: 'ant-design:delete-outlined',
248 event: '', 247 event: '',
249 popconfirm: { 248 popconfirm: {
@@ -281,11 +280,6 @@ @@ -281,11 +280,6 @@
281 </List> 280 </List>
282 </section> 281 </section>
283 <ConfigurationCenterDrawer @register="registerDrawer" @success="getListData" /> 282 <ConfigurationCenterDrawer @register="registerDrawer" @success="getListData" />
284 - <ShareModal  
285 - @register="registerShareModal"  
286 - :shareApi="shareConfiguration"  
287 - @success="getListData"  
288 - />  
289 </PageWrapper> 283 </PageWrapper>
290 </template> 284 </template>
291 285