Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
NewTruckTerminalSyetem
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SQL_Mou
NewTruckTerminalSyetem
Commits
c0730dc9
Commit
c0730dc9
authored
May 09, 2022
by
caicaicai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
3595d804
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
27 deletions
+31
-27
config.json
public/config/config.json
+1
-1
config.js
src/config.js
+4
-4
index.vue
src/views/MLargeScreen/components/voiceApplication/index.vue
+2
-2
index.vue
src/views/MLargeScreen/index.vue
+8
-4
vue.config.js
vue.config.js
+16
-16
No files found.
public/config/config.json
View file @
c0730dc9
{
{
"map3d"
:
{
"map3d"
:
{
"scene"
:
{
"scene"
:
{
"center"
:
{
"lat"
:
36.6
55207
,
"lng"
:
117.130
,
"alt"
:
2500
,
"heading"
:
360
,
"pitch"
:
-90
},
"center"
:
{
"lat"
:
36.6
800
,
"lng"
:
117.1205
,
"alt"
:
2500
,
"heading"
:
360
,
"pitch"
:
-90
},
"scene3DOnly"
:
false
,
"scene3DOnly"
:
false
,
"shadows"
:
false
,
"shadows"
:
false
,
"removeDblClick"
:
true
,
"removeDblClick"
:
true
,
...
...
src/config.js
View file @
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.110:8001',
REAL_URL
:
'
http://192.168.0.110:8001
'
,
//
REAL_URL: 'http://192.168.0.110:8001',
TOKEN_KEY
:
'
token
'
,
TOKEN_KEY
:
'
token
'
,
USER_KEY
:
'
userInfo
'
,
USER_KEY
:
'
userInfo
'
,
...
...
src/views/MLargeScreen/components/voiceApplication/index.vue
View file @
c0730dc9
...
@@ -256,8 +256,8 @@ export default {
...
@@ -256,8 +256,8 @@ export default {
//初始化weosocket
//初始化weosocket
initWebSocket
(){
initWebSocket
(){
//
const wsuri = 'ws://8.143.203.103:9090/webSocket' + '/' + this.userName1;
const
wsuri
=
'
ws://8.143.203.103:9090/webSocket
'
+
'
/
'
+
this
.
userName1
;
const
wsuri
=
'
ws://192.168.0.111:9090/webSocket
'
+
'
/
'
+
this
.
userName1
;
//
const wsuri = 'ws://192.168.0.111:9090/webSocket' + '/' + this.userName1;
this
.
websocket
=
new
WebSocket
(
wsuri
);
this
.
websocket
=
new
WebSocket
(
wsuri
);
this
.
websocket
.
onopen
=
this
.
websocketonopen
;
this
.
websocket
.
onopen
=
this
.
websocketonopen
;
this
.
websocket
.
onerror
=
this
.
websocketonerror
;
this
.
websocket
.
onerror
=
this
.
websocketonerror
;
...
...
src/views/MLargeScreen/index.vue
View file @
c0730dc9
...
@@ -110,6 +110,7 @@ export default {
...
@@ -110,6 +110,7 @@ export default {
return
{
return
{
//地图图片
//地图图片
configUrl
:
basePathUrl
+
'
config/config.json
'
,
configUrl
:
basePathUrl
+
'
config/config.json
'
,
notifyPromise
:
Promise
.
resolve
(),
orderReceiving
:
'
开始接单
'
,
orderReceiving
:
'
开始接单
'
,
carName
:
'
4001
'
,
carName
:
'
4001
'
,
personalName
:
'
李三
'
,
personalName
:
'
李三
'
,
...
@@ -143,10 +144,13 @@ export default {
...
@@ -143,10 +144,13 @@ export default {
httpGet
(
getalarmRealQuery
,{
name
:
res
.
data
.
content
[
0
].
equipmentName
}).
then
((
res1
)
=>
{
httpGet
(
getalarmRealQuery
,{
name
:
res
.
data
.
content
[
0
].
equipmentName
}).
then
((
res1
)
=>
{
if
(
res1
.
code
==
200
){
if
(
res1
.
code
==
200
){
res1
.
data
.
forEach
((
item
,
index
)
=>
{
res1
.
data
.
forEach
((
item
,
index
)
=>
{
this
.
$notify
({
this
.
notifyPromise
=
this
.
notifyPromise
.
then
(
this
.
$nextTick
).
then
(()
=>
{
title
:
(
item
.
type
==
1
?
"
闯入
"
:
item
.
type
==
2
?
'
闯出
'
:
''
)
+
item
.
areaName
,
this
.
$notify
({
type
:
'
warning
'
,
title
:
(
item
.
type
==
1
?
"
闯入
"
:
item
.
type
==
2
?
'
闯出
'
:
''
)
+
item
.
areaName
,
duration
:
2500
type
:
'
warning
'
,
duration
:
8000
,
dangerouslyUseHTMLString
:
true
,
});
});
});
});
});
}
}
...
...
vue.config.js
View file @
c0730dc9
...
@@ -17,30 +17,30 @@ module.exports = {
...
@@ -17,30 +17,30 @@ 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.110:8001'
// },
// '/auth': {
// target: 'http://192.168.0.110:8001',
// },
// '/pic': {
// target: 'http://192.168.0.110/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: true,
// },
},
},
//https: true,
//https: true,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment