no message

src/views/bigViews/dataView1/components/workOrderTrend.vue

@@ -1,19 +1,5 @@
 <template>
   <moduleEnclosure title="近30天工单趋势">
-<<<<<<< HEAD
-    <template v-slot:rightce>
-      <v-scroll-view :x="true" :y="false" slidingBgClassName="slidingBgClassName"
-        slidingBlockClassName="slidingBlockClassName">
-        <div class="tabbar">
-          <div class="tab" :class="tabCurrent == item ? 'active' : ''" v-for="(item, index) in tabList" :key="index"
-            @click="changeTab(item)">
-            {{ item }}
-          </div>
-        </div>
-      </v-scroll-view>
-    </template>
-    <div class="all-container" @mouseenter="mouseenter" @mouseleave="dingshishuaxin">
-=======
 	  <template v-slot:rightce>
       <el-tabs v-model="tabCurrent" type="card" @tab-click="changeTab">
         <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item" :name="item"></el-tab-pane>
@@ -21,7 +7,6 @@
 	    
 	  </template>
 		<div class="all-container">
->>>>>>> moss_dev
       <div id="workorderEcharts1" style="width: 100%; height: 100%"></div>
     </div>
   </moduleEnclosure>
@@ -95,12 +80,8 @@ export default {
     },
 
     changeTab(item) {
-<<<<<<< HEAD
-      this.tabCurrent = item;
-=======
       this.tabCurrent = item.name;
       this.initEcharts();
->>>>>>> moss_dev
     },
 
     initData() {
@@ -247,14 +228,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-<<<<<<< HEAD
-::v-deep .slidingBgClassName {
-  background: rgba(0, 0, 0, 0) !important;
-}
-
-::v-deep .slidingBlockClassName {
-  background: rgba(0, 0, 0, 0) !important;
-=======
 
 ::v-deep .el-tabs {
   width: 100%;
@@ -290,7 +263,6 @@ export default {
       color: #1a8dc8;
     }
   }
->>>>>>> moss_dev
 }
 
 .all-container {
@@ -299,34 +271,4 @@ export default {
   box-sizing: border-box;
   padding-top: 16px;
 }
-<<<<<<< HEAD
-
-.tabbar {
-  width: fit-content;
-  display: flex;
-
-  .tab {
-    flex-shrink: 0;
-    width: 50px;
-    color: #ffffff;
-    border: 1px solid #254280;
-    font-size: 12px;
-    font-weight: bold;
-    padding: 2px 0;
-    margin-right: 10px;
-    text-align: center;
-    cursor: pointer;
-
-    &:last-child {
-      margin-right: 0;
-    }
-  }
-
-  .active {
-    border: 1px solid #153781;
-    color: #1a8dc8;
-  }
-}
-=======
->>>>>>> moss_dev
 </style>