[删除]冲突

src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-02 16:21:18
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-07 08:55:28
+ * @LastEditTime: 2020-09-07 09:30:24
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
@@ -181,7 +181,6 @@ export class DeleteTwoComponent implements OnInit {
     var dianji:boolean=headtext=="删除数量总统计" ? false:true;
     var ec = echarts as any;
     this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp');
-<<<<<<< HEAD
     this.options = {
       grid: {
         top: 50,
@@ -199,25 +198,6 @@ export class DeleteTwoComponent implements OnInit {
       color:'#999',
       fontWeight:'bold',
     },
-=======
-    var options = {
-        grid: {
-          top: 50,
-          left:40,
-          right: 20,
-          bottom: 20,
-        },
-        // 标题
-        title: {
-          text: `${headtext}`,
-          left:'center',
-          top: -4,
-          //副标题文本样式
-      　subtextStyle:{
-          color:'#999',
-          fontWeight:'bold',
-        },
->>>>>>> b56d7ae0c7cd644e4ed01e4efc5232a7cfdf07d3
         textStyle:{
           //文字颜色
           color:'#000',