Commit b2fb0d15 authored by 张冬's avatar 张冬

联调

parent a42528a9
......@@ -41,28 +41,25 @@
<el-button @click=isdialogue>在线对话<i class="el-icon-chat-dot-round"></i></el-button>
<div class="button-pos">
<el-button v-if="openbidButton" type="primary" @click="confirm" style="margin-left: 10px;">立即开标</el-button>
<el-button v-else type="info" style="margin-left: 10px;">{{ buttonWords }}</el-button>
<!-- <el-button v-else type="info" style="margin-left: 10px;">{{ buttonWords }}</el-button> -->
<el-button v-if="endbidButton" type="primary" @click="end" style="margin-top: 10px;">结束开标</el-button>
</div>
</div>
<!-- 在线对话 -->
<div class="dialogue" style="margin-top: 30px;" v-show="dialogue">
<ul class="dialogueList">
<li v-for="(item,index) in dialogueList" :key="index">
<li v-for="(item,index) in dialogueList" :key="index" :class="myId==item.userId?'flex-left':'flex-right'">
<div>
<div class="flex-item">
<div v-if="myId==item.userId"></div>
<div v-else>{{item.name}}</div>
<div>({{item.time}})</div>
</div>
<div>{{item.chatContent}}</div>
</div>
</li>
</ul>
<el-input
placeholder="请输入内容"
v-model="content"
clearable
@keyup.enter.native="send"
>
<el-input placeholder="请输入内容" v-model="content" clearable @keyup.enter.native="send">
</el-input>
</div>
</div>
......@@ -95,31 +92,31 @@
<!-- 详细信息 -->
<el-dialog :visible.sync="isMessge" title="详细信息" width="60%">
<dataTable :columns="columns" :page-obj="pageObj" :margin-top="0" :margin-bottom="0" url="/open-bid/sign/detail">
<el-table-column slot="operate" label="是否买断账期" align="center" fixed="right" >
<el-table-column slot="operate" label="是否买断账期" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.isPayment"></div>
<div v-else></div>
</template>
</el-table-column>
<el-table-column slot="operate" label="是否递交投标文件" align="center" fixed="right" >
<el-table-column slot="operate" label="是否递交投标文件" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.bidFileId"></div>
<div v-else></div>
</template>
</el-table-column>
<el-table-column slot="operate" label="签到" align="center" fixed="right" >
<el-table-column slot="operate" label="签到" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.signIn"></div>
<div v-else></div>
</template>
</el-table-column>
<el-table-column slot="operate" label="解密" align="center" fixed="right" >
<el-table-column slot="operate" label="解密" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.decode"></div>
<div v-else></div>
</template>
</el-table-column>
<el-table-column slot="operate" label="签名" align="center" fixed="right" >
<el-table-column slot="operate" label="签名" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.signature"></div>
<div v-else></div>
......@@ -132,7 +129,7 @@
</el-dialog>
<!-- 开标一览表 -->
<el-dialog :visible.sync="isopenInfo" title="开标一览表">
<nopageTable :tableData="tableData" :columns="nopagecolumns" :margin-top="0" :margin-bottom="0" >
<nopageTable :tableData="tableData" :columns="nopagecolumns" :margin-top="0" :margin-bottom="0">
</nopageTable>
<div slot="footer" class="dialog-footer">
<el-button @click="isopenInfo=false">关闭 </el-button>
......@@ -145,9 +142,9 @@
<div>{{userName}}</div>
</el-form-item>
<el-form-item label="流标原因" prop="reason">
<el-input v-model="form.reason" ></el-input>
<el-input v-model="form.reason"></el-input>
</el-form-item>
<el-form-item label="上传附件" >
<el-form-item label="上传附件">
<singleUpload :limit="1" :max="10" tip="支持上传1份附件,不差过10M." @input="getfile"></singleUpload>
</el-form-item>
</el-form>
......@@ -166,7 +163,7 @@
<div>{{faildetail.reason}}</div>
</el-form-item>
<el-form-item label="上传附件" v-if="faildetail.fileName">
<div @click="down(faildetail.fileUrl)" >{{faildetail.fileName}}</div>
<div @click="down(faildetail.fileUrl)">{{faildetail.fileName}}</div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -178,16 +175,24 @@
</template>
<script>
import {
import {
getTime
} from '@utils/time'
import { timeInfo,startInfo,openInfo,signdetail,startbid,openbidFailed,bidFaileddetail} from '@api/purchaser/bid'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import timeDown from '@components/timeDown.vue'
import dataTable from '@components/dataTable.vue'
import nopageTable from '@components/nopageTable.vue'
import singleUpload from '@components/Upload/Upload.vue'
export default {
} from '@utils/time'
import {
timeInfo,
startInfo,
openInfo,
signdetail,
startbid,
openbidFailed,
bidFaileddetail
} from '@api/purchaser/bid'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
import timeDown from '@components/timeDown.vue'
import dataTable from '@components/dataTable.vue'
import nopageTable from '@components/nopageTable.vue'
import singleUpload from '@components/Upload/Upload.vue'
export default {
components: {
dataBreadcrumb,
timeDown,
......@@ -197,12 +202,12 @@ export default {
},
data() {
return {
faildetail:"",
isfailDetail:false,
projectCode:"",
projectName:"",
userName:"",
isfail:true,
faildetail: "",
isfailDetail: false,
projectCode: "",
projectName: "",
userName: "",
isfail: true,
rules: {
reason: [{
required: true,
......@@ -210,21 +215,21 @@ export default {
trigger: 'blur'
}]
},
form:{
reason:'',
filePOList:[]
form: {
reason: '',
filePOList: []
},
isfailInfo:false,
endbidButton:false,
tableData:[],
isopenInfo:false,
startDetail:"",
dialogue:false,
remaintime:"",
storagedecodeTime:"",
storagesignatureTime:"",
decodeTime:"",
signatureTime:"",
isfailInfo: false,
endbidButton: false,
tableData: [],
isopenInfo: false,
startDetail: "",
dialogue: false,
remaintime: "",
storagedecodeTime: "",
storagesignatureTime: "",
decodeTime: "",
signatureTime: "",
isMessge: false,
pageObj: {
size: 10,
......@@ -271,98 +276,105 @@ export default {
currentTime: '',
breads: ['招标管理', '招标项目管理', '工作台'],
websock: null,
content:"",
dialogueList:[],
myId:"",
leftmessage:""
content: "",
dialogueList: [],
myId: "",
leftmessage: "",
timer:""
}
},
created() {
this.projectCode=localStorage.getItem("projectCode")
this.projectName=localStorage.getItem("projectName")
this.userName=JSON.parse(localStorage.getItem("userInfo")).name
this.projectCode = localStorage.getItem("projectCode")
this.projectName = localStorage.getItem("projectName")
this.userName = JSON.parse(localStorage.getItem("userInfo")).name
this.gettimeInfo();
this.getstartInfo();
this.getopenInfo();
this.getsigndetail();
this.myId=JSON.parse(localStorage.getItem("userInfo")).userId
this.pageObj.companyId=localStorage.getItem("companyId")
this.pageObj.projectId=localStorage.getItem("projectId")
this.myId = JSON.parse(localStorage.getItem("userInfo")).userId
this.pageObj.companyId = localStorage.getItem("companyId")
this.pageObj.projectId = localStorage.getItem("projectId")
// 中国标准时间
let currentTime = getTime()
this.currentTime = currentTime
setInterval(() => {
this.timer1=setInterval(() => {
let currentTime = getTime()
this.currentTime = currentTime
}, 1000)
// websocket
this.createWebSocket()
// 长轮训获取
this.timer = setInterval(() => {
this.getstartInfo()
}, 5000);
},
methods: {
end(){
end() {
},
down(url){
down(url) {
window.open(url)
},
// 流标详情
async failDetail(){
this.isfailDetail=true
let projectId=localStorage.getItem("projectId")
async failDetail() {
this.isfailDetail = true
let projectId = localStorage.getItem("projectId")
const {
data,
code
} = await bidFaileddetail(projectId)
if(code==200){
this.faildetail=data
if (code == 200) {
this.faildetail = data
}
},
// 确定流标
async failbid(){
async failbid() {
try {
let valid = await this.$refs['form'].validate()
if (valid) {
let form=this.form;
form.projectId=localStorage.getItem("projectId")
const { code,msg } = await openbidFailed(form)
let form = this.form;
form.projectId = localStorage.getItem("projectId")
const {
code,
msg
} = await openbidFailed(form)
if (code === 200) {
this.$message.success(msg)
this.isfailInfo=false
this.isfail=false
}else if(code===500){
this.isfailInfo = false
this.isfail = false
} else if (code === 500) {
this.$message.error(msg)
this.isfailInfo=false
this.isfail=false
this.isfailInfo = false
this.isfail = false
}
}
} catch (e) {
console.log(e)
}
},
isdialogue(){
this.dialogue=!this.dialogue
isdialogue() {
this.dialogue = !this.dialogue
},
getfile(val){
this.form.filePOList=val
getfile(val) {
this.form.filePOList = val
},
// 时间信息
async gettimeInfo() {
try {
let projectId=localStorage.getItem("projectId")
let projectId = localStorage.getItem("projectId")
const {
data,
code
} = await timeInfo(projectId)
let remaintime=Number(data.remainTime);
if(remaintime<0){
this.openbidButton=true
}else{
this.remaintime=remaintime
}
this.storagedecodeTime=Number(data.decodeTime)
this.storagesignatureTime=Number(data.signatureTime)
let remaintime = Number(data.remainTime);
if (remaintime < 0) {
this.openbidButton = true
} else {
this.remaintime = remaintime
}
this.storagedecodeTime = Number(data.decodeTime)
this.storagesignatureTime = Number(data.signatureTime)
} catch (e) {
console.log(e)
}
......@@ -370,13 +382,13 @@ export default {
// 开标按钮上三个信息(投标人数,缴纳保证金人数,签到人数)
async getstartInfo() {
try {
let projectId=localStorage.getItem("projectId")
let projectId = localStorage.getItem("projectId")
const {
data,
code
} = await startInfo(projectId)
if(code==200){
this.startDetail=data
if (code == 200) {
this.startDetail = data
}
} catch (e) {
console.log(e)
......@@ -385,13 +397,13 @@ export default {
//签到解密略简
async getsigndetail() {
try {
let projectId=localStorage.getItem("projectId")
let projectId = localStorage.getItem("projectId")
const {
data,
code
} = await signdetail(projectId)
if(code==200){
this.leftmessage=data
if (code == 200) {
this.leftmessage = data
}
} catch (e) {
console.log(e)
......@@ -400,26 +412,26 @@ export default {
// 开标一栏表
async getopenInfo() {
try {
let projectId=localStorage.getItem("projectId")
let projectId = localStorage.getItem("projectId")
const {
data,
code
} = await openInfo(projectId)
if(code==200){
for(let item of data){
if(item.isSign){
item.isSign="是"
}else{
item.isSign="否"
if (code == 200) {
for (let item of data) {
if (item.isSign) {
item.isSign = "是"
} else {
item.isSign = "否"
}
}
this.tableData=data
this.tableData = data
}
} catch (e) {
console.log(e)
}
},
back(){
back() {
this.$router.go(-1)
},
// 计算分秒倒计时
......@@ -452,16 +464,16 @@ export default {
// 开标
async openbid() {
try {
let projectId=localStorage.getItem("projectId")
let projectId = localStorage.getItem("projectId")
const {
code
} = await startbid(projectId)
if(code==200){
if (code == 200) {
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.$message({
message: '开标成功',
type: 'success'
......@@ -487,58 +499,72 @@ export default {
},
// websocket
createWebSocket() {
let token=localStorage.getItem("token")
let projectId=localStorage.getItem("projectId")
this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' +projectId+"/"+ token )
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.onopen = () => {
}
this.websocket.onopen = () => {}
this.websocket.onmessage = event => {
// 后端发送的消息在event.data中
let data=JSON.parse(event.data);
if(data.type==1){
this.content=""
let data = JSON.parse(event.data);
if (data.type == 1) {
this.content = ""
this.dialogueList.push(data)
}else{
} else {
this.halList.push(data)
}
}
this.websocket.onclose = function () {
this.websocket.onclose = function() {
console.log('关闭了')
}
// 路由跳转时结束websocket链接
this.$router.afterEach(function () {
this.$router.afterEach(function() {
this.websocket.close()
})
// 监听窗口关闭事件,当窗口关闭时,主动去关闭websocket连接,防止连接还没断开就关闭窗口,server端会抛异常
window.onbeforeunload = function () {
window.onbeforeunload = function() {
this.websocket.close()
}
},
send(){
let content=this.content;
send() {
let content = this.content;
this.websocket.send(content)
}
},
}
destroyed() {
//清除定时器
clearInterval(this.timer);
clearInterval(this.timer1);
}
}
</script>
<style scoped>
.dialogue{
.flex-left{
display: flex;
justify-content: flex-start;
}
.flex-right{
display: flex;
justify-content: flex-end;
}
.dialogue {
position: absolute;
top:10%;
top: 10%;
right: 10%;
}
.dialogue>.dialogueList{
.dialogue>.dialogueList {
border: 1px solid #DCDFE6;
width: 400px;
height: 300px;
overflow:auto;
overflow: auto;
}
.hal{
.hal {
position: relative;
}
.buttons {
margin: 100px 0;
}
......@@ -578,7 +604,7 @@ export default {
margin: 0 50px;
box-sizing: border-box;
padding: 30px;
overflow:auto
overflow: auto
}
.hal-center>ul>li {
......@@ -615,12 +641,14 @@ export default {
margin-right: 50px;
margin-bottom: 30px;
}
.dialogue>.dialogueList{
.dialogue>.dialogueList {
box-sizing: border-box;
padding:20px;
overflow:auto
padding: 20px;
overflow: auto
}
.dialogueList>li{
.dialogueList>li {
margin-bottom: 20px;
}
</style>
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