From cadfb7e5d3890258c5219cd2c535f81e928759a1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sun, 28 May 2023 14:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                        |  14 +++
 src/pages/modules/workorder/index.vue         | 112 +++++++++++-------
 .../workorder/work-order-assignment.vue       |  19 ++-
 .../modules/workorder/work-report-query.vue   |   2 +-
 src/style/iconfont.styl                       |   2 +
 src/style/iconfont/iconfont.ttf               | Bin 2032 -> 2280 bytes
 src/style/iconfont/iconfont.woff              | Bin 1356 -> 1544 bytes
 src/style/iconfont/iconfont.woff2             | Bin 984 -> 1120 bytes
 src/style/layout.styl                         |  17 +--
 9 files changed, 105 insertions(+), 61 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 33a8f59..350d6cc 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -93,3 +93,17 @@ export const updateReport = (id, report, nok, repare) => post('api/produceshifto
 export const deleteReport = (id) => post('api/produceshiftorder/deleteReport', {
   macoperate_id: id
 })
+
+// 工单作业列表
+// 2.工单管理
+export const getOrderList2 = (code, val, d1, d2) => post('api/produceshiftorder/getOrderList2', {
+  device_code: code,
+  key_value: val,
+  realproducestart_date: d1,
+  realproduceend_date: d2
+})
+// export const getOrderList2 = (code, val, d1, d2) => {
+//   let res = {'totalElements': 2, 'content': [{'material_weight': 0.000000, 'down_id': '1', 'down_time': '2023-05-26 10:32:16.706', 'plan_qty': 111, 'is_needmove': true, 'report_qty': 0, 'create_type': '1', 'confirm_id': '20', 'realproducestart_date': '2023-05-26 10:37:00', 'down_name': '管理员', 'material_spec': '清洗S15', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '1', 'is_error': false, 'material_name': '直接\\CG\\清洗S15\\EKTC00003', 'realproduceend_date': '2023-05-26 11:07:20', 'workorder_status': '3', 'dq_real_qty': 0, 'workprocedure_id': '1535144356586065920', 'workorder_id': '1661923147433250817', 'create_time': '2023-05-26 10:32:10', 'workorder_code': '230526007', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '镗孔', 'order_status_name': '完成', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TK_11', 'order_type_scode': '10', 'material_id': '1528687484865744896', 'planproduceend_date': '2023-05-26 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023-05-26 07:30:00', 'is_canupdate_update': true, 'material_code': '24007845L', 'create_name': '管理员'}, {'material_weight': 1.000000, 'down_id': '1', 'down_time': '2023-05-26 14:06:24.182', 'plan_qty': 1234, 'is_needmove': true, 'report_qty': 0, 'create_type': '1', 'confirm_id': '20', 'realproducestart_date': '2023-05-26 14:11:28', 'down_name': '管理员', 'material_spec': '清洗S15', 'create_id': '1', 'real_qty': 0, 'current_produce_person_id': '1', 'is_error': false, 'material_name': '直接\\CG\\清洗S15\\EKTC00003', 'realproduceend_date': '2023-05-26 14:52:54', 'workorder_status': '5', 'dq_real_qty': 0, 'workprocedure_id': '1535144356586065920', 'workorder_id': '1661976821887012864', 'create_time': '2023-05-26 14:05:27', 'workorder_code': '230526010', 'nok_qty': 0, 'product_area': 'A1', 'is_delete': false, 'workprocedure_name': '镗孔', 'order_status_name': '完成', 'shift_type_scode': '1', 'repare_qty': 0, 'device_code': 'A1_TK_11', 'order_type_scode': '10', 'material_id': '1528687484865744896', 'planproduceend_date': '2023-05-26 18:30:00', 'person_real_qty': 0, 'planproducestart_date': '2023-05-26 07:30:00', 'is_canupdate_update': true, 'material_code': '24007845L', 'create_name': '管理员'}], 'code': 200, 'msg': '查询成功'}
+
+//   return res
+// }
diff --git a/src/pages/modules/workorder/index.vue b/src/pages/modules/workorder/index.vue
index e823042..b334fff 100644
--- a/src/pages/modules/workorder/index.vue
+++ b/src/pages/modules/workorder/index.vue
@@ -1,43 +1,39 @@
 <template>
 <div class="content blue" ref="content">
     <div class="header">
-        <div class="header_wrap_left">
-            <div class="header-user-content" @click="toSelect">
-                <div class="header-user-txt">
-                    <span class="span1">登录人员：</span>
-                    <span class="span2">{{userName}}</span>
-                </div>
-                <div class="drop-button-wraper"><span class="icon_dropdown"></span></div>
-                <div v-show="show" class="dropdown-wrap">
-                    <ul class="dropdown-list drift">
-                        <li class="dropdown-item" @click="exit">退出</li>
-                    </ul>
-                    <div class="popper__arrow"></div>
-                </div>
-            </div>
-            <div class="header-user-content set_color_wrap" @click="toSelectColor">
-                <div class="header-user-txt">
-                    <span class="span1">背景颜色</span>
-                    <span class="span2"></span>
-                </div>
-                <div class="drop-button-wraper"><span class="icon_dropdown"></span></div>
-                <div v-show="showColor" class="dropdown-wrap">
-                    <ul class="dropdown-list drift">
-                        <li class="dropdown-item" @click="switchColor(1)"><div class="color_button overall_orange"></div></li>
-                        <li class="dropdown-item" @click="switchColor(2)"><div class="color_button overall_lightgreen"></div></li>
-                        <li class="dropdown-item" @click="switchColor(3)"><div class="color_button overall_blue"></div></li>
-                    </ul>
-                    <div class="popper__arrow"></div>
-                </div>
-            </div>
-        </div>
         <div class="header-time-wrap">
             <div class="header-time">
-                <div class="xj_time">{{time}}</div>
                 <div class="date_week">
                     <div class="xj_date">{{date}}</div>
                     <div class="xj_week">{{week}}</div>
                 </div>
+                <div class="xj_time">{{time}}</div>
+            </div>
+        </div>
+        <div class="header_wrap_left">
+            <div class="header-user-content" @click="toSelect">
+                <div class="header-user-txt">
+                    <span class="span2">{{userName}}</span>
+                    <span class="span1 icon_user"></span>
+                </div>
+                <div class="drop-button-wraper">
+                    <div class="colors_3_wrap">
+                        <div class="color_item color_1"></div>
+                        <div class="color_item color_2"></div>
+                        <div class="color_item color_3"></div>
+                    </div>
+                </div>
+                <div v-show="show" class="dropdown-wrap">
+                    <ul class="dropdown-list drift">
+                        <li class="dropdown-item" @click="exit">退出</li>
+                        <li class="dropdown-item color_button_wrap">
+                            <div class="color_button overall_orange" @click="switchColor(1)"></div>
+                            <div class="color_button overall_lightgreen" @click="switchColor(2)"></div>
+                            <div class="color_button overall_blue" @click="switchColor(3)"></div>
+                        </li>
+                    </ul>
+                    <div class="popper__arrow"></div>
+                </div>
             </div>
         </div>
     </div>
@@ -99,7 +95,7 @@ export default {
       let myddy = new Date().getDay()
       let week = weekday[myddy]
       this.time = `${hh}:${mm}:${ss}`
-      this.date = `${year}年${month}月${date}日`
+      this.date = `${year}/${month}/${date}`
       this.week = `${week}`
     },
     toSelect () {
@@ -151,7 +147,7 @@ export default {
     padding 14.5px 0
     line-height 1
     .span1
-        _font(14px, 1, #fff,,)
+        _font(16px, 1, #fff,bold,)
         vertical-align middle
     .span2
         _font(16px, 1, #fff,,)
@@ -163,9 +159,9 @@ export default {
     color #fff
     margin-left 15px
     vertical-align middle
+    _fj(center)
 .dropdown-wrap
     position absolute
-    width 100%
     top 39px
     right 0
     z-index 1
@@ -176,11 +172,15 @@ export default {
     background-color #fff
     box-shadow 0 2px 12px 0 rgba(0,0,0,.1)
     margin 5px 0
+    padding 5px 0
 .dropdown-list
     padding 0
 .dropdown-item
+    height 34px
     _font(14px, 34px, #606266,,center)
     padding 0 20px
+    &:hover
+        background-color $gray2
 .popper__arrow
     position absolute
     display block
@@ -200,15 +200,16 @@ export default {
     height 45px
 .header-time
     height 45px
-    _fj(center,flex-end,column)
+    _fj(flex-start)
 .xj_time
-    _font(14px, 18px, #fff,,right)
+    _font(16px, 18px, #fff,,right)
 .date_week
     _fj()
 .xj_date
-    _font(12px, 18px, #fff,,)
+    _font(16px, 18px, #fff,,)
 .xj_week
-    _font(12px, 18px, #fff,,)
+    _font(16px, 18px, #fff,,)
+    margin 0 5px 0 1px
 .body-container
     _wh(calc(100% - 30px), calc(100% - 65px))
     margin 0 auto 20px
@@ -237,9 +238,6 @@ export default {
         border-top-right-radius 12px
 .main-container
     _wh(100%, calc(100% - 44px))
-.color_button
-    _wh(30px, 30px)
-    border-radius 50%
 .set_color_wrap
     .dropdown-wrap
         width 132px
@@ -252,4 +250,36 @@ export default {
         padding 10px 0
         &:nth-child(2)
             padding 10px 10px
+.colors_3_wrap
+    position relative
+    _wh(20px, 20px)
+    border 1px solid $gray3
+    border-radius 50%
+    overflow hidden
+    >.color_item
+        _wh(58%, 58%)
+        position absolute
+        top 50%
+        left 50%
+        transform-origin 0% 0%
+.color_1
+    transform rotate(0deg) skewX(-30deg)
+    background-color #ffa530
+.color_2
+    transform rotate(120deg) skewX(-30deg)
+    background-color #b7e15d
+.color_3
+    transform rotate(240deg) skewX(-30deg)
+    background-color #484cce
+.color_button_wrap
+    display block
+    _fj()
+.color_button
+    _wh(30px, 30px)
+    line-height 30px
+    font-size 30px
+    border-radius 50%
+    overflow hidden
+    &:nth-child(2)
+        margin 0 5px
 </style>
diff --git a/src/pages/modules/workorder/work-order-assignment.vue b/src/pages/modules/workorder/work-order-assignment.vue
index 00ac7eb..5711930 100644
--- a/src/pages/modules/workorder/work-order-assignment.vue
+++ b/src/pages/modules/workorder/work-order-assignment.vue
@@ -18,9 +18,9 @@
             </div>
             <div class="wrap-buttons">
                 <button class="button button--primary" @click="getDatas">查询</button>
-                <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="_openStart">开工</button>
+                <button class="button button--primary" :class="{'button--defalut': pkId === '' || pkObj.workorder_status === '3'}" :disabled="disabled1" @click="_openStart">开工</button>
                 <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="showDialog('1')">报工</button>
-                <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled3" @click="showDialog('2')">强制完成</button>
+                <button class="button button--primary" :class="{'button--defalut': pkId === '' || pkObj.workorder_status === '2'}" :disabled="disabled3" @click="showDialog('2')">强制完成</button>
             </div>
         </div>
         <div class="grid_wraper">
@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { deviceList, getTable, openStart, tofinish, saveReport } from '../../../config/getData2.js'
+import { deviceList, getOrderList2, openStart, tofinish, saveReport } from '../../../config/getData2.js'
 import jxDialog from '@components/dialog.vue'
 import {accSubtract} from '@config/utils.js'
 export default {
@@ -131,6 +131,7 @@ export default {
   },
   created () {
     this._deviceList()
+    this.getDatas()
   },
   methods: {
     async _deviceList () {
@@ -140,7 +141,7 @@ export default {
       }
     },
     async getDatas () {
-      let res = await getTable(this.value)
+      let res = await getOrderList2(this.value)
       res.content.map(el => {
         let qty = '0'
         if (Number(accSubtract(el.plan_qty, el.real_qty)) > 0) {
@@ -158,6 +159,10 @@ export default {
         this.disabled1 = false
         return
       }
+      if (this.pkObj.workorder_status === '3') {
+        this.disabled1 = false
+        return
+      }
       try {
         let res = await openStart(this.pkId, this.value)
         this.toast(res.message)
@@ -199,14 +204,18 @@ export default {
         this.toast('请选择一行')
         return
       }
-      this.$refs.child.active = true
       switch (type) {
         case '1':
           this.reportQty = ''
           this.nokQty = ''
           this.repareQty = ''
+          this.$refs.child.active = true
           break
         case '2':
+          if (this.pkObj.workorder_status === '2') {
+            return
+          }
+          this.$refs.child.active = true
           break
       }
     },
diff --git a/src/pages/modules/workorder/work-report-query.vue b/src/pages/modules/workorder/work-report-query.vue
index 1f0f4e7..e0d2c83 100644
--- a/src/pages/modules/workorder/work-report-query.vue
+++ b/src/pages/modules/workorder/work-report-query.vue
@@ -126,7 +126,7 @@ export default {
     return {
       options: [],
       value: '',
-      value1: [new Date(), new Date()],
+      value1: [],
       workorder: '',
       disabled1: false,
       disabled2: false,
diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl
index 90df834..ebb6ce7 100644
--- a/src/style/iconfont.styl
+++ b/src/style/iconfont.styl
@@ -11,6 +11,8 @@
   content '\e60f'
 .select_icon::before
   content '\e608'
+.icon_user::before
+  content '\e7a3'
 
 // new
 [class*=" icon_"],[class^=icon_]
diff --git a/src/style/iconfont/iconfont.ttf b/src/style/iconfont/iconfont.ttf
index b52c204468b6a4fb9151069ec04adeaf4d1cdcf4..5da68b8216cb754d1612ec8540460ba368f9cbda 100644
GIT binary patch
literal 2280
zcmd^A-ESL35TCiT&v9~2nkJ2thBTLR>;O&u6~}IzG@!J0L{+728Um_{=*77>X?<sN
zz9db75LyX}+6p9u;1wbvfdo|IsS*!;Koq1(h!;Qzl|DH_MS_=#r`XKiodx~)57_hW
z{^qwcvokw;K0p9yf(_syI(g#R3F&h1JOJ(|cIN1bNPMj4aGB&QB%jV{O6kI9m)-;5
zT*Q5wFRU%x{rJK~0RC6v4lSz6eE+eRwn_I6_2eQEp4<GJgukNRzo?n#Ith^NA2f6p
ziaCWlg|x=sBDq;p&Xv#)M`@j@NxGt`J2uCz0SFTL&zFj2^Y36R2+(ke)?WaMo!_W!
zz$prc8Vkw-{|<u15c|aHsqbHG8M_Bfw(gw|-nX>uxpvb9{0I>Zz&XaulK=<7W66wd
zqz9m8$@Wf-5QT9{JbPpYnhT1l!)_LY)tLQ%F&38c3i-D!k=EEM5`(ml&AMEG?|_?f
zeT!o!^0qzWU5F!Da^U8PeMCF9keP=Ym4>ZN>pWOJHc0LM(_lrjHhpj=n)aj{05E8)
z;46;p3bD+~AkCCL@h&(_vS^)@tI|+usf4!9Zf(}+T<(`h%Wg>8^@j!ECSM%$iY)K{
zdlRh#IN}@w)uBR_W}TI)(qea3pGwH?tWH~J?aprN)~4N^ik*gA@C*EfvhAUElfOte
zyA?u^fC(zJ92!o9211Es+`k8RwF?21n>m^pKh6!sJBW(OVN8r;d=IuaW1v-T#`ZlJ
zAIC%(1H9%H6EQ*DDWpby-s-!VSLYJqPT#0@b;>J>-t0;?yK;pM*>o<Q&Y5gT?-#w9
z^{A)SC#0AfY6)dM!_=p)YNNhZUuO04YQ`Gy=k(liZe%34JeRiLJ^mYhAE9R01wjbI
z2ppiBGaz{Usbq>x<Cto*r8e2)PY%WX9rUCqN4~uyo=k*fp^cbcWK^IHQ;6%kXD4JF
z&KhTC<i}4YZXAjR+<V8`M$_Gc;q%30G&~@mEU$j*m;Lmc93ROfQ68H*{`^PP=|TJ)
zzaH$H2x7A5&*<^sz=4kHmn}p6!d?M?YYYpKj=tVd@VRJgTW|II`#L*u&E46P#Nb$;
zT<zt4@7ne|?<IeodzsZQh<#YCKEoSt;619D_0IA)xNEHDUJQD?$e*qruKxHmZg9YT
zQH}f{RX^ljV;6?3>9x&r-$6G#My4s2Z3_-i%I&@A5h(ws(9aGbf?T>Lb_RUani%L3
zYc;V;u48<?=9B9jtpvJ!wVJOhAUc0_JK?r-w*cB`Ln}fW8%VM-NA>A;Fi*VfU>D&h
z9qgvBOx(c&@dq5-2zw#p;3o1|V*fZUFYOb8iw;KE0iQUSqnmKu!94Ld9qc0flY`yR
z0b33hh~IW_Bg~@D!A%gt+(AQCOm$wGTa%V@MSY>DoAr5G%`X=eqb}CxS=A^n6?G{V
zj@GG3RacF=oAOFNZkh|yf>G3@EcsIlg`!k4if7cE8D2EaQaTc0`!GJ7D{AzKF+c?c
zOd97wf;m{DaS3uz1RWNv(R@grCha^dLxC)fhgKi7o+WJq%B079N)V$LDf*DrBx&iE
z=7Z6cVTE>!Q;a4>BvCiWlSU}(#HUgu1;P>)kgc5|KRMD4!=hzXf;2?vspnJI4_kR^
z&RwRevv2I9nt&Yg=t4IN=mB?LHB{ZJ7x$Hy^14zG7fnqm46~9%hlKpHqR%aP>?vk>
F`v>P&Vq*XR

delta 1102
zcmYjPNlX)A6n<}}GgG>-SeOAK+fZ5prL1i+6l5_F5{(Os(Ll_w6S`oj5ez~(s5hfb
zVl<J99`xWAxsu3%c+-;?527)q;DM+IkF>s-P9p#0z5jdPTiW;Dzn}LzXB7|ttdIZ}
z8u|u?y5FQW4*;;0*zU6f^-aN*{!y}*$sQgLEAt<BHrC1BCwV&^TADh3-TMN7eNJ{_
zW>T3bST5CazmfQ7h!A$!+l04BoHOD0Vm<+i{X{B16di9@;4%E50*{HXg_Xs56rrC2
z3dt^yDB;PD!PHFvt{Q*|&qo*HXWG^S0K!A^58dCY?BetesEhhXwf$Fef`7qkA|JqK
z?}2diHUV2lwiy_WrK5GuLAzRxW!6&g0G{eSJqTuX1RJg7H38luzgc~NKCv@t-kW0+
z=>&|h37S?WTm6HMbw(PE>9qhtG)1kdhi(gn#J~idWLxxKWs>G(PSUkEmres5#T20(
zq`1sSy;3Gp6+r&!8iVJ^ZPSA~bq(aE5*g7NO6Ful=Us$Jw7;@9ml3U$ezL&{cVSzN
zbN#FOc-Z$e76GzBgevetD+DRg%?nb%AJDE23^=k;HyyGd`J0<0k-mTz*?h6d-{O*a
zhek9L<91*Gai#cTmyEvN*xZ2Z9%<f|+oVdaHs}bp7JIxm=6wxbw|r^;r8Fo@k}UOg
zoaptT9Nf74Bz3`quW-jBcU7Uk<X6M_Dp!Y?+B8=bIr$m^zgoO}y;xD^sv1@fqj{7p
zinz!XmiV1*J(wzEeij`{>K50yS|r<3X}erxOQ&uBF|Hlq(rJ4|v7K~rg`L)+onx@8
zZ%@MoB-$o5Z6+&&85&fHfm!061~w6<_oK&iU|oe4!{Etr(!ds|g+2pY!2vPtv6!+b
zsRnKt7$Fy48<?S;yfZLM{09S@2!Am!M_W5EFb}!N>bN?K-qA2R42Kn5IBV&NO)Bxp
ziSn_f^4aldWGWhoThu(^Dq7Sv!A<&^@Lj!QmIE9z$f5~3<iR!*4=W*`meA15PhV3a
VW3yS2Xx+l>bVLaW8KP0|`yWf8#DV|-

diff --git a/src/style/iconfont/iconfont.woff b/src/style/iconfont/iconfont.woff
index d2c2ddeca4811e29247abbdf2943f2507ec4faac..79c884f146c78d8496d05750c69aaf6deb81909a 100644
GIT binary patch
literal 1544
zcmY*X3pCSv9RF?e7-sEKqR8Z3n73qUS03Y>8kf~k$$y*2C_^T8@9mnr30tW=mPf6}
zh`W-=#722P61S8>QBkCqJTBM$JGaw0_j}Ig_x*l8=leS6_l={ty8{G(O#uy5);xOh
zKfV_K-#mP&E&w3Vu<8WE51(cDE5(;!4QsA2Ujszc@rq$Y(4t^19p*8xZ$DL;elGMF
zCj^d{Vax%5bbWvIR1!0o76bt5E1YKm!`{F<dW8v#0LU4@TpNag;s`2@8NrT+H4@CR
zFf=vc=U60TEzkSAhD9DmG(^zi;kj}Utm(qQBQ^pGixv?KYg~9P37#8@yG#^EMaHlJ
zke31g$S?xt4Xq601q>(%g2w2UkeC4-kN%=W8|(5k>tOKc5RD6XMC&3eW1C(4L{uxP
z^CmY8iw{XkM*<@!c`{h5rO_aPRN5((4tB6p6BEmHU2GadEa?*<(^_n81IZ)8s!TD8
z#nHsT?&lwy5)%^_u_#^;<mz)@4#f7VV&Vlee3=s065|$ld&5sMbE0ELT}B**HO`vR
zEVSKLm(<iCUCm1%bJ2sHLOGs}>~`2T!#}6Iw&edcf7>s4@Ty)mr>Bk6{N$e6$_nvl
z?lY=?h3)dYuEVU25m`Ae^i=nCc(i@UJK!--cGjLisx!9O!+YEDZblA}*0+v2sULDb
zQEnS1@Gj)poZxK|+>ef!79!k+(5YlMw6`(YUdZ)h>XYPfYAWnk1TG)J%OBc_$LXuk
z86kA~bb+Mw`NhV#dCBa)c^z#8xyh?fh&v7?DWbTT8V90;^;_dnzo;wtB64-|0omWe
zaSg|CU&VXQ^&8BB`n&thG`3BC>yLSuXH@>CCOE<$TVLOK<Uy``@tqrS#((dj4h#kn
zJii@L_Pi9mK6_Rvqn8;@JZkC~fK6649_jHnn{HY0JkU4w>FWdAVwHbRyGzC`wP$m-
zdUGA7ve<=vx5P+|9k^yA@HqGZdYP2xtgyIRL8M}u#y7c*po)FAtq&Nj775-8Gm!-x
z3@)^-3TwhLaH_3(=sP?jTRdOjKl@tJAKt==YKwG?tv?yJ^te<(cjFRmT7O2hwyKGC
zVe<lZw?jBeWu<0!rFli8e~|8loyM<YwGwn<Cqi!Suc<s*`R(P5fHvr5*id3xxyYOg
z&!cwCelC-h?CzV(Aj%;jnyQw>WQN$*Bp!0Y>*7(Rm#$nlc>!G*%8gk_2AsaaQHuD<
z#7!~(u7lnvv?1rq<wUY1Id;okZ#TC$i+z{$oXau{ylT#fs{L%b4i<(7*XNH9_+3*u
zuiQ!{6dml0Tvaq)jCY0){`;*1de7(lFQ1m}1GVb>HA!Q#(^KTHtK(*v?(-xCMU*;u
zJ<!ZlD*utsS{Rk$TABfpbcT=EAVvTW3^Ee#MS~znb_#)D0xh`tnn9o&JOdvQTYuC-
zjHnPO6d;W7Z;&nusjHAP3g9#mq3|v#{9UYO5-z1g#*@o4@e<mG?Kd@1>sZbsi@Zy(
zl`2-h@woHkAb~vSxHpHVK7pQM#$=K?Lwite4bPrNjx-kNbbt@yw6xEXw-!%Z46Dy<
zuajPmI=6IIO!-5jsw|^8>f%yG6p9e9&bq~D#TF+#xRDY^TUWb)s~S@%X{NplY<6Be
zRF|r_jD8|oRd%raRFzW1<h+!=6Ai@J4U4GENA1E7@i}vJb;^v0*l!<L;1`?J>$7Rf
zZ<tZ^yJXUFqo}>mRh3gQK6Jgium&3-W?Q_k9p+E|%v8fbWmYK+!5&(w&bYE3<`-8t
zcIaaM2YLH+|FG3q%H*APk?!#n3naVuuzvlcX3oyNIp%@yePY?$SzU$6ws{A8Jn6Sy
zts_3K6eSO$%(BWcCvV@qq@Lj2&09tcosB%O_Lp=nuuz!hX7e-n1^g8LIes?(Vxrxy
x8WX!*8$w|14x3#Bt2E=w1`bwjwl<Et`=t5i_iU{Qre}3rw5%-wNZ7oN`7d%&eT)DA

literal 1356
zcmXT-cXMN4WB>wI9|mp^&He$x2eDCsdvK@|0|O%mP}CTRoi_a2{MJ8M-v}sX1LV5^
zahOe=XKZqAVgXRB0m#n;(woj5nL8;xr!o!5egnjTAUT<Gy)_xBi75;W%nm?xIzVhD
zS|ewX0Tcv^<pB9IK&--kkGU-)x1<6n)&b=60kMb(kjTkT2C16?Wb%OV9EK;ki4{P5
znU?_h@<6P>D8}HKmzbLh6gvX6)0KgNDc3IKUu{8taS71BAbk!%9O`R5$-H7tazaW%
z!h@s<$rln6N(w)7CO$|=NNix3z?1BkR;3icbBg)Y#)eEjg|y}lCWbC$W`72-p2UPX
z2M(M%aPZ2>lD5Xih4N0u`_c@Oo+KnBBqgM#9pGZR6ca2VGq2F*d|KX*`v(LL-#KuB
zK_rdkBqPJqOFZEfbKXw8$k|}P;}V}UHHc;VhtrC8-1p1ul679+E6?|^HN41OVFHt~
zz!5d28?6^hw6@M;FFLQhyGG5>U`oieP1hdpdw6@l(b>v{FE!T7ntjZE_x|6m8|$9G
z@SAe<<<D1J;#aggS1?5Aif;#cv|^5Lz+Uge4kGpMorJZ0U4!2FY`HRL8ROc_%-o>d
z6=Dk)&F1QQv|w}dB~Ot*5r6b$O1?ACxntGw;Kid?t0qrQ){lF2sk;CB$7=aM_ZXXM
zP8nOWGCf$(>$FDWt@fX(AL`dS%PBHWaB=ruv`Ibe=y9bu0R{d=KkW4KPE_7m_O&X0
zs-)!7#wKRDD+*J*V?vV~<&UguY@B#3E~}vT=TxJ`K}`Hpd31kou3RT&7%;ITJE5T>
zE!WgCEc$IT@4I(lR(sB=30+<&cx_Enc~OXNrQZF2yOQU4#^#;by6VK?*K?yc#vQ1x
z(fqKix$fKYEzh1vhuHAmc(%l9>BHv>mW!>Nd)j*T@4JT+EqyfQ)ZI4yOR42_?W>s`
zEB3!*&q~*O2_nays5+i0;E44!p6u*9b&mLiqer?uo-LkovQ+Tp9Us@fhH>8#1DD(m
z%h8SQfAY;<=0Tt#I84Fmh9T+i%v<w5{xOS}+z~0^@L<`!=(3bqt&Nf59)$)5jTH>{
z53nmj(-<Tf9AaQ{m^6`5bORHEJ2z7vP%aUeW*iSQFtRX+0u2TMJ_Z$rK86EOeF>=>
zQWMe{7}XS>F*&id{ZFuCX5dd}OaR7fYQL}FVFQ8I_+RWxgjTIcXn(?*#HjICaCKfp
zNY?k*lKad2W@~jSA76Wgxj?S(0H+1hod)X<9_q8rrX9b(r!v`};m!kgxxV|l-zVC}
z7+Dwbiti9#7hErpHzB@dcE;n-9j<?UZyYyXb||+bv9kI4j-+ob<%#^VH5}Iqdi@_-
zebs-+_A`1%r}ZDM?H4}2I%M}OE__F?yZ*Q1Vfu68Rz7t+y6~jZWXt_cGvnS*YF&Hj
z)tv0;BWl6T3*tS4=VnIV4SsXo`MHv4<m6SHtF1hHPOZK9>H@3u^G|{6#XIF%)SgBp
z|J!zqsjrZ=Rh6&D&`Bbt<J5~6)}d)%)^Bt^6jvQ)d-i!rw8)kJ#jT7?U(Uw_@7i>!
z(#pTlHeNcYv_w1a^t>r16XVW$3T<+VyS6RF=@p|{YIvVuRm{asdyRCD{|uZ_c_)Cu
z4GQO^1_nL0Hw{xKc21l*v326qiM@^Li&e}GkDC}<+Mho#LwB!<p}yv1WBvH;7RI*v
RhV8OS2`3H!3!JUIo&b#fBE|p!

diff --git a/src/style/iconfont/iconfont.woff2 b/src/style/iconfont/iconfont.woff2
index 8e8a09b5fd25120b6767e99d2628e4e448b5f6eb..e433162ca6abc6c8526c20cf79bb1e210f2e37b4 100644
GIT binary patch
literal 1120
zcmV-m1fTnNPew8T0RR9100dwF3jhEB00`&+00a~O0RR9100000000000000000000
z0000SR0d!GgGdU5M1%nWHUcCA7z+*n1Rw>3X9ryy(g(<%nmj=S7O<cI1(ae=iwL4M
zboTBZ!k`d+6i`uB$g*u!g#j|ILdTVjLIo^j=07+6tq1CoLMK-DP*YOTga{I3;a40c
zMrVF97i6ctoytyP#{z?c#kj}A{lxJf_o`+O;Aa7VIkpBrMdJYq&=|90Q?1~=dbxty
z2YO)wFF!`0)0QHx`;xjg;CGjR8W6>u(;np2aaX|-z*{ycJ?zkG>#-|~cmX^}4_)5^
z;CcN0@f)OtH%XN_`&_+_QQ+a6xBZBl!D#^UM-a9NI69$1#@fj&@u1&zpIe$*<EFFi
zFSt7ebZaH$oA;dm+(Ns`e#GgdBy)VB+x?eEQOS}ZYFOC~E^@l!o40RJ47ERs+SCh?
zN9McAAhG%gN-j%RuQ;L)F9Gl$IJ7mdTQovQgQ0$YZPWB4!jkK0m(fjoT#VL+J;uGJ
z&`%a%*d<^#nL&^U8|5}~2u-^i0xplN)>4DXVlkM_0=I6tA)9Nm*^E}JfK4*D6^4Il
z$D_Olw%Sf}34hXq%I-}SD{cr)(pQDI3X83{wa0MEbjEmk)5-2<)t2Va;?KBM(5cK<
z$e6%!imakl`u4qD{X*LCJ)2G%LZxlH1_#31rMqX`8ir?m%t7uTSo)+t9(XrM%H+*7
zAa4+k!zR*+ffhf8+zBem8*nzq&Ez#8cLVPt;P74rHe~Ynk!~jKE%};9=H?QExg?nb
ziBEj`vILo%2PWShl%l1jApkpwS@}be+}ac})LD@Epsw8Sj~F|BEoe4>|G8^PW11xC
zuUR^z6X%nMQci6TWJF8?D`F)h=JgdZQV??WXj4MRp>OBD-=tf?{MzgPcv*Sj+Q%gy
zozv%Rkh>1Yi$=t6<{eJOi8qMuIuhmE8tO^nJI9#-aGqDY<pMzd;I<;>p1F>5U%6iN
z9J;>xKYrCj^?c~}FZkaI3;4QkFNV$wSSQ^|j28V3>YkB^#SBxIw&wmwf!ZD~?xI1b
z+rsPj4VqocGX&(0(8^+jq%j3qYX)8LD^TgO1GUyJbXtY2?=nQkO_UBSSPc;Ror0v-
z8D#xlpbOpxl~H!6^_z!I*TQ$VE(;+m=V=1c6iSYw3Yk{Jcv={D+d{L09KkomahlgF
zFp8!orBt((w1(!Fn4=$J(;#F}hS#c5iFh8(aavTzYn8MNCdnbx<s~OGZ6A^()2cx^
z9*qFeC@9h>l!A<w1`{H~^3Q8QV-4aE_>pKl#nV$@_o!4!QbwRFRhm&vPtsp+2rCT)
zF+7gJ(^5l8Ob3l~Q(7op`!FS%43tDZBcYQgnUI*Vs-*oj>Ra3aot#&wBSnr9Rn*a_
mZqPifK{VPGdIhT?I3GDwhsw;$7?G0h$qo`4QsEUjQvm?5<ONdz

literal 984
zcmV;}11J1<Pew8T0RR9100Y<n3jhEB00-~@00W8u0RR9100000000000000000000
z0000SLIzd<gE9((0D?^cHUcCA6blRh1Rw>3Z3k5w<_1xe4@!vaPY}oL6+j?Fr4W!H
z2nY!PK$FU>+MKKtoVv^7?Z)jpLq4zB4Pzbz;^E)rulthB{E(q^2dWi?E$w&|3Rk+q
zIJQf-Mz1hkujXn^_dj8q@xAdORwYuX@L}&BXzn*fP<5hgWQA;G%fhxgxgYqZZGn0_
zNb3|h<hBRum1tm60~C1;ZvdOVP|cBp2X3DI*<XhFx_zP&;OGXcUA=a$+wynXy7Llq
zp>>EznXUi1oZe_GkZgWC%W(}FdwEB_0HX;M(B9Yv3AlhxlpDrwB4~)`2{g-!l=JDu
z704>Uv_QPrLW69^s5DfDD)bd=i}(g9HNB|;zVhG4KlR9xbQzd?aW`ec=+FB8oX`Gi
zogyHg&JJS}89P8BUMrn15>awTLi4CgItH35Nk8k`)Z5y-`~HrvI*_5kKRl8mWTFSk
z$HB3ZD*UXNAn|ibR;6E)34&kGDH+eTmWBb>z-NHB;wd4Fq}<n0of>Op0yH?XCN<fb
zmXjfS4prfc2xqx_Z;q(tYeD*%EHQ0H=^FTE^+J_O^XpaPT>C=PeA{fyiR~o_-2ZwR
zm95Asi5M>NVM4=)D&vjVu+V`vetbmOV7Jf0h5N4mm*n>OUU(o2SRY?wYPA@kC`F&y
z@?b9}Ek?!V#Lr~1O>?WLcO{c6vg!hv>3bL^GVCL9u?LyXf=Jpv=8EU$DT)cCnb1c8
zzx1(=`U2MfXIofTz5~q(_O?G^T3Ocxew67#l&caO>LCD-*yj!aBu-TVfP`7yzebIb
ziERn+^5B0R3iz@2o8iWyd#Xwp@_!`nSW|o@Fm=VP#xgh9IWV13@|qg{jCa;>8pA^8
zazeF`Kr*rfS+#-|`VMpk`_QY7pxHLFc`!#xh%$yP*Aj$jw~$Qw4%xI9w9sFnv*;Ik
z(~*GYG75VR*22zDNYn^TrtdS`2m_8RloyptC<dM;(@HK_LmAr<Rx4NYnHdaFPO%`~
z5p^QYxD0(ZEnSA57qUo(4jNRph@yU_!mHj?HbNir&PYf@kcrXlV{C>{fYZh#U-<qK
zBn)^ovVqi-UW25V-8)lLR_%b!=z>n9Te&8-L#QK!V>l_~W2PlL@?bK=MAf4l$Uw@h
z0r5y*MXATT>dMO-{CC_14LGKY6gf(C(HnmtU-Meme^#}T76UEN?OYI+Vp{~7m&rM5
G0002Si^eJd

diff --git a/src/style/layout.styl b/src/style/layout.styl
index e9a9432..f461056 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -224,14 +224,15 @@ header
 .filter-table
   width 100%
   text-align center
-  border 1px solid #8B90A6
   th
     position: sticky;
     top -1px
     z-index 1
     color #606266
-    border-left 1px solid #8B90A6
+    border 1px solid #8B90A6
     padding 5px 0
+    font-weight bold
+    background-color #8B90A6
   th,td
     line-height 18px
     font-size 12px
@@ -239,10 +240,6 @@ header
   td
     border 1px solid #8B90A6
     padding 5px
-    &:first-child
-      border-left 0
-    &:last-child
-      border-right 0
 .input
   width 1.8rem
   height .3rem
@@ -386,10 +383,6 @@ input::-webkit-input-placeholder
     .selected_icon
       background-color: #fff;
       color: $red
-    .filter-table
-      border-color #fff
-      th, td
-        border-color #fff
 .overall_lightgreen
     background linear-gradient(#00d9a1 0%,#00c0a5 30%,#115fae 100%)
     .body-container
@@ -409,9 +402,5 @@ input::-webkit-input-placeholder
     .selected_icon
       background-color: #fff;
       color: #008f8f
-    .filter-table
-      border-color #fff
-      th, td
-        border-color #fff
 .overall_blue
     background linear-gradient(#031f6d 0%,#011a60 20%,#060346 100%)
\ No newline at end of file