From 095654ae8a89476a769dcf19472ede10f7a0148d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 14 三月 2025 11:02:22 +0800
Subject: [PATCH] 1、车间看板页面缩放设备最小尺寸由70调整为50 2、调整车间看板页面右侧设备布局中的设备样式 3、将看板页面加入路由白名单，无需登录即可访问
---
src/permission.js | 6 +++---
.idea/vcs.xml | 6 ++++++
src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue | 8 ++++----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/src/permission.js b/src/permission.js
index fe8d825..4b532ed 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
NProgress.configure({ showSpinner: false }) // NProgress Configuration
-const whiteList = ['/user/login', '/user/register', '/user/register-result','/user/alteration'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result','/user/alteration','/WorkshopSignage'] // no redirect whitelist
whiteList.push(OAUTH2_LOGIN_PAGE_PATH)
router.beforeEach((to, from, next) => {
@@ -21,8 +21,8 @@
to.matched.splice(2, to.matched.length - 3)
}
//update-end---author:scott ---date::2022-10-13 for锛歔jeecg-boot/issues/4091]澶氱骇璺敱缂撳瓨闂 #4091--------------
-
-
+
+
NProgress.start() // start progress bar
if (Vue.ls.get(ACCESS_TOKEN)) {
diff --git a/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue b/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue
index 3eaacc8..8e27e76 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue
@@ -12,8 +12,8 @@
:parentLimitation="true"
:parentH="1065"
:parentW="1500"
- :minw="70"
- :minh="70"
+ :minw="50"
+ :minh="50"
:isDraggable="isSwitchChecked"
:isResizable="isSwitchChecked"
:stickSize="6"
@@ -159,7 +159,7 @@
.single-device {
position: absolute;
border: 1px solid transparent;
- padding: 10px;
+ //padding: 10px;
display: flex;
flex-direction: column;
align-items: center;
@@ -207,7 +207,7 @@
.guideline {
position: absolute;
- border: 1px dashed #fff;
+ border: 1px dashed rgba(255,255,255,.7);
}
.guidelineX {
--
Gitblit v1.9.3