Commit 063a834f authored by youjie's avatar youjie

no message

parent baa114e2
...@@ -810,7 +810,7 @@ html, body{ ...@@ -810,7 +810,7 @@ html, body{
height: 280px; height: 280px;
} }
.travelDaysMasterMap4_1{ .travelDaysMasterMap4_1{
width: 696px; width: 772px;
height: 449px; height: 449px;
} }
.travelDaysMasterMap4_2{ .travelDaysMasterMap4_2{
......
...@@ -340,16 +340,16 @@ ...@@ -340,16 +340,16 @@
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2"> <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="696" :y="449"></FeatureControls> @toSelectImg="SelectImg(0)" :x="772" :y="449"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
@change="uploadpic"> @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length==4" :h="449" :w="696" <VueDraggableResizable v-if="item.ScenicArray.length==4" :h="449" :w="772"
:ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" parent=".travelDaysMasterMap4_1" axis="y" @activated="onActivated(0)" :active="false" parent=".travelDaysMasterMap4_1" 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"
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y" :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop" :min-width="696"> :z="2" @dragstop="onViewSpotDragstop" :min-width="772">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0"> <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img <img
v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url" v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
...@@ -533,12 +533,12 @@ ...@@ -533,12 +533,12 @@
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2"> <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="571.5" :y="291"></FeatureControls> @toSelectImg="SelectImg(0)" :x="571" :y="291"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
@change="uploadpic"> @change="uploadpic">
</div> </div>
<VueDraggableResizable <VueDraggableResizable
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="571.5" v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="571"
:h="291" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false" :h="291" :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"
...@@ -576,10 +576,10 @@ ...@@ -576,10 +576,10 @@
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2"> <div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
@toSelectImg="SelectImg(1)" :x="571.5" :y="291"></FeatureControls> @toSelectImg="SelectImg(1)" :x="571" :y="291"></FeatureControls>
</div> </div>
<VueDraggableResizable <VueDraggableResizable
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="571.5" v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="571"
:h="291" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false" :h="291" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(1)" :active="false" :parent="false" axis="y" @activated="onActivated(1)"
: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"
......
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