Showing
46 changed files
with
12 additions
and
30 deletions
| ... | ... | @@ -17,12 +17,12 @@ export default { | 
| 17 | 17 | |
| 18 | 18 | device: { | 
| 19 | 19 | deviceManagement: 'device management', | 
| 20 | - device: 'device management', | |
| 20 | + device: 'device list', | |
| 21 | 21 | deviceProfile: 'device profile', | 
| 22 | 22 | }, | 
| 23 | 23 | tenant: { | 
| 24 | 24 | tenant: 'tenant', | 
| 25 | - tenantManagement: 'tenant Info', | |
| 25 | + tenantManagement: 'tenant list', | |
| 26 | 26 | tenantSetting: 'tenant config', | 
| 27 | 27 | tenantOEM: 'platform customization', | 
| 28 | 28 | tenantRule: 'tenant rule', | ... | ... | 
| ... | ... | @@ -16,13 +16,13 @@ export default { | 
| 16 | 16 | }, | 
| 17 | 17 | device: { | 
| 18 | 18 | deviceManagement: '设备管理', | 
| 19 | - device: '设备管理', | |
| 19 | + device: '设备列表', | |
| 20 | 20 | deviceProfile: '设备配置', | 
| 21 | 21 | }, | 
| 22 | 22 | |
| 23 | 23 | tenant: { | 
| 24 | 24 | tenant: '租户', | 
| 25 | - tenantManagement: '租户信息', | |
| 25 | + tenantManagement: '租户列表', | |
| 26 | 26 | tenantSetting: '租户配置', | 
| 27 | 27 | tenantOEM: '平台定制', | 
| 28 | 28 | tenantRule: '租户角色', | ... | ... | 
src/views/alarm/log/config/detail.config.ts
renamed from
src/views/alarm/alarmLog/config/detail.config.ts
| 1 | -import { alarmLevel, statusType } from '/@/views/device/manage/config/detail.config'; | |
| 1 | +import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config'; | |
| 2 | 2 | import { FormSchema } from '/@/components/Form'; | 
| 3 | 3 | import { BasicColumn } from '/@/components/Table'; | 
| 4 | 4 | import moment from 'moment'; | ... | ... | 
src/views/alarm/log/cpns/AlarmDetailDrawer.vue
renamed from
src/views/alarm/alarmLog/cpns/AlarmDetailDrawer.vue
| ... | ... | @@ -25,7 +25,7 @@ | 
| 25 | 25 | import { BasicForm, useForm } from '/@/components/Form'; | 
| 26 | 26 | import { alarmSchemasForm } from '../config/detail.config'; | 
| 27 | 27 | import { clearOrAckAlarm } from '/@/api/device/deviceManager'; | 
| 28 | - import { alarmLevel, statusType } from '/@/views/device/manage/config/detail.config'; | |
| 28 | + import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config'; | |
| 29 | 29 | import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; | 
| 30 | 30 | export default defineComponent({ | 
| 31 | 31 | name: 'AlarmDetailDrawer', | ... | ... | 
src/views/alarm/log/index.vue
renamed from
src/views/alarm/alarmLog/index.vue
src/views/device/list/config/data.ts
renamed from
src/views/device/manage/config/data.ts
src/views/device/list/config/detail.config.ts
renamed from
src/views/device/manage/config/detail.config.ts
src/views/device/list/config/device.data.ts
renamed from
src/views/device/manage/config/device.data.ts
src/views/device/list/cpns/modal/AlarmDetailModal.vue
renamed from
src/views/device/manage/cpns/modal/AlarmDetailModal.vue
src/views/device/list/cpns/modal/CustomerModal.vue
renamed from
src/views/device/manage/cpns/modal/CustomerModal.vue
src/views/device/list/cpns/modal/DeviceDetailDrawer.vue
renamed from
src/views/device/manage/cpns/modal/DeviceDetailDrawer.vue
src/views/device/list/cpns/modal/DeviceModal.vue
renamed from
src/views/device/manage/cpns/modal/DeviceModal.vue
src/views/device/list/cpns/modal/ManageDeviceTokenModal.vue
renamed from
src/views/device/manage/cpns/modal/ManageDeviceTokenModal.vue
src/views/device/list/cpns/step/DeviceStep1.vue
renamed from
src/views/device/manage/cpns/step/DeviceStep1.vue
src/views/device/list/cpns/step/DeviceStep2.vue
renamed from
src/views/device/manage/cpns/step/DeviceStep2.vue
src/views/device/list/cpns/tabs/Alarm.vue
renamed from
src/views/device/manage/cpns/tabs/Alarm.vue
src/views/device/list/cpns/tabs/ChildDevice.vue
renamed from
src/views/device/manage/cpns/tabs/ChildDevice.vue
src/views/device/list/cpns/tabs/Detail.vue
renamed from
src/views/device/manage/cpns/tabs/Detail.vue
src/views/device/list/cpns/tabs/RealTimeData.vue
renamed from
src/views/device/manage/cpns/tabs/RealTimeData.vue
src/views/device/list/index.vue
renamed from
src/views/device/manage/index.vue
src/views/device/list/types/index.ts
renamed from
src/views/device/manage/types/index.ts
| ... | ... | @@ -60,7 +60,7 @@ | 
| 60 | 60 | getDeviceActiveTime, | 
| 61 | 61 | } from '/@/api/alarm/position'; | 
| 62 | 62 | import { useDrawer } from '/@/components/Drawer'; | 
| 63 | - import DeviceDetailDrawer from '/@/views/device/manage/cpns/modal/DeviceDetailDrawer.vue'; | |
| 63 | + import DeviceDetailDrawer from '/@/views/device/list/cpns/modal/DeviceDetailDrawer.vue'; | |
| 64 | 64 | import moment from 'moment'; | 
| 65 | 65 | // 导入一些静态图片,避免打包时不能正确解析 | 
| 66 | 66 | import djx from '/@/assets/images/djx.png'; | ... | ... | 
src/views/message/log/data.ts
renamed from
src/views/message/records/data.ts
src/views/message/log/index.vue
renamed from
src/views/message/records/index.vue
src/views/message/log/item/EmailDetail.vue
renamed from
src/views/message/records/item/EmailDetail.vue
src/views/message/log/item/EmailLog.vue
renamed from
src/views/message/records/item/EmailLog.vue
| ... | ... | @@ -43,7 +43,7 @@ | 
| 43 | 43 | import { columns, searchFormSchema } from './email.data'; | 
| 44 | 44 | import { mailLogPage, deleteMailLog } from '/@/api/message/records'; | 
| 45 | 45 | import { useModal } from '/@/components/Modal'; | 
| 46 | - import EmailDetail from '/@/views/message/records/item/EmailDetail.vue'; | |
| 46 | + import EmailDetail from './EmailDetail.vue'; | |
| 47 | 47 | import { useBatchDelete } from '/@/hooks/web/useBatchDelete'; | 
| 48 | 48 | export default defineComponent({ | 
| 49 | 49 | name: 'EmailLog', | ... | ... | 
src/views/message/log/item/SmsLog.vue
renamed from
src/views/message/records/item/SmsLog.vue
src/views/message/log/item/email.data.ts
renamed from
src/views/message/records/item/email.data.ts
src/views/message/log/item/sms.data.ts
renamed from
src/views/message/records/item/sms.data.ts
src/views/notice/manager/config.d.ts
renamed from
src/views/notice/notificationManager/config.d.ts
src/views/notice/manager/index.vue
renamed from
src/views/notice/notificationManager/index.vue
src/views/notice/manager/useDrawer.vue
renamed from
src/views/notice/notificationManager/useDrawer.vue
src/views/notice/manager/viewDetailDrawer.vue
renamed from
src/views/notice/notificationManager/viewDetailDrawer.vue
| ... | ... | @@ -81,13 +81,7 @@ | 
| 81 | 81 | </BasicForm> | 
| 82 | 82 | </Card> | 
| 83 | 83 | <Loading v-bind="compState" /> | 
| 84 | - <a-button | |
| 85 | - @click="handleUpdateInfo" | |
| 86 | - size="large" | |
| 87 | - type="primary" | |
| 88 | - style="margin-top: 20px; border-radius: 5px" | |
| 89 | - >保存信息</a-button | |
| 90 | - > | |
| 84 | + <a-button @click="handleUpdateInfo" type="primary" class="mt-4">保存信息</a-button> | |
| 91 | 85 | </div> | 
| 92 | 86 | </template> | 
| 93 | 87 | ... | ... | 
| ... | ... | @@ -83,13 +83,7 @@ | 
| 83 | 83 | </BasicForm> | 
| 84 | 84 | </Card> | 
| 85 | 85 | <Loading v-bind="compState" /> | 
| 86 | - <a-button | |
| 87 | - @click="handleUpdateInfo" | |
| 88 | - size="large" | |
| 89 | - type="primary" | |
| 90 | - style="margin-top: 20px; border-radius: 5px" | |
| 91 | - >保存信息</a-button | |
| 92 | - > | |
| 86 | + <a-button @click="handleUpdateInfo" type="primary" class="mt-4">保存信息</a-button> | |
| 93 | 87 | </div> | 
| 94 | 88 | </template> | 
| 95 | 89 | ... | ... | 
| ... | ... | @@ -31,13 +31,7 @@ | 
| 31 | 31 | </BasicForm> | 
| 32 | 32 | </Card> | 
| 33 | 33 | <Loading v-bind="compState" /> | 
| 34 | - <a-button | |
| 35 | - @click="handleUpdateInfo" | |
| 36 | - size="large" | |
| 37 | - type="primary" | |
| 38 | - style="margin-top: 1rem; border-radius: 0.5rem" | |
| 39 | - >更新基本信息</a-button | |
| 40 | - > | |
| 34 | + <a-button @click="handleUpdateInfo" type="primary" class="mt-4">更新基本信息</a-button> | |
| 41 | 35 | </div> | 
| 42 | 36 | </template> | 
| 43 | 37 | ... | ... | 
src/views/tenant/config/config.ts
renamed from
src/views/tenant/setting/config.ts
src/views/tenant/config/cpns/config.ts
renamed from
src/views/tenant/setting/cpns/config.ts
src/views/tenant/config/cpns/index.vue
renamed from
src/views/tenant/setting/cpns/index.vue
src/views/tenant/config/index.vue
renamed from
src/views/tenant/setting/index.vue
src/views/tenant/config/useDrawer.vue
renamed from
src/views/tenant/setting/useDrawer.vue
src/views/tenant/list/TenantAdminDrawer.vue
renamed from
src/views/tenant/management/TenantAdminDrawer.vue
src/views/tenant/list/TenantAdminFormDrawer.vue
renamed from
src/views/tenant/management/TenantAdminFormDrawer.vue
src/views/tenant/list/TenantDrawer.vue
renamed from
src/views/tenant/management/TenantDrawer.vue
| ... | ... | @@ -35,7 +35,7 @@ | 
| 35 | 35 | import { message, Upload } from 'ant-design-vue'; | 
| 36 | 36 | |
| 37 | 37 | import { useI18n } from '/@/hooks/web/useI18n'; | 
| 38 | - import { tenantFormSchema } from '/@/views/tenant/management/tenantBaseColumns'; | |
| 38 | + import { tenantFormSchema } from '/@/views/tenant/list/tenantBaseColumns'; | |
| 39 | 39 | import { FileItem } from '/@/components/Upload/src/typing'; | 
| 40 | 40 | import { upload } from '/@/api/oss/ossFileUploader'; | 
| 41 | 41 | import { getTenantRoles, updateOrCreateTenant } from '/@/api/tenant/tenantApi'; | ... | ... | 
src/views/tenant/list/index.vue
renamed from
src/views/tenant/management/index.vue
src/views/tenant/list/tenantBaseColumns.ts
renamed from
src/views/tenant/management/tenantBaseColumns.ts