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
3dca2ea3
Commit
3dca2ea3
authored
Aug 25, 2022
by
xxx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
88eb517e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
24 deletions
+21
-24
config.json
public/config/config.json
+1
-1
index.vue
...ews/MLargeScreen/components/startOrderReceiving/index.vue
+5
-5
index.vue
src/views/MLargeScreen/index.vue
+15
-17
vue.config.js
vue.config.js
+0
-1
No files found.
public/config/config.json
View file @
3dca2ea3
{
"map3d"
:
{
"scene"
:
{
"center"
:
{
"lat"
:
3
4.52912
,
"lng"
:
117.662855
,
"alt"
:
1000
,
"heading"
:
360
,
"pitch"
:
-90
},
"center"
:
{
"lat"
:
3
7.4890
,
"lng"
:
122.04700
,
"alt"
:
1000
,
"heading"
:
360
,
"pitch"
:
-90
},
"scene3DOnly"
:
false
,
"shadows"
:
false
,
"removeDblClick"
:
true
,
...
...
src/views/MLargeScreen/components/startOrderReceiving/index.vue
View file @
3dca2ea3
...
...
@@ -75,9 +75,9 @@ export default {
this
.
carDestination
=
res
.
data
.
content
[
0
].
destination
;
this
.
dingDanId
=
res
.
data
.
content
[
0
].
id
;
//删除路径
this
.
$parent
.
zhixinglujing
(
false
);
this
.
$parent
.
zhixinglujing2
(
true
);
//查询指定目的地围栏以及判
读
该车是否在围栏里
//
this.$parent.zhixinglujing(false);
//
this.$parent.zhixinglujing2(true);
//查询指定目的地围栏以及判
断
该车是否在围栏里
httpGet
(
screenMapSetUpQuery
,{
size
:
9999
,
name
:
this
.
carDestination
}).
then
((
resSon2
)
=>
{
let
weilanArr1
=
[];
resSon2
[
this
.
carDestination
].
forEach
((
item
,
index
)
=>
{
...
...
@@ -186,7 +186,7 @@ export default {
}
});
//执行路径
this
.
$parent
.
zhixinglujing
(
true
);
//
this.$parent.zhixinglujing(true);
},
//拒绝派单
refusePaidanFn
(){
...
...
@@ -239,7 +239,7 @@ export default {
}
});
httpDelForJson
(
dingDanBiaoCaoZuo
,[
this
.
dingDanId
]).
then
((
res
)
=>
{
this
.
$parent
.
zhixinglujing2
(
false
);
//
this.$parent.zhixinglujing2(false);
});
}
...
...
src/views/MLargeScreen/index.vue
View file @
3dca2ea3
...
...
@@ -117,15 +117,14 @@ export default {
//地图图片
configUrl
:
basePathUrl
+
'
config/config.json
'
,
notifyPromise
:
Promise
.
resolve
(),
systemTitle
:
'
莲花山
卡车调度系统卡车终端
'
,
systemTitle
:
'
卡车调度系统卡车终端
'
,
orderReceiving
:
'
开始接单
'
,
carName
:
'
4001
'
,
personalName
:
'
李三
'
,
personalName
:
''
,
zongTimer1
:
null
,
zongTimer2
:
null
,
currentTime
:
''
,
selectFunction
:
0
,
carnumber
:
'
鲁k123456
'
,
carnumber
:
''
,
userName1
:
''
,
carclass
:
''
,
daizhangCar
:[],
...
...
@@ -165,12 +164,12 @@ export default {
if
(
res1
.
code
==
200
){
res1
.
data
.
forEach
((
item
,
index
)
=>
{
this
.
notifyPromise
=
this
.
notifyPromise
.
then
(
this
.
$nextTick
).
then
(()
=>
{
//
this.$notify({
//
title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : (item.type == 3 && this.carclass != '铲车') ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警',
//
type: 'warning',
//
duration: 10000,
//
dangerouslyUseHTMLString: true,
//
});
this
.
$notify
({
title
:
(
item
.
type
==
1
?
"
限入
"
:
item
.
type
==
2
?
'
限出
'
:
(
item
.
type
==
3
&&
this
.
carclass
!=
'
铲车
'
)
?
'
无故停车
'
:
item
.
type
==
4
?
'
防碰撞
'
:
''
)
+
(
item
.
areaName
==
undefined
?
''
:
item
.
areaName
)
+
'
报警
'
,
type
:
'
warning
'
,
duration
:
10000
,
dangerouslyUseHTMLString
:
true
,
});
});
});
}
...
...
@@ -202,7 +201,7 @@ export default {
this
.
carclass
=
res
.
data
.
content
[
0
].
carclass
;
if
(
this
.
carclass
==
'
铲车
'
){
this
.
loadData1
();
this
.
systemTitle
=
'
莲花山
卡车调度系统铲车终端
'
;
this
.
systemTitle
=
'
卡车调度系统铲车终端
'
;
}
else
{
return
;
}
...
...
@@ -509,15 +508,14 @@ export default {
},
//执行路径
zhixinglujing
(
boo
){
this
.
$refs
.
mars3dViewerMapMethod
.
addArrowGraphic3
(
boo
);
//
this.$refs.mars3dViewerMapMethod.addArrowGraphic3(boo);
},
//执行路径
zhixinglujing2
(
boo
){
if
(
!
this
.
boo1
){
this
.
boo1
=
boo
;
this
.
$refs
.
mars3dViewerMapMethod
.
addArrowGraphic4
(
boo
);
}
// if(!this.boo1){
// this.boo1 = boo;
// this.$refs.mars3dViewerMapMethod.addArrowGraphic4(boo);
// }
},
},
beforeDestroy
(){
...
...
vue.config.js
View file @
3dca2ea3
...
...
@@ -10,7 +10,6 @@ module.exports = {
productionSourceMap
:
false
,
//去掉打包的时候生成的map文件
lintOnSave
:
false
,
// 是否在开发环境下通过 eslint-loader 在每次保存时 lint 代码
devServer
:
{
//host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
host
:
'
localhost
'
,
port
:
3002
,
// 端口号
https
:
false
,
// https:{type:Boolean}
...
...
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