4.27

src/echarts/options.js

@@ -285,7 +285,7 @@ export function setSjjk(ele, dataIn) {
 				symbol: 'emptyCircle',
 				symbolSize: nowSize(11),
 				yAxisIndex: 1,
-				itemStyle: { color: 'rgba(143, 186, 236, 1)' },
+				itemStyle: { color: 'rgba(143, 186, 236, 1)'},
 				data: sum,
 			}
 		]
@@ -800,7 +800,7 @@ export function setOnTimeRate(ele, dataIn) {
 	}
 	let rate
 	if(dataIn) {
-		rate = Math.round(+dataIn.slice(0,-1)/100)
+		rate = (Number(dataIn.slice(0,-1))/100).toFixed(3)
 	} else {
 		rate=0
 	}
@@ -834,24 +834,29 @@ export function setOnTimeRate(ele, dataIn) {
 				label: {
 					color: '#ddd',
 					insideColor: '#ddd',
+					fontSize: nowSize(36),
+					lineHeight: nowSize(32),
+					fontFamily: 'BarLowBold',
 					formatter: params => {
+						console.log(params.value)
 						if(params.value==0) {
 							return `{value|-}{percent|%}\n{title|准点率}`
 						} else {
-							return `${'value'|(params.value * 100).toFixed(0)}{percent|%}\n{title|准点率}`
+							let rate = (params.value * 100).toFixed(1).toString().split('.')
+							console.log(rate)
+							return `${rate[0]}${+rate[1]?'.':''}${'percent'|rate[1]||''}{percent|%}\n{title|准点率}`
 						}
 					},
 					rich:{
-						value: {
-							fontFamily: 'BarlowBold',
-							fontSize: nowSize(48),
-						},
 						percent: {
-							fontFamily: 'BarlowBold',
-							fontSize: nowSize(24),
+							fontSize: nowSize(16),
+							verticalAlign: 'bottom',
+							lineHeight: nowSize(16),
+							padding: [0,0,0,nowSize(2)]
 						},
 						title: {
-							fontSize: 16,
+							fontSize: nowSize(16),
+							padding:[nowSize(10),0,0]
 						}
 					}
 				},

src/views/hdsj/Index.vue

@@ -55,7 +55,6 @@
           </li>
         </ul>
       </div>
-      <img v-show="legendShow" src="../../assets/imgs/header/legend-cg.png" alt="" class="legend">
     </div>
     <div class="panel-right">
       <div class="pr-b1 pr">
@@ -266,13 +265,19 @@ export default {
   }
 
   const shujunState = ref(null)
-  const legendShow = ref(false)
+
+  watch(shujunState, (val, oldVal) => {
+    if(val&&!oldVal) {
+      bus.emit('toggleUnderWaterLegend',{from: 'show_hdsj', state: true})
+    }else if(!val&&oldVal){
+      bus.emit('toggleUnderWaterLegend',{from: 'show_hdsj', state: false})
+    }
+  })
 
   function toggleShujunState(type) {
     if(type===shujunState.value) {
       shujunState.value = null
       ueCallInitWaterShujun()
-      legendShow.value = false
     }else {
       if(type==='before') {
         ueCallBeforeShujun()
@@ -280,7 +285,6 @@ export default {
         ueCallAfterShujun()
       }
       shujunState.value = type
-      legendShow.value = true
     }
   }
   
@@ -388,6 +392,7 @@ export default {
     bus.off('ueRec_RunShujun')
     bus.off('ueRec_BackShujun')
     ueCallClearShujun()
+    bus.emit('toggleUnderWaterLegend',{from: 'show_hdsj', state: false})
   })
 </script>
 
@@ -409,13 +414,6 @@ export default {
     left: 0;
     padding: 0 30px 30px;
     justify-content: flex-start;
-    .legend {
-      width: 199px;
-      height: 177px;
-      position: absolute;
-      left: 370px;
-      bottom: 130px;
-    }
   }
 
   .panel-right {

src/views/home/ComPage.vue

@@ -3,6 +3,7 @@
     <boat-panel v-if="boatPanelShow" :boat-info="boatPanelInfo.value" @close-boat-panel="boatPanelShow=false"/>
     <scene-box v-if="sceneBoxShow"/>
     <pic-viewer v-if="picViewShow" :pic-list="picList.value" @close-pic-viewer="picViewShow=false"></pic-viewer>
+    <under-water-legend/>
   </div>
 </template>
 
@@ -13,11 +14,12 @@ export default {
 </script>
 
 <script setup>
-import { reactive, ref, watch } from 'vue';
+import { reactive, ref, watch, computed } from 'vue';
 import bus from '@/utils/bus'
 import BoatPanel from './cpns/boatPanel/Index.vue'
 import SceneBox from './cpns/SceneBox.vue';
 import PicViewer from './cpns/PicViewer.vue';
+import UnderWaterLegend from './cpns/UnderWaterLegend.vue';
 
 const boatPanelShow = ref(false)
 

src/views/home/cpns/UnderWater.vue

@@ -25,7 +25,6 @@
         </div>
       </el-carousel-item>
     </el-carousel>
-    <img src="../../../assets/imgs/header/legend-cg.png" alt="" class="legend">
   </div>
 </template>
 
@@ -41,22 +40,26 @@ import { ElCarousel, ElCarouselItem } from 'element-plus'
 import 'element-plus/es/components/carousel/style/css'
 import 'element-plus/es/components/carousel-item/style/css'
 import { useNow, useDateFormat } from '@vueuse/core'
-import { ueCallCloseWater, ueCallOpenWater, ueCallChangeShuishen, ueCallFlyToSXDX } from '@/utils/UIInteractions'
+import { ueCallCloseWater, ueCallOpenWater, ueCallChangeShuishen, ueCallFlyToSXDX, ueCallChangeTime, ueCallGetNowTime } from '@/utils/UIInteractions'
 import bus from '@/utils/bus'
 
 
 onMounted(() => {
+  bus.emit('toggleUnderWaterLegend',{from: 'show_sxdx', state: true})
   initSxdxData()
   ueCallFlyToSXDX()
   setTimeout(() => {
+    ueCallChangeTime(18)
     ueCallCloseWater()
     ueCallChangeShuishen('2023.1')
   }, 2000);
 })
 
 onBeforeUnmount(() => {
+  ueCallGetNowTime()
   ueCallOpenWater()
   bus.emit('changeYuJiNum', 0)
+  bus.emit('toggleUnderWaterLegend',{from: 'show_sxdx', state: false})
 })
 
 const sxdxCurrent = ref('2023.1')
@@ -220,13 +223,5 @@ const sxdxData = reactive({value: []})
       background-size: contain;
     }
   }
-
-  .legend {
-    width: 199px;
-    height: 177px;
-    position: absolute;
-    left: -240px;
-    bottom: -60px;
-  }
 }
 </style>

src/views/home/cpns/UnderWaterLegend.vue

@@ -0,0 +1,31 @@
+<template>
+  <img v-if="showState.show_hdsj||showState.show_sxdx" src="../../../assets/imgs/header/legend-cg.png" alt="" class="legend">
+</template>
+
+<script setup>
+import { onMounted, reactive } from 'vue'
+import bus from '@/utils/bus'
+
+let showState = reactive({
+  show_sxdx: false,
+  show_hdsj: false,
+})
+
+onMounted(() => {
+  bus.on('toggleUnderWaterLegend', (params) => {
+    console.log('toggleUnderWaterLegend',params)
+    showState[params.from] = params.state
+  })
+})
+
+</script>
+
+<style lang="scss" scoped>
+.legend {
+  width: 199px;
+  height: 177px;
+  position: absolute;
+  left: 370px;
+  bottom: 130px;
+}
+</style>

src/views/ssky/cpns/LdkllLineDetail.vue

@@ -43,7 +43,7 @@ export default {
   background: url('../../../assets/imgs/page_ssky/bg-ldkll-detail.png') no-repeat;
   background-size: contain;
   box-sizing: border-box;
-  padding: 25px;
+  padding: 20px;
 
 
   .dialog-close {