Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/js-web-jianguan

@@ -18,9 +18,7 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .app-main {
 .app-main {
   height: calc(100vh - 70px);
   height: calc(100vh - 70px);
-  overflow-x: auto;
-  box-sizing: border-box;
-  background-color: #EDF1F7;
+  overflow-x: hidden;
   box-sizing: border-box;
   box-sizing: border-box;
 }
 }
 </style>
 </style>
\ No newline at end of file

@@ -358,17 +358,36 @@ aside {
   position: relative;
   position: relative;
 }
 }
 
 
+.warehousing {
+  color: #FF9933;
+  position: relative;
+}
+
+
 .adopt::before {
 .adopt::before {
   position: absolute;
   position: absolute;
   content: '';
   content: '';
   display: block;
   display: block;
-  width: 8px;
-  height: 8px;
+  width: 10px;
+  height: 10px;
   left: -15px;
   left: -15px;
-  top: 5px;
+  top: 3px;
   background: #00FAA8;
   background: #00FAA8;
   border-radius: 50%;
   border-radius: 50%;
-  border: 5px solid rgba(0, 250, 168, 0.3);
+  border: 2px solid rgba(0, 0, 0, 0.6);
+}
+
+.warehousing::before {
+  position: absolute;
+  content: '';
+  display: block;
+  width: 10px;
+  height: 10px;
+  left: -15px;
+  top: 3px;
+  background: #FF9933;
+  border-radius: 50%;
+  border: 2px solid rgba(0, 0, 0, 0.6);
 }
 }
 
 
 //错误日志样式 后期超优化
 //错误日志样式 后期超优化

@@ -5,6 +5,7 @@
     width: 100%;
     width: 100%;
     box-sizing: border-box;
     box-sizing: border-box;
     background-color: #000637;
     background-color: #000637;
+    overflow-x: hidden;
 
 
     &-header {
     &-header {
         width: 100%;
         width: 100%;

@@ -3,6 +3,8 @@
     height: 100%;
     height: 100%;
     transition: margin-left 0.28s;
     transition: margin-left 0.28s;
     margin-left: 220px;
     margin-left: 220px;
+    box-sizing: border-box;
+    padding-right: 10px;
   }
   }
 
 
   .sidebar-container {
   .sidebar-container {

@@ -52,8 +52,8 @@ class data extends filter {
             <div>
             <div>
               {
               {
                 scope.row.jcjg
                 scope.row.jcjg
-                  ? <el-tag type='success'>入库</el-tag>
-                  : <el-tag type='primary'>入库1</el-tag>
+                  ? <span class='warehousing'>入库</span>
+                  : <span>入库1</span>
               }
               }
             </div>
             </div>
           )
           )