页面修改

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/MasterMapList.vue

@@ -27,7 +27,7 @@
           <div class="MasterMapList1 absolute z-index3">
             <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
               :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-              @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="500" :y="577" />
+              @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="500" :y="577" :isShowSelect="true" :DataArray="DataArray" />
           </div>
           <VueDraggableResizable
             :w="500" :h="577"
@@ -64,7 +64,7 @@
           <div class="MasterMapList1 absolute z-index3">
             <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
               :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-              @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="500" :y="577" />
+              @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="500" :y="577" :isShowSelect="true" :DataArray="DataArray" />
           </div>
           <VueDraggableResizable
             :w="500" :h="577"
@@ -121,7 +121,7 @@
             <div class="MasterMapList1 absolute z-index3">
               <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                 :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-                @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="500" :y="279" />
+                @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="500" :y="279" :isShowSelect="true" :DataArray="DataArray" />
             </div>
             <VueDraggableResizable
               :w="500" :h="279"
@@ -198,7 +198,7 @@
                 <div class="MasterMapList1 absolute z-index3">
                   <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                     :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-                    @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="504" :y="282" />
+                    @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="504" :y="282" :isShowSelect="true" :DataArray="DataArray" />
                 </div>
                 <VueDraggableResizable
                   :w="504" :h="282"
@@ -294,7 +294,7 @@
                 <div class="MasterMapList1 absolute z-index3">
                   <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                     :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-                    @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="504" :y="282"/>
+                    @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="504" :y="282" :isShowSelect="true" :DataArray="DataArray" />
                 </div>
                 <VueDraggableResizable
                   :w="504" :h="282"
@@ -412,7 +412,7 @@
                   <div class="MasterMapList1 absolute z-index3">
                     <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                       :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-                      @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="337" :y="282" />
+                      @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="337" :y="282" :isShowSelect="true" :DataArray="DataArray" />
                   </div>
                   <VueDraggableResizable
                     :w="337" :h="282"
@@ -544,7 +544,7 @@
               <div class="MasterMapList1 absolute z-index3">
                 <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                   :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-                  @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="770" :y="427" />
+                  @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="770" :y="427" :isShowSelect="true" :DataArray="DataArray" />
               </div>
               <VueDraggableResizable
                 :w="761" :h="427"
@@ -694,7 +694,7 @@
                 <div class="MasterMapList1 absolute z-index3">
                   <FeatureControls v-if="FeatureData"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                     :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-                    @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="375" :y="427" />
+                    @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="375" :y="427" :isShowSelect="true" :DataArray="DataArray" />
                 </div>
                 <VueDraggableResizable
                   :w="375" :h="427"

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue

@@ -88,8 +88,8 @@
 
 <script>
   export default {
-    components: {
-
+    components: 
+    {
     },
     props: ['index', 'FeatureData', 'ControlsType', 'isImg', 'pagesType', 'isDeletePage',
       'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template', 'x', 'y', 'isFontSize',
@@ -112,10 +112,10 @@
           }
         ],
         changeIndex: 0,
-
       };
     },
     methods: {
+      //数据切换
       changeData() {
         if (this.DataArray && this.DataArray.length > 0 && this.changeIndex <= this.DataArray.length - 1) {
           var dataObj = this.DataArray[this.changeIndex];
@@ -124,15 +124,19 @@
               if (this.FeatureData.dataObj) {
                 this.FeatureData.dataObj.DetailsName = dataObj.MainName;
                 this.FeatureData.dataObj.MainDesc = dataObj.MainDesc;
+                if (dataObj.ImgList && dataObj.ImgList.length > 0) {
                   this.FeatureData.dataObj.ImgList = dataObj.ImgList;
+                }
               } else {
                 this.FeatureData.MainName = dataObj.MainName;
                 this.FeatureData.MainDesc = dataObj.MainDesc;
+                if (dataObj.ImgList && dataObj.ImgList.length > 0) {
                   this.FeatureData.ImgList = dataObj.ImgList;
                 }
               }
             }
           }
+        }
       },
       setTemplate(item) {
         this.TemplateType = item.id