Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
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
罗超
SuperMan
Commits
3c65b0d1
Commit
3c65b0d1
authored
Sep 20, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
093e847f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
13 deletions
+24
-13
TravelManagerThree.vue
...ewTravelmanager/TravelGroupControl/TravelManagerThree.vue
+9
-2
tripmap.vue
...omponents/newTravelmanager/TravelGroupControl/tripmap.vue
+11
-10
travelDays.vue
...newTravelmanager/travelLineTrip/components/travelDays.vue
+4
-1
No files found.
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @
3c65b0d1
...
@@ -73,7 +73,10 @@
...
@@ -73,7 +73,10 @@
<p
v-else
@
click=
"ShowMap=!ShowMap"
style=
"cursor: pointer;"
>
地图暂未生成图
</p>
<p
v-else
@
click=
"ShowMap=!ShowMap"
style=
"cursor: pointer;"
>
地图暂未生成图
</p>
</div>
</div>
</div>
</div>
<Tripmap
v-if=
"ShowMap"
:dataAll=
"PostConfig"
:ConfigId=
"ConfigId"
@
Cancel=
"ShowMap=false"
@
Success=
"getMapImgSuccess"
></Tripmap>
<Tripmap
v-if=
"ShowMap"
:PostConfig=
"PostConfig"
:ConfigId=
"ConfigId"
@
Cancel=
"ShowMap=false"
@
Success=
"getMapImgSuccess()"
@
saveMsg=
"SaveData(1)"
></Tripmap>
</div>
</div>
<TravelNotice
:class=
"
{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
<TravelNotice
:class=
"
{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
...
@@ -312,6 +315,9 @@
...
@@ -312,6 +315,9 @@
}
else
{
}
else
{
this
.
$refs
.
TravelFeature
.
setNewDate
(
data
);
this
.
$refs
.
TravelFeature
.
setNewDate
(
data
);
}
}
},
getConfig
(){
},
},
/*获取组件配置信息【回调方法】*/
/*获取组件配置信息【回调方法】*/
getConfig
(
configObj
)
{
getConfig
(
configObj
)
{
...
@@ -415,6 +421,7 @@
...
@@ -415,6 +421,7 @@
basicData
.
RemoveChild
=
this
.
PostConfig
.
RemoveChild
;
basicData
.
RemoveChild
=
this
.
PostConfig
.
RemoveChild
;
basicData
.
OfferId
=
this
.
PostConfig
.
OfferId
;
basicData
.
OfferId
=
this
.
PostConfig
.
OfferId
;
basicData
.
TeamType
=
this
.
PostConfig
.
TeamType
;
basicData
.
TeamType
=
this
.
PostConfig
.
TeamType
;
basicData
.
TripMapList
=
this
.
PostConfig
.
TripMapList
;
basicData
.
StartCityId
=
0
;
basicData
.
StartCityId
=
0
;
basicData
.
ReturnArriveCityId
=
0
;
basicData
.
ReturnArriveCityId
=
0
;
if
(
this
.
PostDaysTrip
)
{
if
(
this
.
PostDaysTrip
)
{
...
@@ -448,7 +455,7 @@
...
@@ -448,7 +455,7 @@
basicData
.
WCityId
=
this
.
PostConfig
.
WCityId
;
basicData
.
WCityId
=
this
.
PostConfig
.
WCityId
;
basicData
.
TripCountryList
=
this
.
PostDaysTrip
.
TripCountryList
;
basicData
.
TripCountryList
=
this
.
PostDaysTrip
.
TripCountryList
;
basicData
.
TripCitwlist
=
this
.
PostDaysTrip
.
TripCitwlist
;
basicData
.
TripCitwlist
=
this
.
PostDaysTrip
.
TripCitwlist
;
basicData
.
TripMapList
=
this
.
PostDaysTrip
.
TripMapList
;
this
.
journeyList
.
IsUpdateTrip
=
this
.
PostDaysTrip
.
IsUpdateTrip
;
this
.
journeyList
.
IsUpdateTrip
=
this
.
PostDaysTrip
.
IsUpdateTrip
;
//行程特色数据
//行程特色数据
var
TripFeature
=
{};
var
TripFeature
=
{};
...
...
src/components/newTravelmanager/TravelGroupControl/tripmap.vue
View file @
3c65b0d1
<
template
>
<
template
>
<div
class=
"tripmap-form marginT20"
v-if=
"
dataAll
"
>
<div
class=
"tripmap-form marginT20"
v-if=
"
PostConfig
"
>
<div
class=
"tripmap-Search"
v-loading=
"setLoading"
>
<div
class=
"tripmap-Search"
v-loading=
"setLoading"
>
<div
<div
style=
"display: flex;align-items: start; justify-content: space-between;"
style=
"display: flex;align-items: start; justify-content: space-between;"
...
@@ -95,7 +95,7 @@ mapboxgl.accessToken =
...
@@ -95,7 +95,7 @@ mapboxgl.accessToken =
"pk.eyJ1IjoiYWxleDkwMTIiLCJhIjoiY2xtOGw4NHdkMGFndTNjcnFkeWZncGc2dyJ9.lVrAdPHE0Dg5zoWFidfj4Q"
;
"pk.eyJ1IjoiYWxleDkwMTIiLCJhIjoiY2xtOGw4NHdkMGFndTNjcnFkeWZncGc2dyJ9.lVrAdPHE0Dg5zoWFidfj4Q"
;
import
html2Canvas
from
"html2canvas"
;
import
html2Canvas
from
"html2canvas"
;
export
default
{
export
default
{
props
:
[
"
dataAll
"
,
"ConfigId"
],
props
:
[
"
PostConfig
"
,
"ConfigId"
],
data
()
{
data
()
{
return
{
return
{
layerIds
:
[],
layerIds
:
[],
...
@@ -204,7 +204,7 @@ export default {
...
@@ -204,7 +204,7 @@ export default {
deep
:
true
,
deep
:
true
,
immediate
:
false
immediate
:
false
},
},
dataAll
:
{
PostConfig
:
{
handler
(
val
,
oldVal
)
{
handler
(
val
,
oldVal
)
{
if
(
this
.
NationList
.
length
==
0
)
this
.
getAddress
(
1
);
if
(
this
.
NationList
.
length
==
0
)
this
.
getAddress
(
1
);
if
(
val
.
TripMapList
.
length
==
0
)
this
.
SearchCity
(
2
);
if
(
val
.
TripMapList
.
length
==
0
)
this
.
SearchCity
(
2
);
...
@@ -218,8 +218,8 @@ export default {
...
@@ -218,8 +218,8 @@ export default {
CityListAll
:
this
.
CityListAll
,
CityListAll
:
this
.
CityListAll
,
CityListIds
:
[
4
,
6
],
CityListIds
:
[
4
,
6
],
NationList
:
this
.
NationList
,
NationList
:
this
.
NationList
,
ColorStr
:
this
.
dataAll
.
TripColor
ColorStr
:
this
.
PostConfig
.
TripColor
?
this
.
dataAll
.
TripColor
?
this
.
PostConfig
.
TripColor
:
"#409eff"
,
:
"#409eff"
,
ConfigId
:
this
.
ConfigId
,
ConfigId
:
this
.
ConfigId
,
Id
:
0
,
Id
:
0
,
...
@@ -445,7 +445,8 @@ export default {
...
@@ -445,7 +445,8 @@ export default {
},
},
// 保存标记坐标
// 保存标记坐标
SavePositionStr
()
{
SavePositionStr
()
{
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
$emit
(
'saveMsg'
)
// this.TripMapList.forEach(x => {
// this.TripMapList.forEach(x => {
// x.CityList.forEach(y => {
// x.CityList.forEach(y => {
// this.citiesData.forEach(z => {
// this.citiesData.forEach(z => {
...
@@ -484,7 +485,7 @@ export default {
...
@@ -484,7 +485,7 @@ export default {
that
.
SavePositionStr
()
that
.
SavePositionStr
()
that
.
setLoading
=
false
;
that
.
setLoading
=
false
;
let
allPath
=
that
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
let
allPath
=
that
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
;
that
.
dataAll
.
Mapurl
=
allPath
;
that
.
PostConfig
.
Mapurl
=
allPath
;
that
.
$emit
(
"Success"
,
allPath
);
that
.
$emit
(
"Success"
,
allPath
);
}
else
{
}
else
{
that
.
setLoading
=
false
;
that
.
setLoading
=
false
;
...
@@ -554,11 +555,11 @@ export default {
...
@@ -554,11 +555,11 @@ export default {
this
.
ClearSource
(
'curve-source-'
+
MId
,
2
)
this
.
ClearSource
(
'curve-source-'
+
MId
,
2
)
this
.
ClearSource
(
'world-layer-'
+
MId
,
1
)
this
.
ClearSource
(
'world-layer-'
+
MId
,
1
)
this
.
TripMapList
.
splice
(
index
,
1
);
this
.
TripMapList
.
splice
(
index
,
1
);
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
}
}
},
},
getColorStr
()
{
getColorStr
()
{
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
},
},
// 城市ids
// 城市ids
getCityListIds
(
x
,
index
)
{
getCityListIds
(
x
,
index
)
{
...
@@ -595,7 +596,7 @@ export default {
...
@@ -595,7 +596,7 @@ export default {
});
});
});
});
this
.
$forceUpdate
();
this
.
$forceUpdate
();
this
.
dataAll
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
this
.
PostConfig
.
TripMapList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
TripMapList
));
},
},
// 查询城市
// 查询城市
...
...
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @
3c65b0d1
<
template
>
<
template
>
<div
style=
"height: 100%;"
v-if=
"RenderingOk"
>
<div
style=
"height: 100%;
overflow: hidden;
"
v-if=
"RenderingOk"
>
<!-- -->
<!-- -->
<div
class=
"UpgradedVersion-box2 UpgradedVersion-homebj relative"
style=
"zoom: 0.44;"
>
<div
class=
"UpgradedVersion-box2 UpgradedVersion-homebj relative"
style=
"zoom: 0.44;"
>
<div
class=
" z-index1"
style=
"left: 0;right: 0; top: 0;bottom: 0;"
>
<div
class=
" z-index1"
style=
"left: 0;right: 0; top: 0;bottom: 0;"
>
...
@@ -138,6 +138,9 @@
...
@@ -138,6 +138,9 @@
<div
class=
"UpgradedVersion2Line absolute z-index3 row-ajc"
>
<div
class=
"UpgradedVersion2Line absolute z-index3 row-ajc"
>
<span>
底线
</span>
<span>
底线
</span>
</div>
</div>
<div
class=
"UpgradedVersion2Line absolute z-index3 row-ajc"
style=
"top: 3694px;"
>
<span>
底线
</span>
</div>
</div>
</div>
<el-dialog
custom-class=
"resourceImgAdd"
:title=
"$t('sm.chooseImg')"
center
:visible
.
sync=
"isShowScenicImg"
>
<el-dialog
custom-class=
"resourceImgAdd"
:title=
"$t('sm.chooseImg')"
center
:visible
.
sync=
"isShowScenicImg"
>
<!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
<!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
...
...
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