diff --git a/src/pages/modules/board/SortWorkMonitor.vue b/src/pages/modules/board/SortWorkMonitor.vue
index 8ce02f1..890bf9f 100644
--- a/src/pages/modules/board/SortWorkMonitor.vue
+++ b/src/pages/modules/board/SortWorkMonitor.vue
@@ -1,56 +1,4 @@
 <template>
-<<<<<<< HEAD:src/pages/modules/SortWorkMonitor.vue
-  <section class="bg">
-    <t-header title="分拣作业监控">
-    </t-header>
-    <div class="container">
-      <div class="zdy_box">
-        <div class="zero-wrap">
-          <div class="zero-title">
-            <div class="item_tip_left">{{topSec1.pointName}}</div>
-          </div>
-          <div class="zero-title">
-            <div class="item_tip_left">{{topSec2.pointName}}</div>
-          </div>
-          <div class="zero-title">
-            <div class="item_tip_left">人工分拣线</div>
-          </div>
-        </div>
-        <div class="one_wrap">
-          <div class="e-box">
-            <div class="a-box">
-              <!-- <div class="a-title">分拣线1：</div> -->
-              <div class="pie_wraper_2">
-                <div class="w_wraper">
-                  <div id="new_home_echart_01" style="width: 220px; height: 220px;"></div>
-                </div>
-              </div>
-            </div>
-            <div class="b-box">
-              <div class="b-item"><span>当前工单：</span><span>{{topSec1.workorderCode}}</span></div>
-              <div class="b-item"><span>客户：</span><span>{{topSec1.customer}}</span></div>
-              <div class="b-item"><span>物料：</span><span>{{topSec1.materialName}}</span></div>
-              <div class="b-item"><span>规格：</span><span>{{topSec1.materialSpec}}</span></div>
-              <div class="b-item"><span>数量：</span><span>{{topSec1.planQty}}</span></div>
-            </div>
-          </div>
-          <!-- <div class="e-box" v-if="this.topSec2 === []"> -->
-          <div class="e-box">
-            <div class="a-box">
-              <!-- <div class="a-title">分拣线2：</div> -->
-              <div class="pie_wraper_2">
-                <div class="w_wraper">
-                  <div id="new_home_echart_02" style="width: 220px; height: 220px;"></div>
-                </div>
-              </div>
-            </div>
-            <div class="b-box">
-              <div class="b-item"><span>当前工单：</span><span>{{topSec2.workorderCode}}</span></div>
-              <div class="b-item"><span>客户：</span><span>{{topSec2.customer}}</span></div>
-              <div class="b-item"><span>物料：</span><span>{{topSec2.materialName}}</span></div>
-              <div class="b-item"><span>规格：</span><span>{{topSec2.materialSpec}}</span></div>
-              <div class="b-item"><span>数量：</span><span>{{topSec2.planQty}}</span></div>
-=======
 <div class="wraper">
   <div class="zdy_box">
     <div class="zero-wrap">
@@ -71,7 +19,6 @@
           <div class="pie_wraper_2">
             <div class="w_wraper">
               <div id="new_home_echart_01" style="width: 220px; height: 220px;"></div>
->>>>>>> 531846f0d18afe089f16fd741b29b58522df2837:src/pages/modules/board/SortWorkMonitor.vue
             </div>
           </div>
         </div>