diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 2b0ec69..5715fed 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -71,7 +71,6 @@
}
.el-menu-item, .el-submenu__title {
- overflow: hidden !important;
text-overflow: ellipsis !important;
white-space: nowrap !important;
}
@@ -105,7 +104,7 @@
background-color: $base-sub-menu-hover !important;
}
}
-
+
& .theme-dark .el-submenu .el-menu-item.is-active {
background-color: #0b50ff !important;
}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 5be1d54..8e2f8ba 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index be3285d..4b9847a 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -1,33 +1,57 @@
+
+
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 7880cbb..a8b4cb9 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,96 +1,160 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/asrs/rollMessage/index.vue b/src/views/asrs/rollMessage/index.vue
index 0a12fc0..840e27f 100644
--- a/src/views/asrs/rollMessage/index.vue
+++ b/src/views/asrs/rollMessage/index.vue
@@ -161,6 +161,7 @@ export default {
},
tableProps,
tableData: [],
+ getTrayCode: undefined,
formConfig: [
{
type: 'input',
@@ -226,7 +227,11 @@ export default {
};
},
components: {},
- created() {},
+ created() {
+ this.listQuery.trayCode = this.$route.query && this.$route.query.trayCode
+ this.formConfig[0].placeholder = this.listQuery.trayCode || '托盘编码'
+ this.getDataList();
+ },
methods: {
buttonClick(val) {
switch (val.btnName) {
diff --git a/src/views/asrs/rollTimeRemind/index.vue b/src/views/asrs/rollTimeRemind/index.vue
index 3784e27..b0b5963 100644
--- a/src/views/asrs/rollTimeRemind/index.vue
+++ b/src/views/asrs/rollTimeRemind/index.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2024-02-27 14:43:14
* @LastEditors: zwq
- * @LastEditTime: 2024-08-20 16:17:36
+ * @LastEditTime: 2024-08-21 14:04:09
* @Description:
-->
@@ -39,13 +39,14 @@
:label="'第' + i + '页'"
:name="i + '页'">
{{ item.containerCode }}
@@ -158,6 +159,23 @@ export default {
})
.catch(() => {});
},
+ /** 跳转膜卷信息页面 */
+ toRollMessagePage(trayCode){
+ this.$confirm(`是否跳转到膜卷信息页面? 托盘编码:[ ${trayCode} ]`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "success ",
+ })
+ .then(() => {
+ this.$router.push({
+ path: "rollMessage",
+ query:{
+ trayCode: trayCode
+ }
+ });
+ })
+ .catch(() => { });
+ }
},
};