1
This commit is contained in:
parent
82a5082a57
commit
3a561a504e
2
env.js
2
env.js
@ -9,7 +9,7 @@ module.exports = {
|
|||||||
dev: {
|
dev: {
|
||||||
MODE: 'dev',
|
MODE: 'dev',
|
||||||
// VUE_APP_API_URL: 'http://122.51.230.86:8099/',
|
// VUE_APP_API_URL: 'http://122.51.230.86:8099/',
|
||||||
VUE_APP_API_URL: 'http://192.168.1.17:8099/',
|
VUE_APP_API_URL: 'http://192.168.1.4:8099/',
|
||||||
VUE_APP_WEBSOCKET: 'ws://localhost:8099/ws/asset/'
|
VUE_APP_WEBSOCKET: 'ws://localhost:8099/ws/asset/'
|
||||||
},
|
},
|
||||||
// 生产环境 接口请求地址 (http)或(https)://www.a.com(换成你的域名)/api 非独立部署默认为空
|
// 生产环境 接口请求地址 (http)或(https)://www.a.com(换成你的域名)/api 非独立部署默认为空
|
||||||
|
@ -243,7 +243,6 @@ export default {
|
|||||||
/**打开聊天窗口,并建立连接*/
|
/**打开聊天窗口,并建立连接*/
|
||||||
chat(){
|
chat(){
|
||||||
this.$refs.chatFrom.show()
|
this.$refs.chatFrom.show()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,37 +6,14 @@
|
|||||||
<el-header class="AddressBook-header" style="height: 30px">
|
<el-header class="AddressBook-header" style="height: 30px">
|
||||||
<span></span>
|
<span></span>
|
||||||
<!-- <span style="margin-left: 500px">当前在线人数:{{count.split(',')[1]}}</span>-->
|
<!-- <span style="margin-left: 500px">当前在线人数:{{count.split(',')[1]}}</span>-->
|
||||||
|
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-container>
|
<el-container>
|
||||||
<!-- <el-aside width="200px" class="AddressBook-aside">-->
|
|
||||||
<!-- <el-input placeholder="请输入用户名"-->
|
|
||||||
<!-- size="mini"-->
|
|
||||||
<!-- v-model="userQuery.name"-->
|
|
||||||
<!-- clearable-->
|
|
||||||
<!-- @clear="getUserList"-->
|
|
||||||
<!-- @keyup.enter.native="getUserList">-->
|
|
||||||
<!-- <!– <el-button size="small" icon="el-icon-search" @click="getAddressBook"></el-button>–>-->
|
|
||||||
<!-- </el-input>-->
|
|
||||||
<!-- <div style="margin-top: 0px">-->
|
|
||||||
<!-- <div v-for="item in userList" class="userList">-->
|
|
||||||
<!-- <div style="height:5px">-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <el-avatar shape="square" size="medium" :src="item.userface"-->
|
|
||||||
<!-- style="margin-left: 5px"></el-avatar>-->
|
|
||||||
<!-- <span class="name">{{item.name}}</span>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <div style="height:5px">-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
|
|
||||||
<!-- </el-aside>-->
|
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-main class="AddressBook-main">
|
<el-main class="AddressBook-main">
|
||||||
<el-row style="margin-top: 20px" v-for="item in message" :key="item.createTime">
|
<el-row style="margin-top: 20px" v-for="item in message" :key="item.createTime">
|
||||||
<el-row v-if="item.dataFrom===name" type="flex" justify="end">
|
<el-row v-if="item.dataFrom==='customer'" type="flex" justify="end">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-card shadow="always" :style="'item.dataFrom===name'?'':'background-color: greenyellow;'">
|
<el-card shadow="always" :style="'item.dataFrom===customer'?'':'background-color: greenyellow;'">
|
||||||
{{ item.content }}
|
{{ item.content }}
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -87,8 +64,6 @@ export default {
|
|||||||
title: null,
|
title: null,
|
||||||
//消息
|
//消息
|
||||||
message: [],
|
message: [],
|
||||||
//客户端
|
|
||||||
name: null,
|
|
||||||
//发送消息内容
|
//发送消息内容
|
||||||
text: null,
|
text: null,
|
||||||
//聊天信息
|
//聊天信息
|
||||||
@ -128,7 +103,6 @@ export default {
|
|||||||
Fingerprint2.get((components) => {
|
Fingerprint2.get((components) => {
|
||||||
const values = components.map((component) => component.value);
|
const values = components.map((component) => component.value);
|
||||||
const fingerprintHash = Fingerprint2.x64hash128(values.join(''), 31);
|
const fingerprintHash = Fingerprint2.x64hash128(values.join(''), 31);
|
||||||
this.name = fingerprintHash
|
|
||||||
const data = {
|
const data = {
|
||||||
cusCode: fingerprintHash,
|
cusCode: fingerprintHash,
|
||||||
tenantId: 'main',
|
tenantId: 'main',
|
||||||
@ -162,7 +136,7 @@ export default {
|
|||||||
|
|
||||||
/**发送消息*/
|
/**发送消息*/
|
||||||
sendToServer() {
|
sendToServer() {
|
||||||
this.$store.dispatch('modules/websocket/websocket_send',this.name + "," + this.text);
|
this.$store.dispatch('modules/websocket/websocket_send',"customer," + this.text);
|
||||||
this.message=this.$store.state.modules.websocket.messages;
|
this.message=this.$store.state.modules.websocket.messages;
|
||||||
this.text=''
|
this.text=''
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user