表格更改

src/pages/monitoring/index.vue

@@ -168,7 +168,6 @@
           />
         </div>
       </van-list>-->
-<<<<<<< .mine
       <el-table :data="tableData" border style="width: 100%" class="newTable">
         <el-table-column fixed prop="date" label="机号" width="100" align="center">
             <template slot-scope="scope">
@@ -248,87 +247,6 @@
             </template>
         </el-table-column>
       </el-table>
-=======
-      <div class="monitoringTable">
-        <el-table :data="tableData" border style="width: 100%" class="newTable">
-          <el-table-column fixed prop="date" label="姓名" width="100"></el-table-column>
-          <el-table-column prop="name" label="机号" width="100"></el-table-column>
-          <el-table-column prop="province" label="透析号" width="100"></el-table-column>
-          <el-table-column prop="city" label="排班时间" width="100"></el-table-column>
-          <el-table-column prop="address" label="透析模式" width="200"></el-table-column>
-          <el-table-column prop="zip" label="脱水量" width="100"></el-table-column>
-          <el-table-column prop="zip" label="体重(透前/透后)" width="150"></el-table-column>
-          <el-table-column prop="zip" label="监控预警(血压/心率)" width="200"></el-table-column>
-        </el-table>
-      </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
     </div>
     <side-bar :active_index="1"></side-bar>
     <mt-datetime-picker