Commit 5974e299 authored by youjie's avatar youjie

修改confirmationOrderDownLoadNew

parent 99aaa9f2
...@@ -655,8 +655,8 @@ img { ...@@ -655,8 +655,8 @@ img {
} }
.UpgradedVersionDetails1 { .UpgradedVersionDetails1 {
left: 16px; left: 10px;
top: 122px; top: 147px;
} }
/**/ /**/
...@@ -1123,3 +1123,6 @@ img { ...@@ -1123,3 +1123,6 @@ img {
bottom: 0; bottom: 0;
color: #e95252; color: #e95252;
} }
.cursorInitial{
cursor: initial
}
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary"> <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">
{{$t('Operation.Op_tripUpdate')}}</el-button> {{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary"> <el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button> {{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary"> <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button> <el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
<!-- <el-button @click="goUrlR('SalesconfirmationOrder',item)" type="primary">行程下载</el-button> --> <!-- <el-button @click="goUrlR('SalesconfirmationOrder',item)" type="primary">行程下载</el-button> -->
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary"> <el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
{{$t('Operation.Op_tripDownLoad')}}</el-button> {{$t('Operation.Op_tripDownLoad')}}</el-button>
</div> </div>
</div> </div>
......
...@@ -1086,7 +1086,7 @@ ...@@ -1086,7 +1086,7 @@
@click.native="goTeamBalance(item.TCID,item.OutBranchId)"> @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}} {{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)"> <el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoadNew',item)">
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item> {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}} <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item> </el-dropdown-item>
......
...@@ -783,7 +783,7 @@ ...@@ -783,7 +783,7 @@
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)"> <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item> {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
<el-dropdown-item <el-dropdown-item
@click.native="goUrlR('confirmationOrderDownLoad',item)"> @click.native="goUrlR('confirmationOrderDownLoadNew',item)">
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item> {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}} <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item> </el-dropdown-item>
......
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
data() { data() {
return { return {
TripLayer: {}, TripLayer: {},
TripPath: "confirmationOrderDownLoad" TripPath: "confirmationOrderDownLoadNew"
}; };
}, },
methods: { methods: {
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover"> <div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-img relative"> <div class="UpgradedVersionDetails-img relative">
<div class="UpgradedVersionDetails1 absolute z-index1"> <div class="UpgradedVersionDetails1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'column'" isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" isImg="1" :isUploadImg="true"
:isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg" :isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
@toDeleteImg="DeleteImg(i)" /> @toDeleteImg="DeleteImg(i)" :x="312" :y="312" />
</div> </div>
<div class="UpgradedVersionDetails-imgOne bjE6"> <div class="UpgradedVersionDetails-imgOne bjE6">
<template v-if="item.ImgList&&item.ImgList.length>0"> <template v-if="item.ImgList&&item.ImgList.length>0">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<FeatureControls v-if="FeatureData&&pageType!=2" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" <FeatureControls v-if="FeatureData&&pageType!=2" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1"
:isUploadImg="pageType==2?false:true" :isSelectImg="pageType==2?false:true" :isUploadImg="pageType==2?false:true" :isSelectImg="pageType==2?false:true"
:isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[3].url" /> <img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[3].url" />
</div> </div>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[3].url" /> <img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[3].url" />
</div> </div>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" /> <img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div> </div>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577"/>
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" /> <img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div> </div>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" /> <img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div> </div>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" /> <img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div> </div>
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" /> <img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div> </div>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" /> <img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" />
</div> </div>
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" /> <img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div> </div>
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" /> <img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div> </div>
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" /> <img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" />
</div> </div>
...@@ -352,7 +352,7 @@ ...@@ -352,7 +352,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(7)" @toSelectImg="toSelectImg(7)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(7)" @toSelectImg="toSelectImg(7)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(7)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(7)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[7].url" class="absolute" :src="FeatureData.ImgList[7].url" /> <img v-if="FeatureData.ImgList[7].url" class="absolute" :src="FeatureData.ImgList[7].url" />
</div> </div>
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" /> <img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div> </div>
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" /> <img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div> </div>
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" /> <img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div> </div>
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" /> <img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div> </div>
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" /> <img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div> </div>
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" /> <img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" />
</div> </div>
...@@ -430,7 +430,7 @@ ...@@ -430,7 +430,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(7)" @toSelectImg="toSelectImg(7)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(7)" @toSelectImg="toSelectImg(7)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(7)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(7)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[7].url" class="absolute" :src="FeatureData.ImgList[7].url" /> <img v-if="FeatureData.ImgList[7].url" class="absolute" :src="FeatureData.ImgList[7].url" />
</div> </div>
...@@ -438,7 +438,7 @@ ...@@ -438,7 +438,7 @@
<div class="MasterMapList1 absolute z-index1"> <div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(8)" @toSelectImg="toSelectImg(8)" :isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(8)" @toSelectImg="toSelectImg(8)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(8)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(8)" :x="1019" :y="577" />
</div> </div>
<img v-if="FeatureData.ImgList[8].url" class="absolute" :src="FeatureData.ImgList[8].url" /> <img v-if="FeatureData.ImgList[8].url" class="absolute" :src="FeatureData.ImgList[8].url" />
</div> </div>
......
<template> <template>
<div class="featureControls"> <div class="featureControls">
<div class="row-aic featureControls-bottom featureControls-bottomOne" v-if="ControlsType=='row'"> <div class="row-aic featureControls-bottom featureControls-bottomOne" v-if="ControlsType=='row'">
<el-tooltip class="item" effect="dark" content="上传图" placement="top"> <el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg"> <div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i> <i class="el-icon-upload2"></i>
...@@ -22,6 +21,9 @@ ...@@ -22,6 +21,9 @@
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="尺寸" placement="top" v-if="x&&y">
<div class="cursorInitial fz14">{{x}} * {{y}}</div>
</el-tooltip>
</div> </div>
<div class="column featureControls-bottom featureControls-bottomTwo" v-else> <div class="column featureControls-bottom featureControls-bottomTwo" v-else>
<template v-if="!isImg&&!isTemplate"> <template v-if="!isImg&&!isTemplate">
...@@ -74,7 +76,7 @@ ...@@ -74,7 +76,7 @@
}, },
props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage', props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template' 'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y'
], ],
data() { data() {
return { return {
......
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
<div class="subIdeImg1 bjE6 UpgradedVersion-Hover"> <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
<div class="subIdeImg1relative relative UpgradedVersion-Hover"> <div class="subIdeImg1relative relative UpgradedVersion-Hover">
<div class="subIdeImgForm1Box absolute"> <div class="subIdeImgForm1Box absolute">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="Template>2?178:250" :y="187" />
</div> </div>
<template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0"> <template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0">
<img :src="FeatureData.dataObj.SubList[0].url" /> <img :src="FeatureData.dataObj.SubList[0].url" />
...@@ -77,9 +77,9 @@ ...@@ -77,9 +77,9 @@
<div class="subIdeImg1 bjE6 UpgradedVersion-Hover"> <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
<div class="subIdeImg1relative relative"> <div class="subIdeImg1relative relative">
<div class="subIdeImgForm1Box absolute"> <div class="subIdeImgForm1Box absolute">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true" <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)" :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" /> @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="Template==1?331:250" :y="187" />
</div> </div>
<template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1 "> <template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1 ">
<img :src="FeatureData.dataObj.SubList[1].url" /> <img :src="FeatureData.dataObj.SubList[1].url" />
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<div class="featureHome-vToolBar-one absolute z-index3"> <div class="featureHome-vToolBar-one absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false" <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg" :isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls> @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"
:x="697" :y="930"></FeatureControls>
<input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic"> <input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<div class="featureHome-vToolBar-two absolute z-index3"> <div class="featureHome-vToolBar-two absolute z-index3">
......
...@@ -258,13 +258,17 @@ ...@@ -258,13 +258,17 @@
tempImgUrl = tripObj.scenicArray[0].ImgList[0].url; tempImgUrl = tripObj.scenicArray[0].ImgList[0].url;
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempImgUrl url: tempImgUrl,
x: 0,
y: 0,
}];; }];;
newObj.MainDesc = tripObj.scenicArray[0].MainDesc; newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
} else { } else {
newObj.DetailsName = "景点介绍"; newObj.DetailsName = "景点介绍";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg2 url: this.homeBg2,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "景点描述"; newObj.MainDesc = "景点描述";
} }
...@@ -274,7 +278,9 @@ ...@@ -274,7 +278,9 @@
newObj.MainName = "日本旅行专家"; newObj.MainName = "日本旅行专家";
newObj.SubName = "『印象日本』日本豪华游代名词"; newObj.SubName = "『印象日本』日本豪华游代名词";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg1 url: this.homeBg1,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "描述信息"; newObj.MainDesc = "描述信息";
}, },
...@@ -283,7 +289,9 @@ ...@@ -283,7 +289,9 @@
var dinnerObj = { var dinnerObj = {
MainName: "行程特色餐1", MainName: "行程特色餐1",
ImgList: [{ ImgList: [{
url: this.dinner1 url: this.dinner1,
x: 0,
y: 0,
}], }],
MainDesc: "行程特色餐1描述" MainDesc: "行程特色餐1描述"
}; };
...@@ -313,7 +321,9 @@ ...@@ -313,7 +321,9 @@
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
url: tempUrl url: tempUrl,
x: 0,
y: 0,
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
...@@ -328,7 +338,9 @@ ...@@ -328,7 +338,9 @@
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
url: tempUrl2 url: tempUrl2,
x: 0,
y: 0,
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
...@@ -340,7 +352,9 @@ ...@@ -340,7 +352,9 @@
newObj.SubList.push({ newObj.SubList.push({
MainName: dItem.MainName, MainName: dItem.MainName,
ImgList: [{ ImgList: [{
url: tempUrl3 url: tempUrl3,
x: 0,
y: 0,
}], }],
MainDesc: dItem.MainDesc MainDesc: dItem.MainDesc
}); });
...@@ -359,13 +373,19 @@ ...@@ -359,13 +373,19 @@
newObj.SubName = "特色酒店"; newObj.SubName = "特色酒店";
newObj.MainName = "行程酒店"; newObj.MainName = "行程酒店";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg1 url: this.homeBg1,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "行程酒店描述信息"; newObj.MainDesc = "行程酒店描述信息";
newObj.SubList = [{ newObj.SubList = [{
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}, { }, {
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}]; }];
if (tripObj.hotelArray && tripObj.hotelArray.length > 0) { if (tripObj.hotelArray && tripObj.hotelArray.length > 0) {
newObj.MainName = tripObj.hotelArray[0].MainName; newObj.MainName = tripObj.hotelArray[0].MainName;
...@@ -376,22 +396,32 @@ ...@@ -376,22 +396,32 @@
if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 2) { if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 2) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.hotelArray[0].ImgList[1].url url: tripObj.hotelArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.hotelArray[0].ImgList[2].url url: tripObj.hotelArray[0].ImgList[2].url,
x: 0,
y: 0,
}); });
} else if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 1) { } else if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 1) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.hotelArray[0].ImgList[1].url url: tripObj.hotelArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}); });
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempHotelImg url: tempHotelImg,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = tripObj.hotelArray[0].MainDesc; newObj.MainDesc = tripObj.hotelArray[0].MainDesc;
} }
...@@ -400,13 +430,19 @@ ...@@ -400,13 +430,19 @@
getDinnerData(tripObj, newObj) { getDinnerData(tripObj, newObj) {
newObj.SubName = "特色餐食"; newObj.SubName = "特色餐食";
newObj.SubList = [{ newObj.SubList = [{
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}, { }, {
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}]; }];
newObj.MainName = "行程餐食"; newObj.MainName = "行程餐食";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.dinner4, url: this.dinner4,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "行程餐食描述"; newObj.MainDesc = "行程餐食描述";
if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) { if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
...@@ -418,23 +454,33 @@ ...@@ -418,23 +454,33 @@
if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 2) { if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 2) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.dinnerArray[0].ImgList[1].url url: tripObj.dinnerArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.dinnerArray[0].ImgList[2].url url: tripObj.dinnerArray[0].ImgList[2].url,
x: 0,
y: 0,
}); });
} }
if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 1) { if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 1) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.dinnerArray[0].ImgList[1].url url: tripObj.dinnerArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}); });
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempDinnerImg url: tempDinnerImg,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = tripObj.dinnerArray[0].MainDesc; newObj.MainDesc = tripObj.dinnerArray[0].MainDesc;
} }
...@@ -443,13 +489,19 @@ ...@@ -443,13 +489,19 @@
getScenicData(tripObj, newObj) { getScenicData(tripObj, newObj) {
newObj.SubName = "特色景点"; newObj.SubName = "特色景点";
newObj.SubList = [{ newObj.SubList = [{
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}, { }, {
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}]; }];
newObj.MainName = "行程景点"; newObj.MainName = "行程景点";
newObj.ImgList = [{ newObj.ImgList = [{
url: this.homeBg1 url: this.homeBg1,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = "行程景点描述信息"; newObj.MainDesc = "行程景点描述信息";
if (tripObj.scenicArray && tripObj.scenicArray.length > 0) { if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
...@@ -461,22 +513,32 @@ ...@@ -461,22 +513,32 @@
if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 2) { if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 2) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.scenicArray[0].ImgList[1].url url: tripObj.scenicArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.scenicArray[0].ImgList[2].url url: tripObj.scenicArray[0].ImgList[2].url,
x: 0,
y: 0,
}); });
} else if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 1) { } else if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 1) {
newObj.SubList = []; newObj.SubList = [];
newObj.SubList.push({ newObj.SubList.push({
url: tripObj.scenicArray[0].ImgList[1].url url: tripObj.scenicArray[0].ImgList[1].url,
x: 0,
y: 0,
}); });
newObj.SubList.push({ newObj.SubList.push({
url: this.homeBg3 url: this.homeBg3,
x: 0,
y: 0,
}); });
} }
newObj.ImgList = [{ newObj.ImgList = [{
url: tempScenicImg url: tempScenicImg,
x: 0,
y: 0,
}]; }];
newObj.MainDesc = tripObj.scenicArray[0].MainDesc; newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
} }
...@@ -509,7 +571,9 @@ ...@@ -509,7 +571,9 @@
if (sItem.NewImaArray && sItem.NewImaArray.length > 0) { if (sItem.NewImaArray && sItem.NewImaArray.length > 0) {
sItem.NewImaArray.forEach(iItem => { sItem.NewImaArray.forEach(iItem => {
tempImgList.push({ tempImgList.push({
url: iItem.Url url: iItem.Url,
x: 0,
y: 0,
}); });
}) })
} }
...@@ -534,7 +598,9 @@ ...@@ -534,7 +598,9 @@
if (sItem.ImaArray && sItem.ImaArray.length > 0) { if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => { sItem.ImaArray.forEach(iItem => {
tempImgList.push({ tempImgList.push({
url: iItem.Url url: iItem.Url,
x: 0,
y: 0,
}); });
}) })
} }
...@@ -558,7 +624,9 @@ ...@@ -558,7 +624,9 @@
if (sItem.ImaArray && sItem.ImaArray.length > 0) { if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => { sItem.ImaArray.forEach(iItem => {
tempImgList.push({ tempImgList.push({
url: iItem.Url url: iItem.Url,
x: 0,
y: 0,
}); });
}) })
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false: :isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false:
FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
&&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg" &&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls> @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="1019" :y="577"></FeatureControls>
<input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic"> <input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
</div> </div>
<div class="MasterMapList-box-two absolute z-index3"> <div class="MasterMapList-box-two absolute z-index3">
......
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