Merge branch 'ZHNY_WW' into ZHNY_DCF

src/components/jt-popup/jt-popup2.vue

@@ -16,7 +16,7 @@
 		<div class="middle">
 			<slot></slot>
 		</div>
-		<div class="footers"></div>
+		<!-- <div class="footers"></div> -->
 	</div>
 	<div :class="['popup-main2',animationClass]" v-drag v-show="isshow" :isEmit="isEmit" id="popup" :style="{height:height,width:width}">
 		<!-- <div class="borderstyle" :style="{height:height}">
@@ -34,7 +34,7 @@
 		<div class="middle2">
 			<slot></slot>
 		</div>
-		<div class="footers2"></div>
+		<!-- <div class="footers2"></div> -->
 	</div>
 	<div :class="['popup-main3',animationClass]" v-drag v-show="isshow" :isEmit="isEmit" id="popup" :style="{height:height,width:width}">
 		<!-- <div class="borderstyle" :style="{height:height}">
@@ -52,7 +52,7 @@
 		<div class="middle3">
 			<slot></slot>
 		</div>
-		<div class="footers3"></div>
+		<!-- <div class="footers3"></div> -->
 	</div>
 </template>
 
@@ -96,7 +96,7 @@
 		height: calc((100% - 115rem)/3);
 		width: 350rem;
 		// padding: 10rem;
-		background-color: rgba(0, 45, 66, 0.5);
+		// background-color: rgba(0, 45, 66, 0.5);
 		z-index: 1000;
 		font-size: 16rem;
 		color: white;
@@ -225,7 +225,7 @@
 		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
-		background-color: rgba(0, 45, 66, 0.5);
+		// background-color: rgba(0, 45, 66, 0.5);
 		z-index: 1000;
 		font-size: 16rem;
 		color: white;
@@ -354,7 +354,7 @@
 		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
-		background-color: rgba(0, 45, 66, 0.5);
+		// background-color: rgba(0, 45, 66, 0.5);
 		z-index: 1000;
 		font-size: 16rem;
 		color: white;

src/components/jt-popup/jt-popup3.vue

@@ -16,7 +16,7 @@
 		<div class="middle">
 			<slot></slot>
 		</div>
-		<div class="footers"></div>
+		<!-- <div class="footers"></div> -->
 	</div>
 	<div :class="['popup-main2',animationClass]" v-drag v-show="isshow" :isEmit="isEmit" id="popup" :style="{height:height,width:width}">
 		<!-- <div class="borderstyle" :style="{height:height}">
@@ -34,7 +34,7 @@
 		<div class="middle2">
 			<slot></slot>
 		</div>
-		<div class="footers2"></div>
+		<!-- <div class="footers2"></div> -->
 	</div>
 	<div :class="['popup-main3',animationClass]" v-drag v-show="isshow" :isEmit="isEmit" id="popup" :style="{height:height,width:width}">
 		<!-- <div class="borderstyle" :style="{height:height}">
@@ -52,7 +52,7 @@
 		<div class="middle3">
 			<slot></slot>
 		</div>
-		<div class="footers3"></div>
+		<!-- <div class="footers3"></div> -->
 	</div>
 </template>
 
@@ -96,7 +96,7 @@
 		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
-		background-color: rgba(0, 45, 66, 0.5);
+		// background-color: rgba(0, 45, 66, 0.5);
 		z-index: 1000;
 		font-size: 16rem;
 		color: white;
@@ -225,7 +225,7 @@
 		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
-		background-color: rgba(0, 45, 66, 0.5);
+		// background-color: rgba(0, 45, 66, 0.5);
 		z-index: 1000;
 		font-size: 16rem;
 		color: white;
@@ -354,7 +354,7 @@
 		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
-		background-color: rgba(0, 45, 66, 0.5);
+		// background-color: rgba(0, 45, 66, 0.5);
 		z-index: 1000;
 		font-size: 16rem;
 		color: white;

src/views/Map3d/components/zstc.vue

@@ -12,22 +12,7 @@
 </script>
 
 <template>
-	<div class="mainview">
-		<div class="header">
-			
-		</div>
-		<div class="middleviewer">
-			<div class="viewer" v-for="(res,index) in ImgurlList" :key="index">
-				<div class="viewertop">
-					<img :src="res.url" @click="flyto(res.info)">
-				</div>
-				<div class="viewerbottom">
-					{{res.name}}
-					<img src="@/assets/images/delete.png" class="deleteImg" @click="deleteviewer(res,index)" />
-				</div>
-			</div>
-		</div>
-	</div>
+	<div style="font-weight: bold;">总设备数量</div>
 </template>
 
 <script>