Commit 32bce56a authored by zhangdong's avatar zhangdong

开标大厅逻辑改变

parent d4d4289a
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<timeDown :remain-time="decodeTime" @countDowmEnd="decodeTimeEnd"></timeDown> <timeDown :remain-time="decodeTime" @countDowmEnd="decodeTimeEnd"></timeDown>
</div> </div>
<!-- <div class="flex" v-show="signatureTime"> --> <!-- <div class="flex" v-show="signatureTime"> -->
<div class="flex" v-show="openStatus == 2&&endbidButton"> <!-- <div class="flex" v-show="openStatus == 2&&endbidButton"> -->
<div class="flex" v-show="openStatus == 2 && issueTable">
<p>签名倒计时:</p> <p>签名倒计时:</p>
<timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown> <timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown>
</div> </div>
...@@ -408,13 +409,13 @@ export default { ...@@ -408,13 +409,13 @@ export default {
form.projectId = localStorage.getItem('projectId'); form.projectId = localStorage.getItem('projectId');
const { code, msg } = await openbidFailed(form); const { code, msg } = await openbidFailed(form);
if (code === 200) { if (code === 200) {
this.$message({ this.$message({
message: msg, message: msg,
type: 'success', type: 'success',
duration: 1500 duration: 1500
}); });
setTimeout(() => { setTimeout(() => {
this.$router.push("/purchaser/bid/workbench") this.$router.push('/purchaser/bid/workbench');
}, 1500); }, 1500);
// this.isfailInfo = false; // this.isfailInfo = false;
// this.isFailed = false; // this.isFailed = false;
...@@ -487,18 +488,23 @@ export default { ...@@ -487,18 +488,23 @@ export default {
this.openStatus = data.openStatus; this.openStatus = data.openStatus;
this.isFailed = data.isFailed; this.isFailed = data.isFailed;
this.issueTable = data.issueTable; this.issueTable = data.issueTable;
// 解密时间
let comparyTime = this.storagedecodeTime - (localTime - data.openBidTime) / 1000;
if(data.issueTable){
// 签名时间
this.signatureTime = this.storagesignatureTime - (localTime - data.openBidTime) / 1000+comparyTime;
}
if (data.openStatus == 2) { if (data.openStatus == 2) {
let localTime = new Date().getTime(); let localTime = new Date().getTime();
console.log(this.storagedecodeTime, '..............'); console.log(this.storagedecodeTime, '..............');
let comparyTime = this.storagedecodeTime - (localTime - data.openBidTime) / 1000;
console.log(comparyTime); this.decodeTime = comparyTime;
if (comparyTime > 0) { if (comparyTime > 0) {
this.decodeTime = comparyTime;
console.log('大于'); console.log('大于');
} else { } else {
console.log('小于'); console.log('小于');
this.endbidButton = true; this.endbidButton = true;
this.signatureTime = this.storagesignatureTime - (localTime - data.openBidTime) / 1000;
} }
} }
} }
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
<p>解密倒计时:</p> <p>解密倒计时:</p>
<timeDown :remain-time="decodeTime" @countDowmEnd="decodeTimeEnd"></timeDown> <timeDown :remain-time="decodeTime" @countDowmEnd="decodeTimeEnd"></timeDown>
</div> </div>
<div class="flex" v-show="openStatus == 2 && isDecode"> <!-- <div class="flex" v-show="openStatus == 2 && isDecode"> -->
<div class="flex" v-show="openStatus == 2 && issueTable">
<p>签名倒计时:</p> <p>签名倒计时:</p>
<timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown> <timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown>
</div> </div>
...@@ -406,16 +407,22 @@ export default { ...@@ -406,16 +407,22 @@ export default {
this.issueTable = data.issueTable; this.issueTable = data.issueTable;
let localTime = new Date().getTime(); let localTime = new Date().getTime();
console.log(this.storagedecodeTime, '..............'); console.log(this.storagedecodeTime, '..............');
// 解密时间
let comparyTime = this.storagedecodeTime - (localTime - data.openBidTime) / 1000; let comparyTime = this.storagedecodeTime - (localTime - data.openBidTime) / 1000;
// 签名时间
let comparyTime1 = this.storagesignatureTime - (localTime - data.openBidTime) / 1000;
this.decodeTime = comparyTime;
if (data.issueTable) {
this.signatureTime = comparyTime1+comparyTime;
}
if (comparyTime > 0) { if (comparyTime > 0) {
this.decodeTime = comparyTime;
console.log('大于'); console.log('大于');
} else { } else {
console.log('小于'); console.log('小于');
this.isDecode = true; this.isDecode = true;
let comparyTime1 = this.storagesignatureTime - (localTime - data.openBidTime) / 1000;
if (comparyTime > 0) { if (comparyTime > 0) {
this.signatureTime = comparyTime1;
console.log('大于'); console.log('大于');
} else { } else {
console.log('小于'); console.log('小于');
......
...@@ -6,7 +6,8 @@ import {requestUrl,homeUrl} from "./common.js" ...@@ -6,7 +6,8 @@ import {requestUrl,homeUrl} from "./common.js"
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
baseURL: `/apis`, // baseURL: `/apis`,
baseURL:"http://www.eugood.cn/apis",
timeout: 35000 // 请求超时时间 timeout: 35000 // 请求超时时间
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment