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
aa4588c0
Commit
aa4588c0
authored
Sep 18, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
页面修改
parents
fbdd2f66
dace10ae
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
19 deletions
+34
-19
tripmap.vue
...omponents/newTravelmanager/TravelGroupControl/tripmap.vue
+1
-1
TravelDaysTrip_DirectThree.vue
...avelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
+1
-1
travelDaysTripThree.vue
...s/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
+15
-12
trifficTripThree.vue
...ents/newTravelmanager/travelLineTrip/trifficTripThree.vue
+17
-5
No files found.
src/components/newTravelmanager/TravelGroupControl/tripmap.vue
View file @
aa4588c0
...
@@ -834,7 +834,7 @@ export default {
...
@@ -834,7 +834,7 @@ export default {
}
}
});
});
}
}
},
3
00
)
},
5
00
)
}
}
});
});
},
},
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @
aa4588c0
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
.newDayContent
{
.newDayContent
{
width
:
520px
;
width
:
520px
;
/* max-height: 678px; */
/* max-height: 678px; */
overflow-y
:
scroll
;
/* overflow-y: scroll; */
/* margin-left: 20px; */
/* margin-left: 20px; */
position
:
relative
;
position
:
relative
;
/* background-color: #eee; */
/* background-color: #eee; */
...
...
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @
aa4588c0
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
width
:
300px
;
width
:
300px
;
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.TC-itemContent
{
.TC-itemContent
{
position
:
relative
;
position
:
relative
;
/* max-height: 700px; */
/* max-height: 700px; */
...
@@ -12,7 +11,12 @@
...
@@ -12,7 +11,12 @@
.TD_OperaContent
{
.TD_OperaContent
{
position
:
absolute
;
position
:
absolute
;
top
:
24px
;
top
:
24px
;
right
:
0
;
right
:
-40px
;
display
:
flex
;
flex-direction
:
column
;
border-top-right-radius
:
4px
;
border-bottom-right-radius
:
4px
;
overflow
:
hidden
;
}
}
.TD_ComIcon
{
.TD_ComIcon
{
...
@@ -62,10 +66,10 @@
...
@@ -62,10 +66,10 @@
.toggle-box
{
.toggle-box
{
position
:
absolute
;
position
:
absolute
;
right
:
0px
;
right
:
-1
0px
;
top
:
0px
;
top
:
-2
0px
;
border-
top
-right-radius
:
1px
;
border-
bottom
-right-radius
:
1px
;
border-
bottom
-left-radius
:
4px
;
border-
top
-left-radius
:
4px
;
padding
:
2px
12px
;
padding
:
2px
12px
;
background
:
#7cb99f
;
background
:
#7cb99f
;
color
:
#444
;
color
:
#444
;
...
@@ -131,7 +135,7 @@
...
@@ -131,7 +135,7 @@
<
template
>
<
template
>
<div>
<div>
<div
class=
"TC-itemContent"
>
<div
class=
"TC-itemContent"
>
<div
class=
"dayscontent hideToggle"
v-show=
"dayObj.isHide"
>
<div
class=
"dayscontent hideToggle
relative
"
v-show=
"dayObj.isHide"
>
<div
class=
"toggle-box"
@
click=
"changeToggleBox(dayObj)"
>
点击展开
</div>
<div
class=
"toggle-box"
@
click=
"changeToggleBox(dayObj)"
>
点击展开
</div>
<div
class=
"TC-daycont"
>
<div
class=
"TC-daycont"
>
<div
class=
"d"
>
第
{{
dayObj
.
DayNum
}}
天
</div>
<div
class=
"d"
>
第
{{
dayObj
.
DayNum
}}
天
</div>
...
@@ -160,7 +164,7 @@
...
@@ -160,7 +164,7 @@
</div>
</div>
</div>
</div>
<!-- 交通 -->
<!-- 交通 -->
<div
class=
"TC-Comtitlediv"
>
<div
class=
"TC-Comtitlediv"
style=
"padding: 5px 0 10px 0;"
>
<trifficTrip
v-bind:trafficObj=
"dayObj.TrafficObj"
:isOpenGroup=
"isOpenGroup"
v-bind:AllCityList=
"AllCityList"
<trifficTrip
v-bind:trafficObj=
"dayObj.TrafficObj"
:isOpenGroup=
"isOpenGroup"
v-bind:AllCityList=
"AllCityList"
v-bind:UseTypeArray=
"UseTypeArray"
v-bind:AirPickUp=
"AirPickUp"
v-bind:AirSend=
"AirSend"
v-bind:UseTypeArray=
"UseTypeArray"
v-bind:AirPickUp=
"AirPickUp"
v-bind:AirSend=
"AirSend"
v-bind:StartCity=
"StartCity"
v-bind:CurrentIndex=
"CurrentIndex"
v-bind:TotalCount=
"TotalCount"
v-bind:StartCity=
"StartCity"
v-bind:CurrentIndex=
"CurrentIndex"
v-bind:TotalCount=
"TotalCount"
...
@@ -172,7 +176,7 @@
...
@@ -172,7 +176,7 @@
<span
class=
"TC-tripTitle"
>
{{ishasScenic?"景点":"默认描述"}}
</span>
<span
class=
"TC-tripTitle"
>
{{ishasScenic?"景点":"默认描述"}}
</span>
</div>
</div>
<div
class=
"column"
>
<div
class=
"column"
>
<div
class=
"TC-titlebox row"
>
<div
class=
"TC-titlebox row"
style=
"width: 100%;"
>
<el-checkbox
v-model=
"ishasScenic"
border
size=
"mini"
@
change=
"hasScenicChange"
>
景点
</el-checkbox>
<el-checkbox
v-model=
"ishasScenic"
border
size=
"mini"
@
change=
"hasScenicChange"
>
景点
</el-checkbox>
<el-select
v-if=
"ishasScenic&&NoticeParameters.IsDirect==1"
class=
"Ht_hotelSelect"
size=
"mini"
<el-select
v-if=
"ishasScenic&&NoticeParameters.IsDirect==1"
class=
"Ht_hotelSelect"
size=
"mini"
:placeholder=
"$t('pub.pleaseSel')"
:multiple-limit=
"5"
v-model=
"ChooseScenicArray"
multiple
filterable
:placeholder=
"$t('pub.pleaseSel')"
:multiple-limit=
"5"
v-model=
"ChooseScenicArray"
multiple
filterable
...
@@ -212,8 +216,7 @@
...
@@ -212,8 +216,7 @@
</li>
</li>
</ul>
</ul>
</div>
</div>
<div
class=
"row marginT10"
style=
"width: 100%;"
v-if=
"dayObj.ScenicArray.length>0"
>
<div
class=
"row-aic marginT10"
style=
"width: 100%;"
v-if=
"dayObj.ScenicArray.length>0"
>
<div>
<span
v-if=
"ishasScenic"
>
默认展示图
</span>
<span
v-if=
"ishasScenic"
>
默认展示图
</span>
<el-select
v-if=
"ishasScenic&&NoticeParameters.IsDirect==1"
class=
"w220 Ht_hotelSelect"
size=
"mini"
<el-select
v-if=
"ishasScenic&&NoticeParameters.IsDirect==1"
class=
"w220 Ht_hotelSelect"
size=
"mini"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"ScenicArraySingle"
filterable
@
change=
"setDefaultScenic"
>
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"ScenicArraySingle"
filterable
@
change=
"setDefaultScenic"
>
...
@@ -221,7 +224,7 @@
...
@@ -221,7 +224,7 @@
:value=
"item.CouponsId"
:key=
"index"
>
:value=
"item.CouponsId"
:key=
"index"
>
</el-option>
</el-option>
</el-select>
</el-select>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue
View file @
aa4588c0
...
@@ -5,11 +5,13 @@
...
@@ -5,11 +5,13 @@
<div
class=
"partName"
>
<div
class=
"partName"
>
<span
class=
"TDTripType"
>
交通
</span>
<span
class=
"TDTripType"
>
交通
</span>
</div>
</div>
<div
class=
"TDplanList clearfix"
>
<div
class=
"TDplanList
TDplanListTwo
clearfix"
>
<div
class=
"TDLeftPlan"
>
<div
class=
"TDLeftPlan"
>
<span
v-for=
"(subTraffic,subTrafficIndex) in trafficObj.SubTraffic"
>
<span
v-for=
"(subTraffic,subTrafficIndex) in trafficObj.SubTraffic"
>
<span
v-if=
"subTrafficIndex==0"
>
<span
v-if=
"subTrafficIndex==0"
>
<el-form-item
:rules=
"trifficTripRules.StartCityId"
>
<el-form-item
class=
"StartCity"
:rules=
"trifficTripRules.StartCityId"
>
<el-select
:disabled=
"isOpenGroup"
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
filterable
remote
<el-select
:disabled=
"isOpenGroup"
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
filterable
remote
v-model=
"subTraffic.StartCityId"
reserve-keyword
:remote-method=
"GetDepartList1"
v-model=
"subTraffic.StartCityId"
reserve-keyword
:remote-method=
"GetDepartList1"
@
change=
"changeGetDepartList(subTraffic.StartCityId)"
>
@
change=
"changeGetDepartList(subTraffic.StartCityId)"
>
...
@@ -53,7 +55,7 @@
...
@@ -53,7 +55,7 @@
class=
"addTrafficPlan"
@
click=
"minusTrafficPlan(trafficObj)"
>
-
</span>
class=
"addTrafficPlan"
@
click=
"minusTrafficPlan(trafficObj)"
>
-
</span>
</div>
</div>
</div>
</div>
<div
class=
"TC-TrauseCar"
>
<div
class=
"TC-TrauseCar"
style=
"padding-top: 6px;"
>
<el-checkbox
v-model=
"trafficObj.IsUseBus"
:checked=
"trafficObj.IsUseBus===CheckedVaule"
<el-checkbox
v-model=
"trafficObj.IsUseBus"
:checked=
"trafficObj.IsUseBus===CheckedVaule"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedVaule"
border
size=
"mini"
>
用车
</el-checkbox>
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedVaule"
border
size=
"mini"
>
用车
</el-checkbox>
</div>
</div>
...
@@ -80,11 +82,11 @@
...
@@ -80,11 +82,11 @@
</div>
</div>
</div>
</div>
<div
class=
"read"
v-if=
"isRead"
>
<div
class=
"read"
v-if=
"isRead"
>
<div
class=
"TCtraffic flex"
>
<div
class=
"TCtraffic flex"
style=
"padding: 0;"
>
<div
class=
"partName"
>
<div
class=
"partName"
>
<span
class=
"TDTripType"
>
交通
</span>
<span
class=
"TDTripType"
>
交通
</span>
</div>
</div>
<div
class=
"TDplanList clearfix"
>
<div
class=
"TDplanList clearfix"
style=
"padding-top: 0;"
>
<div
class=
"TDLeftPlan TC-trafficSpan"
>
<div
class=
"TDLeftPlan TC-trafficSpan"
>
<span
v-for=
"(subTraffic,subTrafficIndex) in trafficObj.SubTraffic"
>
<span
v-for=
"(subTraffic,subTrafficIndex) in trafficObj.SubTraffic"
>
<span
v-if=
"subTrafficIndex==0"
>
<span
v-if=
"subTrafficIndex==0"
>
...
@@ -424,4 +426,14 @@
...
@@ -424,4 +426,14 @@
.addTrafficPlan
{
.addTrafficPlan
{
line-height
:
20px
;
line-height
:
20px
;
}
}
.useTypeDiv
.el-input
.el-input__inner
{
height
:
27px
!important
;
border-radius
:
3px
;
}
.StartCity
.el-form-item__content
{
line-height
:
35px
;
}
.TCtraffic.flex
.TDplanList.TDplanListTwo
{
padding-top
:
0
;
}
</
style
>
</
style
>
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