From 8d3f86a6c3ee81e84b984e0838cdd581b1e16c71 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Tue, 16 Jan 2024 15:01:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/package.json | 4 +-
ruoyi-ui/src/common/scrollbar.js | 39 ++
.../components/Dialog/index.vue | 2 +-
.../Cards/DisposalProcess/index.vue | 2 +-
.../pages/service/board/BoardInfoEditor.vue | 4 +-
.../pages/service/board/index.vue | 498 +++++++++---------
ruoyi-ui/vue.config.js | 3 +-
7 files changed, 294 insertions(+), 258 deletions(-)
create mode 100644 ruoyi-ui/src/common/scrollbar.js
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 06413bed..db476b50 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -98,9 +98,11 @@
"vue-resource": "^1.5.3",
"vue-router": "3.4.9",
"vue-seamless-scroll": "^1.1.23",
+ "vue-slick-carousel": "^1.0.6",
"vue-splitpane": "1.0.4",
"vue-video-player": "^5.0.2",
"vuedraggable": "2.24.3",
+ "vuescroll": "^4.18.1",
"vuex": "3.6.0"
},
"devDependencies": {
@@ -130,7 +132,7 @@
"plop": "2.3.0",
"runjs": "4.4.2",
"sass": "^1.39.0",
- "sass-loader": "10.1.1",
+ "sass-loader": "^10.5.2",
"script-ext-html-webpack-plugin": "2.1.5",
"serve-static": "1.13.2",
"snapsvg": "^0.5.1",
diff --git a/ruoyi-ui/src/common/scrollbar.js b/ruoyi-ui/src/common/scrollbar.js
new file mode 100644
index 00000000..165634e0
--- /dev/null
+++ b/ruoyi-ui/src/common/scrollbar.js
@@ -0,0 +1,39 @@
+export default {
+ vuescroll: {
+ mode: "native", //模式:pc natice 移动端是slice
+ sizeStrategy: 'percent', //父元素是否是固定的是就percent 不是就是number 填一个数值
+ detectResize: true, //内容是否根据页面调整
+ },
+ scrollPanel: {
+ initialScrollY: false, //初始化距离顶部的位置
+ initialScrollX: false, //初始化距离左侧的位置
+ scrollingX: false, // 是否开启横向滚动
+ scrollingY: true, //是否开启竖向滚动
+ speed: 300, //多长时间内完成一次滚动。 数值越小滚动的速度越快。
+ easing: 'easeInQuad', //默认动画
+ verticalNativeBarPos: "right",
+ maxHeight: undefined, //这是滚动条最大高度,内容高度小于 maxHeight 时高度自适应，超出的话出现滚动条。
+ maxWidth: undefined, //这是滚动条最大宽度,内容宽度小于 maxWidth 时高度自适应，超出的话出现滚动条。
+ },
+ rail: {
+ background: "#000000", //轨道的背景色。
+ opacity: 0.4, //轨道的透明度。 0是透明，1是不透明
+ size: "8px", //轨道的尺寸。
+ specifyBorderRadius: false, //是否指定轨道的 borderRadius， 如果不那么将会自动设置。
+ gutterOfEnds: null,
+ gutterOfSide: "0px", //距离容器的距离
+ keepShow: false, //是否即使 bar 不存在的情况下也保持显示。
+ },
+ bar: {
+ showDelay: 500, //在鼠标离开容器后多长时间隐藏滚动条。
+ onlyShowBarOnScroll: false, //是否只在滚动时显示 bar。
+ keepShow: true, //滚动条是否保持显示。
+ background: "#007799", //滚动条背景色。
+ opacity: 1, //滚动条透明度。
+ hoverStyle: false,
+ specifyBorderRadius: false, //是否指定滚动条的 borderRadius， 如果不那么和轨道的保持一致。
+ minSize: false, //为 bar 设置一个最小尺寸, 从 0 到 1. 如 0.3, 代表 30%.
+ size: "8px", //bar 的尺寸。
+ disable: false, //是否禁用滚动条。
+ }
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
index ec5d2c6d..e03c62e6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@@ -95,7 +95,7 @@ export default {
position: absolute;
background: rgba(78, 174, 204, .6);
height: 2px;
- width: calc(sqrt(pow(var(--clip-width-num), 2) * 2) * 1px);
+ // width: calc(sqrt(pow(var(--clip-width-num), 2) * 2) * 1px);
right: calc(var(--clip-width) / -2);
top: -2px;
transform-origin: top left;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
index ea9532c7..a97d0917 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
@@ -43,7 +43,7 @@