解决冲突
dev
commit d82660073e3921f54268018b541a3701439fe0b2
2 parents b48b84f + 5e7b01f
dutingting authored 8 days ago
Showing 77 changed files
View
.env.development
View
.env.production
View
.gitignore
View
public/config/config.json 0 → 100644
View
public/favicon.ico
View
public/file/device_template.xlsx 0 → 100644
Not supported
View
src/api/basic/config.ts 0 → 100644
View
src/api/basic/device.ts
View
src/api/basic/group.ts
View
src/api/basic/package.ts 0 → 100644
View
src/api/basic/product.ts 0 → 100644
View
src/api/basic/subscribe.ts 0 → 100644
View
src/api/basic/task.ts 0 → 100644
View
src/api/common.ts 0 → 100644
View
src/api/data/alarm.ts 0 → 100644
View
src/api/data/query.ts
View
src/api/index.ts
View
src/assets/icons/icon-dashboard.svg 0 → 100644
View
src/assets/icons/icon-ota.svg
View
src/components/SearchArea/index.vue
View
src/components/dialog/selectStaffDialog.vue
View
src/layouts/components/Logo/index.vue
View
src/layouts/components/SubSidebar/index.vue
View
src/layouts/components/Tools/index.vue
View
src/layouts/components/Topbar/index.vue
View
src/layouts/index.vue
View
src/main.ts
View
src/router/modules/basic.ts
View
src/router/modules/dashboard.ts 0 → 100644
View
src/router/modules/data.ts
View
src/router/modules/multilevel.menu.example.ts 100644 → 0
View
src/router/modules/system.ts
View
src/router/routes.ts
View
src/settings.ts
View
src/utils/exportXlsx.ts
View
src/views/basic/device/addDeviceDialog.vue
View
src/views/basic/device/configList.vue 0 → 100644
View
src/views/basic/device/detail.vue
View
src/views/basic/device/device-info.ts
View
src/views/basic/device/electricity.vue 0 → 100644
View
src/views/basic/device/list.vue
View
src/views/basic/device/listEmbedded.vue
View
src/views/basic/group/addGroupDialog.vue
View
src/views/basic/group/addSubscribeDialog.vue 0 → 100644
View
src/views/basic/group/detail.vue
View
src/views/basic/group/list.vue
View
src/views/basic/group/subscription.vue 0 → 100644
View
src/views/basic/package/components/addPackageDialog.vue 0 → 100644
View
src/views/basic/package/components/showFile.vue 0 → 100644
View
src/views/basic/package/index.vue 0 → 100644
View
src/views/basic/product/addGroupDialog.vue 100644 → 0
View
src/views/basic/product/addProductDialog.vue 0 → 100644
View
src/views/basic/product/group-info.ts 100644 → 0
View
src/views/basic/product/list.vue
View
src/views/basic/product/product-info.ts 0 → 100644
View
src/views/basic/task/index.vue 0 → 100644
View
src/views/breadcrumb_example/detail1.vue 100644 → 0
View
src/views/breadcrumb_example/detail2.vue 100644 → 0
View
src/views/breadcrumb_example/list1.vue 100644 → 0
View
src/views/breadcrumb_example/list2.vue 100644 → 0
View
src/views/dashboard/index.vue 0 → 100644
View
src/views/data/alarm/index.vue 0 → 100644
View
src/views/data/query/data-query.ts
View
src/views/data/query/dataDetailDialog.vue 0 → 100644
View
src/views/data/query/list.vue
View
src/views/data/query/listEmbedded.vue 100644 → 0
View
src/views/data/statistics/index.vue 0 → 100644
View
src/views/example/chartExample.vue 100644 → 0
View
src/views/multilevel_menu_example/level2/level3/page1.vue 100644 → 0
View
src/views/multilevel_menu_example/level2/level3/page2.vue 100644 → 0
View
src/views/multilevel_menu_example/level2/page.vue 100644 → 0
View
src/views/multilevel_menu_example/page.vue 100644 → 0
View
src/views/system/dict/listDict.vue
View
src/views/system/log/listErrorLog.vue
View
src/views/system/process/process.vue
View
src/views/system/resource/listResource.vue
View
src/views/system/user/listUser.vue