From 20f3acdc1f11a3da9e7ba79a1edac2ab1b4af85a Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Thu, 4 Mar 2021 18:22:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=E5=90=8C?=
=?UTF-8?q?=E7=BA=A7=E7=BC=96=E8=BE=91=E5=B7=A5=E5=85=B7=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../editToolTJ/component/mapVisual/index.vue | 0
.../editToolTJ/component/menuItem.vue | 68 ------
.../{menuNav.vue => menuNav/index.vue} | 19 +-
.../editToolTJ/component/menuNav/menuItem.vue | 93 ++++++++
.../component/{ => menuNav}/menuList.vue | 31 ++-
src/views/planMonitor/editToolTJ/index.vue | 92 ++++++--
src/views/planMonitor/editToolTJ/navBar.vue | 43 ++--
.../planMonitor/editToolTJ/navSchedule.vue | 30 +++
src/views/planMonitor/editToolTJ/navState.vue | 9 +-
src/views/planMonitor/editToolTJ/navTool.vue | 207 +++++++++---------
10 files changed, 353 insertions(+), 239 deletions(-)
create mode 100644 src/views/planMonitor/editToolTJ/component/mapVisual/index.vue
delete mode 100644 src/views/planMonitor/editToolTJ/component/menuItem.vue
rename src/views/planMonitor/editToolTJ/component/{menuNav.vue => menuNav/index.vue} (83%)
create mode 100644 src/views/planMonitor/editToolTJ/component/menuNav/menuItem.vue
rename src/views/planMonitor/editToolTJ/component/{ => menuNav}/menuList.vue (79%)
create mode 100644 src/views/planMonitor/editToolTJ/navSchedule.vue
diff --git a/src/views/planMonitor/editToolTJ/component/mapVisual/index.vue b/src/views/planMonitor/editToolTJ/component/mapVisual/index.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/views/planMonitor/editToolTJ/component/menuItem.vue b/src/views/planMonitor/editToolTJ/component/menuItem.vue
deleted file mode 100644
index af8ea453a..000000000
--- a/src/views/planMonitor/editToolTJ/component/menuItem.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/planMonitor/editToolTJ/component/menuNav.vue b/src/views/planMonitor/editToolTJ/component/menuNav/index.vue
similarity index 83%
rename from src/views/planMonitor/editToolTJ/component/menuNav.vue
rename to src/views/planMonitor/editToolTJ/component/menuNav/index.vue
index d541ee846..07d174044 100644
--- a/src/views/planMonitor/editToolTJ/component/menuNav.vue
+++ b/src/views/planMonitor/editToolTJ/component/menuNav/index.vue
@@ -2,12 +2,13 @@
@@ -31,11 +32,11 @@ export default {
},
background: {
type: String,
- default: '#F6F6F6'
+ default: '#fff'
},
color: {
type: String,
- default: '#222'
+ default: '#000'
},
elNavClass: {
type: String,
@@ -54,7 +55,7 @@ export default {
},
methods: {
onClick(el, i){
- this.active = i;
+ this.active = i
if (el.disabled) return;
if (el.handle) {
el.handle(el);
@@ -63,11 +64,13 @@ export default {
},
onMouseEnter(el, i) {
this.index = i;
- console.log(333333333333333);
},
onMouseLeave(el, i) {
- console.log(444444444444444);
this.index = -1;
+ },
+ onClose(el, i) {
+ this.active = i
+ this.onMouseLeave(el, i);
}
}
}
@@ -77,8 +80,10 @@ export default {
display: flex;
justify-content: flex-start;
align-items: center;
+ box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
&-menu {
position: relative;
+ z-index: 100;
}
}
diff --git a/src/views/planMonitor/editToolTJ/component/menuNav/menuItem.vue b/src/views/planMonitor/editToolTJ/component/menuNav/menuItem.vue
new file mode 100644
index 000000000..da813e93d
--- /dev/null
+++ b/src/views/planMonitor/editToolTJ/component/menuNav/menuItem.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
diff --git a/src/views/planMonitor/editToolTJ/component/menuList.vue b/src/views/planMonitor/editToolTJ/component/menuNav/menuList.vue
similarity index 79%
rename from src/views/planMonitor/editToolTJ/component/menuList.vue
rename to src/views/planMonitor/editToolTJ/component/menuNav/menuList.vue
index 783febc6e..21023c888 100644
--- a/src/views/planMonitor/editToolTJ/component/menuList.vue
+++ b/src/views/planMonitor/editToolTJ/component/menuNav/menuList.vue
@@ -3,13 +3,14 @@
@@ -49,21 +50,21 @@ export default {
},
methods: {
onMouseEnter(el, i) {
- this.$emit('mouseenter', el, i);
this.index = i;
},
onMouseLeave(el, i) {
- this.$emit('mouseleave', el, i);
this.index = -1;
- console.log(999999999999999)
},
onClick(el, i) {
- this.$emit('click', el, i);
if (el.disabled) return;
if (el.handle) {
el.handle(el);
this.onMouseLeave(el, i);
+ this.$emit('close', el, i);
}
+ },
+ onClose(el, i) {
+ this.$emit('close', el, i);
}
}
}
@@ -78,11 +79,11 @@ export default {
.menu {
&-ul {
+ z-index: 99;
position: absolute;
white-space: nowrap;
border: 1px solid #d1d1d1;
- box-shadow: 2px 2px 2px #999;
- z-index: 999;
+ box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
}
&-li {
position: relative;
@@ -100,15 +101,21 @@ export default {
}
&-list {
- transform:translateX(100%);
+ transform:translate(100%, -1px);
right: 0px;
top: 0;
}
&-separation {
- height: 0px;
- border: 1px solid #bfbfbf;
- margin: 0 5px;
+ &::after {
+ content:"";
+ position: absolute;
+ left: -50%;
+ bottom: -1px;
+ width: 200%;
+ border: 1px solid #d1d1d1;
+ transform: scale(0.5);
+ }
}
}
diff --git a/src/views/planMonitor/editToolTJ/index.vue b/src/views/planMonitor/editToolTJ/index.vue
index 63524e7ad..2c74591e9 100644
--- a/src/views/planMonitor/editToolTJ/index.vue
+++ b/src/views/planMonitor/editToolTJ/index.vue
@@ -1,49 +1,103 @@
-
-
-
-
-
-
+
diff --git a/src/views/planMonitor/editToolTJ/navBar.vue b/src/views/planMonitor/editToolTJ/navBar.vue
index e6d95120d..63b1c2123 100644
--- a/src/views/planMonitor/editToolTJ/navBar.vue
+++ b/src/views/planMonitor/editToolTJ/navBar.vue
@@ -1,10 +1,10 @@
-