修改 江

src/views/performance/assetssMag.vue

@@ -43,7 +43,6 @@
         :cell-style="rowStyle"
       >
         <el-table-column
-<<<<<<< HEAD
           align="center"
           label="分析主题"
           prop="analysisName"
@@ -55,24 +54,6 @@
       <span>{{ scope.row.analysisName }}</span>
     </el-tooltip>
   </template>
-=======
-          fixed
-          align="center"
-          label="分析主题"
-          prop="analysisName"
-          min-width="200"
-        >
-          <template slot-scope="scope">
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :content="scope.row.sketch ? scope.row.sketch : '暂无简述内容'"
-              placement="top"
-            >
-              <span style="color: #4caf50">{{ scope.row.analysisName }}</span>
-            </el-tooltip>
-          </template>
->>>>>>> cd49b9e9d50e9e446a8759c0a81253ddbc1366ad
         </el-table-column>
         <el-table-column
           align="center"