Skip to content

S
SuperMan
Commit f695eb98 authored by youjie's avatar youjie
Browse files
Options

行程线路 横版 及横版 、竖版查询

parent 0c3380e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 129 deletions
src/components/commonPage/pptIframe/index.vue
View file @ f695eb98
......@@ -3,6 +3,7 @@
<div class="dialogPptistVisible-box"
style="width: 100%;height: 100%;">
<div class="closePptist-box">
<div class="closePptist">
<el-tooltip class="item" effect="dark" content="关闭窗口" placement="bottom">
<i class="el-icon-close"
......@@ -11,14 +12,14 @@
</el-tooltip>
</div>
</div>
<iframe :src="Url"
<iframe name="myTemplateUrl" :src="Url"
class="TemplateIframe">
</iframe>
</div>
</template>
<script>
export default {
props:['Url'],
props:['Url','FeaturePageType'],
data() {
return {
dialogPptistVisible: false,
......@@ -27,6 +28,21 @@
TemplateUrlImg:'',
isPostMessage: false
}
},
watch: {
FeaturePageType: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
if(document.all.myTemplateUrl){
document.all.myTemplateUrl.src = this.Url
}
},
deep: true,
immediate:true
},
},
mounted() {
},
methods: {
close() {
......
src/components/index.vue
View file @ f695eb98
......@@ -1991,7 +1991,7 @@
// 添加编辑模版
journeyTemplate(){
let href = this.domainManager().PptUrl
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1`
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1&TempType=0`
this.dialogPptistVisible = true
},
GetExaminePriceOrderPageList(type) {
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ f695eb98
......@@ -140,7 +140,7 @@
</div>
<!-- ppt 模版新增编辑窗口 -->
<pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl"
<pptIframe v-show="dialogPptistVisible" :FeaturePageType="dataAll.FeaturePageType" :Url="TemplateUrl"
@close="closeIframe()"></pptIframe>
</div>
</template>
......@@ -179,7 +179,7 @@
UpgradedVersion,
pptIframe
},
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType", "dataAll"],
inject: ['loadConfigInfo'],
data() {
return {
......@@ -336,12 +336,13 @@
},
// 添加编辑模版
journeyTemplate(type){
console.log(this.dataAll.FeaturePageType,'-===FeaturePageType')
this.isPostMessage = false
let href = this.domainManager().PptUrl
if(type&&type==1){
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1`
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0`
}else{
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0`
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
}
this.dialogPptistVisible = true
},
......@@ -674,6 +675,12 @@
}
},
watch: {
dataAll:{
handler: function (val, oldVal) {
},
deep: true,
immediate:true
},
FeatureData: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ f695eb98
......@@ -55,7 +55,7 @@
:IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity"
:UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData"
:TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
<TravelFeature :TripColor="PostConfig.TripColor" :dataAll="PostConfig" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"
@ConfigInfo="firstLoadConfigInfo">
......@@ -222,6 +222,7 @@
TripCityList: [], //行程城市
TripMapList: [],
NotQueryCityList:[],//使用系统中的经纬度城市
FeaturePageType:0,//1横版 2竖版
},
//行程
FeatureData: {
......@@ -422,6 +423,7 @@
basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.OfferId = this.PostConfig.OfferId;
basicData.TeamType = this.PostConfig.TeamType;
basicData.FeaturePageType = this.PostConfig.FeaturePageType
basicData.TripMapList = this.PostConfig.TripMapList;
basicData.TripCountryList = this.PostConfig.TripCountryList;
......@@ -457,7 +459,6 @@
basicData.WCountryId = this.PostConfig.WCountryId;
basicData.WLocationId = this.PostConfig.WLocationId;
basicData.WCityId = this.PostConfig.WCityId;
this.journeyList.FeaturePageType = this.PostDaysTrip.FeaturePageType;
this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
//行程特色数据
var TripFeature = {};
......@@ -685,13 +686,12 @@
this.journeyList.isFileUpload = true;
this.journeyList.DayNum = configData.Days.length;
this.journeyList.NightNum = this.journeyList.DayNum - 1;
let _this = this
let arrDayList = function(list){
list.forEach(x=>{
x.IsBlowUp = false
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
if(this.PostConfig.FeaturePageType==2){
x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){
}else if(this.PostConfig.FeaturePageType==1){
x.zoom = 0.285
}
})
......@@ -883,6 +883,7 @@
this.PostConfig.LineteamId = tempData.LineteamId;
this.PostConfig.CountryID = tempData.CountryID;
this.PostConfig.TeamType = tempData.TeamType;
this.PostConfig.FeaturePageType = tempData.FeaturePageType;
//视频地址
this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
......@@ -949,18 +950,16 @@
//默认不联动行程特色
this.journeyList.IsUpdateTrip = 0;
this.journeyList.FeaturePageType = 2;
this.journeyList.DayNum = tempData.DayNum;
this.journeyList.NightNum = tempData.NightNum;
this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
this.journeyList.StartCityId = tempData.StartCityId;
let _this = this
let arrDayList = function(list){
list.forEach(x=>{
x.IsBlowUp = false
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
if(tempData.FeaturePageType==2){
x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){
}else if(tempData.FeaturePageType==1){
x.zoom = 0.285
}
})
......@@ -1055,6 +1054,13 @@
'$route'(to, from) { //监听路由是否变化
location.reload()
},
PostDaysTrip:{
handler: function (val, oldVal) {
},
deep: true,
immediate:true
}
},
mounted() {
this.CurrentUserInfo = this.getLocalStorage();;
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ f695eb98
......@@ -162,7 +162,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
<el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
<el-option v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID">
......@@ -173,18 +173,18 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-option :label="$t('op.notUpdate')" :value="0"></el-option>
<el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select>
</el-form-item>
</span>
<template v-if="false">
<template v-if="true">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select placeholder="请选择版型" v-model="subConfig.FeaturePageType"
style="width: 80px;">
<el-form-item prop="FeaturePageType">
<el-select class="w90" placeholder="请选择版型" v-model="dataAll.FeaturePageType"
@change="getFeaturePageType()">
<el-option label="横版" :value="1"></el-option>
<el-option label="竖版" :value="2"></el-option>
</el-select>
......@@ -206,14 +206,14 @@
<span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span>
</el-tooltip>
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
<travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
<travelDays v-if="dataAll.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays>
<div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox">
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
<travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
<travelDays v-if="dataAll.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays>
<span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
@click="clickBlowUpTravelDays(item)"></span>
......@@ -270,10 +270,24 @@
travelDaysHV
},
methods: {
getFeaturePageType(){
this.subConfig.DayList.forEach(x=>{
if(this.dataAll.FeaturePageType==1){
x.zoom = 0.285
}
if(this.dataAll.FeaturePageType==2){
x.zoom = 0.44
}
})
this.$forceUpdate()
},
clickBlowUpTravelDays(item){
item.IsBlowUp=!item.IsBlowUp
if(item.IsBlowUp) item.zoom = 1
else item.zoom = 0.44
else{
if(this.dataAll.FeaturePageType==1) item.zoom = 0.285
if(this.dataAll.FeaturePageType==2) item.zoom = 0.44
}
this.$forceUpdate()
},
handlerChangeDateList(data) {
......@@ -443,6 +457,7 @@
WarmTipList: WarmTipList,
TitleList: TitleList,
IsUpdateTrip:this.subConfig.IsUpdateTrip,
FeaturePageType: this.dataAll.FeaturePageType
};
this.HotelList = HotelList;
this.DinnerList = DinnerList;
......@@ -466,6 +481,14 @@
}
},
watch: {
'dataAll.FeaturePageType': {
deep: true,
immediate: true,
handler: function (newVal, oldVal) {
}
},
'subConfig.DayList': {
deep: true,
handler: function (newVal, oldVal) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment