Explorar el Código

大屏展示样式调整

like hace 6 meses
padre
commit
ebace8b9e7

+ 1 - 1
snowy-admin-web/src/components/HomeCard/SysWarningCard/index.vue

@@ -8,7 +8,7 @@
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.dataIndex === 'state'">
 					<span>
-						<a-tag :color="record.state == '1' ? '#cd201f' : record.state == '2' ? '#2db7f5' : '#87d068'">
+						<a-tag :color="record.state == '1' ? '#87d068' : record.state == '2' ? '#cd201f' : '#50cd7c'">
 							{{ record.stateVlaue }}
 						</a-tag>
 					</span>

+ 2 - 1
snowy-admin-web/src/views/auth/login/login.vue

@@ -252,6 +252,8 @@
 			font-size: 30px;
 			margin-bottom: 30px;
 			letter-spacing: 5px;
+			font-weight: bold;
+
 			color: #1f3253;
 		}
 
@@ -267,7 +269,6 @@
 
 			.form_head {
 				font-size: 20px;
-				font-weight: bold;
 				height: 70px;
 				line-height: 70px;
 			}

+ 1 - 1
snowy-admin-web/src/views/basicset/mem/collector.vue

@@ -32,7 +32,7 @@
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.dataIndex === 'state'">
 					<span>
-						<a-tag :color="record.state == '1' ? '#50cd7c' : record.state == '2' ? '#cd201f' : '#87d068'">
+						<a-tag :color="record.state == '1' ? '#87d068' : record.state == '2' ? '#cd201f' : '#50cd7c'">
 							{{ record.stateValue }}
 						</a-tag>
 					</span>

+ 1 - 1
snowy-admin-web/src/views/motoring/analyse/daily.vue

@@ -41,7 +41,7 @@
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.dataIndex === 'state'">
 					<span>
-						<a-tag :color="record.state == '1' ? '#2db7f5' : record.state == '2' ? '#cd201f' : '#87d068'">
+						<a-tag :color="record.state == '1' ? '#87d068' : record.state == '2' ? '#cd201f' : '#50cd7c'">
 							{{ record.stateVlaue }}
 						</a-tag>
 					</span>

+ 93 - 83
snowy-admin-web/src/views/motoring/bigscreen/index.vue

@@ -17,39 +17,39 @@
 
 						<!-- 信息 -->
 						<div class="col-right">
-							<div class="right-info">
-								<div class="info-left">
-									<div class="info-tilte">
-										<div class="name">{{ item.name }}</div>
-										<a-tag :bordered="false" :color="item.state == 1 ? 'success' : 'orange'">{{
-											item.stateValue
-										}}</a-tag>
-									</div>
-									<div class="info-row">
-										<div class="label">部门:</div>
-										<div class="text">{{ item.bm }}</div>
-									</div>
-									<div class="info-row">
-										<div class="label">位置:</div>
-										<div class="text">{{ item.wz }}</div>
-									</div>
-									<div class="info-row">
-										<div class="label">监控点:</div>
-										<div class="text">{{ item.jkd }}</div>
+							<div class="info-tilte">
+								<div class="name">{{ item.name }}</div>
+								<a-tag :bordered="false" :color="item.state == 1 ? 'success' : 'orange'">{{ item.stateValue }}</a-tag>
+							</div>
+							<div class="info">
+								<div class="right-info">
+									<div class="info-left">
+										<div class="info-row">
+											<div class="label">部门:</div>
+											<div class="text">{{ item.bm }}</div>
+										</div>
+										<div class="info-row">
+											<div class="label">位置:</div>
+											<div class="text">{{ item.wz }}</div>
+										</div>
+										<div class="info-row">
+											<div class="label">监控点:</div>
+											<div class="text">{{ item.jkd }}</div>
+										</div>
+										<div class="info-row">
+											<div class="label">温度:</div>
+											<div class="text">{{ item.wd }}</div>
+										</div>
 									</div>
-									<div class="info-row">
-										<div class="label">温度:</div>
-										<div class="text">{{ item.wd }}</div>
+									<div class="info-right">
+										<img src="/src/assets/images/bigscreen/img.png" style="width: 115%; padding-top: 5px" />
 									</div>
 								</div>
-								<div class="info-right">
-									<img src="/src/assets/images/bigscreen/img.png" style="width: 115%; padding-top: 35px" />
+								<div class="right-foot">
+									<div>记录时间:{{ item.jlsj }}</div>
+									<div class="history">历史记录</div>
 								</div>
 							</div>
