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
b57a5206
Commit
b57a5206
authored
May 16, 2022
by
caicaicai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
7a2bcd22
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
65 additions
and
22 deletions
+65
-22
config.js
src/config.js
+2
-2
index.vue
...ews/MLargeScreen/components/startOrderReceiving/index.vue
+31
-7
index.vue
src/views/MLargeScreen/index.vue
+29
-10
vue.config.js
vue.config.js
+3
-3
No files found.
src/config.js
View file @
b57a5206
...
...
@@ -4,8 +4,8 @@ const config = {
// BASE_URL: 'http://8.143.203.103:9090', //线上地址2
// REAL_URL: 'http://8.143.203.103:9090', //线上地址2
BASE_URL
:
'
http://192.168.0.1
08:8001
'
,
REAL_URL
:
'
http://192.168.0.1
08:8001
'
,
BASE_URL
:
'
http://192.168.0.1
11:9090
'
,
REAL_URL
:
'
http://192.168.0.1
11:9090
'
,
TOKEN_KEY
:
'
token
'
,
USER_KEY
:
'
userInfo
'
,
...
...
src/views/MLargeScreen/components/startOrderReceiving/index.vue
View file @
b57a5206
...
...
@@ -28,6 +28,7 @@ export default {
btnShow2
:
false
,
//完成派单展示
sonTimer1
:
null
,
startOrderSrcUrl
:
''
,
//来订单语音路径
dingDanId
:
''
,
}
},
mounted
(){
...
...
@@ -44,11 +45,19 @@ export default {
this
.
btnShow1
=
true
;
this
.
btnShow2
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
this
.
startOrderSrcUrl
=
newOrder
;
let
au
=
document
.
getElementById
(
'
audio1
'
);
au
.
currentTime
=
0
;
au
.
play
();
}
else
{
this
.
showDe
=
true
;
this
.
btnShow1
=
false
;
this
.
btnShow2
=
true
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
}
}
}
...
...
@@ -73,11 +82,13 @@ export default {
this
.
btnShow1
=
true
;
this
.
btnShow2
=
false
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
}
else
{
this
.
showDe
=
true
;
this
.
btnShow1
=
false
;
this
.
btnShow2
=
true
;
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
}
}
}
...
...
@@ -122,12 +133,16 @@ export default {
});
httpGet
(
vehicleInformationQuery
,{
number
:
this
.
carnumber
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
vehicleInformationUpdate
,{
id
:
res
.
data
.
content
[
0
].
id
,
number
:
this
.
carnumber
,
workStatus
:
1
,
weightStatus
:
2
}).
then
((
res
)
=>
{});
putForJson
(
vehicleInformationUpdate
,{
id
:
res
.
data
.
content
[
0
].
id
,
workStatus
:
1
,
weightStatus
:
2
}).
then
((
res
)
=>
{});
}
});
httpGet
(
manualSchedulingQuery
,{
sort
:
'
createTime,desc
'
,
size
:
1
,
carNo
:
this
.
carnumber
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
carNo
:
this
.
carnumber
,
status
:
1
}).
then
((
res
)
=>
{});
if
(
res
.
data
.
totalElements
==
0
){
}
else
{
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
status
:
1
}).
then
((
res
)
=>
{});
}
}
});
},
...
...
@@ -142,14 +157,19 @@ export default {
});
httpGet
(
vehicleInformationQuery
,{
number
:
this
.
carnumber
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
vehicleInformationUpdate
,{
id
:
res
.
data
.
content
[
0
].
id
,
number
:
this
.
carnumber
,
oddStatus
:
1
,
workStatus
:
0
}).
then
((
res
)
=>
{});
putForJson
(
vehicleInformationUpdate
,{
id
:
res
.
data
.
content
[
0
].
id
,
oddStatus
:
1
,
workStatus
:
0
}).
then
((
res
)
=>
{});
}
});
httpGet
(
manualSchedulingQuery
,{
sort
:
'
createTime,desc
'
,
size
:
1
,
carNo
:
this
.
carnumber
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
carNo
:
this
.
carnumber
,
status
:
0
}).
then
((
res
)
=>
{});
if
(
res
.
data
.
totalElements
==
0
){
}
else
{
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
status
:
0
}).
then
((
res
)
=>
{});
}
}
});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
]).
then
((
res
)
=>
{});
},
//卸车
finishPaidanFn
(){
...
...
@@ -157,15 +177,19 @@ export default {
this
.
showDe
=
false
;
httpGet
(
vehicleInformationQuery
,{
number
:
this
.
carnumber
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
vehicleInformationUpdate
,{
id
:
res
.
data
.
content
[
0
].
id
,
number
:
this
.
carnumber
,
workStatus
:
0
,
weightStatus
:
0
}).
then
((
res
)
=>
{});
putForJson
(
vehicleInformationUpdate
,{
id
:
res
.
data
.
content
[
0
].
id
,
workStatus
:
0
,
weightStatus
:
0
,
oddStatus
:
1
}).
then
((
res
)
=>
{});
}
});
httpGet
(
manualSchedulingQuery
,{
sort
:
'
createTime,desc
'
,
size
:
1
,
carNo
:
this
.
carnumber
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
carNo
:
this
.
carnumber
,
status
:
0
}).
then
((
res
)
=>
{});
if
(
res
.
data
.
totalElements
==
0
){
}
else
{
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
status
:
0
}).
then
((
res
)
=>
{});
}
}
});
httpDelForJson
(
dingDanBiaoCaoZuo
,
{
carNo
:
this
.
carnumber
}
).
then
((
res
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,
[
this
.
dingDanId
]
).
then
((
res
)
=>
{});
},
//获取当前时间
currentTime
(){
...
...
src/views/MLargeScreen/index.vue
View file @
b57a5206
...
...
@@ -56,17 +56,16 @@
<personalCenter
ref=
"personalCenterMethod"
v-show=
"selectFunction == 6"
/>
<smallWindow
ref=
"smallWindowMethod"
v-show=
"selectFunction == 7"
/>
<!-- 地图区域 -->
<div
id=
"centerDiv"
class=
"mapcontainer"
>
<
!--
<
div
id=
"centerDiv"
class=
"mapcontainer"
>
<mars3dViewerMap
:url=
"configUrl"
@
onload=
"onMapload"
/>
</div>
</div>
-->
<!-- 电铲待装车辆列表 -->
<div
class=
"waitingtrucksView"
v-if=
"carclass == '电铲'"
>
<div
class=
"waitingtrucksView_title"
>
待装卡车列表
</div>
<div
class=
"waitingtrucksView_content"
>
<div
v-for=
"(item,index) in daizhangCar"
:key=
"index"
>
<div>
车牌号:
{{
item
.
number
}}
</div>
<div>
司机:
{{
item
.
driver
}}
</div>
<el-button
type=
"primary"
style=
"font-size:18px;"
@
click=
"wanchengzhuangcheFn(item.number)"
>
完成装车
</el-button>
<el-button
type=
"primary"
style=
"font-size:18px;"
@
click=
"wanchengzhuangcheFn(item.number,item.id)"
>
完成装车
</el-button>
</div>
</div>
</div>
...
...
@@ -360,19 +359,39 @@ export default {
}
},
//完成装车
wanchengzhuangcheFn
(
number
){
wanchengzhuangcheFn
(
number
,
id
){
//删除
httpDelForJson
(
dingDanBiaoCaoZuo
,{
carNo
:
number
}).
then
((
res
)
=>
{});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
id
]).
then
((
res
)
=>
{
this
.
loadData1
();
});
//改订单状态
httpGet
(
manualSchedulingQuery
,{
sort
:
'
createTime,desc
'
,
size
:
1
,
carNo
:
number
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
carNo
:
number
,
status
:
0
}).
then
((
res
)
=>
{});
if
(
res
.
data
.
totalElements
==
0
){
}
else
{
putForJson
(
manualSchedulingQuery
,{
id
:
res
.
data
.
content
[
0
].
id
,
status
:
0
}).
then
((
res
)
=>
{});
}
}
});
//车辆信息状态修改
httpGet
(
vehicleInformationQuery
,{
number
:
number
}).
then
((
res
)
=>
{
//
查询Oredr接口,判断是智能调度还是人工调度从而进行
车辆信息状态修改
httpGet
(
dingDanBiaoCaoZuo
,{
carNo
:
number
,
size
:
1
,
sort
:
'
createTime,desc
'
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
putForJson
(
vehicleInformationUpdate
,{
id
:
res
.
data
.
content
[
0
].
id
,
workStatus
:
0
,
weightStatus
:
1
,
oddStatus
:
1
}).
then
((
res
)
=>
{});
if
(
res
.
data
.
content
[
0
].
flag
!=
0
){
//车辆信息状态修改
httpGet
(
vehicleInformationQuery
,{
number
:
number
}).
then
((
res11
)
=>
{
if
(
res11
.
code
==
200
){
putForJson
(
vehicleInformationUpdate
,{
id
:
res11
.
data
.
content
[
0
].
id
,
workStatus
:
0
,
weightStatus
:
1
,
oddStatus
:
1
}).
then
((
res
)
=>
{});
}
});
}
else
{
//车辆信息状态修改
httpGet
(
vehicleInformationQuery
,{
number
:
number
}).
then
((
res11
)
=>
{
if
(
res11
.
code
==
200
){
putForJson
(
vehicleInformationUpdate
,{
id
:
res11
.
data
.
content
[
0
].
id
,
workStatus
:
0
,
weightStatus
:
1
}).
then
((
res
)
=>
{});
}
});
}
}
});
//智能调度是否完成
...
...
vue.config.js
View file @
b57a5206
...
...
@@ -31,13 +31,13 @@ module.exports = {
'
/dianziweilan
'
:
{
target
:
'
http://192.168.0.1
08:8001
'
target
:
'
http://192.168.0.1
11:9090
'
},
'
/auth
'
:
{
target
:
'
http://192.168.0.1
08:8001
'
,
target
:
'
http://192.168.0.1
11:9090
'
,
},
'
/pic
'
:
{
target
:
'
http://192.168.0.1
08
/avatar/
'
,
target
:
'
http://192.168.0.1
11
/avatar/
'
,
pathRewrite
:
{
'
^/pic
'
:
''
},
changeOrigin
:
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