From dd70c94dd7a26eed7779313f8979abef108124bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Mon, 8 Jun 2026 14:21:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=84=E4=BB=B6=E4=B8=8E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=B8=8E=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增QRCode二维码组件、ChecklistSelect选择器、DragResizePanel拖拽面板 2. 更新项目依赖，新增qrcode、html2canvas等工具库 3. 重构侧边栏Logo与导航栏样式，调整布局与视觉效果 4. 优化设备巡检日报页面，支持多日期范围查询与多维度统计 5. 修复迷你按钮样式，更新设备巡检记录页面功能与交互 6. 更新项目logo资源与部分样式变量 --- ruoyi-ui/package.json | 8 +- ruoyi-ui/src/assets/logo/logo.png | Bin 19409 -> 2812 bytes .../src/assets/styles/element-variables.scss | 2 +- ruoyi-ui/src/assets/styles/sidebar.scss | 454 +++++------ .../src/components/ChecklistSelect/index.vue | 72 ++ .../src/components/DragResizePanel/index.vue | 159 ++++ ruoyi-ui/src/components/QRCode/index.vue | 72 ++ ruoyi-ui/src/layout/components/Navbar.vue | 420 +++++----- .../src/layout/components/Sidebar/Logo.vue | 213 ++--- ruoyi-ui/src/views/mill/eqp/day.vue | 336 +++++--- ruoyi-ui/src/views/mill/eqp/index.vue | 770 ++++++++++++------ ruoyi-ui/src/views/mill/eqp/record.vue | 450 +++++----- 12 files changed, 1920 insertions(+), 1036 deletions(-) create mode 100644 ruoyi-ui/src/components/ChecklistSelect/index.vue create mode 100644 ruoyi-ui/src/components/DragResizePanel/index.vue create mode 100644 ruoyi-ui/src/components/QRCode/index.vue diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index cc7c0e30..883c6d2f 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -39,22 +39,26 @@ "@riophae/vue-treeselect": "0.4.0", "axios": "0.28.1", "bpmn-js": "^11.1.0", - "bpmnlint": "^6.4.0", "bpmn-js-bpmnlint": "^0.15.0", + "bpmnlint": "^6.4.0", "bpmnlint-loader": "^0.1.4", - "file-drops": "^0.4.0", "clipboard": "2.0.8", "core-js": "3.37.1", "diagram-js": "^11.4.1", + "dom-to-image": "^2.6.0", "echarts": "5.4.0", "element-ui": "2.15.14", + "file-drops": "^0.4.0", "file-saver": "2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", + "html2canvas": "^1.4.1", "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", "nprogress": "0.2.0", + "pdf-lib": "^1.17.1", + "qrcode": "^1.5.4", "quill": "2.0.2", "screenfull": "5.0.2", "sortablejs": "1.10.2", diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png index b440cf92af69ac6faa1df28e8a4830f3baf57d43..99f8a170d09ab459d86e29397dce7bec020f6540 100644 GIT binary patch literal 2812 zcmb_di9gj@8^1UEPJ{|mNE#(G!x+gZMaU2-Whg?05-n7s#>^l~i{XthlO>XhtT)^k zWgUz{_U+o@?)UzFzq`BdbM+^@@A;hHbDr}(&+~njbMEKfJ>q^yMRAiN4u?~5aX#n; z>nq78F9kCDWBUXw_$ywA9Pp!EJ8#2AA=3He6&y}UQ}W?)kMneKxOIdhZr+Y?`1I+^ zn(7Ae+F;PxD9YjS_(FkDBoeKzt_lPKK3@PThr`1#E?Cu65nq-Q07noMq);eC5RA*^ zQK@XOr;t&w;c_LGGzx2tRU#w|m=FxuYz`Yig+dX70TKqpkqqGHa`{}Y0K-7xt+|Lm zK~ZciItP3K#4rw>E(ruWkH%142*`On0U(kn7;jay%3@+r z6pMv?0pGXw0~^AYz(voR)<4uzm7 z7jococuWS$;qn2=%PVFu*kB1>O>g?xEOf0perxj}M1%xEehJC}2RX z04RWxPTF~3lLynGTAg5J2$5Y+?h359gF53VdD&`jV#QT~_OKMjzfV{i&hlT^oIgD-=QQmGUGVE_mzu~;Y+MWZob z(&-Ec#ALDAYy>VHWLZ!0nLUdrkI5dm`nCaCeLJ%v9L^N-n`rdOdD0MRl|&M;rl#i? z`B=*;S&VQAJ1|-wk0bS&C0_Z5JTsf{FbAu}k7Wt!d)xb8vt$;;Vj01JSmuG4RnBG$ zMdgiC7;WM+YjJ3fK}X)96j8S-Ql>;6Y2lOQWoiVJc)4;~X*BzW@)*hyiABQM#fDXp zfX|a$w@^gG58;v@rOaEgbBaTrP->}b~v2uvdh8!-q-V} zxuI!Vj#?d!ZjH}oHJ#GrQyWbUw-7WmG%OQk3JddG9~d39na?;-ZMr34;&Nxf9mVx~ zYul|`kWQoY^m$(+KIeo*8-#g@)vE2#Q=;jL@S8Uq z%EKKQ%^BQ!{KR~e&BFh0W@-9)7IdeZx?M;~yet8Atec$ju92gtyFITdo=y6hMmR@^(Kk=30 zZCZ|jlSlh{?h$0R`zvkX3wD=Y)tOND@U)+6)igex^o_|}B6`~}crwzP=75_2;J(d- z^!;9^fByIDl1O&0m=e{rh>5F7G1kr&9jVRBk-PH~9Q! zdXg98z`C~d-0w%v;a!K{ss2_Hl65D)c-pKjtRg==nN#epOBk5V&l3Uv@O$Vj5g}l3nrX!2@^uyExo(qCVwdk<+VJT1D zi8p4V#pmp^0Y(wC-)wZYwut{QMzPec9;rR%RD|jz-gEL(kQ*C~ZBE$Qy6N^~J!+zB zSCdkrmX!HACDn-BmxF)F&LyS)M<$9c_?CF%-=%>1=@0{_w@x>EKEkkA}dDW3>&a-w+ZIR)n40qSn&;Bs&g2q59W|Y4Fx&nL7TSh&_#S z+C`U2dvA`5N<0i-$+`D$B+OT-I6KYa7-4Un?1hpYCrg$ZFXtwVpR;PKtT^Fl`YAS~?XWlo!HM2l zca6vVK4^?wZ?>kId%S2!ew1Q-z)|#QHvi}*f50<8b&vajDLGKH6P{dQYHeQ)Ty$U$L_oKhR5Q|?CubgTPlq4*0(B3g>?bPt#`@X z%&c-pa4EV;I}Pp}SH0D*|M#v9{`=Y4{YznW;|w+1{TlKyapyE6PVg;8XbiuX4!H&y z-P;=?XvNzvQnFv1XY`{{3x+>>zIjnWym%&Zd@{08Atp9lp|CIX`dJ&Rb+%*co%6M* z7i8pidQ8N0#h&-?_9AXKdt6sYKQJ>V28!>fH7HmR&e8#gB z>a>%hml}tKOdCa;=~=V@)*xW99cWRBaPS&JTqjX_~g$k!kP{IG|$jqd7yczGzNT?`6_n=(vaiZs8 zy)e?5%ul~0Mv#mBeGYj%-XuLe?e#i};bb)v&oF4PQB>1uK)WuN-MU`9Wr{Q?es+H5 z#~|%_*7V-arVdv1?#nJw_jQ7;iZd=J#kvk!x4Rq5A;CnkDs9`tj)lzsZ4TPkBlq6k UR}MM`fAlyPNB4uT90C&l3qfw|`Tzg` literal 19409 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 diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss index 0c1c639b..71614891 100644 --- a/ruoyi-ui/src/assets/styles/element-variables.scss +++ b/ruoyi-ui/src/assets/styles/element-variables.scss @@ -53,7 +53,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; .el-button { padding: 5px 12px !important; font-size: 12px !important; } .el-button--medium { padding: 6px 14px !important; font-size: 12px !important; } .el-button--small { padding: 4px 10px !important; font-size: 12px !important; } -.el-button--mini { padding: 3px 8px !important; font-size: 12px !important; } +.el-button--mini { padding: 4px 4px !important; font-size: 12px !important; } // 表格 .el-table { diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss index d7b32b13..f7a0f0ea 100644 --- a/ruoyi-ui/src/assets/styles/sidebar.scss +++ b/ruoyi-ui/src/assets/styles/sidebar.scss @@ -1,227 +1,227 @@ -#app { - - .main-container { - height: 100%; - transition: margin-left .28s; - margin-left: $base-sidebar-width; - position: relative; - } - - .sidebarHide { - margin-left: 0!important; - } - - .sidebar-container { - -webkit-transition: width .28s; - transition: width 0.28s; - width: $base-sidebar-width !important; - background-color: $base-menu-background; - height: 100%; - position: fixed; - font-size: 0px; - top: 0; - bottom: 0; - left: 0; - z-index: 1001; - overflow: hidden; - -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35); - box-shadow: 2px 0 6px rgba(0,21,41,.35); - - // reset element-ui css - .horizontal-collapse-transition { - transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; - } - - .scrollbar-wrapper { - overflow-x: hidden !important; - } - - .el-scrollbar__bar.is-vertical { - right: 0px; - } - - .el-scrollbar { - height: 100%; - } - - &.has-logo { - .el-scrollbar { - height: calc(100% - 50px); - } - } - - .is-horizontal { - display: none; - } - - a { - display: inline-block; - width: 100%; - overflow: hidden; - } - - .svg-icon { - margin-right: 16px; - } - - .el-menu { - border: none; - height: 100%; - width: 100% !important; - } - - .el-menu-item, .el-submenu__title { - overflow: hidden !important; - text-overflow: ellipsis !important; - white-space: nowrap !important; - } - - // menu hover - .submenu-title-noDropdown, - .el-submenu__title { - &:hover { - background-color: rgba(255,255,255,.06) !important; - } - } - - & .theme-dark .is-active > .el-submenu__title { - color: $base-menu-color-active !important; - } - - .el-menu-item.is-active { - background-color: #1d4e89 !important; - color: #ffffff !important; - border-left: 3px solid #5dade2; - } - - & .nest-menu .el-submenu>.el-submenu__title, - & .el-submenu .el-menu-item { - min-width: $base-sidebar-width !important; - &:hover { background-color: rgba(255,255,255,.06) !important; } - } - - & .theme-dark .nest-menu .el-submenu>.el-submenu__title, - & .theme-dark .el-submenu .el-menu-item { - background-color: $base-sub-menu-background !important; - &:hover { background-color: $base-sub-menu-hover !important; } - } - } - - .hideSidebar { - .sidebar-container { - width: 54px !important; - } - - .main-container { - margin-left: 54px; - } - - .submenu-title-noDropdown { - padding: 0 !important; - position: relative; - - .el-tooltip { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - } - } - - .el-submenu { - overflow: hidden; - - &>.el-submenu__title { - padding: 0 !important; - - .svg-icon { - margin-left: 20px; - } - - } - } - - .el-menu--collapse { - .el-submenu { - &>.el-submenu__title { - &>span { - height: 0; - width: 0; - overflow: hidden; - visibility: hidden; - display: inline-block; - } - } - } - } - } - - .el-menu--collapse .el-menu .el-submenu { - min-width: $base-sidebar-width !important; - } - - // mobile responsive - .mobile { - .main-container { - margin-left: 0px; - } - - .sidebar-container { - transition: transform .28s; - width: $base-sidebar-width !important; - } - - &.hideSidebar { - .sidebar-container { - pointer-events: none; - transition-duration: 0.3s; - transform: translate3d(-$base-sidebar-width, 0, 0); - } - } - } - - .withoutAnimation { - - .main-container, - .sidebar-container { - transition: none; - } - } -} - -// when menu collapsed -.el-menu--vertical { - &>.el-menu { - .svg-icon { - margin-right: 16px; - } - } - - .nest-menu .el-submenu>.el-submenu__title, - .el-menu-item { - &:hover { - // you can use $subMenuHover - background-color: rgba(0, 0, 0, 0.06) !important; - } - } - - // the scroll bar appears when the subMenu is too long - >.el-menu--popup { - max-height: 100vh; - overflow-y: auto; - - &::-webkit-scrollbar-track-piece { - background: #d3dce6; - } - - &::-webkit-scrollbar { - width: 6px; - } - - &::-webkit-scrollbar-thumb { - background: #99a9bf; - border-radius: 20px; - } - } -} +#app { + + .main-container { + height: 100%; + transition: margin-left .28s; + margin-left: $base-sidebar-width; + position: relative; + } + + .sidebarHide { + margin-left: 0!important; + } + + .sidebar-container { + -webkit-transition: width .28s; + transition: width 0.28s; + width: $base-sidebar-width !important; + background-color: $base-menu-background; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35); + box-shadow: 2px 0 6px rgba(0,21,41,.35); + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 56px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + .el-menu-item, .el-submenu__title { + overflow: hidden !important; + text-overflow: ellipsis !important; + white-space: nowrap !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: rgba(255,255,255,.06) !important; + } + } + + & .theme-dark .is-active > .el-submenu__title { + color: $base-menu-color-active !important; + } + + .el-menu-item.is-active { + background-color: #1d4e89 !important; + color: #ffffff !important; + border-left: 3px solid #5dade2; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $base-sidebar-width !important; + &:hover { background-color: rgba(255,255,255,.06) !important; } + } + + & .theme-dark .nest-menu .el-submenu>.el-submenu__title, + & .theme-dark .el-submenu .el-menu-item { + background-color: $base-sub-menu-background !important; + &:hover { background-color: $base-sub-menu-hover !important; } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $base-sidebar-width !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $base-sidebar-width !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$base-sidebar-width, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: rgba(0, 0, 0, 0.06) !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/ruoyi-ui/src/components/ChecklistSelect/index.vue b/ruoyi-ui/src/components/ChecklistSelect/index.vue new file mode 100644 index 00000000..bdb5e78f --- /dev/null +++ b/ruoyi-ui/src/components/ChecklistSelect/index.vue @@ -0,0 +1,72 @@ + + + diff --git a/ruoyi-ui/src/components/DragResizePanel/index.vue b/ruoyi-ui/src/components/DragResizePanel/index.vue new file mode 100644 index 00000000..d3e0e9a4 --- /dev/null +++ b/ruoyi-ui/src/components/DragResizePanel/index.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/components/QRCode/index.vue b/ruoyi-ui/src/components/QRCode/index.vue new file mode 100644 index 00000000..4f780a8e --- /dev/null +++ b/ruoyi-ui/src/components/QRCode/index.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 2544f7cb..05d53422 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -1,199 +1,221 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue index bd3510cc..05df4c75 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue @@ -1,94 +1,119 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/mill/eqp/day.vue b/ruoyi-ui/src/views/mill/eqp/day.vue index 3b127bda..99e4d192 100644 --- a/ruoyi-ui/src/views/mill/eqp/day.vue +++ b/ruoyi-ui/src/views/mill/eqp/day.vue @@ -1,160 +1,308 @@ + + diff --git a/ruoyi-ui/src/views/mill/eqp/index.vue b/ruoyi-ui/src/views/mill/eqp/index.vue index 2e9beca0..4a37d302 100644 --- a/ruoyi-ui/src/views/mill/eqp/index.vue +++ b/ruoyi-ui/src/views/mill/eqp/index.vue @@ -1,341 +1,649 @@ diff --git a/ruoyi-ui/src/views/mill/eqp/record.vue b/ruoyi-ui/src/views/mill/eqp/record.vue index 498589e1..8ccb5564 100644 --- a/ruoyi-ui/src/views/mill/eqp/record.vue +++ b/ruoyi-ui/src/views/mill/eqp/record.vue @@ -1,31 +1,39 @@