diff --git a/.env b/.env
index 9a1e7a0..94730b0 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
NODE_ENV=production
-VUE_APP_PLATFORM_NAME=JeroBoot 企业级快速开发平台
+VUE_APP_PLATFORM_NAME=昆鸿设备管理系统
VUE_APP_SSO=false
\ No newline at end of file
diff --git a/README.md b/README.md
index a972fb1..ce8772b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Jero-Web
+kh-device-client
====
当前最新版本： 2.5.0
@@ -31,8 +31,7 @@ Jero-boot 的前端UI框架，采用前后端分离方案，提供强大代码
- 拉取项目代码
```bash
-git clone http://git.hzwlsoft.com/JeroBoot/jero-boot.git
-cd jero-boot/jero-web
+git clone http://git.hzwlsoft.com/kh-device/kh-device-client.git
```
- 安装依赖
diff --git a/package-lock.json b/package-lock.json
index c71d345..1caf91c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
- "name": "jero-web",
- "version": "2.4.6",
+ "name": "kh-device-client",
+ "version": "2.5.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 64d5cf3..ed348ed 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "jero-web",
+ "name": "kh-device-client",
"version": "2.5.0",
"private": true,
"scripts": {
diff --git a/public/index.html b/public/index.html
index d12a0d4..dc076e1 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
- JeroBoot平台
+ 昆鸿设备管理系统
@@ -222,22 +222,22 @@
}
/* 滚动条优化 start */
::-webkit-scrollbar{
- width:8px;
- height:8px;
+ width:6px;
+ height:6px;
}
::-webkit-scrollbar-track{
- background: #f6f6f6;
- border-radius:2px;
+ background: transparent;
+ border-radius:3px;
}
::-webkit-scrollbar-thumb{
- background: #cdcdcd;
- border-radius:2px;
+ background: linear-gradient(180deg, #0094FF 0%, #2EE4FD 100%);
+ border-radius:3px;
}
::-webkit-scrollbar-thumb:hover{
- background: #747474;
+ background: linear-gradient(180deg, #0094FF 0%, #2EE4FD 100%);
}
::-webkit-scrollbar-corner {
- background: #f6f6f6;
+ background: pink;
}
/* 滚动条优化 end */
diff --git a/src/App.vue b/src/App.vue
index dfc5199..a3e4fd6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,6 +34,7 @@ export default {
}
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 87cb274..e740bd0 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -2,35 +2,19 @@
@@ -64,10 +47,13 @@ import UserMenu from '../tools/UserMenu'
import SMenu from '../menu/'
import Logo from '../tools/Logo'
import { mixin } from '@/utils/mixin.js'
+import moment from 'dayjs'
+import FirstLevelMenu from '@comp/menu/FirstLevelMenu'
export default {
name: 'GlobalHeader',
components: {
+ FirstLevelMenu,
UserMenu,
SMenu,
Logo
@@ -110,7 +96,9 @@ export default {
headerIndexRight: {},
topSmenuStyle: {}
},
- chatStatus: ''
+ chatStatus: '',
+ systemTime: '', // 当前时间
+ updateTimer: null // 更新当前时间定时器
}
},
watch: {
@@ -130,6 +118,15 @@ export default {
this.getBreadcrumb()
}
},
+ created () {
+ /* 先设置当前时间，如果没有定时器，就添加一个定时器更新当前时间 */
+ this.systemTime = moment().format('YYYY-MM-DD HH:mm:ss')
+ if (!this.updateTimer) {
+ this.updateTimer = setInterval(() => {
+ this.systemTime = moment().format('YYYY-MM-DD HH:mm:ss')
+ }, 1000)
+ }
+ },
// update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
mounted () {
window.addEventListener('scroll', this.handleScroll)
@@ -142,6 +139,9 @@ export default {
},
methods: {
+ selectFirstLevelMenu (...arg) {
+ this.$emit('selectFirstLevelMenu', ...arg)
+ },
getBreadcrumb () {
this.breadList = []
// this.breadList.push({name: 'index', path: '/dashboard/', meta: {title: '首页'}})
@@ -195,8 +195,59 @@ export default {
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 360e6c1..9ce588b 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -1,59 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -66,17 +13,32 @@
:device="device"
@toggle="toggle"
@updateMenuTitle="handleUpdateMenuTitle"
+ @selectFirstLevelMenu="selectFirstLevelMenu"
/>
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -86,12 +48,13 @@
+
+
diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue
new file mode 100644
index 0000000..c627630
--- /dev/null
+++ b/src/views/systemOverview/systemSettings/SystemSettings.vue
@@ -0,0 +1,13 @@
+
+ 1
+
+
+
+
+
diff --git a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue
new file mode 100644
index 0000000..7488854
--- /dev/null
+++ b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue
@@ -0,0 +1,13 @@
+
+ 1
+
+
+
+
+
diff --git a/vue.config.js b/vue.config.js
index 8794229..98e20c5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,6 @@
const path = require('path')
const CompressionPlugin = require('compression-webpack-plugin')
-
+const modifyLessVars = require('./src/assets/less/modifyLessVars')
function resolve (dir) {
return path.join(__dirname, dir)
}
@@ -65,9 +65,10 @@ module.exports = {
less: {
modifyVars: {
/* less 变量覆盖，用于自定义 ant design 主题 */
- 'primary-color': '#1890FF',
- 'link-color': '#1890FF',
- 'border-radius-base': '4px'
+ 'primary-color': '#0094FF',
+ 'link-color': '#0094FF',
+ 'border-radius-base': '4px',
+ ...modifyLessVars
},
javascriptEnabled: true
}
@@ -75,7 +76,7 @@ module.exports = {
},
devServer: {
- port: 3000,
+ port: 4242,
proxy: {
/* '/api': {
target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
@@ -86,7 +87,7 @@ module.exports = {
}
}, */
'/jero-boot': {
- target: 'http://localhost:8080', // 请求本地 jero-boot后台项目
+ target: 'http://localhost:9393', // 请求本地 jero-boot后台项目
ws: false,
changeOrigin: true,
pathRewrite: {