-							<div class="right-foot">
-								<div>记录时间:{{ item.jlsj }}</div>
-								<div class="history">历史记录</div>
-							</div>
 						</div>
 					</div>
 				</a-col>
@@ -295,74 +295,84 @@
 						width: 90%;
 						height: 100%;
 
-						.right-info {
+						// 整体标题区域
+						.info-tilte {
 							width: 100%;
-							height: 80%;
-							padding: 10px 10px;
-
+							height: 20%;
 							display: flex;
 							align-items: center;
+							letter-spacing: 2px;
+							padding: 0 10px;
 
-							.info-left {
-								width: 80%;
-								height: 100%;
-								overflow-y: auto;
+							.name {
+								font-weight: bold;
+								font-size: 16px;
+								white-space: nowrap;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								margin-right: 10px;
+							}
+						}
 
-								.info-tilte {
-									display: flex;
-									align-items: center;
-									.name {
-										font-weight: bold;
-										font-size: 16px;
-										white-space: nowrap;
-										overflow: hidden;
-										text-overflow: ellipsis;
-										margin-right: 10px;
-									}
-								}
+						.info {
+							height: 80%;
+							.right-info {
+								width: 100%;
+								height: 80%;
+								padding: 0 10px;
 
-								.info-row {
-									padding: 5px 0;
-									display: flex;
-									width: 100%;
+								display: flex;
+								align-items: center;
 
-									.label {
-										width: 60px;
-										text-align-last: justify;
-									}
+								.info-left {
+									width: 80%;
+									height: 100%;
+									overflow-y: auto;
+
+									.info-row {
+										width: 100%;
+										font-size: 12px;
+										color: #909399;
+										display: flex;
+										padding-top: 10px;
+										.label {
+											width: 60px;
+											text-align-last: justify;
+										}
 
-									.text {
-										flex: 1;
-										overflow: hidden;
-										word-break: break-all;
-										text-overflow: ellipsis;
-										display: -webkit-box;
-										-webkit-box-orient: vertical;
-										-webkit-line-clamp: 2;
+										.text {
+											flex: 1;
+											overflow: hidden;
+											word-break: break-all;
+											text-overflow: ellipsis;
+											display: -webkit-box;
+											-webkit-box-orient: vertical;
+											-webkit-line-clamp: 2;
+										}
 									}
 								}
-							}
-							.info-left::-webkit-scrollbar {
-								display: none;
-							}
+								.info-left::-webkit-scrollbar {
+									display: none;
+								}
 
-							.info-right {
-								padding: 0 40px 0 30px;
+								.info-right {
+									padding: 0 40px 0 30px;
+								}
 							}
-						}
 
-						.right-foot {
-							height: 20%;
-							padding: 0 10px;
-
-							color: #afafaf;
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-							border-top: 1px solid #e7e7e7;
-							.history {
-								cursor: pointer;
-								color: #008dff;
+							.right-foot {
+								height: 20%;
+								padding: 0 10px;
+								font-size: 12px;
+								color: #909399;
+								display: flex;
+								align-items: center;
+								justify-content: space-between;
+								border-top: 1px solid #e7e7e7;
+								.history {
+									cursor: pointer;
+									color: #008dff;
+								}
 							}
 						}
 					}

+ 1 - 1
snowy-admin-web/src/views/motoring/query/history.vue

@@ -4,7 +4,7 @@
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.dataIndex === 'state'">
 					<span>
-						<a-tag :color="record.state == '1' ? '#2db7f5' : record.state == '2' ? '#cd201f' : '#87d068'">
+						<a-tag :color="record.state == '1' ? '#87d068' : record.state == '2' ? '#cd201f' : '#50cd7c'">
 							{{ record.stateVlaue }}
 						</a-tag>
 					</span>

+ 1 - 1
snowy-admin-web/src/views/motoring/query/realtime.vue

@@ -22,7 +22,7 @@
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.dataIndex === 'state'">
 					<span>
-						<a-tag :color="record.state == '1' ? '#2db7f5' : record.state == '2' ? '#cd201f' : '#87d068'">
+						<a-tag :color="record.state == '1' ? '#87d068' : record.state == '2' ? '#cd201f' : '#50cd7c'">
 							{{ record.stateVlaue }}
 						</a-tag>
 					</span>

+ 1 - 1
snowy-admin-web/src/views/motoring/report/list.vue

@@ -44,7 +44,7 @@
 							{{ record.clztValue }}
 						</a-tag>
 
-						<a-tag v-else-if="record.clzt == '2'" color="#2db7f5">
+						<a-tag v-else-if="record.clzt == '2'" color="#87d068">
 							{{ record.clztValue }}
 						</a-tag>
 					</span>