From 0ef2692358a867784da731630bc5a1d390f526f1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 25 Apr 2024 13:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/css/mixin.styl                    | 49 ---------------------------
 src/pages/modules/PressProd.vue       |  7 ++--
 src/pages/modules/SortWorkMonitor.vue | 13 ++++---
 3 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 src/css/mixin.styl

diff --git a/src/css/mixin.styl b/src/css/mixin.styl
deleted file mode 100644
index 97224f1..0000000
--- a/src/css/mixin.styl
+++ /dev/null
@@ -1,49 +0,0 @@
-$red = #ed4754
-$green = #67c23a
-$yellow = #f2d648
-$orange = #f17d3a
-$blue = #6798ef
-$gray = #c9c9c9
-$fc1 = #323232
-
-.green
-  background-color #11ff0d
-.yellow
-  background-color #fdfd0f
-.gray
-  background-color #bfbfbf
-.red
-  background-color #ff1016
-
-//宽高
-_wh(w, h)
-  width: w
-  height: h
-
-//字体大小、行高、颜色
-_font(size,height,color=$fc1,weight=normal,align=left)
-  font-size: size
-  line-height: height
-  color: color
-  font-weight: weight
-  text-align: align
-
-//flex 布局和 子元素 对其方式
-_fj(x=space-between,y=center)
-  display: flex
-  justify-content: x
-  align-items: y
-
-// 背景图片地址和大小
-_bis(url,w,h=auto,x=center,y=center)
-  background-position: x y
-  background-size: w h
-  background-image: url(url)
-  background-repeat: no-repeat
-
-// 定位上下居中
-_ct()
-  position: absolute
-  top: 50%
-  transform: translateY(-50%)
-  
\ No newline at end of file
diff --git a/src/pages/modules/PressProd.vue b/src/pages/modules/PressProd.vue
index cdcc78f..2b3ba35 100644
--- a/src/pages/modules/PressProd.vue
+++ b/src/pages/modules/PressProd.vue
@@ -100,7 +100,6 @@
 
 <script>
 import THeader from '@components/header3.vue'
-// import * as echarts from 'echarts'
 import { cockpitpress } from '@js/getData1'
 // import {cockpitpress} from '@js/mork1.js'
 export default {
@@ -632,9 +631,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-// @import '~@css/mixin'
-@import '../../css/mixin'
-// @import '~@style/mixin'
+@import '~@style/mixin'
 .bg
   _wh(100%, 100%)
   overflow hidden
@@ -886,7 +883,7 @@ export default {
     .scroll-ul_2_div
         float left
         _wh(7%, 44px)
-        _fj(center)
+        _fj(row,center)
         _font(12px, 44px, #fff,,center)
         word-wrap break-word
         word-break break-all
diff --git a/src/pages/modules/SortWorkMonitor.vue b/src/pages/modules/SortWorkMonitor.vue
index 8539a88..7e7421f 100644
--- a/src/pages/modules/SortWorkMonitor.vue
+++ b/src/pages/modules/SortWorkMonitor.vue
@@ -471,8 +471,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-// @import '~@css/mixin'
-@import '../../css/mixin'
+@import '~@style/mixin'
 .bg
   _wh(100%, 100%)
   overflow hidden
@@ -545,12 +544,12 @@ export default {
     &:nth-child(1)
       color #2ef6ff
 .zdy_box
-  _fj(flex-start, flex-start)
+  _fj(row,flex-start, flex-start)
   flex-wrap wrap
   align-content flex-start
 .one_wrap_item
   height calc(50% - 15px)
-  _fj(flex-start)
+  _fj(row,flex-start)
   margin-top 15px
   margin-right 15px
 .one_w_item_label
@@ -563,7 +562,7 @@ export default {
   min-width 20px
   height 100%
   _font(30px, 1, #f7b502,,center)
-  _fj(center)
+  _fj(row,center)
   background-color rgba(50,197,255,0.1)
   padding 0 10px
 .two_wrap
@@ -572,7 +571,7 @@ export default {
 .two_wrap_item
   _wh(50%, 100%)
   padding 0 15px
-  _fj()
+  _fj(row)
 .two_w_item_label
   width 170px
   _font(18px, 1, #32c5ff,,)
@@ -655,7 +654,7 @@ export default {
     .scroll-ul_2_div
         float left
         _wh(11.1%, 44px)
-        _fj(center)
+        _fj(row,center)
         _font(12px, 44px, #fff,,center)
         word-wrap break-word
         word-break break-all