生命线管线弹窗更改

src/components/PipeLineDetail/index.vue

@@ -13,7 +13,6 @@
         width="55%"
         append-to-body
         center
-        style="margin-top: 12vh !important;"
         @close="cancelHeatingPipeVisible()"
         class="dialog4"
         >
@@ -25,7 +24,7 @@
                 <div class="leader-info-container" style="width: 100%;height: 100%;padding: 0;">
                 <div
                     class="leader-info-list-con  tk_list "
-                    style="width: 100% !important;height: 100% !important; overflow: auto;margin-bottom: 0;padding:1rem;background-image: none !important;box-shadow: none !important;">
+                    style="width: 100% !important;height: 100% !important; overflow: auto;margin-top: 20px;padding:1rem;background-image: none !important;box-shadow: none !important;">
                     <div class="imgzw">
                         <!--<img src="../../assets/images/lookall/sxt.png" >-->
                     </div>

src/components/supermap-2.5d.vue

@@ -329,9 +329,9 @@ export default {
               // 具体属性查看data
               console.log("三维管线数据："+JSON.stringify(data));
               if('y_id' in data&&'y_name' in data){
-                that.$emit('getPipeByDataSetAndSmId', data.y_id, data.y_name);
+                that.$emit('getHeatingPipeByDataSetAndSmId', data.y_id, data.y_name);
               }else if('Y_id' in data&&'Y_name' in data){
-                that.$emit('getPipeByDataSetAndSmId', data.Y_id, data.Y_name);
+                that.$emit('getHeatingPipeByDataSetAndSmId', data.Y_id, data.Y_name);
               }
             });
           }

src/views/industry/ThermalPower.vue

@@ -428,7 +428,7 @@
 
     </div>
     <!-- 地图功能栏 -->
-    <supermap ref="supermap" style="width: 100%;height: 100%;position: relative;top: -10%;" :showLayer="true" @getPipeByDataSetAndSmId="getPipeByDataSetAndSmId" @previewPointDetail="previewPointDetail">
+    <supermap ref="supermap" style="width: 100%;height: 100%;position: relative;top: -10%;" :showLayer="true" @getHeatingPipeByDataSetAndSmId="getHeatingPipeByDataSetAndSmId" @previewPointDetail="previewPointDetail">
     </supermap>
     <DetailDialog ref="detailDialog" />
     <div class="btm_bg"></div>
@@ -3142,7 +3142,7 @@ export default {
       this.heatingPipe = {}
     },
     //查询单选管线信息
-    getPipeByDataSetAndSmId(yId,yName) {
+    getHeatingPipeByDataSetAndSmId(yId,yName) {
       getGasPipeDetailByYIdAndYName({yId:yId,yName:yName}).then(res => {
         this.openHeatingPipeVisible = true
         if (res && res.data !== null && res.data !== undefined) {

src/views/industry/lookall.vue

@@ -13,7 +13,6 @@
 
 		<!-- 地图 -->
 		<supermap ref="supermap" style="width: 100%;height: 100vh;position: relative;bottom: 11%;" @preview="preview"
-			@getPipeByDataSetAndSmId="getPipeByDataSetAndSmId"
 			@getHeatingPipeByDataSetAndSmId="getHeatingPipeByDataSetAndSmId" :showLayer="true">
 		</supermap>
 
@@ -2769,8 +2768,8 @@
 				this.$refs.tableInfo.TableInfoHandler('框选管线信息', selectedObjs, null)
 			},
 			//查询单选管线信息
-			getPipeByDataSetAndSmId(yId, yName) {
-				getHeatingPipeByDataSetAndSmId({
+      getHeatingPipeByDataSetAndSmId(yId, yName) {
+        getHeatingPipeByDataSetAndSmId({
 					yId: yId,
 					yName: yName
 				}).then(res => {

src/views/industry/paishui.vue

@@ -16,7 +16,7 @@
 		</div>
 
 		<!-- 地图 -->
-		<supermap ref="supermap" style="width: 100%;height: 100vh;position: relative;bottom: 16%;"  @previewPointDetail="previewPointDetail" @getPipeByDataSetAndSmId="getPipeByDataSetAndSmId"  :showLayer="true">
+		<supermap ref="supermap" style="width: 100%;height: 100vh;position: relative;bottom: 16%;"  @previewPointDetail="previewPointDetail" @getHeatingPipeByDataSetAndSmId="getHeatingPipeByDataSetAndSmId"  :showLayer="true">
     	</supermap>
 
 		<!-- 左边 -->
@@ -3937,7 +3937,7 @@
         )
       },
 	  		//查询单选管线详情信息
-      getPipeByDataSetAndSmId(yId,yName) {
+      getHeatingPipeByDataSetAndSmId(yId,yName) {
 				getDrainagePipeBySmId({yId:yId,yName:yName}).then(res => {
 					if (res && res.data !== null && res.data !== undefined) {
 						this.openHeatingPipeVisible=true

src/views/industry/water.vue

@@ -2,7 +2,7 @@
 <template>
 	<div class="water">
     <!-- 地图 -->
-    <supermap ref="supermap" style="width: 100%;height: 100vh;position: relative;bottom: 11%;" @preview="preview" @getPipeByDataSetAndSmId="getPipeByDataSetAndSmId" @previewPointDetail="previewPointDetail" :showLayer="true">
+    <supermap ref="supermap" style="width: 100%;height: 100vh;position: relative;bottom: 11%;" @preview="preview" @getHeatingPipeByDataSetAndSmId="getHeatingPipeByDataSetAndSmId" @previewPointDetail="previewPointDetail" :showLayer="true">
     </supermap>
 		<div class="water_header">
 			<div class="left_head">
@@ -3048,7 +3048,7 @@
         this.TableInfoHandler('框选管线信息', selectedObjs, null)
       },
       //查询单选管线信息
-      getPipeByDataSetAndSmId(yId,yName) {
+      getHeatingPipeByDataSetAndSmId(yId,yName) {
         getWaterPipeBySmId({yId:yId,yName:yName}).then(res => {
           if (res && res.data !== null && res.data !== undefined) {
             this.openHeatingPipeVisible=true