Commit f284f885 authored by caicaicai's avatar caicaicai

修改

parent c0730dc9
// 项目配置相关 // 项目配置相关
const config = { const config = {
BASE_URL: 'http://8.143.203.103:9090', //线上地址2 // BASE_URL: 'http://8.143.203.103:9090', //线上地址2
REAL_URL: 'http://8.143.203.103:9090', //线上地址2 // REAL_URL: 'http://8.143.203.103:9090', //线上地址2
// BASE_URL: 'http://192.168.0.110:8001', BASE_URL: 'http://192.168.0.108:8001',
// REAL_URL: 'http://192.168.0.110:8001', REAL_URL: 'http://192.168.0.108:8001',
TOKEN_KEY: 'token', TOKEN_KEY: 'token',
USER_KEY: 'userInfo', USER_KEY: 'userInfo',
......
...@@ -496,23 +496,21 @@ export default { ...@@ -496,23 +496,21 @@ export default {
postData+="mime="+encodeURIComponent(blob.type);//告诉后端,这个录音是什么格式的,可能前后端都固定的mp3可以不用写 postData+="mime="+encodeURIComponent(blob.type);//告诉后端,这个录音是什么格式的,可能前后端都固定的mp3可以不用写
postData+="&upfile_b64="+encodeURIComponent((/.+;\s*base64\s*,\s*(.+)$/i.exec(reader.result)||[])[1]) //录音文件内容,后端进行base64解码成二进制 postData+="&upfile_b64="+encodeURIComponent((/.+;\s*base64\s*,\s*(.+)$/i.exec(reader.result)||[])[1]) //录音文件内容,后端进行base64解码成二进制
//...其他表单参数 //...其他表单参数
// var xhr=new XMLHttpRequest(); // var xhr=new XMLHttpRequest();
// xhr.open("POST", api); // xhr.open("POST", api);
// xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded"); // xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
// xhr.onreadystatechange=onreadystatechange("上传方式一【Base64】"); // xhr.onreadystatechange=onreadystatechange("上传方式一【Base64】");
// xhr.send(postData); // xhr.send(postData);
//发送语音数据 //发送语音数据
if (This.websocket.readyState === 1) { // that.websock.readyState = 1 表示连接成功,可以立即发送信息 if (This.websocket.readyState == 1) { // that.websock.readyState = 1 表示连接成功,可以立即发送信息
//console.log(`{"toUserId":"${This.userName1}","contentText":"${postData}"}`);
This.websocketsend(`{"toUserId":"${This.carAllNumberString}","contentText":"${postData}","fromUserId":"${This.userName1}"}`); This.websocketsend(`{"toUserId":"${This.carAllNumberString}","contentText":"${postData}","fromUserId":"${This.userName1}"}`);
This.$notify({ This.$notify({
title: '上传成功!', title: '上传成功!',
type: 'success', type: 'success',
duration: 2500 duration: 2500
}); });
} else if (This.websocket.readyState == 0) { // 表示正在连接,设置300ms后发送信息
} else if (This.websocket.readyState === 0) { // 表示正在连接,设置300ms后发送信息
setTimeout(function () { setTimeout(function () {
This.websocketsend(`{"toUserId":"${This.carAllNumberString}","contentText":"${postData}","fromUserId":"${This.userName1}"}`); This.websocketsend(`{"toUserId":"${This.carAllNumberString}","contentText":"${postData}","fromUserId":"${This.userName1}"}`);
This.$notify({ This.$notify({
......
...@@ -146,9 +146,9 @@ export default { ...@@ -146,9 +146,9 @@ export default {
res1.data.forEach((item,index) => { res1.data.forEach((item,index) => {
this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{ this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{
this.$notify({ this.$notify({
title: (item.type == 1 ? "闯入" : item.type == 2 ? '闯出' : '') + item.areaName, title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : item.type == 3 ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警',
type: 'warning', type: 'warning',
duration: 8000, duration: 10000,
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
}); });
}); });
......
...@@ -17,31 +17,31 @@ module.exports = { ...@@ -17,31 +17,31 @@ module.exports = {
open: true, // 配置自动启动浏览器 open: true, // 配置自动启动浏览器
proxy: { proxy: {
'/dianziweilan': {
target: 'http://8.143.203.103:9090'
},
'/auth': {
target: 'http://8.143.203.103:9090',
},
'/pic': {
target: 'http://8.143.203.103/avatar/',
pathRewrite: { '^/pic': '' },
changeOrigin: true,
},
// '/dianziweilan': { // '/dianziweilan': {
// target: 'http://192.168.0.110:8001' // target: 'http://8.143.203.103:9090'
// }, // },
// '/auth': { // '/auth': {
// target: 'http://192.168.0.110:8001', // target: 'http://8.143.203.103:9090',
// }, // },
// '/pic': { // '/pic': {
// target: 'http://192.168.0.110/avatar/', // target: 'http://8.143.203.103/avatar/',
// pathRewrite: { '^/pic': '' }, // pathRewrite: { '^/pic': '' },
// changeOrigin: true, // changeOrigin: true,
// }, // },
'/dianziweilan': {
target: 'http://192.168.0.108:8001'
},
'/auth': {
target: 'http://192.168.0.108:8001',
},
'/pic': {
target: 'http://192.168.0.108/avatar/',
pathRewrite: { '^/pic': '' },
changeOrigin: true,
},
}, },
//https: true, //https: true,
}, },
......
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