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

src/components/Combinations/CityPlanning/CityPlanning.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="cityPlan" class="sm-panel" v-if="cityPlanShow" v-drag data-attr="drag">
+  <div id="cityPlan" class="sm-panel" v-show="cityPlanShow" v-drag data-attr="drag">
     <div class="sm-content">
       <div class="sm-panel-header">
         <span :class="{titleColor:backLineShow}" class="title-txt" @click="choose(0)">退线</span>

src/components/Combinations/LayerManage/LayerManageSplit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="sm-panel" v-if="LayerManageShow">
+  <div class="sm-panel" v-show="LayerManageShow">
     <div class="sm-panel-header">
       <span>{{ Resource.LayerManage }}</span>
       <span class="closeBtn" @click="toggleVisibility">&times;</span>

src/components/Combinations/analysisCombination/analysisCombination.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="3DAnalysis" class="sm-panel" v-if="analysisShow" v-drag>
+  <div id="3DAnalysis" class="sm-panel" v-show="analysisShow" v-drag>
     <div class="sm-content">
       <div class="sm-panel-header">
         <span :class="{titleColor:sightlineShow}" class="title-txt" @click="choose(0)">{{Resource.sightline}}</span>

src/components/Combinations/clipCombination/ClipCombination.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="clipAnalysis" class="sm-panel" v-if="clipShow" v-drag data-attr="drag">
+  <div id="clipAnalysis" class="sm-panel" v-show="clipShow" v-drag data-attr="drag">
     <div class="sm-content">
       <div class="sm-panel-header">
         <span :class="{titleColor:boxShow}" class="title-txt" @click="choose(0)">{{Resource.BoxClip}}</span>

src/components/Combinations/sceneAtttribute/sceneAtttribute.vue

@@ -2,7 +2,7 @@
   <div
     id="SceneAtttribute"
     class="sm-panel"
-    v-if="SceneAtttributeShow"
+    v-show="SceneAtttributeShow"
     v-drag
     data-attr="drag"
   >

src/components/Combinations/terrainCombination/TerrainCombination.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="terrainAnalysis" class="sm-panel" v-if="terrainShow" v-drag>
+  <div id="terrainAnalysis" class="sm-panel" v-show="terrainShow" v-drag>
     <div class="sm-content">
       <div class="sm-panel-header">
         <span :class="{ titleColor: OperationShow }" class="title-txt" @click="choose(0)">{{ Resource.TerrainOperation