From e31a294cd6ce4cdc41a2df4a5d3994b0f14f1eb2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 九月 2023 14:31:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/view/index.vue | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 711181b..95ba3db 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -60,7 +60,12 @@
align-items: center;
flex-direction: column;
padding: 20px 0;
- transition: .3s;
+ transition: 0.3s;
+ overflow-y: auto;
+ }
+
+ .left::-webkit-scrollbar {
+ width: 0;
}
.left .box {
@@ -121,7 +126,7 @@
.right {
height: calc(100vh - 58px);
- transition: .3s;
+ transition: 0.3s;
}
.tag {
@@ -136,14 +141,28 @@
font-size: 14px;
}
- .tag > .el-icon-s-unfold,.el-icon-s-fold {
+ .tag .el-icon-delete {
+ display: none;
+ }
+
+ .tag .el-icon-delete:hover {
+ color: #F56C6C;
+ }
+
+ .tag:hover .el-icon-delete {
+ display: block;
+ }
+
+ .tag>.el-icon-s-unfold,
+ .el-icon-s-fold,
+ .el-icon-delete {
font-size: 18px;
cursor: pointer;
margin: 0 8px;
}
.tabs {
- min-width: calc(100% - 34px);
+ min-width: calc(100% - 68px);
height: 100%;
align-items: center;
display: flex;
@@ -182,6 +201,7 @@
width: calc(100% - 48px);
padding: 11px 24px;
background: rgb(245, 247, 251);
+ overflow-y: auto;
}
.com_index {
@@ -203,7 +223,7 @@
<img src="../../static/img/閫�鍑�.png" @click="out" />
</div>
</div>
- <div class="left" :style="`width: ${leftOpen?'92':'0'}px;`">
+ <div class="left" :style="`width: ${leftOpen ? '92' : '0'}px;`">
<div :class="`box ${activeBox == 0 ? 'active_box' : ''}`" @click="addTab(menu[0].c[0])">
<i class="font icon-shouye"></i>
<div>棣栭〉</div>
@@ -226,16 +246,17 @@
</div>
</el-popover>
</div>
- <div class="right" :style="`width: calc(100% - ${leftOpen?'92':'0'}px);`">
+ <div class="right" :style="`width: calc(100% - ${leftOpen ? '92' : '0'}px);`">
<div class="tag">
- <i :class="`${leftOpen?'el-icon-s-unfold':'el-icon-s-fold'}`" @click="leftOpen = !leftOpen"></i>
+ <i :class="`${leftOpen ? 'el-icon-s-unfold' : 'el-icon-s-fold'}`" @click="leftOpen = !leftOpen"></i>
<div class="tabs">
<div :class="`tab ${tabActive == a.k ? 'active_tab' : ''}`" v-for="(a, ai) in tabs" :key="ai"
@click="upTabActive(a.k)">
{{ a.v }}
- <i class="el-icon-close" @click="removeTab(ai)" v-if="tabActive!=0"></i>
+ <i class="el-icon-close" @click="removeTab(ai)" v-if="tabActive != 0"></i>
</div>
</div>
+ <i class="el-icon-delete" @click="allDel" title="鍒犻櫎鎵�鏈夋爣绛鹃〉"></i>
</div>
<div class="component_view">
<component class="com_index" v-for="(com, index) in tabs" :is="com.u" :key="upIndex + '|' + index"
@@ -288,7 +309,7 @@
{
k: 1,
v: "鎶�鏈鐞�",
- i: "font icon-shouye",
+ i: "font icon-ic_form_set24px",
c: [{
k: 1,
v: "鏍囧噯BOM",
@@ -306,7 +327,7 @@
{
k: 4,
v: "鐢熶骇绠＄悊",
- i: "font icon-shouye",
+ i: "font icon-shengchanguanli",
c: [{
k: 12,
v: "鐢熶骇璁㈠崟",
@@ -330,7 +351,7 @@
{
k: 5,
v: "WMS绠＄悊",
- i: "font icon-shouye",
+ i: "font icon-a-Inventorydumprequest",
c: [{
k: 15,
v: "鍘熸潗鏂欏簱瀛�",
@@ -372,7 +393,7 @@
{
k: 2,
v: "QMS绠＄悊",
- i: "font icon-shouye",
+ i: "font icon-xunhuan",
c: [{
k: 3,
v: "鍘熸潗鏂欐楠�",
@@ -426,7 +447,7 @@
{
k: 6,
v: "鏍哥畻绠＄悊",
- i: "font icon-shouye",
+ i: "font icon-caiwuhesuanxitong",
c: [{
k: 21,
v: "浜ч噺宸ヨ祫",
@@ -444,10 +465,10 @@
{
k: 7,
v: "鍩虹鏁版嵁",
- i: "font icon-shouye",
+ i: "font icon-a-ziyuan20",
c: [{
k: 23,
- v: "璁板綍鍐呭缁存姢",
+ v: "鐢熶骇璁板綍缁存姢",
i: "font icon-shouye",
u: "record-content"
},
@@ -482,14 +503,8 @@
u: "mbom"
},
{
- k: 29,
- v: "宸℃椤圭洰缁存姢",
- i: "font icon-shouye",
- u: "routinginspection"
- },
- {
k: 30,
- v: "璁惧鎸囨爣缁存姢",
+ v: "鐢熶骇宸ヨ壓缁存姢",
i: "font icon-shouye",
u: "equipmentmaintain"
}
@@ -530,33 +545,31 @@
}
},
removeTab(index) {
- if (this.tabs.length > 1) {
- this.tabs.splice(index, 1);
- this.activeP = this.tabs[this.tabs.length - 1].k;
- this.tabActive = this.tabs[this.tabs.length - 1].k;
- } else {
- this.$message.warning("涓嶈兘鍏抽棴鏈�鍚庣殑鏍囩");
- }
+ this.tabs.splice(index, 1);
+ this.activeP = this.tabs[this.tabs.length - 1].k;
+ this.tabActive = this.tabs[this.tabs.length - 1].k;
+ },
+ allDel() {
+ this.activeBox = 0
+ this.activeP = 0
+ this.tabActive = 0
+ this.tabs = [{
+ k: 0,
+ v: " 棣栭〉",
+ i: "font icon-shouye",
+ u: "index-index"
+ }]
},
upTabActive(num) {
this.tabActive = num;
this.activeP = num;
- if (num == 0) {
- this.activeBox = 0;
- } else if (num > 0 && num <= 2) {
- this.activeBox = 1;
- } else if (num > 2 && num < 11) {
- this.activeBox = 2;
- } else if (num == 11) {
- this.activeBox = 3;
- } else if (num > 11 && num <= 14) {
- this.activeBox = 4;
- } else if (num > 14 && num <= 20) {
- this.activeBox = 5
- } else if (num > 20 && num <= 22) {
- this.activeBox = 6
- } else if (num > 22 && num <= 30) {
- this.activeBox = 7
+ for (var i = 0; i < this.menu.length; i++) {
+ this.menu[i].c.forEach(b => {
+ if (b.k == num) {
+ this.activeBox = this.menu[i].k;
+ return
+ }
+ })
}
},
out() {
@@ -566,4 +579,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3