|
@@ -1,21 +1,46 @@
|
|
|
<template>
|
|
|
<div class="personal-center-container">
|
|
|
- <qrCode :loading="false" :testNum="testNum" :trade_state_closed="trade_state_closed"
|
|
|
- :centerDialogVisible.sync="centerDialogVisible" :wxPayCode="wxPayCode" @closePayDialogs="closePayDialogs"
|
|
|
- :price="price" @getReacquireCodes="getReacquireCodes" />
|
|
|
+ <qrCode
|
|
|
+ :loading="false"
|
|
|
+ :testNum="testNum"
|
|
|
+ :trade_state_closed="trade_state_closed"
|
|
|
+ :centerDialogVisible.sync="centerDialogVisible"
|
|
|
+ :wxPayCode="wxPayCode"
|
|
|
+ @closePayDialogs="closePayDialogs"
|
|
|
+ :price="price"
|
|
|
+ @getReacquireCodes="getReacquireCodes"
|
|
|
+ />
|
|
|
|
|
|
<div class="flex-row top-line">
|
|
|
<el-breadcrumb separator="/">
|
|
|
<!-- :to="{ path: '/welcome/MainTable' }" -->
|
|
|
- <el-breadcrumb-item style="cursor: pointer" @click.native="goBack()">首页</el-breadcrumb-item>
|
|
|
- <el-breadcrumb-item style="cursor: pointer"><a href="#">测试记录</a></el-breadcrumb-item>
|
|
|
+ <el-breadcrumb-item style="cursor: pointer" @click.native="goBack()"
|
|
|
+ >首页</el-breadcrumb-item
|
|
|
+ >
|
|
|
+ <el-breadcrumb-item style="cursor: pointer"
|
|
|
+ ><a href="#">测试记录</a></el-breadcrumb-item
|
|
|
+ >
|
|
|
</el-breadcrumb>
|
|
|
- <el-input placeholder="请输入测试名称" clearable v-model="searchKey" class="input-with-select"
|
|
|
- @keyup.enter="searchRecord" @clear="searchRecord">
|
|
|
- <el-button slot="append" icon="el-icon-search" @click="searchRecord"></el-button>
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入测试名称"
|
|
|
+ clearable
|
|
|
+ v-model="searchKey"
|
|
|
+ class="input-with-select"
|
|
|
+ @keyup.enter="searchRecord"
|
|
|
+ @clear="searchRecord"
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ slot="append"
|
|
|
+ icon="el-icon-search"
|
|
|
+ @click="searchRecord"
|
|
|
+ ></el-button>
|
|
|
</el-input>
|
|
|
</div>
|
|
|
- <div class="card-list" v-loading="loading" element-loading-background="rgba(255, 255, 255, 0.3)">
|
|
|
+ <div
|
|
|
+ class="card-list"
|
|
|
+ v-loading="loading"
|
|
|
+ element-loading-background="rgba(255, 255, 255, 0.3)"
|
|
|
+ >
|
|
|
<ul>
|
|
|
<li v-for="(item, index) in dataList" :key="index">
|
|
|
<img src="../assets/60e9526e0b432@2x(0).png" alt="" />
|
|
@@ -34,8 +59,13 @@
|
|
|
</ul>
|
|
|
</div>
|
|
|
<div class="flex-center">
|
|
|
- <el-pagination background layout="prev, pager, next" :total="total" :current-page="pageNum"
|
|
|
- @current-change="handleCurrentChange">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ layout="prev, pager, next"
|
|
|
+ :total="total"
|
|
|
+ :current-page="pageNum"
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
+ >
|
|
|
</el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -51,7 +81,7 @@ export default {
|
|
|
|
|
|
testNum: "",
|
|
|
baseUrl: baseUrl,
|
|
|
- pageSize: 12,
|
|
|
+ pageSize: 10,
|
|
|
pageNum: 1,
|
|
|
dataList: [],
|
|
|
total: 0,
|
|
@@ -64,7 +94,7 @@ export default {
|
|
|
price: "",
|
|
|
searchKey: "",
|
|
|
itemList: {},
|
|
|
- loading: false
|
|
|
+ loading: false,
|
|
|
};
|
|
|
},
|
|
|
//页面初始化函数
|
|
@@ -111,7 +141,7 @@ export default {
|
|
|
},
|
|
|
// 获取测试记录列表
|
|
|
getRecordList() {
|
|
|
- this.loading = true
|
|
|
+ this.loading = true;
|
|
|
this.$http.get(
|
|
|
`mineTest/${this.userBid}/${this.institutionNo}?pageSize=${this.pageSize}&pageNum=${this.pageNum}&searchKey=${this.searchKey}`,
|
|
|
{},
|
|
@@ -120,11 +150,12 @@ export default {
|
|
|
this.total = res.data.allNum;
|
|
|
this.dataList = res.data.userRecordEntityList;
|
|
|
setTimeout(() => {
|
|
|
- this.loading = false
|
|
|
- }, 350)
|
|
|
- }, (err) => {
|
|
|
- console.log(err)
|
|
|
- this.loading = false
|
|
|
+ this.loading = false;
|
|
|
+ }, 350);
|
|
|
+ },
|
|
|
+ (err) => {
|
|
|
+ console.log(err);
|
|
|
+ this.loading = false;
|
|
|
}
|
|
|
);
|
|
|
},
|
|
@@ -293,11 +324,13 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
if (res && res.code == 200) {
|
|
|
- if (res.data?.userRecordEntity.type == '1') {
|
|
|
+ if (res.data?.userRecordEntity.type == "1") {
|
|
|
sessionStorage.setItem("testResult", JSON.stringify(res?.data));
|
|
|
- let versionNo = JSON.parse(res.data?.userRecordEntity?.testResult).versionNo;
|
|
|
- if (versionNo == '2.0.1' || versionNo == '2.0' ) {
|
|
|
- sessionStorage.setItem("backToPageFlag", 'testResultNew')
|
|
|
+ let versionNo = JSON.parse(
|
|
|
+ res.data?.userRecordEntity?.testResult
|
|
|
+ ).versionNo;
|
|
|
+ if (versionNo == "2.0.1" || versionNo == "2.0") {
|
|
|
+ sessionStorage.setItem("backToPageFlag", "testResultNew");
|
|
|
this.$router.push({
|
|
|
name: "testResultNew",
|
|
|
query: {
|
|
@@ -307,7 +340,7 @@ export default {
|
|
|
},
|
|
|
});
|
|
|
} else {
|
|
|
- sessionStorage.setItem("backToPageFlag", 'PersionDetail')
|
|
|
+ sessionStorage.setItem("backToPageFlag", "PersionDetail");
|
|
|
this.$router.push({
|
|
|
path: "/PersionDetail",
|
|
|
params: {
|
|
@@ -321,7 +354,7 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
} else {
|
|
|
- sessionStorage.setItem("backToPageFlag", 'personalCenter')
|
|
|
+ sessionStorage.setItem("backToPageFlag", "personalCenter");
|
|
|
this.$router.push({
|
|
|
path: "/persionDetailSCl",
|
|
|
params: {
|
|
@@ -372,7 +405,6 @@ export default {
|
|
|
justify-content: space-between;
|
|
|
|
|
|
::v-deep .el-breadcrumb {
|
|
|
-
|
|
|
.el-breadcrumb__inner,
|
|
|
.el-breadcrumb__separator,
|
|
|
.el-breadcrumb__inner a {
|
|
@@ -391,7 +423,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.card-list {
|
|
|
- width: 100%;
|
|
|
+ width: calc(100% - 2px);
|
|
|
height: calc(100% - 112px);
|
|
|
|
|
|
ul {
|
|
@@ -400,7 +432,7 @@ export default {
|
|
|
justify-content: flex-start;
|
|
|
flex-wrap: wrap;
|
|
|
font-family: PingFang SC;
|
|
|
-
|
|
|
+ margin-left: 190px;
|
|
|
li {
|
|
|
width: 230px;
|
|
|
height: calc(50% - 30px);
|
|
@@ -447,7 +479,7 @@ export default {
|
|
|
font-size: 0.086rem;
|
|
|
font-weight: 400;
|
|
|
line-height: 20px;
|
|
|
- color: #26B600;
|
|
|
+ color: #26b600;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
}
|
|
@@ -466,8 +498,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
.pageNationBox {
|
|
|
padding: 20px 10px;
|
|
|
text-align: center;
|