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

yangdelong

2021-05-26 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e

 src/components/panel/topicSearch/sewers-select/SewersHistory.vue

@@ -14,6 +14,12 @@
            </el-option>
          </el-select>
        </el-form-item>
                <div class="page_total">
                    <p>共计
                        <span>{{total}}</span>
                        条记录
                    </p>
                </div>
        <div class="rightButtonSearch">
          <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
          <el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -29,7 +35,7 @@
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
      <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
            <div class="environmental-risk-list hover">
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
@@ -37,7 +43,7 @@
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
      <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
            <div class="environmental-risk-list hover">
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
@@ -46,6 +52,17 @@
        </div>
      </div>
    </el-scrollbar>
        <el-card class="footer-page" v-if="total > 10">
            <el-pagination
                    small
                    @current-change="handlePage"
                    :page-size=pageSize
                    layout="prev, pager, next"
                    :total=total
                    class="warnPagination"
            >
            </el-pagination>
        </el-card>
  </div>
</template>

@@ -123,10 +140,18 @@
            key: 'length'
          }]
        }
      ]
      ],
      list: [],
      total: 0,
      // 分页
      pageSize: 10
    }
  },
  methods: {
    // 分页
    handlePage (val) {
      console.log(val)
    },
    handlePipelineType (val) {
      console.log(val)
    },