Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Combinations/LayerManage/LayerManageSplit.vue

@@ -121,7 +121,7 @@
       >
         <div class="tckz">
           <List split size="large">
-            <ListItem v-for="(item, index) in addlayerdataCopy" :key="index">
+            <ListItem v-for="(item, index) in addlayerdata" :key="index">
               {{ item.title }}
               <div class="listBtn">
                 <i-switch
@@ -155,7 +155,7 @@
                   :title="Resource.MoveDownOneLevel"
                   @click="lower(item)"
                   v-if="
-                    index < addlayerdataCopy.length - 1 &&
+                    index < addlayerdata.length - 1 &&
                     (item.type == 'Vector' || item.type == 'IMG')
                   "
                 />
@@ -239,7 +239,7 @@ export default {
         endYears: "",
         treeSearchText: "",
       },
-      addlayerdataCopy:[],//用于双向绑定
+      addlayerdata:[],//用于双向绑定
       defaultProps: {
         children: "children",
         label: "label",
@@ -436,7 +436,7 @@ export default {
       immediate: true,
     },
     addlayerdata(val){
-      this.addlayerdataCopy = val
+      this.addlayerdata = val
     }
   },
 };

src/views/farmlandProtection/index.vue

@@ -20,8 +20,12 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <RzDtails :rzBsm="rzBsm" @updateParent="changeData" :interObj="interObj" v-if="showInter"></RzDtails>
-
+    <interDetails :rzBsm="rzBsm" @updateParent="changeData" :interObj="interObj" v-if="showInter"></interDetails>
+    <RzDtails
+      :rzBsm="rzBsm"
+      :rzMc="nowObj.xmmc"
+      @updateParent="changeData"
+    ></RzDtails>
   </div>
 </template>
 
@@ -29,14 +33,16 @@
 import FZJCYP from "./components/fzjcyp.vue";
 import FXJG from "./components/fxjg.vue";
 import Lsjl from "../complianceAnalysis/components/lsjl.vue";
-import RzDtails from "./components/interDetails.vue";
+import interDetails from "./components/interDetails.vue";
+import RzDtails from "../complianceAnalysis/components/rzDtails.vue";
 export default {
   name: "farmlandProtection",
   components: {
     FZJCYP,
     Lsjl,
     FXJG,
-    RzDtails
+    interDetails,
+    RzDtails,
   },
   data() {
     return {