@@ -295,8 +295,8 @@ export default {
methods: {
/** 初始化WebSocket */
initWebSocket() {
- console.log(this.$store.state.location)
- const ws_location = 'ws://' + this.$store.state.location + '/Msg'
+ const ws_location = 'ws://' + window.location.host + '/Msg'
+ console.log(ws_location);
this.my_socket = new WebSocket(ws_location)
this.my_socket.onopen = this.WebSocketOpen
this.my_socket.onclose = this.WebSocketClose
@@ -640,9 +640,8 @@ export default {
const url_type = url.split('.').pop()
if (url_type.toUpperCase() === 'PDF') {
isPdfUrl = true
- }
- // const url_cut = url.split('192.168.10.55:13100')[1]
- const url_cut = url.split(this.$store.state.location)[1]
+ }
+ const url_cut = url.split('/').slice(3,url.split('/').length).join('/');
console.log('url: ', url, '\nurl_cut: ', url_cut, '\nurl type: ', url_type, '\nupper: ', url_type.toUpperCase(), '\n对比: ', (url_type.toUpperCase() === 'PDF'))
callback(isPdfUrl, '/pdfv' + url_cut)
}
@@ -620,8 +620,8 @@ export default {
+ //const url_cut = url.split(this.$store.state.location)[1]
@@ -595,7 +595,7 @@ export default {
callback(isPdfUrl, '/pdfv' + url_cut, url)
@@ -369,7 +369,7 @@ export default {
},
@@ -65,7 +65,7 @@
autocomplete="new-password"
:rules="[{ trigger: 'onBlur', required: true, message: '请填写用户名' }]"
label-class="filed-label"
- style="border-radius:40px 40px 0 0;height:auto;display:block;font-size:16px"
+ style="border-radius:40px 40px 0 0;height:auto;display:block;font-size:16px;padding:10px 16px !important;"
/>
<van-field
label="密码"
@@ -75,7 +75,7 @@
placeholder="请输入密码"
- style="border-radius:0 0 40px 40px;height:auto;display:block;font-size:16px"
+ style="border-radius:0 0 40px 40px;height:auto;display:block;font-size:16px;padding:10px 16px !important;"
</div>
<div style="margin:36px 10%;width:80%">
@@ -1162,7 +1162,7 @@ export default {
if (url_type.toUpperCase() === "PDF") {
isPdfUrl = true;
- const url_cut = url.split(this.$store.state.location)[1];
console.log(
"url: ",
url,
@@ -830,7 +830,7 @@ export default {