Merge branch 'ZHNY_LHR' into ZHNY_DCF

# Conflicts:
#	src/store/index.ts
#	src/views/Main/components/ZhHeader.vue

src/store/index.ts

@@ -22,7 +22,6 @@ export const Store = defineStore({
 			keepAlives: ['Map3DMain'],//控制加载缓存页面
 			userport: '',
 			jt3d: {},//地图实例
-			tabID:"",//保存头部选中
 		}
 	},
 	getters: {

src/views/Main/components/ZhHeader.vue

@@ -20,7 +20,7 @@
 		<router-link to="/home/test">
 			<div :class="[sqTitle?'SqTitle':'SqXzTitle']" @click="slideTitle('SqTitle')"></div>
 		</router-link>
-		
+
 		<div :class="[ywTitle?'YwTitle':'YwXzTitle']" @click="slideTitle('YwTitle')"></div>
 	</div>
 	<div class="dataTime">
@@ -33,9 +33,9 @@
 
 <script>
 	import DataTime from "../../Map3d/components/DataTime.vue";
+
 	import weather from "../../Map3d/components/weather.vue"
-	let store = undefined;
-	
+
 	export default {
 		name: "ZhHeader",
 		components: {
@@ -48,6 +48,7 @@
 				sqTitle: true,
 				ggTitle: true,
 				ywTitle: true
+
 			}
 		},
 		methods: {
@@ -57,48 +58,40 @@
 					this.sqTitle = true;
 					this.ggTitle = true;
 					this.ywTitle = true;
-					
-					setTimeout(res=>{
-						store.tabID = 'YztTitle'
-					})
-					console.log('IDDDD',store.tabID)
+
+					localStorage.setItem("currenttab", "YztTitle");
+
 				}
 				if (val == 'SqTitle') {
 					this.sqTitle = false;
 					this.yztTitle = true;
 					this.ggTitle = true;
 					this.ywTitle = true;
-					setTimeout(res=>{
-						store.tabID = 'SqTitle'
-					})
-					
-					console.log('IDDDD',store.tabID)
+
+					localStorage.setItem("currenttab", "SqTitle");
 				}
 				if (val == 'GgTitle') {
 					this.ggTitle = false;
 					this.yztTitle = true;
 					this.sqTitle = true;
 					this.ywTitle = true;
-					
-					setTimeout(res=>{
-						store.tabID = 'GgTitle'
-					})
-					console.log('IDDDD',store.tabID)
+					localStorage.setItem("currenttab", "GgTitle");
 				}
 				if (val == 'YwTitle') {
 					this.ywTitle = false;
 					this.yztTitle = true;
 					this.sqTitle = true;
 					this.ggTitle = true;
-					store.tabID = 'YwTitle'
-					console.log('IDDDD',store.tabID)
+					localStorage.setItem("currenttab", "YwTitle");
+
 				}
 			}
 
 		},
-		created(){
-			console.log('IDDDD',store.tabID)
-			let val = store.tabID
+
+
+		created() {
+			let val = localStorage.currenttab
 			this.slideTitle(val)
 		}
 	}

src/views/Table/components/BasicInfor.vue

@@ -61,7 +61,7 @@
 	.ref000 {
 		position: absolute;
 		height: 100rem;
-		width: 240rem;
+		width: 235rem;
 		right: 0;
 		top: 0;
 		text-indent: 30rem;

src/views/Table/components/WaterLevelChart.vue

@@ -49,14 +49,14 @@
   					series: [{
   						name: '完成',
   						type: 'liquidFill',
-  						radius: '80%',
+  						radius: '130rem',
   						data: [0.80],
   						label: {
   							normal: {
   								color: '#27e5f1',
   								insideColor: '#fff',
   								textStyle: {
-  									fontSize: 40,
+  									fontSize: "40rem",
   									fontWeight: 'bold',
   								}
   							}