更新

src/components/dataTable.vue

@@ -218,6 +218,7 @@ export default {
     // 重置
     rest(data) {
       this.$refs[data].resetFields()
+	  this.getqueryList();
     },
     handlerelease() {
       console.log('1')

src/components/detail/priceDetail.vue

 <template>
 	<div>
-		<h1>{{projectName}}在线询价公告</h1>
+		<h1>{{detail.title}}</h1>
 		<div class="flex-center" v-if="state">
 			<h6 style="margin-right:60px;margin-top:30px" v-if="detail.area">询价所在地:{{detail.area}}</h6>
 			<h6 style="margin-buttom:60px;margin-top:30px">日期:{{detail.createTime}}</h6>

src/components/queryTable.vue

@@ -153,6 +153,7 @@ export default {
     // 重置
     rest(data) {
       this.$refs[data].resetFields()
+	  this.getqueryList();
     },
 	//
 	async getqueryList() {

src/pages/purchaser/bid/bidEvaluation/projectManager/content.vue

@@ -3,7 +3,7 @@
 		<div class="content">
 			<dataBreadcrumb :breads="breads"></dataBreadcrumb>
 			<div class="message">
-				<div class="flex-between" >
+				<div class="flex-between">
 					<div>招标文件：<span @click="download(bidDetail.fileUrl)">{{bidDetail.fileName}}</span></div>
 					<div>开标信息：<span>开标一览表</span></div>
 				</div>
@@ -73,7 +73,7 @@
 						</el-table-column>
 					</dataTable>
 				</div>
-				
+
 				<div class="flex">
 					<div>评标附件：</div>
 					<ul class="upload">
@@ -112,8 +112,8 @@
 		},
 		data() {
 			return {
-				downloadList:[],
-				changeList:[],
+				downloadList: [],
+				changeList: [],
 				bidDetail: "",
 				rankTitle: [{
 						label: '投标人名称',
@@ -170,7 +170,7 @@
 			}
 		},
 		methods: {
-			down(url){
+			down(url) {
 				window.open(url)
 			},
 			jump() {
@@ -184,27 +184,36 @@
 				}
 			},
 			// 查看评标附件
-			async getaccessorydownload(){
+			async getaccessorydownload() {
 				let projectId = localStorage.getItem("projectId");
-				const{data,code}=await accessorydownload(projectId)
-				if(code===200){
-					this.downloadList=data
+				const {
+					data,
+					code
+				} = await accessorydownload(projectId)
+				if (code === 200) {
+					this.downloadList = data
 				}
 			},
 			// 查看投标文件
-			async getbidFilelist(){
+			async getbidFilelist() {
 				let projectId = localStorage.getItem("projectId");
-				const{data,code}=await bidFilelist(projectId)
-				if(code===200){
-					this.bids=data
+				const {
+					data,
+					code
+				} = await bidFilelist(projectId)
+				if (code === 200) {
+					this.bids = data
 				}
 			},
 			// 查看变更信息
-			async getchangeNoticelist(){
+			async getchangeNoticelist() {
 				let projectId = localStorage.getItem("projectId");
-				const{data,code}=await changeNoticelist(projectId)
-				if(code===200){
-					this.changeList=data;
+				const {
+					data,
+					code
+				} = await changeNoticelist(projectId)
+				if (code === 200) {
+					this.changeList = data;
 				}
 			},
 			// 查投标公司评审信息
@@ -216,7 +225,7 @@
 						code
 					} = await CompanyEvaluatec(projectId)
 					if (code === 200) {
-						
+
 						this.review = data
 					}
 				} catch (e) {
@@ -233,8 +242,8 @@
 						code
 					} = await companyRank(projectId)
 					if (code === 200) {
-						console.log(data,"...............");
-                       let data1=data.sort(this.compare('finalScore'))
+						console.log(data, "...............");
+						let data1 = data.sort(this.compare('finalScore'))
 						this.rank = data1
 					}
 				} catch (e) {
@@ -257,7 +266,7 @@
 			},
 			async end() {
 				// 二次确认
-				this.$confirm('确定要流标吗？', '提示', {
+				this.$confirm('确定要评标结束吗？', '提示', {
 						type: 'warning'
 					})
 					.then(async () => {
@@ -266,11 +275,18 @@
 							msg,
 							code
 						} = await bidend(projectId)
-						this.$message({
-							message: msg,
-							type: 'success',
-							duration: 1500
-						})
+						if (code == 200) {
+							this.$message({
+								message: msg,
+								type: 'success',
+								duration: 1500
+							})
+							setTimeout(() => {
+								this.$router.go(-1)
+							}, 1500)
+						} else {
+							this.$message.error(msg)
+						}
 					})
 					.catch(() => {})
 			},

src/pages/purchaser/bid/bidOpen/bidOpenhal.vue

@@ -19,7 +19,7 @@
 					<div class="flex" v-show="openStatus==2">
 						<p>签名倒计时：</p>
 						<timeDown :remain-time="signatureTime" @countDowmEnd="signatureTimeEnd"></timeDown>
-					</div>
+					</div>  
 				</div>
 				<div class="flex">
 					<div class="hal-left">
@@ -290,7 +290,7 @@
 			this.projectCode = localStorage.getItem("projectCode")
 			this.projectName = localStorage.getItem("projectName")
 			this.userName = JSON.parse(localStorage.getItem("userInfo")).name
-			this.gettimeInfo();
+			// this.gettimeInfo();
 			this.getstartInfo();
 			this.getopenInfo();
 			this.getsigndetail();
@@ -308,7 +308,7 @@
 			this.createWebSocket()
 			// 长轮训获取
 			this.timer = setInterval(() => {
-				this.getstartInfo()
+				this.getsigndetail() 
 			}, 5000);
 		},
 		methods: {
@@ -382,10 +382,34 @@
 				this.form.filePOList = val
 			},
 			// 时间信息
-			async gettimeInfo() {
+			// async gettimeInfo() {
+			// 	try {
+			// 		let projectId = localStorage.getItem("projectId")
+				
+			// 	} catch (e) {
+			// 		console.log(e)
+			// 	}
+			// },
+			// 开标按钮上三个信息（投标人数，缴纳保证金人数，签到人数）
+			async getstartInfo() {
 				try {
 					let projectId = localStorage.getItem("projectId")
 					const {
+						data,
+						code
+					} = await startInfo(projectId)
+					if (code == 200) {
+						this.startDetail = data	
+					}
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			//签到解密略简
+			async getsigndetail() {
+				try {
+					let projectId = localStorage.getItem("projectId")
+					var {
 						data,
 						code,
 						msg
@@ -409,37 +433,29 @@
 									this.$router.go(-1)
 						},3000)
 					}
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			// 开标按钮上三个信息（投标人数，缴纳保证金人数，签到人数）
-			async getstartInfo() {
-				try {
-					let projectId = localStorage.getItem("projectId")
-					const {
-						data,
-						code
-					} = await startInfo(projectId)
-					if (code == 200) {
-						this.startDetail = data
-						this.openStatus=data.openStatus
-						this.isFailed=data.isFailed
-					}
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			//签到解密略简
-			async getsigndetail() {
-				try {
-					let projectId = localStorage.getItem("projectId")
-					const {
+					var {
 						data,
 						code
 					} = await signdetail(projectId)
 					if (code == 200) {
 						this.leftmessage = data
+						this.openStatus=data.openStatus
+						this.isFailed=data.isFailed
+						if(data.openStatus==2){
+							let localTime=new Date().getTime();
+							console.log(this.storagedecodeTime,"..............")
+							let comparyTime=this.storagedecodeTime-(localTime-data.openBidTime)/1000
+							console.log(comparyTime)
+							 if(comparyTime>0){
+								 this.decodeTime=comparyTime
+								 this.signatureTime=this.storagesignatureTime-(localTime-data.openBidTime)/1000
+								 console.log("大于")
+							 }else{
+								  console.log("小于")
+								  this.endbidButton = true
+							 }
+							console.log()
+						}
 					}
 				} catch (e) {
 					console.log(e)
@@ -488,14 +504,15 @@
 			// 截标时间到了
 			remaintimeEnd(val) {
 				this.openbidButton = val
+				console.log("截标时间到了")
 			},
 			// 解密时间到了
 			decodeTimeEnd(val) {
-
+               this.endbidButton = val
+               console.log("解密时间到了")
 			},
 			// 签名时间到了
 			signatureTimeEnd(val) {
-				this.endbidButton = val
 			},
 			// 开标
 			async openbid() {
@@ -509,8 +526,9 @@
 						this.isOpenbid = false
 						this.openbidButton = false
 						this.buttonWords = '停止开标'
-						this.decodeTime = this.storagedecodeTime
-						this.signatureTime = this.storagesignatureTime
+						// this.decodeTime = this.storagedecodeTime
+						// this.signatureTime = this.storagesignatureTime
+						this.getsigndetail();
 						this.$message({
 							message: '开标成功',
 							type: 'success'
@@ -524,8 +542,6 @@
 				} catch (e) {
 					console.log(e)
 				}
-
-
 			},
 			// 开标提示
 			confirm() {
@@ -543,8 +559,8 @@
 			createWebSocket() {
 				let token = localStorage.getItem("token")
 				let projectId = localStorage.getItem("projectId")
-				// this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId + "/" + token)
-				this.websocket = new WebSocket('ws://60.205.251.80:8085/webSocket/' + projectId +"/"+token )
+				this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId + "/" + token)
+				// this.websocket = new WebSocket('ws://60.205.251.80:8085/webSocket/' + projectId +"/"+token )
 				// 连接成功时
 				this.websocket.onopen = () => {}
 				this.websocket.onmessage = event => {
@@ -561,13 +577,13 @@
 					console.log('关闭了')
 				}
 				// 路由跳转时结束websocket链接
-				this.$router.afterEach(function() {
-					this.websocket.close()
-				})
-				// 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常
-				// window.onbeforeunload = function() {
+				// this.$router.afterEach(function() {
 				// 	this.websocket.close()
-				// }
+				// })
+				// 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常
+				window.onbeforeunload = function() {
+					this.websocket.close()
+				}
 			},
 			send() {
 				let content = this.content;
@@ -589,6 +605,7 @@
 			//清除定时器
 			clearInterval(this.timer);
 			clearInterval(this.timer1);
+			this.websocket.close()
 		}
 	}
 </script>

src/pages/purchaser/bid/bidSure/bidResult/list.vue

@@ -42,17 +42,7 @@ export default {
     return {
       navs: ['招标结果通知书'],
       breads: ['招标管理', '招标项目管理', '工作台'],
-      tableData: [{
-        bidder: '腾讯',
-        code: '',
-        state: '未编辑',
-        receiver: '中标人'
-      }, {
-        bidder: '腾讯',
-        code: '',
-        state: '未编辑',
-        receiver: '中标人'
-      }],
+      tableData: [],
       columns: [{
         label: '投标人',
         prop: 'bidder'
@@ -74,6 +64,9 @@ export default {
       ], // 操作列
     }
   },
+  created(){
+	  this.getresultBookList()
+  }, 
  methods: {
  	edit(row) {
  		this.$router.push(`/purchaser/bid/bidSure/bidResult/edit?id=${row.id}&winDate=${row.winDate}&money=${row.money}`)

src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue

@@ -218,8 +218,8 @@
            createWebSocket() {
 			   let token=localStorage.getItem("token")
            	let projectId = localStorage.getItem("projectId")
-           	// this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId +"/"+token )
-			this.websocket = new WebSocket('ws://60.205.251.80:8085/webSocket/' + projectId +"/"+token )
+           	this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId +"/"+token )
+			// this.websocket = new WebSocket('ws://60.205.251.80:8085/webSocket/' + projectId +"/"+token )
            	// 连接成功时
            	this.websocket.onopen = () => {}
            	this.websocket.onmessage = event => {
@@ -237,9 +237,9 @@
            		console.log('关闭了')
            	}
            	// 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常
-           	// window.onbeforeunload = function() {
-           	// 	this.websocket.close()
-           	// },
+           	window.onbeforeunload = function() {
+           		this.websocket.close()
+           	},
 			// 路由跳转时结束websocket链接
 			this.$router.afterEach(function() {
 				this.websocket.close()
@@ -262,7 +262,7 @@
 			},
 			// 解密时间到了
 			decodeTimeEnd(val) {
-            this.isDecode=false
+              this.isDecode=false
 			},
 			// 签名时间到了
 			signatureTimeEnd(val) {

src/pages/supply/bid/signupOnline/signupList.vue

@@ -85,7 +85,9 @@ export default {
 	  localStorage.setItem("projectId",row.projectId)
     },
 	signup(row){
-		this.$router.push(`/supply/bid/signupOnline/SignUp?id=${row.projectId}`)
+		this.$router.push("/supply/bid/signupOnline/SignUp")
+		// this.$router.push(`/supply/bid/signupOnline/SignUp?id=${row.projectId}`)
+		 localStorage.setItem("projectId",row.projectId)
 	}
   }
 }

src/utils/request.js

@@ -6,8 +6,8 @@ import { Message, MessageBox } from 'element-ui'
 // 创建axios实例
 const service = axios.create({
 	// baseURL: 'http://hsz.free.qydev.com/apis',
-  baseURL: 'http://60.205.251.80:8082/apis', 
-  // baseURL: 'http://192.168.3.35:8085/apis',
+  // baseURL: 'http://60.205.251.80:8082/apis', 
+  baseURL: 'http://192.168.3.35:8085/apis',
   timeout: 35000 // 请求超时时间
 })
 
@@ -43,8 +43,8 @@ service.interceptors.response.use(
     	 Message.error("登陆失效,请重新登录!")
        localStorage.removeItem('token');
        setTimeout(function () {
-         location.href = 'http://60.205.251.80:8081/login/user/';
-		  // location.href = 'http://localhost:3000/login/user/';
+         // location.href = 'http://60.205.251.80:8081/login/user/';
+		  location.href = 'http://localhost:3000/login/user/';
        }, 2000);
     }
   }