Skip to content

Commit 3ac275a

Browse files
youwenbusiyouwenbusi
authored
Merge pull request #222 from 724338817/develop
modifyGetWeIdList
2 parents 55bacf0 + 8aee51b commit 3ac275a

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

‎src/main/resources/static/weid/weid-build-tools/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=./static/outcss/element-ui.css><title>WeIdentity 网页管理工具</title></head><body><div id=app></div><script src=./static/outjs/vue.min.js></script><script src=./static//outjs/vuex.js></script><script src=./static/outjs/vue-router.main.js></script><script src=./static/outjs/axios.main.js></script><script src=./static/outjs/qs.main.js></script><script src=./static/outjs/element-ui.js></script><script src=./static/js/runtime.16ba17da09624267ac80.js></script><script src=./static/js/0.7e5a8c5af62823b879bd.js></script><script src=./static/js/2.d75146936d4e2539a8ee.js></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=./static/outcss/element-ui.css><title>WeIdentity 网页管理工具</title></head><body><div id=app></div><script src=./static/outjs/vue.min.js></script><script src=./static//outjs/vuex.js></script><script src=./static/outjs/vue-router.main.js></script><script src=./static/outjs/axios.main.js></script><script src=./static/outjs/qs.main.js></script><script src=./static/outjs/element-ui.js></script><script src=./static/js/runtime.16ba17da09624267ac80.js></script><script src=./static/js/0.f74d3b40e364c6028a56.js></script><script src=./static/js/2.d75146936d4e2539a8ee.js></script></body></html>

‎src/main/resources/static/weid/weid-build-tools/static/js/0.7e5a8c5af62823b879bd.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/main/resources/static/weid/weid-build-tools/static/js/0.f74d3b40e364c6028a56.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/src/module/page/weid/weidListPage.vue‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,21 @@
1818
<span class='long_words link' @click="showAll(scope.row.weId, scope.row.id)" :title='scope.row.weId'>{{scope.row.weId}}</span>
1919
</template>
2020
</el-table-column>
21-
<el-table-column label="创建时间" align="center" :formatter="dateFormat" width='200'></el-table-column>
21+
<!-- <el-table-column label="创建时间" align="center" :formatter="dateFormat" width='200'></el-table-column> -->
22+
<el-table-column label="创建时间" align="center" width='200'>
23+
<template slot-scope='scope'>
24+
<span>{{scope.row.createTime}}</span>
25+
</template>
26+
</el-table-column>
2227
<el-table-column label="操作" align="center" width='400'>
2328
<template slot-scope='scope'>
2429
<el-button type="primary" class="btn" @click="showRegistIssuer(scope.row.weId)" :disabled='scope.row.issuer' style="width:180px;">注册为权威凭证发行者</el-button>
2530
<el-button type="primary" class="btn" @click="showRegistWhiteList(scope.row.weId)" style="width:120px;" v-if="roleType === '1'">添加到白名单</el-button>
2631
</template>
2732
</el-table-column>
2833
</el-table>
29-
<el-pagination @current-change="indexChange" :current-page="page.pageIndex" :page-size="page.pageSize" layout="total, prev, slot, next" :total="page.total">
30-
<span style="text-align: center;">{{page.pageIndex}}</span>
34+
<el-pagination class="page" @current-change="indexChange" :current-page="page.pageIndex" :page-size="page.pageSize" layout="total, prev, pager, next" :total="page.total">
35+
<!-- <span style="text-align: center;">{{page.pageIndex}}</span> -->
3136
</el-pagination>
3237
</div>
3338

@@ -437,23 +442,24 @@ export default {
437442
var pageIndex = this.page.pageIndex
438443
this.page.pageIndex = currentPage
439444
var blockNumber, indexInBlock, direction
440-
if (pageIndex > this.page.pageIndex) { // 向前
441-
blockNumber = this.page.weidList[0].weIdPojo.currentBlockNum
442-
indexInBlock = this.page.weidList[0].weIdPojo.index + 1
443-
direction = false
444-
} else { // 向后
445-
blockNumber = this.page.weidList[this.page.weidList.length - 1].weIdPojo.currentBlockNum
446-
indexInBlock = this.page.weidList[this.page.weidList.length - 1].weIdPojo.index - 1
447-
direction = true
448-
}
445+
indexInBlock=currentPage-1
446+
// if (pageIndex > this.page.pageIndex) { // 向前
447+
// blockNumber = this.page.weidList[0].weIdPojo.currentBlockNum
448+
// indexInBlock = this.page.weidList[0].weIdPojo.index + 1
449+
// direction = false
450+
// } else { // 向后
451+
// blockNumber = this.page.weidList[this.page.weidList.length - 1].weIdPojo.currentBlockNum
452+
// indexInBlock = this.page.weidList[this.page.weidList.length - 1].weIdPojo.index - 1
453+
// direction = true
454+
// }
449455
this.queryWeIdList(this.page.pageIndex, blockNumber, indexInBlock, direction)
450456
},
451457
queryWeIdList (pageIndex, blockNumber, indexInBlock, direction) {
452458
var formData = {}
453-
formData.blockNumber = blockNumber
459+
// formData.blockNumber = blockNumber
454460
formData.pageSize = this.page.pageSize
455-
formData.indexInBlock = indexInBlock
456-
formData.direction = direction
461+
formData.indexFirst = indexInBlock * this.page.pageSize
462+
// formData.direction = direction
457463
formData.iDisplayStart = pageIndex * this.page.pageSize
458464
formData.iDisplayLength = this.page.pageSize
459465

0 commit comments

Comments
 (0)