From 52ad37fba37a1ae72f124106627227a09836be5b Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 25 三月 2022 15:36:31 +0800
Subject: [PATCH] 初稿
---
src/views/hashrate/CameraManage/CameraInfo/index.vue | 89 +++++++++++++++++++++-----------------------
1 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/src/views/hashrate/components/CameraInfo.vue b/src/views/hashrate/CameraManage/CameraInfo/index.vue
similarity index 92%
rename from src/views/hashrate/components/CameraInfo.vue
rename to src/views/hashrate/CameraManage/CameraInfo/index.vue
index f81fb22..b4d7ca1 100644
--- a/src/views/hashrate/components/CameraInfo.vue
+++ b/src/views/hashrate/CameraManage/CameraInfo/index.vue
@@ -118,6 +118,24 @@
</el-form-item>
</div>
+ <div class="row">
+ <el-form-item label="鎵�灞為泦缇�">
+ <el-select
+ v-model="form.cluster"
+ placeholder="璇烽�夋嫨鎵�灞為泦缇�"
+ size="small"
+ class="clusterSelect"
+ >
+ <el-option
+ v-for="item in clusterList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+
<!-- 娣诲姞浼犳劅鍣� -->
<CameraInfoEditor
ref="cameraEditor"
@@ -188,51 +206,10 @@
</div>
</div>
- <div
- class="chart"
+ <sysinfo
+ :stroke="24"
v-if="PollData.barCharts && PollData.barCharts.length !== 0"
- >
- <!-- 鍐呭瓨杩涘害鏉� -->
- <div class="row">
- <div class="label">鍐呭瓨</div>
- <el-progress
- :percentage="PollData.barCharts[3]"
- :stroke-width="24"
- :show-text="false"
- ></el-progress>
- <div class="number">{{ PollData.barCharts[3] }}%</div>
- </div>
- <!-- 绠楀姏杩涘害鏉� -->
- <div class="row">
- <div class="label">绠楀姏</div>
- <el-progress
- :percentage="PollData.barCharts[2]"
- :stroke-width="24"
- :show-text="false"
- ></el-progress>
- <div class="number">{{ PollData.barCharts[2] }}%</div>
- </div>
- <!-- CPU杩涘害鏉� -->
- <div class="row">
- <div class="label">CPU</div>
- <el-progress
- :percentage="PollData.barCharts[1]"
- :stroke-width="24"
- :show-text="false"
- ></el-progress>
- <div class="number">{{ PollData.barCharts[1] }}%</div>
- </div>
- <!-- 纭洏杩涘害鏉� -->
- <div class="row">
- <div class="label">纭洏</div>
- <el-progress
- :percentage="PollData.barCharts[0]"
- :stroke-width="24"
- :show-text="false"
- ></el-progress>
- <div class="number">{{ PollData.barCharts[0] }}%</div>
- </div>
- </div>
+ />
</div>
<div class="camera">
@@ -282,13 +259,15 @@
import { getSoundList } from "@/api/event";
import WasmPlayer from "@/components/wasmPlayer";
-import CameraInfoEditor from "./CameraInfoEditor";
+import CameraInfoEditor from "./components/CameraInfoEditor";
+import Sysinfo from "@/components/subComponents/SystemInfo";
export default {
name: "CameraInfo",
components: {
WasmPlayer,
CameraInfoEditor,
+ Sysinfo,
},
props: {
cameraList: {
@@ -325,6 +304,16 @@
//浼犳劅鍣ㄥ垪琛�
sensors: [],
voice: null,
+ clusterList: [
+ {
+ label: "闆嗙兢1",
+ value: 0,
+ },
+ {
+ label: "闆嗙兢2",
+ value: 1,
+ },
+ ],
};
},
computed: {
@@ -748,7 +737,7 @@
}
}
- @media screen and (max-width: 1440px) {
+ @media screen and (max-width: 1600px) {
.cameraBody {
display: block;
@@ -756,6 +745,10 @@
margin-right: 0;
margin-bottom: 24px;
}
+ }
+
+ .camera {
+ height: auto !important;
}
}
@@ -829,6 +822,10 @@
}
}
+ .clusterSelect.el-select {
+ width: 360px;
+ }
+
.el-switch ::v-deep {
height: 32px;
.el-switch__core {
--
Gitblit v1.8.0