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