样式

src/assets/css/layout.styl

@@ -2,7 +2,7 @@
 
 // 样式测试
 .style_block
-//   display none
+  display none
   position absolute
   _wh(calc(100% / 3), calc(100% / 3))
   background red

src/pages/modules/homepage/one.vue

@@ -434,6 +434,9 @@
                             <img v-show="String(ManipulatorInfoList[3].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
                             <img v-show="String(ManipulatorInfoList[3].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                           </div>
+                          <div class="sh_machine elect_1 elect_2">
+                            <img src="../../../images/workshop/elect.png" alt="">
+                          </div>
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
                           <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
@@ -646,12 +649,12 @@
             <router-link to="/pdone" class="tooltip_page">6</router-link>
           </div>
         </div>
-        <!-- <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
+        <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
         <div class="style_block" style="background: green;left: calc(100% / 3);top:calc(100% / 3);"></div>
         <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
         <div class="style_block" style="background: green;left: calc(200% / 3);top:0;"></div>
         <div class="style_block" style="left: calc(200% / 3);top:calc(100% / 3);"></div>
-        <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div> -->
+        <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div>
     </div>
 </template>
 
@@ -1421,9 +1424,10 @@ export default {
     background-color #d9d9d9
     top auto
     bottom 0
-    _fj(row,center)
+    _fj(row,flex-start)
+    padding 0 10px
     p
-      _font(15px,17px,#333,,)
+      _font(15px,17px,#333,,left)
   .jzjcss
     width: 24%;
     left: 51%;
@@ -1679,6 +1683,9 @@ export default {
     width: 18%;
     top: 12%;
     left: 57%;
+  .elect_2
+    top: 74%;
+    left: 38%;
 .yj_wrap_8
   top 89%
 .yj_wrap_17

src/pages/modules/takeshape/one.vue

@@ -369,6 +369,9 @@
                         <img v-show="String(ManipulatorInfoList[3].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
                         <img v-show="String(ManipulatorInfoList[3].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
+                      <div class="sh_machine elect_1 elect_2">
+                        <img src="../../../images/workshop/elect.png" alt="">
+                      </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
                       <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
@@ -1174,13 +1177,13 @@ export default {
   height: 98%;
   bottom: -33%;
   left: auto;
-  right: 57.5%;
+  right: 51.5%
   transform: rotate(90deg);
   .lz
     position relative
     _wh(100%,4.96%)
   .mgt5
-    margin-top 45%
+    margin-top 75%
 .kl_wrap_2
   bottom -40%
 .yaji_wrap
@@ -1342,7 +1345,7 @@ export default {
     top 9%
     left: 89%;
 .yj_wrap_3
-  left: 53%
+  left: 52.6%
   .yj_info_wrap
     top -10%
     width 148%
@@ -1508,6 +1511,9 @@ export default {
     width: 18%;
     top: 12%;
     left: 57%;
+  .elect_2
+    top: 74%;
+    left: 38%;
 .yj_wrap_8
   left 3%
 .yj_wrap_17

src/pages/modules/takeshape/two.vue

@@ -296,20 +296,26 @@ export default {
     padding 0 5px
     overflow hidden
     box-sizing border-box
+    &:nth-child(1),&:nth-child(3)
+        width 11%
+    &:nth-child(4)
+        width 8%
     &:nth-child(7)
         width 6%
     &:nth-child(9),&:nth-child(10)
         width 12%
 .scroll_tab_2 li
-    width 16%
+    width 16% !important
     &:nth-child(6)
-        width 20%
+        width 20% !important
 .scroll_tab_3 li
-    width 14%
+    width 14% !important
+    &:nth-child(1)
+        width 11% !important
     &:nth-child(3)
-        width 11%
+        width 11% !important
     &:nth-child(7)
-        width 19%
+        width 22% !important
 .scroll_container_1
   width 100%
   height calc(100% - 40px)
@@ -331,18 +337,24 @@ export default {
       // white-space nowrap
       padding 0 5px
       overflow hidden
+      &:nth-child(1),&:nth-child(3)
+        width 11%
+      &:nth-child(4)
+        width 8%
       &:nth-child(7)
         width 6%
       &:nth-child(9),&:nth-child(10)
         width 12%
 .scroll-ul_2 li .scroll-ul_1_div
-    width 16%
+    width 16% !important
     &:nth-child(6)
-        width 20%
+        width 20% !important
 .scroll-ul_3 li .scroll-ul_1_div
-    width 14%
+    width 14% !important
+    &:nth-child(1)
+        width 11% !important
     &:nth-child(3)
-        width 11%
+        width 11% !important
     &:nth-child(7)
-        width 19%
+        width 22% !important
 </style>