Skip to content

S
SuperMan
Commit f5fd6fea authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 595da6dc 17ee5435
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 24 deletions
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ f5fd6fea
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<!-- 一张图 1-单张图，2-多张图--> <!-- 一张图 1-单张图，2-多张图-->
<div v-if="item.TitleObj.ShowTripType==1||(item.TitleObj.ShowTripType==2&&item.ScenicArray.length==1)"> <div v-if="item.TitleObj.ShowTripType==1||(item.TitleObj.ShowTripType==2&&item.ScenicArray.length==1)||item.ScenicArray.length==0">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden"> <div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}"> <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover"> <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
...@@ -130,7 +130,6 @@ ...@@ -130,7 +130,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
:x="524" :y="250"></FeatureControls> :x="524" :y="250"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="524" :h="250" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false" :w="524" :h="250" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
...@@ -224,7 +223,6 @@ ...@@ -224,7 +223,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
:x="517" :y="280"></FeatureControls> :x="517" :y="280"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="517" :h="280" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false" :w="517" :h="280" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
...@@ -257,7 +255,6 @@ ...@@ -257,7 +255,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)"
:x="517" :y="280"></FeatureControls> :x="517" :y="280"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="517" :h="280" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false" :w="517" :h="280" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
...@@ -303,7 +300,7 @@ ...@@ -303,7 +300,7 @@
:x="696" :y="449"></FeatureControls> :x="696" :y="449"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic"> <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="696" :h="449" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false" :w="696" :h="449" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)" :active="false" :parent="false" axis="y" @activated="onActivated(0)"
:x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x" :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
...@@ -343,7 +340,6 @@ ...@@ -343,7 +340,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
:x="331" :y="214"></FeatureControls> :x="331" :y="214"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false" :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
...@@ -384,7 +380,6 @@ ...@@ -384,7 +380,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)"
:x="331" :y="214"></FeatureControls> :x="331" :y="214"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false" :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
...@@ -425,7 +420,6 @@ ...@@ -425,7 +420,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)"
:x="331" :y="214"></FeatureControls> :x="331" :y="214"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0" :resizable="false" :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0" :resizable="false"
...@@ -507,7 +501,6 @@ ...@@ -507,7 +501,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)"
:x="514" :y="291"></FeatureControls> :x="514" :y="291"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="514" :h="291" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false" :w="514" :h="291" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
...@@ -547,7 +540,6 @@ ...@@ -547,7 +540,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)"
:x="331" :y="214"></FeatureControls> :x="331" :y="214"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false" :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
...@@ -588,7 +580,6 @@ ...@@ -588,7 +580,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)"
:x="331" :y="214"></FeatureControls> :x="331" :y="214"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0" :resizable="false" :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_3'+index" tabindex="0" :resizable="false"
...@@ -629,7 +620,6 @@ ...@@ -629,7 +620,6 @@
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(4)" @toSelectImg="SelectImg(4)" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(4)" @toSelectImg="SelectImg(4)"
:x="331" :y="214"></FeatureControls> :x="331" :y="214"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length>4||item.TrafficObj.trafficIntroduce.IntroduceImage" <VueDraggableResizable v-if="item.ScenicArray.length>4||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_4'+index" tabindex="0" :resizable="false" :w="331" :h="214" :ref="'viewSpotVds_' + item * 4 + '_4'+index" tabindex="0" :resizable="false"
...@@ -797,7 +787,8 @@ ...@@ -797,7 +787,8 @@
this.RenderingOk = false; this.RenderingOk = false;
this.ScenicArrayList = [] this.ScenicArrayList = []
this.item.ScenicArray.forEach((x, index) => { this.item.ScenicArray.forEach((x, index) => {
if((this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0)||(this.item.TitleObj.ShowTripType==2&&this.item.ScenicArray&&this.item.ScenicArray.length==1)){ if((this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0)
||(this.item.TitleObj.ShowTripType==2&&this.item.ScenicArray&&this.item.ScenicArray.length==1)){
if (x.DefaultNum > 0) { if (x.DefaultNum > 0) {
this.defaultScenicIndex = index; this.defaultScenicIndex = index;
this.ScenicArrayList.push(x) this.ScenicArrayList.push(x)
...@@ -808,7 +799,8 @@ ...@@ -808,7 +799,8 @@
}); });
if (this.ScenicArrayList.length == 0) { if (this.ScenicArrayList.length == 0) {
this.item.ScenicArray.forEach((x, index) => { this.item.ScenicArray.forEach((x, index) => {
if((this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0)||(this.item.TitleObj.ShowTripType==2&&this.item.ScenicArray&&this.item.ScenicArray.length==1)){ if((this.item.TitleObj.ShowTripType==1&&this.item.ScenicArray&&this.item.ScenicArray.length>0)
||(this.item.TitleObj.ShowTripType==2&&this.item.ScenicArray&&this.item.ScenicArray.length==1)){
if (index == 0) { if (index == 0) {
x.DefaultNum = 1; x.DefaultNum = 1;
this.defaultScenicIndex = index; this.defaultScenicIndex = index;
...@@ -915,10 +907,10 @@ ...@@ -915,10 +907,10 @@
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath; let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2]; let i = e.target.id.split("_")[2];
if (that.ScenicArrayList.length > 0) { if (that.ScenicArrayList.length > 0) {
that.ScenicArrayList[0].NewImaArray[0].Url = allPath that.ScenicArrayList[that.imgIndex].NewImaArray[0].Url = allPath
that.ScenicArrayList[0].NewImaArray[0].x = 0 that.ScenicArrayList[that.imgIndex].NewImaArray[0].x = 0
that.ScenicArrayList[0].NewImaArray[0].y = 0 that.ScenicArrayList[that.imgIndex].NewImaArray[0].y = 0
that.ScenicArrayList[0].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray); that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray);
if (that.item.ScenicArray && that.item.ScenicArray.length > 0) { if (that.item.ScenicArray && that.item.ScenicArray.length > 0) {
that.item.ScenicArray[that.defaultScenicIndex] = JSON.parse(JSON.stringify(that.ScenicArrayList[ that.item.ScenicArray[that.defaultScenicIndex] = JSON.parse(JSON.stringify(that.ScenicArrayList[
0])); 0]));
...@@ -927,7 +919,7 @@ ...@@ -927,7 +919,7 @@
that.item.TrafficObj.trafficIntroduce.IntroduceImage = allPath that.item.TrafficObj.trafficIntroduce.IntroduceImage = allPath
that.item.TrafficObj.trafficIntroduce.x = 0 that.item.TrafficObj.trafficIntroduce.x = 0
that.item.TrafficObj.trafficIntroduce.y = 0 that.item.TrafficObj.trafficIntroduce.y = 0
that.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce); that.item.TrafficObj.Introduce = JSON.stringify(that.item.TrafficObj.trafficIntroduce);
} }
that.$message.success('上传成功'); that.$message.success('上传成功');
}); });
...@@ -953,11 +945,11 @@ ...@@ -953,11 +945,11 @@
if (imgItem.FileType) { if (imgItem.FileType) {
obj.FileType = imgItem.FileType; obj.FileType = imgItem.FileType;
} }
that.ScenicArrayList[0].NewImaArray = []; that.ScenicArrayList[that.imgIndex].NewImaArray = [];
that.ScenicArrayList[0].NewImaArray.push(obj); that.ScenicArrayList[that.imgIndex].NewImaArray.push(obj);
that.ScenicArrayList[0].ScenicJson.x = 0 that.ScenicArrayList[that.imgIndex].ScenicJson.x = 0
that.ScenicArrayList[0].ScenicJson.y = 0 that.ScenicArrayList[that.imgIndex].ScenicJson.y = 0
that.ScenicArrayList[0].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray); that.ScenicArrayList[that.imgIndex].NewScenicImg = JSON.stringify(that.ScenicArrayList[0].NewImaArray);
}); });
} else { } else {
this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path this.item.TrafficObj.trafficIntroduce.IntroduceImage = selectImgArr[0].Path
......
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