From 0f9f70d05e3739d657f8047675f2b12def44525e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 11:09:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/newPage/index.vue | 200 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 140 insertions(+), 60 deletions(-)
diff --git a/src/views/screen/newPage/index.vue b/src/views/screen/newPage/index.vue
index 15b8974..a2a83e9 100644
--- a/src/views/screen/newPage/index.vue
+++ b/src/views/screen/newPage/index.vue
@@ -1,8 +1,7 @@
<template>
<div class="new-page">
- <div style="display: flex; justify-content: space-between">
+ <div style="display: flex; justify-content: center">
<div class="header_box">
- <h1>杩愮淮鑰冩牳澶у睆</h1>
<div class="tabs-box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane
@@ -18,6 +17,19 @@
</div>
<div style="display: flex; justify-content: space-between">
<div class="left_box">
+ <div class="titleCard" style="height: 90px; width: 450px">
+ <div>杩愮淮鑰冩牳澶у睆</div>
+ </div>
+ <div class="card" style="height: 622px">
+ <div class="card_header"><div class="title">宸ュ崟鏁版嵁</div></div>
+ <div><ScreenData></ScreenData></div>
+ </div>
+ </div>
+ <div class="large_screen_box">
+ <NewMap></NewMap>
+ </div>
+
+ <div class="left_box">
<div class="card">
<div class="card_header">
<div class="title">璁惧鏁版嵁</div>
@@ -32,15 +44,24 @@
<div style="margin: 0 10px">浜鸿劯</div>
<div class="data-info">
<div class="data-lable">璁惧鎬绘暟</div>
- <div class="data-num type1" v-roll>{{ 1123 }}</div>
+ <div class="data-num type1">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-top"></i>
+ </div>
</div>
<div class="data-info">
<div class="data-lable">璁惧姝ｅ父鏁�</div>
- <div class="data-num type2" v-roll>{{ 1123 }}</div>
+ <div class="data-num type2">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-top"></i>
+ </div>
</div>
<div class="data-info">
<div class="data-lable">璁惧寮傚父鏁�</div>
- <div class="data-num type3" v-roll>{{ 1123 }}</div>
+ <div class="data-num type3">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-bottom"></i>
+ </div>
</div>
</div>
<div class="device_data">
@@ -52,15 +73,24 @@
<div style="margin: 0 10px">杞﹁締</div>
<div class="data-info">
<div class="data-lable">璁惧鎬绘暟</div>
- <div class="data-num type1" v-roll>{{ 1123 }}</div>
+ <div class="data-num type1">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-bottom"></i>
+ </div>
</div>
<div class="data-info">
<div class="data-lable">璁惧姝ｅ父鏁�</div>
- <div class="data-num type2" v-roll>{{ 1123 }}</div>
+ <div class="data-num type2">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-bottom"></i>
+ </div>
</div>
<div class="data-info">
<div class="data-lable">璁惧寮傚父鏁�</div>
- <div class="data-num type3" v-roll>{{ 1123 }}</div>
+ <div class="data-num type3">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-bottom"></i>
+ </div>
</div>
</div>
<div class="device_data">
@@ -72,15 +102,24 @@
<div style="margin: 0 10px">瑙嗛</div>
<div class="data-info">
<div class="data-lable">璁惧鎬绘暟</div>
- <div class="data-num type1" v-roll>{{ 1123 }}</div>
+ <div class="data-num type1">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-bottom"></i>
+ </div>
</div>
<div class="data-info">
<div class="data-lable">璁惧姝ｅ父鏁�</div>
- <div class="data-num type2" v-roll>{{ 1123 }}</div>
+ <div class="data-num type2">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-bottom"></i>
+ </div>
</div>
<div class="data-info">
<div class="data-lable">璁惧寮傚父鏁�</div>
- <div class="data-num type3" v-roll>{{ 1123 }}</div>
+ <div class="data-num type3">
+ <span v-roll>{{ 1123 }}</span
+ ><i class="el-icon-bottom"></i>
+ </div>
</div>
</div>
</div>
@@ -94,41 +133,38 @@
</div>
</div>
</div>
- <div class="large_screen_box">
- <ScreenMap></ScreenMap>
- </div>
- <div class="left_box">
- <div class="card" style="height: 103px">
- <div class="card_header"></div>
- </div>
- <div class="card" style="height: 500px">
- <div class="card_header"><div class="title">浜鸿劯鑰冩牳鏁版嵁</div></div>
- <div><ScreenData></ScreenData></div>
- </div>
- </div>
</div>
<div class="footer_box">
<div class="footer_card">
<div class="card_header">
<div class="title">浜鸿劯鑰冩牳鏁版嵁</div>
- <div style="width: 500px; margin-left: 40px">
- <ExamineChart class="wrapper-item"></ExamineChart>
+ <div style="width: 600px; margin-left: -20px">
+ <ExamineChart class="wrapper-item" dataType="face"></ExamineChart>
</div>
</div>
</div>
<div class="footer_card">
<div class="card_header">
- <div class="title">杞﹁締鑰冩牳鏁版嵁</div>
- <div style="width: 500px; margin-left: 40px">
- <ExamineChart class="wrapper-item"></ExamineChart>
+ <div class="titleCar">杞﹁締鑰冩牳鏁版嵁</div>
+ </div>
+ <div
+ style="
+ overflow: hidden;
+ overflow-x: auto;
+ margin-top: -9px;
+ height: 90%;
+ "
+ >
+ <div style="width: 750px">
+ <ExamineChart class="wrapper-item" dataType="car"></ExamineChart>
</div>
</div>
</div>
<div class="footer_card">
<div class="card_header">
<div class="title">瑙嗛鑰冩牳鏁版嵁</div>
- <div style="width: 500px; margin-left: 40px">
- <ExamineChart class="wrapper-item"></ExamineChart>
+ <div style="width: 600px; margin-left: -20px">
+ <ExamineChart class="wrapper-item" dataType="video"></ExamineChart>
</div>
</div>
</div>
@@ -142,6 +178,7 @@
import ScreenMapThree from "../components/screen-map-three/index";
import ExamineChart from "../components/screen-examine/components/examine-chart.vue";
import ScreenData from "../components/screen-data/index.vue";
+import NewMap from "./components/newMap.vue";
export default {
name: "Newpage",
components: {
@@ -150,6 +187,7 @@
ScreenMap,
ExamineChart,
ScreenData,
+ NewMap,
},
data() {
return {
@@ -174,9 +212,11 @@
mounted() {},
methods: {
returnPath() {
- this.$router.push('/index');
+ this.$router.push("/index");
},
- handleClick() {},
+ handleClick(tab, event) {
+ console.log(tab, event);
+ },
},
};
</script>
@@ -188,31 +228,43 @@
display: flex;
align-items: center;
margin-top: 10px;
+ margin-left: -25px;
}
.return-button {
- position: absolute;
- right: 20px;
- top: 20px;
- border-radius: 4px;
- border: 1px solid #4481DD;
- background-color: rgba(67, 102, 155, 0.4);
- color: #4481DD;
- padding: 5px 20px;
- cursor: pointer;
-}
+ position: absolute;
+ right: -5px;
+ top: 20px;
+ background: url("../../../assets/images/screen/backBt.png");
+ background-size: 100% 100%;
+ background-repeat: no-repeat !important;
+ background-position: center center !important;
+ padding: 15px 25px;
+ cursor: pointer;
+ font-size: 20px;
+ }
}
::v-deep .tabs-box {
margin-top: 5px;
.el-tabs__item {
color: #ffffff !important;
- font-size: 20px;
+ font-size: 26px;
}
.is-active {
- color: #66b5ff !important;
- background: url("../../../assets/images/screen/button1.png");
- background-size: cover !important;
- background-repeat: no-repeat !important;
- background-position: center center !important;
+ color: #00b8ff !important;
+ // background: url("../../../assets/images/screen/button1.png");
+ // background-size: cover !important;
+ // background-repeat: no-repeat !important;
+ // background-position: center center !important;
+ background: linear-gradient(#00b8ff, #00b8ff) left top,
+ linear-gradient(#00b8ff, #00b8ff) left top,
+ linear-gradient(#00b8ff, #00b8ff) right top,
+ linear-gradient(#00b8ff, #00b8ff) right top,
+ linear-gradient(#00b8ff, #00b8ff) left bottom,
+ linear-gradient(#00b8ff, #00b8ff) left bottom,
+ linear-gradient(#00b8ff, #00b8ff) right bottom,
+ linear-gradient(#00b8ff, #00b8ff) right bottom;
+ background-repeat: no-repeat;
+ background-size: 0.1vw 0.5vw, 0.5vw 0.1vw;
}
}
::v-deep .el-input__inner {
@@ -232,22 +284,33 @@
/* 鍘绘帀tabs鏍囩鏍忎笅鐨勪笅鍒掔嚎 */
::v-deep .el-tabs__nav-wrap::after {
position: static !important;
-// background-color: #fff;
+ // background-color: #fff;
}
-::v-deep .el-tabs__active-bar{
- width: 0 !important;
+::v-deep .el-tabs__active-bar {
+ width: 0 !important;
}
::v-deep .el-tabs__item {
margin: 5px 30px;
padding: 0px 25px !important;
- border-radius: 5px;
- background: url("../../../assets/images/screen/button.png");
- background-size: 100% 100%;
- background-repeat: no-repeat !important;
- background-position: center center !important;
+ background: linear-gradient(#ffffff, #ffffff) left top,
+ linear-gradient(#ffffff, #fff) left top,
+ linear-gradient(#ffffff, #ffffff) right top,
+ linear-gradient(#ffffff, #ffffff) right top,
+ linear-gradient(#ffffff, #ffffff) left bottom,
+ linear-gradient(#ffffff, #ffffff) left bottom,
+ linear-gradient(#ffffff, #ffffff) right bottom,
+ linear-gradient(#ffffff, #ffffff) right bottom;
+ background-repeat: no-repeat;
+ background-size: 0.1vw 0.5vw, 0.5vw 0.1vw;
+ // background-color: rgba(65, 136, 242, 0.1);
+ // background: url("../../../assets/images/screen/button.png");
+ // background-size: 100% 100%;
+ // background-repeat: no-repeat !important;
+ // background-position: center center !important;
}
.left_box {
width: 460px;
+ position: relative;
.card {
height: 300px;
width: 460px;
@@ -255,6 +318,17 @@
.card_header {
height: 40px;
}
+ }
+ .titleCard {
+ // background: url("../../../assets/images/screen/titleBg.png");
+ // background-size: 100% 100%;
+ // background-repeat: no-repeat !important;
+ // background-position: center center !important;
+ font-size: 40px;
+ font-weight: bold;
+ position: absolute;
+ top: -60px;
+ left: 10px;
}
}
.large_screen_box {
@@ -281,17 +355,23 @@
.footer_box {
width: 100%;
height: 320px;
- background: url("../../../assets/images/screen/cardBg.png");
- background-size: 100% 101%;
- background-repeat: no-repeat !important;
- background-position: center center !important;
+ background: rgba(90, 125, 179, 0.1) !important;
display: flex;
justify-content: space-between;
+ border: rgba(84, 132, 203, 0.4) 2px solid;
.footer_card {
width: 33%;
margin: 5px 0;
.card_header {
height: 40px;
+ .titleCar {
+ margin-left: 20px;
+ padding-top: 5px;
+ color: #fff;
+ letter-spacing: 2px;
+ font-size: 20px;
+ font-style: italic;
+ }
}
}
}
--
Gitblit v1.8.0