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

chenyabin

2021-04-13 040ae93ad865e102322ceb5582982c1549422bf4

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

 src/assets/css/map/map-panel-style.less

@@ -598,3 +598,6 @@
  color: #ffffff;
  margin: 15px 0;
}
.fixed-table {
  background: rgba(0, 16, 30, 1);
}

 src/components/panel/RightSearchPanel.vue

@@ -242,7 +242,7 @@
.search-container {
  position: relative;
  //width: 1.79167rem;
  width: 4.7rem;
  width: 2.79167rem;
  /*  height: 5.6475rem;*/
  overflow: hidden;
}

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

@@ -13,16 +13,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>
@@ -32,16 +39,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>
@@ -51,16 +65,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>
@@ -80,4 +101,5 @@
</script>

<style lang="less" scoped>

</style>

 src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.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>

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

@@ -9,16 +9,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>
@@ -28,16 +35,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>

 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>