Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/saber-grid-sys into master

src/components/menuSide/subMenu.vue

@@ -13,7 +13,7 @@
     </ul>
     <ul v-else>
       <li @click="handleOpen" class="center button" style="width: 90%;height: 50px;margin-top: 0px;">
-        <dv-border-box-2>
+        <dv-border-box-2 :class="{active: isActive}">
           <div class="full center title">
             <i :class="menu.source"></i>
             {{menu.name}}
@@ -21,7 +21,7 @@
           </div>
         </dv-border-box-2>
       </li>
-      <sub-menu style="width: 95%" v-if="isOpen" v-for="item of menu.children" :menu="item"></sub-menu>
+      <sub-menu style="width: 95%;float: right" v-if="menu.isOpen==2"  v-for="item of menu.children" :menu="item"></sub-menu>
     </ul>
   </div>
 </template>
@@ -37,20 +37,16 @@ export default {
     }
   },
   computed: {
-    isOpen(){
-      return this.menuWrap.openMenuName == this.menu.name
-    },
     isActive(){
       return this.menuWrap.activeName == this.menu.name
     }
   },
   mounted() {
-    console.log()
   },
   methods: {
     handleOpen(){
       this.menuWrap.activeName = this.menu.name;
-      this.menuWrap.openMenuName =  this.menuWrap.openMenuName == this.menu.name ? "" : this.menu.name;
+      this.menu.isOpen = this.menu.isOpen==2? 1:2;
     },
     handleMenu(){
       this.menuWrap.activeName = this.menu.name;
@@ -100,7 +96,7 @@ export default {
     border-top: 10px solid  rgba(78, 241, 218,0.3);
   }
   .active{
-    background: rgba(11, 150, 214,0.5);
+    background: rgba(11, 150, 214,0.5) ;
     animation: jello-horizontal 0.5s both !important;
   }
   .button{

src/styles/element-ui.scss

@@ -11,14 +11,56 @@
   position: absolute;
 }
 .basic-container{
-  animation: slide-top 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+  //animation: heartbeat 1.5s ease-in-out  both;
 }
-@keyframes slide-top {
-  0% {
-    transform: translateY(-30px);
+.avue-tags {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  position: relative;
+  padding: 10px 10px;
+  margin-bottom: 10px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  overflow: hidden;
+  border-radius: 10px;
+  border-top: 1px solid #f6f6f6;
+  background-color: #fff;
+}
+@keyframes heartbeat {
+  from {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+    -webkit-transform-origin: center center;
+    transform-origin: center center;
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
+  }
+  10% {
+    -webkit-transform: scale(0.91);
+    transform: scale(0.91);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+  17% {
+    -webkit-transform: scale(0.98);
+    transform: scale(0.98);
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
   }
-  100% {
-    transform: translateY(0);
+  33% {
+    -webkit-transform: scale(0.87);
+    transform: scale(0.87);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+  45% {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
   }
 }
 
+

src/views/grid/dataView.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="full" style="position: relative;" :style="tagIndex==0?'':'background-color: rgba(20, 41, 87,.5);'">
-    <div style="width: 100%;z-index: 999999;" :class="tagIndex==0?'tagIndex0':''">
+    <div style="width: 100%;z-index: 999999;" :class="tagIndex==0?'tagIndex0':'tagIndex1'">
       <top-menu style="z-index: 99999;" :gridList="gridList"></top-menu>
     </div>
-      <dv-border-box-8 :color="['#1a3776', '#3f6a9a']" backgroundColor="rgba(20, 41, 87,.5)" :style="tagIndex==0?'':'height: 89%'">
-        <div class="full center">
+      <dv-border-box-8 :color="['#1a3776', '#3f6a9a']" backgroundColor="rgba(20, 41, 87,.5)" :style="tagIndex==0?'':'height: 90%'">
+        <div class="full center" style="flex-direction: column">
           <keep-alive>
             <router-view   v-if="$route.meta.keepAlive" />
           </keep-alive>
@@ -351,6 +351,8 @@
     color: white;
     font-size: 40px;
   }
-
+.tagIndex1{
+  height: 10%;
+}
 
 </style>

src/views/grid/myLayout.vue

@@ -2,8 +2,9 @@
   <div class="full" style="display: flex;flex-direction: row">
 <!--    <sidebar ></sidebar>-->
     <menu-side></menu-side>
-    <div class="center" style="width: 85%;height: 100%;">
-          <div style="width: 98%;height: 98%;">
+    <div class="center" style="width: 85%;height: 100%;flex-direction: column">
+      <tags style="width: 98%;height: 4%;"></tags>
+          <div style="width: 98%;height: 93%;">
             <keep-alive>
               <router-view   v-if="$route.meta.keepAlive" />
             </keep-alive>
@@ -17,6 +18,7 @@
     import Sidebar from "../../page/index/sidebar/index";
     import {mapGetters} from "vuex";
     import MenuSide from "../../components/menuSide/menuSide";
+    import Tags from "../../page/index/tags";
     export default {
       // provide() {
       //   return {
@@ -24,7 +26,7 @@
       //   };
       // },
       name: "myLayout",
-      components: {MenuSide, Sidebar},
+      components: {Tags, MenuSide, Sidebar},
       methods: {
       },
     }

src/views/order/deviceorder.vue

@@ -205,10 +205,8 @@
       })
     },
     watch:{
-      solveDetailVisible:function(value){
-
+      solveDetailVisible(value){
         this.onLoad(this.page,this.query)
-
       },
     },
     methods: {