From a413ea959cfcb7874c6062d3f2bff2816d87116e Mon Sep 17 00:00:00 2001
From: zhoucong <123456>
Date: 星期一, 16 五月 2022 14:28:19 +0800
Subject: [PATCH] 合并shf分支
---
src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
index dd65b2e..0319cd9 100644
--- a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="app-container">
<div class="filter-container">
- <div class="basic_search">
- <span>巡检开始时间:</span>
- <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始时间"></el-date-picker>
- </div>
- <div class="basic_search">
- <span>巡检结束时间:</span>
- <el-date-picker v-model="listQuery.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束时间"></el-date-picker>
- </div>
+<!-- <div class="basic_search">-->
+<!-- <span>巡检开始时间:</span>-->
+<!-- <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始时间"></el-date-picker>-->
+<!-- </div>-->
+<!-- <div class="basic_search">-->
+<!-- <span>巡检结束时间:</span>-->
+<!-- <el-date-picker v-model="listQuery.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束时间"></el-date-picker>-->
+<!-- </div>-->
<div class="basic_search">
<span>风险源名称:</span>
<el-input v-model="listQuery.name" class="analyseUnit_input">
@@ -122,9 +122,9 @@
<br>
<el-pagination
v-show="recordTotal>0"
- :current-page="currentPage"
+ :current-page="listQuery.pageIndex"
:page-sizes="[10, 20, 30, 50]"
- :page-size="pageSize"
+ :page-size="listQuery.pageSize"
:total="recordTotal"
layout="total, sizes, prev, pager, next, jumper"
background
@@ -279,10 +279,7 @@
this.listLoading = true
let res = await getRiskSourceList(this.listQuery)
if(res.data.code === '200'){
- this.recordTotal =JSON.parse(res.data.message).totalCount
- this.pageSize = JSON.parse(res.data.message).pageSize
- this.pageTotal = computePageCount(this.recordTotal, this.pageSize)
- this.currentPage = JSON.parse(res.data.message).pageIndex
+ this.recordTotal = JSON.parse(res.data.message).totalCount
this.riskSourceData = res.data.result
}else{
this.$message({
--
Gitblit v1.9.2