diff --git a/src/api/mes/md/measurepoint.js b/src/api/mes/md/measurepoint.js new file mode 100644 index 0000000..6548d13 --- /dev/null +++ b/src/api/mes/md/measurepoint.js @@ -0,0 +1,55 @@ +import request from '@/utils/request' + +export function listMeasurePoint(query) { + return request({ + url: '/mes/md/measurepoint/list', + method: 'get', + params: query + }) +} + +export function getMeasurePoint(pointId) { + return request({ + url: '/mes/md/measurepoint/' + pointId, + method: 'get' + }) +} + +export function addMeasurePoint(data) { + return request({ + url: '/mes/md/measurepoint', + method: 'post', + data: data + }) +} + +export function updateMeasurePoint(data) { + return request({ + url: '/mes/md/measurepoint', + method: 'put', + data: data + }) +} + +export function delMeasurePoint(pointId) { + return request({ + url: '/mes/md/measurepoint/' + pointId, + method: 'delete' + }) +} + +export function getMeasurePointLatest(pointCode) { + return request({ + url: '/mes/md/measurepoint/latest', + method: 'get', + params: { pointCode } + }) +} + +export function getMeasurePointHistory(query) { + return request({ + url: '/mes/md/measurepoint/history', + method: 'get', + params: query + }) +} diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg index 8a89eb8..a365d30 100644 Binary files a/src/assets/images/login-background.jpg and b/src/assets/images/login-background.jpg differ diff --git a/src/assets/images/login-background2.jpg b/src/assets/images/login-background2.jpg new file mode 100644 index 0000000..8a89eb8 Binary files /dev/null and b/src/assets/images/login-background2.jpg differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 4e3dfe8..797d42e 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/assets/logo/logo1.png b/src/assets/logo/logo1.png new file mode 100644 index 0000000..24e9f08 Binary files /dev/null and b/src/assets/logo/logo1.png differ diff --git a/src/config/website.js b/src/config/website.js index 2ded285..c33f0f5 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -4,7 +4,7 @@ * 全局配置文件 */ export default { - reportUrl: 'http://localhost:7899/ureport', + reportUrl: 'http://110.40.171.179:7899/ureport', print_transfer_url: "http://111.21.251.50:17522", print_transfer_token: "123456", } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 09a8577..9c2a90e 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,13 +2,23 @@
- - + +
@@ -47,8 +58,6 @@ import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' -import RuoYiGit from '@/components/RuoYi/Git' -import RuoYiDoc from '@/components/RuoYi/Doc' export default { components: { @@ -57,9 +66,10 @@ export default { Hamburger, Screenfull, SizeSelect, - Search, - RuoYiGit, - RuoYiDoc + Search + }, + data() { + return {} }, computed: { ...mapGetters([ @@ -88,6 +98,36 @@ export default { toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, + openWorkshopBoard() { + const routeData = this.$router.resolve({ + path: '/board/workshop', + query: { + _t: Date.now(), + displayMode: 'fullscreen' + } + }) + const screenWidth = window.screen.availWidth || window.innerWidth || 1920 + const screenHeight = window.screen.availHeight || window.innerHeight || 1080 + const features = [ + 'popup=yes', + 'noopener=yes', + 'noreferrer=yes', + 'toolbar=no', + 'menubar=no', + 'location=no', + 'status=no', + 'scrollbars=yes', + 'resizable=yes', + `width=${screenWidth}`, + `height=${screenHeight}`, + 'left=0', + 'top=0' + ].join(',') + const popup = window.open(routeData.href, 'WorkshopBoardDisplay', features) + if (popup) { + popup.focus() + } + }, async logout() { this.$confirm('确定注销并退出系统吗？', '提示', { confirmButtonText: '确定', @@ -95,9 +135,9 @@ export default { type: 'warning' }).then(() => { this.$store.dispatch('LogOut').then(() => { - location.href = '/index'; + location.href = '/index' }) - }).catch(() => {}); + }).catch(() => {}) } } } @@ -165,6 +205,17 @@ export default { } } + .board-entry { + padding: 0 4px; + + :deep(.el-button) { + height: 32px; + padding: 0 12px; + border-radius: 16px; + font-size: 13px; + } + } + .avatar-container { margin-right: 30px; diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 59815f1..b86a195 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -6,18 +6,18 @@

主题风格设置

-
- dark -
- - - -
-
+ + + + + + + + + + + +
light
@@ -41,7 +41,7 @@

系统布局配置

- +
开启 TopNav diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index c6b4a60..1e0237b 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -3,11 +3,10 @@ -

{{ title }}

-

{{ title }}

+
@@ -15,6 +14,7 @@ + + diff --git a/src/views/mes/md/measurepoint/index.vue b/src/views/mes/md/measurepoint/index.vue new file mode 100644 index 0000000..eb59844 --- /dev/null +++ b/src/views/mes/md/measurepoint/index.vue @@ -0,0 +1,491 @@ + + + + +