From 27e8d88ed3fb019de4b46a9257d6ab71daa2638e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 20 三月 2024 09:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-examine/components/examine-chart.vue | 2
src/views/screen/components/wrapper-title/index.vue | 8 +++
src/views/screen/components/screen-title/index.vue | 2
src/views/screen/components/screen-wrapper/index.vue | 12 +++++
src/views/screen/index.vue | 2 +
src/views/screen/components/select-item/index.vue | 71 +++++++++++++++++++++++++++++++++--
6 files changed, 89 insertions(+), 8 deletions(-)
diff --git a/src/views/screen/components/screen-examine/components/examine-chart.vue b/src/views/screen/components/screen-examine/components/examine-chart.vue
index 32dfd86..6b4b7f9 100644
--- a/src/views/screen/components/screen-examine/components/examine-chart.vue
+++ b/src/views/screen/components/screen-examine/components/examine-chart.vue
@@ -26,7 +26,7 @@
{id: 4,name: '鐐逛綅鍦ㄧ嚎鐜�', value: 40},
{id: 5,name: '褰曞儚鍙敤鐜�', value: 80},
{id: 6,name: '閲嶇偣鐐逛綅褰曞儚鍙敤鐜�', value: 20},
- {id: 7,name: '涓�鏈轰竴妗ｅ悎鏍肩巼', value: 60},
+ {id: 7,name: '淇℃伅閲囬泦鍑嗙‘鐜�', value: 60},
{id: 8,name: '鍗￠棬杩囪溅鏁版嵁涓�鑷存��', value: 40},
]
diff --git a/src/views/screen/components/screen-title/index.vue b/src/views/screen/components/screen-title/index.vue
index 1cf07c4..181f81d 100644
--- a/src/views/screen/components/screen-title/index.vue
+++ b/src/views/screen/components/screen-title/index.vue
@@ -5,7 +5,7 @@
<img src="@/assets/images/screen/header_bg.png" class="width-img" alt="">
</div>
<div class="header-text">
- 鑷础杩愮淮鑰冩牳鍙鍖栧ぇ灞�
+ 鑷础甯傝繍缁磋�冩牳鍙鍖栧ぇ灞�
</div>
</div>
</div>
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index b314a67..7bdc799 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -1,6 +1,9 @@
<template>
<div class="wrapper-container">
-
+ <select-item></select-item>
+ <div class="return-button">
+ <el-button type="primary">杩斿洖</el-button>
+ </div>
<div class="wrapper-content">
<div class="left-container wrapper">
<screen-face></screen-face>
@@ -20,6 +23,7 @@
</template>
<script>
+import SelectItem from '../select-item/index';
import ScreenFace from '../screen-face/index';
import ScreenDetection from '../screen-detection/index';
import ScreenExamine from '../screen-examine/index';
@@ -29,6 +33,7 @@
export default {
name: 'ScreenWrapper',
components: {
+ SelectItem,
ScreenFace,
ScreenDetection,
ScreenExamine,
@@ -40,6 +45,11 @@
</script>
<style lang="scss" scoped>
+.return-button {
+ position: absolute;
+ right: 20px;
+ top: 30px;
+}
.wrapper-container {
width: 100%;
height: 100%;
diff --git a/src/views/screen/components/select-item/index.vue b/src/views/screen/components/select-item/index.vue
index f458ad6..3297ce7 100644
--- a/src/views/screen/components/select-item/index.vue
+++ b/src/views/screen/components/select-item/index.vue
@@ -1,15 +1,78 @@
<template>
<div class="select-container">
-
+ <div class="type-select">
+ <div class="select-label">鏁版嵁婧�</div>
+ <el-select v-model="typeValue" popper-class="type-select" class="select-style" @change="setConfig">
+ <el-option v-for="item in testData1" :key="item.name" :label="item.name" :value="item.value" />
+ </el-select>
+ </div>
+
+ <div class="date-select">
+ <div class="select-label">鏃ユ湡</div>
+ <el-date-picker
+ v-model="dateValue"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ value-format="yyyy-MM-dd"
+ @change="setConfig"
+ />
+ </div>
+
</div>
</template>
<script>
- export default {
-
+export default {
+ data() {
+ return {
+ typeValue: 1,
+ dateValue: new Date(),
+ testData1: [
+ {
+ name: '鐪佸巺',
+ value: 1
+ },
+ {
+ name: '甯傚巺',
+ value: 2
+ },
+ {
+ name: '鍏畨閮�',
+ value: 3
+ }
+ ]
+ }
+ },
+ methods: {
+ setConfig() {
+
+ }
}
+}
</script>
<style lang="scss" scoped>
-
+.select-container {
+ position: absolute;
+ top: 30px;
+ left: 20px;
+ display: flex;
+ align-items: center;
+ .select-label {
+ font-size: 20px;
+ margin-right: 10px;
+ color: #2375f0;
+ }
+ .type-select {
+ display: flex;
+ align-items: center;
+ margin-right: 20px;
+ }
+ .date-select {
+ display: flex;
+ align-items: center;
+ }
+}
</style>
\ No newline at end of file
diff --git a/src/views/screen/components/wrapper-title/index.vue b/src/views/screen/components/wrapper-title/index.vue
index 81de806..6351d2b 100644
--- a/src/views/screen/components/wrapper-title/index.vue
+++ b/src/views/screen/components/wrapper-title/index.vue
@@ -2,7 +2,7 @@
<div class="title-container">
<span class="title">{{ title }}</span>
- <div class="more-button">
+ <div class="more-button" v-if="path" @click="toPath">
<dv-border-box-12>
<div class="button-text">
璇︽儏
@@ -22,6 +22,12 @@
},
path: {
type: String,
+ default: ''
+ }
+ },
+ methods: {
+ toPath () {
+ this.$router.push(this.path);
}
}
}
diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue
index 7f4fb93..2758458 100644
--- a/src/views/screen/index.vue
+++ b/src/views/screen/index.vue
@@ -1,5 +1,6 @@
<template>
<div class="screen-container">
+
<screen-title></screen-title>
<v-scale-screen width="1920" height="1080" :autoScale="true" :delay="0" class="screen">
<screen-wrapper></screen-wrapper>
@@ -35,4 +36,5 @@
background-repeat: no-repeat !important;
background-position: center center !important;
}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0