From 12227728f719524122dcf477ce797a269f095843 Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Fri, 15 Nov 2024 14:14:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E9=A1=B9=E4=BF=AE=E6=94=B9=20=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/com_tool_info_add_update.vue | 2 ++ src/views/modules/tooling/manuf_tool.vue | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/modules/tooling/components/com_tool_info_add_update.vue b/src/views/modules/tooling/components/com_tool_info_add_update.vue index 862f960..6275c4d 100644 --- a/src/views/modules/tooling/components/com_tool_info_add_update.vue +++ b/src/views/modules/tooling/components/com_tool_info_add_update.vue @@ -165,6 +165,7 @@ export default { propertyNo: '', ifsRowId: 0, ifsRowVersion: '', + addFlag: true, }, dataListLoading: false, labels: { @@ -348,6 +349,7 @@ export default { this.pageData = JSON.parse(JSON.stringify(toolInfo)); this.pageData.username = this.$store.state.user.name; } + this.pageData.addFlag = addFlag; this.addFlag = addFlag; }, diff --git a/src/views/modules/tooling/manuf_tool.vue b/src/views/modules/tooling/manuf_tool.vue index 83f7e37..0866445 100644 --- a/src/views/modules/tooling/manuf_tool.vue +++ b/src/views/modules/tooling/manuf_tool.vue @@ -542,7 +542,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 40 + columnWidth: 90 }, { userId: this.$store.state.user.name, @@ -803,7 +803,6 @@ export default { // columnList: { // deep: true, // handler: function (newV, oldV) { - // debugger // // } // } @@ -1095,8 +1094,17 @@ export default { /*调整等待派工单的等待时间*/ changeCurrentToolInfo(tempData) { - //重置选择行 - this.currentRow = JSON.parse(JSON.stringify(tempData)); + //判断是否是新增的数据 + if(tempData.addFlag){ + //重置查询的条件 + this.searchData.site = tempData.site; + this.searchData.toolId = tempData.toolId; + //调用传的方法 + this.refreshTooInfoData(); + }else { + //重置选择行 + this.currentRow = JSON.parse(JSON.stringify(tempData)); + } }, /*调整等待派工单的等待时间*/ From d3cc267ff5b1e0e573fe74f274e29aa83f375820 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 15 Nov 2024 14:33:31 +0800 Subject: [PATCH 2/3] plm BMM --- src/assets/scss/_base.scss | 36 +++++++++++++++++++++++++++++++++++- src/assets/scss/global.scss | 5 +++++ src/views/main-navbar.vue | 12 ++++++++++-- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/assets/scss/_base.scss b/src/assets/scss/_base.scss index c6121b0..257be5a 100644 --- a/src/assets/scss/_base.scss +++ b/src/assets/scss/_base.scss @@ -71,6 +71,7 @@ img { .site-sidebar--fold { .site-navbar__header, .site-navbar__brand, + .site-navbar__brand2, .site-sidebar, .site-sidebar__inner, .el-menu.site-sidebar__menu { @@ -88,6 +89,14 @@ img { display: inline-block; } } + .site-navbar__brand2 { + &-lg { + display: none; + } + &-mini { + display: inline-block; + } + } .site-sidebar, .site-sidebar__inner { overflow: initial; @@ -103,6 +112,7 @@ img { // animation .site-navbar__header, .site-navbar__brand, +.site-navbar__brand2, .site-navbar__body, .site-sidebar, .site-sidebar__inner, @@ -174,7 +184,31 @@ img { text-transform: uppercase; white-space: nowrap; color: #fff; - + &-lg, + &-mini { + margin: 0 5px; + color: #fff; + &:focus, + &:hover { + color: #fff; + text-decoration: none; + } + } + &-mini { + display: none; + } + } + &__brand2 { + display: table-cell; + vertical-align: middle; + width: 230px; + height: 50px; + margin: 0; + line-height: 50px; + font-size: 20px; + text-align: center; + white-space: nowrap; + color: #fff; &-lg, &-mini { margin: 0 5px; diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index f91960d..4379954 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -153,6 +153,11 @@ line-height: 35px; font-size: 18px; } +.site-navbar__brand2 { + height: 35px; + line-height: 35px; + font-size: 18px; +} .site-navbar { height: 35px; } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index e8664c2..9bcf418 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -2,7 +2,7 @@