Skip to content

S
SuperMan
Commit 8d568a4f authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent a41dbfe5
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 227 deletions
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ 8d568a4f
<template>
<div style="height: 100%;" v-if="RenderingOk">
<div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" style="zoom: 0.44;">
<div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header>
<div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left">
<div class="travelDaysTitlle-left-text column-ajc">
<div class="travelDaysTitlle-left-textOne">
<span>{{item.DayNum>9?item.DayNum:'0'+item.DayNum}}</span>
</div>
<div class="travelDaysTitlle-left-textTwo">
<span>{{day}}</span>
<div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header>
<div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left">
<div class="travelDaysTitlle-left-text column-ajc">
<div class="travelDaysTitlle-left-textOne">
<span>{{item.DayNum>9?item.DayNum:'0'+item.DayNum}}</span>
</div>
<div class="travelDaysTitlle-left-textTwo">
<span>{{day}}</span>
</div>
</div>
</div>
</div>
<div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'background': dataAll.TripColor,'font-size': getFontSize(item.TitleObj.Title),'color':textColor}">
{{item.TitleObj.Title}}
<div class="travelDaysTitlle-right">
<div class="travelDaysTitlle-right-text row-aic"
:style="{'background': dataAll.TripColor,'font-size': getFontSize(item.TitleObj.Title),'color':textColor}">
{{item.TitleObj.Title}}
</div>
</div>
</div>
</div>
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(0)" @toSelectImg="SelectImg(0)"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" @toSelectImg="SelectImg(0)"
:x="1123" :y="632"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div>
<VueDraggableResizable
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="1123" :h="632"
:ref="'viewSpotVds_' + item * 4 + '_0'+index"
tabindex="0" :resizable="false" :active="false" :parent="false" axis="y"
@activated="onActivated(0)"
:x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
<template v-if="ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].FileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="ScenicArrayList[0].NewImaArray[0].VideoPath" controls="controls"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
</video>
<VueDraggableResizable v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="1123" :h="632" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)"
:x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
<template
v-if="ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].FileType=='.mp4'">
<video ref="myVideo" width="100%" height="100%" :src="ScenicArrayList[0].NewImaArray[0].VideoPath"
controls="controls" :id="'viewSpotImg_'+(item*4)+'_0'+index">
</video>
</template>
</template>
</template>
<img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage" :id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable>
<img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute"
src="../../../../assets/img/defaultairline.png">
<img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage" :id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute" src="../../../../assets/img/defaultairline.png">
</div>
<div class="travelDaysMasterMap-text absolute z-index2">
<vEditDiv v-if="ScenicArrayList.length==0" :canEdit='canEdit' v-model="item.TrafficObj.trafficIntroduce.IntroduceTitle"></vEditDiv>
<vEditDiv v-if="ScenicArrayList.length==0" :canEdit='canEdit'
v-model="item.TrafficObj.trafficIntroduce.IntroduceTitle"></vEditDiv>
<template v-if="ScenicArrayList.length>0">{{ScenicArrayList[0].CouponsName}}</template>
<!-- <vEditDiv v-if="ScenicArrayList.length>0" :canEdit='canEdit' v-model="ScenicArrayList[0].CouponsName"></vEditDiv> -->
</div>
</div>
<div class="travelDaysMasterMap-two absolute z-index2" v-if="ScenicArrayList.length>1||ScenicArrayList.length>2"
style="display: none;">
<div class="travelDaysMasterMap-twoImg relative bjF6 UpgradedVersion-Hover"
:style="{'color':'#fff'}"
:id="'viewSpotBox_'+(item*4)+'_1'+index"
v-if="ScenicArrayList.length>1">
<div class="featureDay-vToolBar absolute z-index3" style="display: none;">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
:x="335" :y="198"></FeatureControls>
</div>
<VueDraggableResizable v-if="ScenicArrayList.length>1&&ScenicArrayList[1].NewImaArray[0].Url"
:w="335" :h="198"
:ref="'viewSpotVds_' + item * 4 + '_1'+index"
tabindex="0" :resizable="false" :active="false" :parent="false" axis="y"
@activated="onActivated(1)"
:x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<div class="travelDaysMasterMap-two absolute z-index2"
v-if="ScenicArrayList.length>1||ScenicArrayList.length>2" style="display: none;">
<div class="travelDaysMasterMap-twoImg relative bjF6 UpgradedVersion-Hover" :style="{'color':'#fff'}"
:id="'viewSpotBox_'+(item*4)+'_1'+index" v-if="ScenicArrayList.length>1">
<div class="featureDay-vToolBar absolute z-index3" style="display: none;">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
:x="335" :y="198"></FeatureControls>
</div>
<VueDraggableResizable v-if="ScenicArrayList.length>1&&ScenicArrayList[1].NewImaArray[0].Url" :w="335"
:h="198" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false" :active="false"
:parent="false" axis="y" @activated="onActivated(1)"
:x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<img :src="ScenicArrayList[1].NewImaArray[0].Url" :id="'viewSpotImg_'+(item*4)+'_1'+index">
</VueDraggableResizable>
<img v-if="!ScenicArrayList[1].NewImaArray[0].Url"
class="absolute"
src="../../../../assets/img/defaultairline.png">
<div class="travelDaysMasterMap-text textTwo absolute z-index2">
【{{ScenicArrayList[1].CouponsName}}】</div>
<img v-if="!ScenicArrayList[1].NewImaArray[0].Url" class="absolute"
src="../../../../assets/img/defaultairline.png">
<div class="travelDaysMasterMap-text textTwo absolute z-index2">
【{{ScenicArrayList[1].CouponsName}}】</div>
</div>
<div class="travelDaysMasterMap-twoImg relative bjF6 UpgradedVersion-Hover" style="margin-top: 47px;"
:style="{'color':'#fff'}"
:id="'viewSpotBox_'+(item*4)+'_2'+index"
v-if="ScenicArrayList.length>2">
<div class="featureDay-vToolBar absolute z-index3" style="display: none;">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)"
:x="697" :y="930"></FeatureControls>
</div>
<VueDraggableResizable v-if="ScenicArrayList.length>2&&ScenicArrayList[2].NewImaArray[0].Url"
:w="335" :h="198"
:ref="'viewSpotVds_' + item * 4 + '_2'+index"
tabindex="0" :resizable="false" :active="false" :parent="false" axis="y"
@activated="onActivated(2)"
:x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<img :src="ScenicArrayList[2].NewImaArray[0].Url" :id="'viewSpotImg_'+(item*4)+'_2'+index">
</VueDraggableResizable>
<img v-if="!ScenicArrayList[2].NewImaArray[0].Url"
class="absolute"
src="../../../../assets/img/defaultairline.png">
:style="{'color':'#fff'}" :id="'viewSpotBox_'+(item*4)+'_2'+index" v-if="ScenicArrayList.length>2">
<div class="featureDay-vToolBar absolute z-index3" style="display: none;">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)"
:x="697" :y="930"></FeatureControls>
</div>
<VueDraggableResizable v-if="ScenicArrayList.length>2&&ScenicArrayList[2].NewImaArray[0].Url" :w="335"
:h="198" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false" :active="false"
:parent="false" axis="y" @activated="onActivated(2)"
:x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop">
<img :src="ScenicArrayList[2].NewImaArray[0].Url" :id="'viewSpotImg_'+(item*4)+'_2'+index">
</VueDraggableResizable>
<img v-if="!ScenicArrayList[2].NewImaArray[0].Url" class="absolute"
src="../../../../assets/img/defaultairline.png">
<div class="travelDaysMasterMap-text textTwo absolute z-index2">
【{{ScenicArrayList[2].CouponsName}}】</div>
<!-- <template v-else>
<template v-for="(jiudian,j) in item.jiu2">
<template v-if="jiudian.url&&j==1">
<img v-if="jiudian.url" :src="jiudian.url">
<div class="travelDaysMasterMap-text textTwo absolute z-index2">
【{{jiudian.name}}】</div>
</template>
</template>
</template> -->
</div>
</div>
</div>
<div class="travelDaysContent">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray"
v-if="item.ScenicArray.length>0">
</div>
<div class="travelDaysContent">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" v-if="item.ScenicArray.length>0"
:key="j">
<span class="textBold">
【{{jindian.CouponsName}}】
<!-- <vEditDiv class="dayCouponsName" :canEdit='canEdit' v-model="'【'+jindian.CouponsName+'】'"></vEditDiv> -->
</span>
<span><vEditDiv :canEdit='canEdit' v-model="jindian.Description"></vEditDiv></span>
<span>
<vEditDiv :canEdit='canEdit' v-model="jindian.Description"></vEditDiv>
</span>
</div>
<div v-if="item.ScenicArray.length==0" class="travelDaysContent-text">
<span class="textBold">
<vEditDiv class="dayCouponsName" :canEdit='canEdit' v-model="'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"></vEditDiv>
<vEditDiv class="dayCouponsName" :canEdit='canEdit'
v-model="'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"></vEditDiv>
</span>
<span>
<vEditDiv :canEdit='canEdit' v-model="item.TrafficObj.trafficIntroduce.IntroduceDetail"></vEditDiv>
</span>
</div>
</div>
<div class="travelDaysdetails-tsTextBox">
<div class="travelDaysdetails-tsText"
:style="{'background':backgroundColor2}">
<span class="travelDaysdetails-text0">温馨提示：</span>
</div>
<div class="travelDaysdetails-tsTextBox">
<div class="travelDaysdetails-tsText" :style="{'background':backgroundColor2}">
<span class="travelDaysdetails-text0">温馨提示：</span>
<template v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
{{getHtmlPlainText(item.WarmTipObj.Description)}}
<div v-html="item.WarmTipObj.Description"></div>
</template>
<template v-else>暂无提示</template>
</div>
</div>
<div class="travelDaysdetails">
<div class="travelDaysdetailsBJ column"
:style="{'background':backgroundColor}">
<div class="travelDaysdetails-textBox row">
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">早餐：</span>
<div>{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}</div>
</div>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">午餐：</span>
<div>{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}</div>
</div>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">晚餐：</span>
<div>{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}</div>
</div>
</div>
<div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text right0 row">
<span class="travelDaysdetails-text0">住宿：</span>
<template v-for="(j,i) in item.HotelArray">{{j.HotelName?j.HotelName:'无'}}</template>
<div class="travelDaysdetails">
<div class="travelDaysdetailsBJ column" :style="{'background':backgroundColor}">
<div class="travelDaysdetails-textBox row">
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">早餐：</span>
<div>{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}</div>
</div>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">午餐：</span>
<div>{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}</div>
</div>
<div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">晚餐：</span>
<div>{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}</div>
</div>
</div>
<div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text right0 row">
<span class="travelDaysdetails-text0">住宿：</span>
<template v-for="(j,i) in item.HotelArray">{{j.HotelName?j.HotelName:'无'}}</template>
</div>
</div>
</div>
</div>
<!-- otherJourney-footer -->
<div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
<img src="http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png" />
<div class="edit_div">{{dataAll.LineShortName?dataAll.LineShortName:dataAll.LineName}}</div>
</div>
<div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.TripColor}">&nbsp;</div>
</div>
</div>
<!-- otherJourney-footer -->
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
:style="{'background':''}">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
<img src="http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png" />
<div class="edit_div">{{dataAll.LineShortName?dataAll.LineShortName:dataAll.LineName}}</div>
</div>
<div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.TripColor}">&nbsp;</div>
</div>
</div>
<div class="UpgradedVersion2Line absolute z-index3 row-ajc">
<span>底线</span>
</div>
<div class="UpgradedVersion2Line absolute z-index3 row-ajc">
<span>底线</span>
</div>
</div>
<el-dialog custom-class="resourceImgAdd" :title="$t('sm.chooseImg')" center :visible.sync="isShowScenicImg">
......@@ -225,7 +200,7 @@
DMCchooseImg,
VueDraggableResizable
},
props: ['dataAll','item','index','tripList','orderMsg','orderTripdiff'],
props: ['dataAll', 'item', 'index', 'tripList', 'orderMsg', 'orderTripdiff'],
data() {
return {
RenderingOk: false,
......@@ -236,7 +211,7 @@
backgroundColor2: '',
textColor: '',
textColorOne: '',
ScenicArrayList:[],
ScenicArrayList: [],
//选取弹窗
isShowScenicImg: false,
choseType: 0,
......@@ -253,26 +228,26 @@
getHtmlPlainText(html_str) {
//提取字符串中的文字
let re = new RegExp('<[^<>]+>', 'g')
if(html_str){
if (html_str) {
let text = html_str.replace(re, '')
//或
// var text = html_str.replace(/<[^<>]+>/g, "");
return text
}else{
} else {
return ''
}
},
getFontSize(title){
if(!title) return
getFontSize(title) {
if (!title) return
let size = 30;
if (title.length >80){
var tempSize= Number(80) / Number(title.length);
if (title.length > 80) {
var tempSize = Number(80) / Number(title.length);
tempSize = tempSize * 30;
size = tempSize.toFixed(1);
}
return size + "px";
},
getImgColor(img,id){
getImgColor(img, id) {
return "#fff"
},
onActivated(j) {
......@@ -280,10 +255,10 @@
},
onViewSpotDragstop(x, y) {
let imgHeight = document.querySelector(
"#viewSpotImg_" + (this.item * 4)+ "_"+this.imgIndex + this.index
"#viewSpotImg_" + (this.item * 4) + "_" + this.imgIndex + this.index
).height;
let boxHeight = document.querySelector(
"#viewSpotBox_" + (this.item * 4)+ "_"+this.imgIndex + this.index
"#viewSpotBox_" + (this.item * 4) + "_" + this.imgIndex + this.index
).offsetHeight;
let cha = boxHeight - imgHeight;
if (cha <= 0) {
......@@ -299,22 +274,22 @@
y = cha;
}
}
if(this.ScenicArrayList&&this.ScenicArrayList.length>0){
if (this.ScenicArrayList && this.ScenicArrayList.length > 0) {
this.ScenicArrayList[this.imgIndex].ScenicJson.y = y
this.item.ScenicArray.forEach(x=>{
this.ScenicArrayList.forEach(y=>{
if(x.CouponsId==y.CouponsId){
this.item.ScenicArray.forEach(x => {
this.ScenicArrayList.forEach(y => {
if (x.CouponsId == y.CouponsId) {
x.ScenicJson.y = y.ScenicJson.y
}
})
})
}else{
} else {
this.item.TrafficObj.trafficIntroduce.x = 0
this.item.TrafficObj.trafficIntroduce.y = y
this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
}
this.$refs[
"viewSpotVds_" + (this.item * 4)+ "_"+this.imgIndex + this.index
"viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
]._data.top = y;
},
SelectImg(index) {
......@@ -337,14 +312,14 @@
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr,'', x => {
that.uploadSelfBlob(path, newArr, '', x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
if(that.ScenicArrayList.length>0){
if (that.ScenicArrayList.length > 0) {
that.ScenicArrayList[that.imgIndex].NewImaArray[0].Url = allPath
that.ScenicArrayList[that.imgIndex].NewImaArray[0].x = 0
that.ScenicArrayList[that.imgIndex].NewImaArray[0].y = 0
}else{
} else {
that.item.TrafficObj.trafficIntroduce.IntroduceImage = allPath
that.item.TrafficObj.trafficIntroduce.x = 0
that.item.TrafficObj.trafficIntroduce.y = 0
......@@ -361,7 +336,7 @@
this.isShowScenicImg = false;
},
getDMCimg(selectImgArr) {
if(this.ScenicArrayList.length>0){
if (this.ScenicArrayList.length > 0) {
var that = this;
selectImgArr.forEach(imgItem => {
var obj = {
......@@ -381,10 +356,8 @@
that.ScenicArrayList[that.imgIndex].ScenicJson.y = 0
that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray);
});
// this.ScenicArrayList[this.imgIndex].NewImaArray[0].Url = selectImgArr[0].Path
// this.ScenicArrayList[this.imgIndex].NewImaArray[0].x = 0
// this.ScenicArrayList[this.imgIndex].NewImaArray[0].y = 0
}else{
} else {
this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path
this.item.TrafficObj.trafficIntroduce.x = 0
this.item.TrafficObj.trafficIntroduce.y = 0
......@@ -392,39 +365,40 @@
}
this.isShowScenicImg = false;
this.item.ScenicArray = JSON.parse(JSON.stringify(this.ScenicArrayList))
// this.$forceUpdate()
}
},
computed: {},
watch: {
item: {
handler(val, oldVal) {
this.RenderingOk = false;
this.ScenicArrayList = []
this.item.ScenicArray.forEach(x => {
if(x.Rank>0){
if (x.Rank > 0) {
this.ScenicArrayList.push(x)
}
});
if(this.ScenicArrayList&&this.ScenicArrayList.length>0) this.ScenicArrayList.sort((a, b)=>{return a.Rank - b.Rank})
if(!this.RenderingOk){
this.RenderingOk = true;
}
if (this.ScenicArrayList && this.ScenicArrayList.length > 0) this.ScenicArrayList.sort((a, b) => {
return a.Rank - b.Rank
})
this.RenderingOk = true;
},
deep: true,
immediate: true
},
dataAll: {
handler(val, oldVal) {
if(val&&val.TripColor){
if (val && val.TripColor) {
this.backgroundColor = this.hexToRgb(val.TripColor, 0.2)
this.backgroundColor2 = this.hexToRgb(val.TripColor, 0.1)
let rgba = this.hexToRgb(val.TripColor, 1)
rgba = rgba.split(',')
let rgba0 = rgba[0].split('(')
let arr = [rgba0[1],rgba[1],rgba[2]]
if(this.getRgbLevel(arr)>50){
let arr = [rgba0[1], rgba[1], rgba[2]]
if (this.getRgbLevel(arr) > 50) {
this.textColor = "#fff"
}else{
} else {
this.textColor = "#333"
}
}
......@@ -448,17 +422,17 @@
</script>
<style>
.travelDaysContent-text .dayCouponsName{
font-size: 21px;
line-height: 38px;
font-weight: bold;
float: left;
}
.travelDaysContent-text .dayCouponsTitle{
.travelDaysContent-text .dayCouponsName {
font-size: 21px;
line-height: 38px;
font-weight: bold;
float: left;
}
.travelDaysContent-text .dayCouponsTitle {}
}
.travelDaysMasterMap img{
height: auto;
}
.travelDaysMasterMap img {
height: auto;
}
</style>
src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue
View file @ 8d568a4f
......@@ -222,38 +222,11 @@
</div>
</div>
<!-- 行程景点信息 -->
<!--
<div class>
<noScenic v-if="!ishasScenic" :trafficObj="dayObj.TrafficObj" :class="{'showOther':TeamType==3}"></noScenic>
</div>
<div class="TC-ComInfoDiv" :class="scenicCheck>0||dayObj.ScenicArray.length>0?'_margin_bottom':''">
<onedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==1)||(scenicCheck==1 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></onedayList>
<twodayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==2)||(scenicCheck==2 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></twodayList>
<threedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==3)||(scenicCheck==3 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></threedayList>
<fourdayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==4)||(scenicCheck==4 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></fourdayList>
<fivedayList :class="{'showOther':TeamType==3}"
v-if="(NoticeParameters.IsDirect==1 && dayObj.ScenicArray.length==5)||(scenicCheck==5 && NoticeParameters.IsDirect==0)"
:isRead="dayObj.isRead" :scenicArray="dayObj.ScenicArray" :IsDirect="NoticeParameters.IsDirect"
:DayNum="dayObj.DayNum"></fivedayList>
</div> -->
<div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}">
<div class="TC-SpecialInstruction clearfix column">
<div class="TC-leftTitle" style="height: 20px;">温馨提示</div>
<div class="TC-rightContent" style="width: 100%;">
<!--<el-input type="textarea" v-model="dayObj.WarmTipObj.Description"></el-input>-->
<my-edit v-on:edit-value="dayObj.WarmTipObj.Description = arguments[0]"
v-bind:editValue="dayObj.WarmTipObj.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList"></my-edit>
......
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