diff --git a/imt-ui/.env.dev b/imt-ui/.env.dev index cbe967e..09bd8b7 100644 --- a/imt-ui/.env.dev +++ b/imt-ui/.env.dev @@ -2,9 +2,9 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 智能机床运维管理系统 -# 芋道管理系统/开发环境 +# 智能机床运维管理系统/开发环境 VUE_APP_BASE_API = 'http://localhost:48080' # 路由懒加载 diff --git a/imt-ui/.env.front b/imt-ui/.env.front index 9e2d4d2..cdd0cc6 100644 --- a/imt-ui/.env.front +++ b/imt-ui/.env.front @@ -2,9 +2,9 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 智能机床运维管理系统 -# 芋道管理系统/本地环境 +# 智能机床运维管理系统/本地环境 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' # 路由懒加载 diff --git a/imt-ui/.env.prod b/imt-ui/.env.prod index 511b91b..b1f481a 100644 --- a/imt-ui/.env.prod +++ b/imt-ui/.env.prod @@ -2,9 +2,9 @@ NODE_ENV = 'production' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 智能机床运维管理系统 -# 芋道管理系统/生产环境 +# 智能机床运维管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' # 根据服务器或域名修改 diff --git a/imt-ui/.env.stage b/imt-ui/.env.stage index 5942b3c..9d0cce2 100644 --- a/imt-ui/.env.stage +++ b/imt-ui/.env.stage @@ -1,12 +1,12 @@ NODE_ENV = production # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 智能机床运维管理系统 # 测试环境配置 ENV = 'staging' -# 芋道管理系统/测试环境 +# 智能机床运维管理系统/测试环境 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' # 静态资源地址 diff --git a/imt-ui/.env.static b/imt-ui/.env.static index a06ba49..fc19f6c 100644 --- a/imt-ui/.env.static +++ b/imt-ui/.env.static @@ -4,9 +4,9 @@ NODE_ENV = development ENV = 'staging' # 页面标题 -VUE_APP_TITLE = 芋道管理系统 +VUE_APP_TITLE = 智能机床运维管理系统 -# 芋道管理系统/测试环境 +# 智能机床运维管理系统/测试环境 VUE_APP_BASE_API = 'http://127.0.0.1:48080' # 根据服务器或域名修改 diff --git a/imt-ui/public/favicon.ico b/imt-ui/public/favicon.ico index e263760..086dd14 100644 Binary files a/imt-ui/public/favicon.ico and b/imt-ui/public/favicon.ico differ diff --git a/imt-ui/src/assets/logo/logo.png b/imt-ui/src/assets/logo/logo.png index 7e1043f..edab5dd 100644 Binary files a/imt-ui/src/assets/logo/logo.png and b/imt-ui/src/assets/logo/logo.png differ diff --git a/imt-ui/src/assets/png/customer.png b/imt-ui/src/assets/png/customer.png new file mode 100644 index 0000000..ce18a85 Binary files /dev/null and b/imt-ui/src/assets/png/customer.png differ diff --git a/imt-ui/src/assets/png/device.png b/imt-ui/src/assets/png/device.png new file mode 100644 index 0000000..66cad0c Binary files /dev/null and b/imt-ui/src/assets/png/device.png differ diff --git a/imt-ui/src/assets/png/offline.png b/imt-ui/src/assets/png/offline.png new file mode 100644 index 0000000..24221b1 Binary files /dev/null and b/imt-ui/src/assets/png/offline.png differ diff --git a/imt-ui/src/assets/png/online.png b/imt-ui/src/assets/png/online.png new file mode 100644 index 0000000..9383c55 Binary files /dev/null and b/imt-ui/src/assets/png/online.png differ diff --git a/imt-ui/src/assets/png/running.png b/imt-ui/src/assets/png/running.png new file mode 100644 index 0000000..1c5ddf5 Binary files /dev/null and b/imt-ui/src/assets/png/running.png differ diff --git a/imt-ui/src/assets/png/shutdown.png b/imt-ui/src/assets/png/shutdown.png new file mode 100644 index 0000000..1ba0f48 Binary files /dev/null and b/imt-ui/src/assets/png/shutdown.png differ diff --git a/imt-ui/src/assets/png/title.png b/imt-ui/src/assets/png/title.png new file mode 100644 index 0000000..ac55cc3 Binary files /dev/null and b/imt-ui/src/assets/png/title.png differ diff --git a/imt-ui/src/assets/styles/login.scss b/imt-ui/src/assets/styles/login.scss index ba28fc8..e053e65 100644 --- a/imt-ui/src/assets/styles/login.scss +++ b/imt-ui/src/assets/styles/login.scss @@ -14,7 +14,7 @@ $containerBgImage: '../assets/images/bg.png'; // container-logo $logoWidth: 417px; $logoHeight: 64px; -$logoImage: '../assets/logo/login-logo.png'; +// $logoImage: '../assets/logo/login-logo.png'; // container-content $contentWidth: round($W / $H * 100) * 1vw; $contentHeight: round($picH / $W * 100) / 100 * $contentWidth; @@ -65,13 +65,15 @@ $buttonHeight: $buttonH * 1px; // 元素 width: $logoWidth; height: $logoHeight; - background-image: url($logoImage); + //background-image: url($logoImage); background-size: contain; // 定位 position: absolute; - top: 50px; + top: 10%; left: 50%; margin-left: -$logoWidth/2; + text-align: center; + font-size: 40px; } .content { // 元素 diff --git a/imt-ui/src/layout/components/Navbar.vue b/imt-ui/src/layout/components/Navbar.vue index 2bec4f3..83d957a 100644 --- a/imt-ui/src/layout/components/Navbar.vue +++ b/imt-ui/src/layout/components/Navbar.vue @@ -12,13 +12,13 @@ - + diff --git a/imt-ui/src/layout/components/Sidebar/Logo.vue b/imt-ui/src/layout/components/Sidebar/Logo.vue index 5a0cb5d..4c5477a 100644 --- a/imt-ui/src/layout/components/Sidebar/Logo.vue +++ b/imt-ui/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '芋道管理系统', + title: '智能机床运维管理系统', logo: logoImg } } diff --git a/imt-ui/src/main.js b/imt-ui/src/main.js index 2061757..8d6c2aa 100644 --- a/imt-ui/src/main.js +++ b/imt-ui/src/main.js @@ -40,12 +40,12 @@ Vue.prototype.divide = divide // 全局组件挂载 Vue.component('DictTag', DictTag) -Vue.component('DocAlert', DocAlert) +// Vue.component('DocAlert', DocAlert) Vue.component('Pagination', Pagination) Vue.component('RightToolbar', RightToolbar) // 字典标签组件 import DictTag from '@/components/DictTag' -import DocAlert from '@/components/DocAlert' +// import DocAlert from '@/components/DocAlert' // 头部标签插件 import VueMeta from 'vue-meta' diff --git a/imt-ui/src/router/index.js b/imt-ui/src/router/index.js index 60f629a..d092701 100644 --- a/imt-ui/src/router/index.js +++ b/imt-ui/src/router/index.js @@ -67,10 +67,10 @@ export const constantRoutes = [ { path: '', component: Layout, - redirect: 'index', + redirect: 'imtIndex', children: [{ - path: 'index', - component: (resolve) => require(['@/views/index'], resolve), + path: 'imtIndex', + component: (resolve) => require(['@/views/imtIndex'], resolve), name: '首页', meta: {title: '首页', icon: 'dashboard', affix: true} } diff --git a/imt-ui/src/utils/constants.js b/imt-ui/src/utils/constants.js index 2ce6d00..304eca2 100644 --- a/imt-ui/src/utils/constants.js +++ b/imt-ui/src/utils/constants.js @@ -102,7 +102,7 @@ export const InfraApiErrorLogProcessStatusEnum = { * 用户的社交平台的类型枚举 */ export const SystemUserSocialTypeEnum = { - DINGTALK: { + /*DINGTALK: { title: "钉钉", type: 20, source: "dingtalk", @@ -113,7 +113,7 @@ export const SystemUserSocialTypeEnum = { type: 30, source: "wechat_enterprise", img: "https://s1.ax1x.com/2022/05/22/OzMrzn.png", - } + }*/ } /** diff --git a/imt-ui/src/views/home/LineChart.vue b/imt-ui/src/views/home/LineChart.vue new file mode 100644 index 0000000..21ed979 --- /dev/null +++ b/imt-ui/src/views/home/LineChart.vue @@ -0,0 +1,107 @@ + + + diff --git a/imt-ui/src/views/imtIndex.vue b/imt-ui/src/views/imtIndex.vue new file mode 100644 index 0000000..9d4bb9d --- /dev/null +++ b/imt-ui/src/views/imtIndex.vue @@ -0,0 +1,333 @@ + + + + + diff --git a/imt-ui/src/views/login.vue b/imt-ui/src/views/login.vue index f2a1625..fc8865e 100644 --- a/imt-ui/src/views/login.vue +++ b/imt-ui/src/views/login.vue @@ -1,6 +1,6 @@