Merge branch 'yjl_dev' into 'master'

大屏页面调整

See merge request !1

.env.development

@@ -4,7 +4,7 @@ NODE_ENV = 'development'
 # 本地环境接口地址(/api/index.ts文件中使用)
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://182.90.224.147:100'
-VITE_API_URL = 'http://192.168.34.221:8070'
+VITE_API_URL = 'http://192.168.34.221:12360'
 
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

src/views/sevenLargeScreen/distributionMonitoring/index.vue

@@ -54,7 +54,7 @@ export default {
 		}
 	}
 	.bottom {
-		height: 40%;
+		height: 42%;
 		display: flex;
 		.bottomLeft {
 			width: 50%;

src/views/sevenLargeScreen/elevatorMonitoring/index.vue

@@ -27,7 +27,7 @@ import Right from "@/views/sevenLargeScreen/elevatorMonitoring/right.vue";
 	display: flex;
 	.left {
 		width: 30%;
-		height: 100%;
+		height: 102%;
 		.leftTop {
 			height: 29%;
 		}
@@ -43,7 +43,7 @@ import Right from "@/views/sevenLargeScreen/elevatorMonitoring/right.vue";
 	.right {
 		margin-left: 1%;
 		width: 83%;
-		height: 100%;
+		height: 102%;
 		.rightBox {
 			width: 100%;
 			height: 100%;

src/views/sevenLargeScreen/headNoise/centerBottom.vue

@@ -24,10 +24,8 @@ const weatherList = ref([]);
 //获取天气
 const loadWeather = async () => {
 	const res = await getWeatherDataApi({ cityid: "" });
-	console.log("获取天气", res);
 	var json = JSON.parse(res.result);
 	var list = json;
-	console.log("获取天气 - list", list);
 	list.forEach((element, index) => {
 		element.url = "src/assets/images/dustNoise/weatherIcon/" + element.wea_img + ".png";
 		weatherList.value.push(element);

src/views/sevenLargeScreen/headNoise/index.vue

@@ -52,7 +52,7 @@ export default {
 	}
 	.left {
 		width: 30%;
-		height: 100%;
+		height: 103%;
 		.leftTop {
 			height: 29%;
 		}
@@ -69,7 +69,7 @@ export default {
 		// width: calc(40% - 40px);
 		margin: 0% 1%;
 		width: 55%;
-		height: 100%;
+		height: 103%;
 		.centerTop {
 			height: 68%;
 		}

src/views/sevenLargeScreen/headNoise/leftCenter.vue

@@ -100,13 +100,15 @@ onMounted(() => {
 		font-size: calc(100vw * 14 / 1920);
 		margin: 1% 3%;
 		.decName {
-			width: 30%;
+			width: 90%;
+			display: flex;
 			span {
-				margin-left: 10%;
+				margin-left: 2%;
+		    display: inline-block;
 			}
 		}
 		.status {
-			margin-left: 60%;
+			// margin-left: 60%;
 		}
 	}
 }

src/views/sevenLargeScreen/headNoise/rightBottom.vue

@@ -7,11 +7,13 @@
 				<div class="tabThree">报警类型</div>
 			</div>
 			<div class="listBox" ref="scrollRef">
+				<el-scrollbar style="height:85%">
 				<div v-for="item in list" class="listStyle">
-					<div class="dev" style="margin-left: 5%">{{ item.deviceName }}</div>
+					<div class="dev">{{ item.deviceName }}</div>
 					<div class="time">{{ item.tempAlarmTime }}</div>
-					<div class="type" style="margin-right: 5%; width: 6%">{{ item.alarmTypeName }}</div>
+					<div class="type" style="margin-right: 8%; width: 6%">{{ item.alarmTypeName }}</div>
 				</div>
+			</el-scrollbar>
 				<div class="notoDta" v-if="list.length == 0">
 					<img src="@/assets/images/noData.png" alt="" />
 					<p>暂无数据</p>
@@ -59,6 +61,7 @@ onMounted(() => {
 		justify-content: space-around;
 	}
 	.listBox {
+		height: 100%;
 		.listStyle {
 			display: flex;
 			justify-content: space-around;
@@ -66,6 +69,12 @@ onMounted(() => {
 			height: 12%;
 			line-height: 25px;
 			font-size: calc(100vw * 12 / 1920);
+			.dev{
+				width: 20%;
+				white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+			}
 		}
 		.listStyle:hover {
 			background: #091f3f;

src/views/sevenLargeScreen/headNoise/rightCenter.vue

@@ -489,7 +489,7 @@ onMounted(async () => {
 }
 .styleImg {
 	left: 75%;
-	top: 46%;
+	top: 45%;
 	width: 10%;
 	position: absolute;
 	height: 20%;

src/views/sevenLargeScreen/indexL.vue

@@ -147,7 +147,7 @@ export default {
 		}
 	}
 	.dataBoardContent {
-		height: 85%;
+		height: 83%;
 		// height: calc(100% - 15px - 50px - 60px - 20px);
 		margin: 15px auto 16px auto;
 		width: calc(100% - 40px);

src/views/sevenLargeScreen/laborManagement/index.vue

@@ -36,7 +36,7 @@ export default {
 	display: flex;
 	.left {
 		width: 75%;
-		height: 100%;
+		height: 102%;
 		.leftTop {
 			height: 68%;
 		}
@@ -46,7 +46,7 @@ export default {
 	}
 	.right {
 		width: 25%;
-		height: 100%;
+		height: 102%;
 		.rightTop {
 			height: 29%;
 		}

src/views/sevenLargeScreen/towerCraneMonitoring/index.vue

@@ -27,7 +27,7 @@ import Right from "@/views/sevenLargeScreen/towerCraneMonitoring/right.vue";
 	display: flex;
 	.left {
 		width: 30%;
-		height: 100%;
+		height: 102%;
 		.leftTop {
 			height: 29%;
 		}
@@ -43,7 +43,7 @@ import Right from "@/views/sevenLargeScreen/towerCraneMonitoring/right.vue";
 	.right {
 		margin-left: 1%;
 		width: 83%;
-		height: 100%;
+		height: 102%;
 		.rightBox {
 			width: 100%;
 			height: 100%;

src/views/sevenLargeScreen/vehicleManagement/index.vue

@@ -43,7 +43,7 @@ export default {
 		}
 	}
 	.bottom {
-		height: 49%;
+		height: 51%;
 		margin-top: 1%;
 	}
 }