diff --git a/mes/hd/logPath_IS_UNDEFINED/2022-09-01.0.log b/mes/hd/logPath_IS_UNDEFINED/2022-09-01.0.log deleted file mode 100644 index e69de29b..00000000 diff --git a/mes/hd/logPath_IS_UNDEFINED/2022-10-17.0.log b/mes/hd/logPath_IS_UNDEFINED/2022-10-17.0.log deleted file mode 100644 index e69de29b..00000000 diff --git a/mes/hd/logPath_IS_UNDEFINED/2022-10-21.0.log b/mes/hd/logPath_IS_UNDEFINED/2022-10-21.0.log deleted file mode 100644 index e69de29b..00000000 diff --git a/mes/hd/logPath_IS_UNDEFINED/2023-01-13.0.log b/mes/hd/logPath_IS_UNDEFINED/2023-01-13.0.log deleted file mode 100644 index e69de29b..00000000 diff --git a/mes/qd/src/assets/styles/eladmin.scss b/mes/qd/src/assets/styles/eladmin.scss index 56e24a1c..57a62e5d 100644 --- a/mes/qd/src/assets/styles/eladmin.scss +++ b/mes/qd/src/assets/styles/eladmin.scss @@ -167,15 +167,52 @@ input[type="number"]::-webkit-outer-spin-button { } //去除编辑文本框为数字时的上下箭头end + //设置计数器文字居左 .el-input-number--mini .el-input__inner { text-align: left; } -.el-table:not(.el-table–scrollable-x) .el-table__fixed-right{ +.el-table:not(.el-table–scrollable-x) .el-table__fixed-right { height: 100% !important; } +// 修改弹出框距离 .el-dialog__body { padding-top: 0px !important; } + +//表格标题样式 +.el-table { + .el-table__header-wrapper, + .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9; + color: #515a6e; + height: 35px; + font-size: 13px; + } + + td { + color: #f8f8f9; + } + } + + .el-table__body-wrapper { + .el-button [class*="el-icon-"] + span { + margin-left: 1px; + } + } +} + +//表格固定列最后一行显示不全(https://mp.weixin.qq.com/s/HpoykJNtsynsW4UMHitZbQ) +.el-table__fixed-right { + height: 100% !important; +} + +//表头与内容错位 +.el-table--scrollable-y .el-table__body-wrapper { + overflow-y: overlay !important; +} + diff --git a/mes/qd/src/assets/styles/element-ui.scss b/mes/qd/src/assets/styles/element-ui.scss index 8f7881c2..5c72fb9a 100644 --- a/mes/qd/src/assets/styles/element-ui.scss +++ b/mes/qd/src/assets/styles/element-ui.scss @@ -17,7 +17,7 @@ .cell { .el-tag { - margin-right: 0; + margin-right: 0px; } } @@ -41,7 +41,7 @@ text-align: center; .el-tag { - margin-right: 0; + margin-right: 0px; } } } @@ -69,7 +69,7 @@ // dropdown .el-dropdown-menu { a { - display: block + display: block; } } @@ -77,3 +77,46 @@ .el-range-editor.el-input__inner { display: inline-flex !important; } + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} + +.el-menu--collapse +> div +> .el-submenu +> .el-submenu__title +.el-submenu__icon-arrow { + display: none; +} + +.el-form-search { + float: right; + .el-form-search-item { + margin-bottom: 0px; + .el-input__inner { + width: 140px; + } + } +} + +el-table .el-table__cell { + padding: 8px 0; +} + +.el-table--medium .el-table__cell { + padding: 6px 0; +} + +.el-table--small .el-table__cell { + padding: 3px 0; +} + +.el-table--mini .el-table__cell { + padding: 1px 0; +} + +.el-dialog__body { + padding: 20px 20px; +} diff --git a/mes/qd/src/assets/styles/variables.scss b/mes/qd/src/assets/styles/variables.scss index 41de79ca..384517bb 100644 --- a/mes/qd/src/assets/styles/variables.scss +++ b/mes/qd/src/assets/styles/variables.scss @@ -8,14 +8,20 @@ $tiffany: #4AB7BD; $yellow:#FEC171; $panGreen: #30B08F; +$base-logo-title-color: #ffffff; +$base-logo-light-title-color: #001529; +$base-menu-light-background:#ffffff; + // sidebar $menuText:#bfcbd9; $menuActiveText:#409EFF; $subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; +$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 $menuHover:#263445; +$base-menu-light-color:rgba(0,0,0,.70); + $subMenuBg:#1f2d3d; $subMenuHover:#001528; @@ -28,8 +34,15 @@ $sideBarWidth: 205px; menuActiveText: $menuActiveText; subMenuActiveText: $subMenuActiveText; menuBg: $menuBg; + menuLightBackground: $base-menu-light-background; + menuLightColor: $base-menu-light-color; menuHover: $menuHover; subMenuBg: $subMenuBg; subMenuHover: $subMenuHover; sideBarWidth: $sideBarWidth; + + logoTitleColor: $base-logo-title-color; + logoLightTitleColor: $base-logo-light-title-color } + +$base-sidebar-width: 200px; diff --git a/mes/qd/src/components/Crud/crud.js b/mes/qd/src/components/Crud/crud.js index bf10ea42..9994fd2f 100644 --- a/mes/qd/src/components/Crud/crud.js +++ b/mes/qd/src/components/Crud/crud.js @@ -52,7 +52,7 @@ function CRUD(options) { add: true, edit: true, del: true, - download: true, + download: false, reset: true }, // 自定义一些扩展属性