Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-13 040ae93ad865e102322ceb5582982c1549422bf4

 src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue

@@ -12,16 +12,23 @@
          style="width: 100%">
        <el-table-column
            prop="date"
            label="管线名称"
            width="180">
            label="管线类型">
        </el-table-column>
        <el-table-column
            prop="name"
            label="管线类型"
            width="180">
            label="管线名称">
        </el-table-column>
        <el-table-column
            prop="address"
            prop="province"
            label="起点编号">
        </el-table-column>
        <el-table-column
            prop="city"
            label="终点编号">
        </el-table-column>
        <el-table-column
            class-name="fixed-table"
            fixed="right"
            label="操作">
        </el-table-column>
      </el-table>
@@ -31,16 +38,23 @@
          style="width: 100%">
        <el-table-column
            prop="date"
            label="管线名称"
            width="180">
            label="管线类型">
        </el-table-column>
        <el-table-column
            prop="name"
            label="管线类型"
            width="180">
            label="管线名称">
        </el-table-column>
        <el-table-column
            prop="address"
            prop="province"
            label="起点编号">
        </el-table-column>
        <el-table-column
            prop="city"
            label="终点编号">
        </el-table-column>
        <el-table-column
            class-name="fixed-table"
            fixed="right"
            label="操作">
        </el-table-column>
      </el-table>