冲突修复

src/views/monthlyReport/childrenPage/editReport/components/VarText.vue

@@ -15,14 +15,9 @@
         />
         <span
           v-if="pageDate.status > 10 && textValue"
-<<<<<<< HEAD
-          style="padding: 10px 0;display: inline-block;"
-        >{{ textValue }}</span>
-=======
           style="padding: 10px 0;display: inline-block;line-height: 1.65;"
           v-html="textValue.replace(/\n/g, '<br />')"
           />
->>>>>>> http_mock
       </div>
     </div>
   </div>

src/views/monthlyReport/childrenPage/editReport/components/anchor.vue

@@ -1,16 +1,6 @@
 <template>
   <div v-if="list && list.length && isLine() > -1" class="anchor-wrapper">
-<<<<<<< HEAD
-    <!--
-      如果是TAG的话
-        循环
-      判断当前tabs焦点，符合的话，调用当前组件
-        不符合条件
-      正常渲染
-    -->
-=======
     <!-- 如果是TAG的话 -->
->>>>>>> http_mock
     <div v-if="list[0].type === 'Tag'">
       <!-- 循环 -->
       <div v-for="item in list" :key="item.domKey" class="title-wrapper">

src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -6,9 +6,6 @@
         :title="baseData.title"
         @click.native.stop="baseDataShow"
       >
-<<<<<<< HEAD
-        <Refresh v-if="pageDate && pageDate.status < 20" slot="refresh" :title="baseData.title" :tab-key="tabKey" :active-name="activeName" :dom-key="baseData.domKey" style="margin-left: 5px" />
-=======
         <Refresh
           v-if="pageDate && pageDate.status < 20"
           slot="refresh"
@@ -18,7 +15,6 @@
           :dom-key="baseData.domKey"
           style="margin-left: 5px"
         />
->>>>>>> http_mock
       </headTitle>
     </div>
     <div