diff --git a/vue/.env.development b/vue/.env.development index 28b97c7e..65b74607 100644 --- a/vue/.env.development +++ b/vue/.env.development @@ -1,7 +1,7 @@ # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 +# 物美智能/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/vue/.env.production b/vue/.env.production index 27c717e9..d7601f06 100644 --- a/vue/.env.production +++ b/vue/.env.production @@ -1,5 +1,5 @@ # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# 物美智能/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/vue/.env.staging b/vue/.env.staging index 61957367..8e468b23 100644 --- a/vue/.env.staging +++ b/vue/.env.staging @@ -3,5 +3,5 @@ NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 若依管理系统/测试环境 +# 物美智能/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/vue/package.json b/vue/package.json index 57fa9dbb..e3d3fa35 100644 --- a/vue/package.json +++ b/vue/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi", "version": "3.4.0", - "description": "若依管理系统", + "description": "物美智能", "author": "若依", "license": "MIT", "scripts": { diff --git a/vue/public/favicon.ico b/vue/public/favicon.ico index e2637602..afbba6f0 100644 Binary files a/vue/public/favicon.ico and b/vue/public/favicon.ico differ diff --git a/vue/src/api/system/group.js b/vue/src/api/system/group.js new file mode 100644 index 00000000..734a0c73 --- /dev/null +++ b/vue/src/api/system/group.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询分组列表 +export function listGroup(query) { + return request({ + url: '/system/group/list', + method: 'get', + params: query + }) +} + +// 查询分组详细 +export function getGroup(groupId) { + return request({ + url: '/system/group/' + groupId, + method: 'get' + }) +} + +// 新增分组 +export function addGroup(data) { + return request({ + url: '/system/group', + method: 'post', + data: data + }) +} + +// 修改分组 +export function updateGroup(data) { + return request({ + url: '/system/group', + method: 'put', + data: data + }) +} + +// 删除分组 +export function delGroup(groupId) { + return request({ + url: '/system/group/' + groupId, + method: 'delete' + }) +} + +// 导出分组 +export function exportGroup(query) { + return request({ + url: '/system/group/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/vue/src/assets/icons/svg/category.svg b/vue/src/assets/icons/svg/category.svg new file mode 100644 index 00000000..a106063e --- /dev/null +++ b/vue/src/assets/icons/svg/category.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/config.svg b/vue/src/assets/icons/svg/config.svg new file mode 100644 index 00000000..5106ed4c --- /dev/null +++ b/vue/src/assets/icons/svg/config.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/device.svg b/vue/src/assets/icons/svg/device.svg new file mode 100644 index 00000000..8f2124ad --- /dev/null +++ b/vue/src/assets/icons/svg/device.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/group.svg b/vue/src/assets/icons/svg/group.svg new file mode 100644 index 00000000..66eba4b8 --- /dev/null +++ b/vue/src/assets/icons/svg/group.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/iot.svg b/vue/src/assets/icons/svg/iot.svg new file mode 100644 index 00000000..e3ab00d5 --- /dev/null +++ b/vue/src/assets/icons/svg/iot.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/mqtt.svg b/vue/src/assets/icons/svg/mqtt.svg new file mode 100644 index 00000000..9874d2ff --- /dev/null +++ b/vue/src/assets/icons/svg/mqtt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/status.svg b/vue/src/assets/icons/svg/status.svg new file mode 100644 index 00000000..dbad9258 --- /dev/null +++ b/vue/src/assets/icons/svg/status.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_0.svg b/vue/src/assets/icons/svg/wifi_0.svg new file mode 100644 index 00000000..92af0481 --- /dev/null +++ b/vue/src/assets/icons/svg/wifi_0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_1.svg b/vue/src/assets/icons/svg/wifi_1.svg new file mode 100644 index 00000000..ebb2d4ec --- /dev/null +++ b/vue/src/assets/icons/svg/wifi_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_2.svg b/vue/src/assets/icons/svg/wifi_2.svg new file mode 100644 index 00000000..ca1ae185 --- /dev/null +++ b/vue/src/assets/icons/svg/wifi_2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_3.svg b/vue/src/assets/icons/svg/wifi_3.svg new file mode 100644 index 00000000..e4a05f87 --- /dev/null +++ b/vue/src/assets/icons/svg/wifi_3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/icons/svg/wifi_4.svg b/vue/src/assets/icons/svg/wifi_4.svg new file mode 100644 index 00000000..761c124e --- /dev/null +++ b/vue/src/assets/icons/svg/wifi_4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vue/src/assets/logo/logo.png b/vue/src/assets/logo/logo.png index e2637602..3e8e9cb6 100644 Binary files a/vue/src/assets/logo/logo.png and b/vue/src/assets/logo/logo.png differ diff --git a/vue/src/layout/components/Sidebar/Logo.vue b/vue/src/layout/components/Sidebar/Logo.vue index 57dbd3a8..b286685b 100644 --- a/vue/src/layout/components/Sidebar/Logo.vue +++ b/vue/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '若依管理系统', + title: '物美智能', logo: logoImg } } diff --git a/vue/src/settings.js b/vue/src/settings.js index 40a7f159..5f540fcb 100644 --- a/vue/src/settings.js +++ b/vue/src/settings.js @@ -1,5 +1,5 @@ module.exports = { - title: '若依管理系统', + title: '物美智能设备', /** * 侧边栏主题 深色主题theme-dark，浅色主题theme-light diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue index d2ded934..f763a55a 100644 --- a/vue/src/views/index.vue +++ b/vue/src/views/index.vue @@ -1,68 +1,26 @@ diff --git a/vue/src/views/login.vue b/vue/src/views/login.vue index 0c381ac6..a742bfad 100644 --- a/vue/src/views/login.vue +++ b/vue/src/views/login.vue @@ -1,7 +1,7 @@