From 3639c456d1889cd3e688191a4398af8a3f49679c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 12 四月 2023 15:29:21 +0800
Subject: [PATCH] 添加常量的公共数据. 增加场景名称
---
src/views/personalCenter/components/SubAccount.vue | 50 ---------
src/Pool/constants.ts | 56 +++++++++++
src/mixins.js | 50 +++++----
src/views/manageCenter/index.vue | 17 ++-
src/views/dataPush/components/point.vue | 52 ---------
src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue | 62 +----------
6 files changed, 110 insertions(+), 177 deletions(-)
diff --git a/src/Pool/constants.ts b/src/Pool/constants.ts
new file mode 100644
index 0000000..2a3eee9
--- /dev/null
+++ b/src/Pool/constants.ts
@@ -0,0 +1,56 @@
+export default class Constants {
+ public sceneNameOptions: Array<object>
+
+ constructor() {
+ this.sceneNameOptions = [
+ {
+ value: "鏄庣伀",
+ label: "鏄庣伀"
+ },
+ {
+ value: "鐑熼浘",
+ label: "鐑熼浘"
+ },
+ {
+ value: "缈昏秺鍥存爮",
+ label: "缈昏秺鍥存爮"
+ },
+ {
+ value: "鍖哄煙鍏ヤ镜",
+ label: "鍖哄煙鍏ヤ镜"
+ },
+ {
+ value: "浜哄憳绂诲矖",
+ label: "浜哄憳绂诲矖"
+ },
+ {
+ value: "浜哄憳鑱氶泦",
+ label: "浜哄憳鑱氶泦"
+ },
+ {
+ value: "鎵撶數璇�",
+ label: "鎵撶數璇�"
+ },
+ {
+ value: "鎶界儫",
+ label: "鎶界儫"
+ },
+ {
+ value: "鏈僵鎴村畨鍏ㄥ附",
+ label: "鏈僵鎴村畨鍏ㄥ附"
+ },
+ {
+ value: "鏈┛宸ヨ",
+ label: "鏈┛宸ヨ"
+ },
+ {
+ value: "鐫″矖",
+ label: "鐫″矖"
+ },
+ {
+ value: "鏈僵鎴村畨鍏ㄥ附(鍐�)",
+ label: "鏈僵鎴村畨鍏ㄥ附(鍐�)"
+ }
+ ]
+ }
+}
diff --git a/src/mixins.js b/src/mixins.js
index 19e3f0d..ed98350 100644
--- a/src/mixins.js
+++ b/src/mixins.js
@@ -1,25 +1,28 @@
-import VideoPhotoData from "@/Pool/VideoPhotoData";
-import VideoTaskData from "@/Pool/VideoTaskData";
-import TreeDataPool from "@/Pool/TreeData";
-import CardList from "@/Pool/CardList";
-import DataStackPool from "@/Pool/dataStack";
-import AuthData from "@/Pool/AuthData";
-import DataPool from "@/Pool/PollData";
-import VideoManageData from "@/Pool/VideoManageData";
-import TaskMange from "@/Pool/TaskMange";
-import drag from "@/plugin/drag";
+import VideoPhotoData from "@/Pool/VideoPhotoData"
+import VideoTaskData from "@/Pool/VideoTaskData"
+import TreeDataPool from "@/Pool/TreeData"
+import CardList from "@/Pool/CardList"
+import DataStackPool from "@/Pool/dataStack"
+import AuthData from "@/Pool/AuthData"
+import DataPool from "@/Pool/PollData"
+import VideoManageData from "@/Pool/VideoManageData"
+import TaskMange from "@/Pool/TaskMange"
+import Constants from "@/Pool/constants"
+
+import drag from "@/plugin/drag"
/* eslint-disable */
-const onlyVideoPhotoData = new VideoPhotoData();
-const onlyVideoTaskData = new VideoTaskData();
-const onlyTreeDataPool = new TreeDataPool();
-const onlyDataStack = new DataStackPool();
-const onlyCardList = new CardList();
-const onlyAuthData = new AuthData();
+const onlyVideoPhotoData = new VideoPhotoData()
+const onlyVideoTaskData = new VideoTaskData()
+const onlyTreeDataPool = new TreeDataPool()
+const onlyDataStack = new DataStackPool()
+const onlyCardList = new CardList()
+const onlyAuthData = new AuthData()
-const onlyDataPool = new DataPool();
-const onlyVideoManageData = new VideoManageData();
-const onlyTaskMange = new TaskMange();
+const onlyDataPool = new DataPool()
+const onlyVideoManageData = new VideoManageData()
+const onlyTaskMange = new TaskMange()
+const onlyConstants = new Constants()
const mixin = {
data() {
@@ -33,7 +36,8 @@
VideoManageData: onlyVideoManageData,
TaskMange: onlyTaskMange,
PollData: onlyDataPool,
- };
- },
-};
-export default mixin;
+ Constants: onlyConstants
+ }
+ }
+}
+export default mixin
diff --git a/src/views/dataPush/components/point.vue b/src/views/dataPush/components/point.vue
index fb05840..b73a00f 100644
--- a/src/views/dataPush/components/point.vue
+++ b/src/views/dataPush/components/point.vue
@@ -171,52 +171,7 @@
query: {},
inputText: "", //杈撳叆妗嗗唴瀹�
cameraOptions: [],
- scene_nameOptions: [
- {
- value: "鏄庣伀",
- label: "鏄庣伀"
- },
- {
- value: "鐑熼浘",
- label: "鐑熼浘"
- },
- {
- value: "缈昏秺鍥存爮",
- label: "缈昏秺鍥存爮"
- },
- {
- value: "鍖哄煙鍏ヤ镜",
- label: "鍖哄煙鍏ヤ镜"
- },
- {
- value: "浜哄憳绂诲矖",
- label: "浜哄憳绂诲矖"
- },
- {
- value: "浜哄憳鑱氶泦",
- label: "浜哄憳鑱氶泦"
- },
- {
- value: "鎵撶數璇�",
- label: "鎵撶數璇�"
- },
- {
- value: "鎶界儫",
- label: "鎶界儫"
- },
- {
- value: "鏈僵鎴村畨鍏ㄥ附",
- label: "鏈僵鎴村畨鍏ㄥ附"
- },
- {
- value: "鏈┛宸ヨ",
- label: "鏈┛宸ヨ"
- },
- {
- value: "鐫″矖",
- label: "鐫″矖"
- }
- ],
+ scene_nameOptions: [],
isShowAdd: false, //鏄惁灞曠ず鏂板寮圭獥
ruleForm: {
CameraName: "", // 鎽勫儚鏈哄悕绉�
@@ -273,7 +228,8 @@
let res = await camerasList(query)
this.dataList = res.data
this.total = res.total
- this.aaaaa()
+ this.scene_nameOptions = this.Constants.sceneNameOptions
+ this.pageInit()
},
methods: {
@@ -330,7 +286,7 @@
this.ruleForm.updatedAt = row.updatedAt
this.ruleForm.id = row.id
},
- async aaaaa() {
+ async pageInit() {
// 杩涘叆椤甸潰鍓嶇殑鍒濆鍖�
let res = await camerasConfig()
// 鎬诲紑鍏�
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue
index 014a1a5..87ed854 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue
@@ -76,61 +76,9 @@
components: {
TimeSlider
},
- mounted() {
- console.log(this.editData)
- this.getSounds()
- this.eventAudio.addEventListener("ended", () => {
- this.togglePlay = true
- })
- },
data() {
return {
- scene_nameOptions: [
- {
- value: "鏄庣伀",
- label: "鏄庣伀"
- },
- {
- value: "鐑熼浘",
- label: "鐑熼浘"
- },
- {
- value: "缈昏秺鍥存爮",
- label: "缈昏秺鍥存爮"
- },
- {
- value: "鍖哄煙鍏ヤ镜",
- label: "鍖哄煙鍏ヤ镜"
- },
- {
- value: "浜哄憳绂诲矖",
- label: "浜哄憳绂诲矖"
- },
- {
- value: "浜哄憳鑱氶泦",
- label: "浜哄憳鑱氶泦"
- },
- {
- value: "鎵撶數璇�",
- label: "鎵撶數璇�"
- },
- {
- value: "鎶界儫",
- label: "鎶界儫"
- },
- {
- value: "鏈僵鎴村畨鍏ㄥ附",
- label: "鏈僵鎴村畨鍏ㄥ附"
- },
- {
- value: "鏈┛鐫�宸ヤ綔鏈�",
- label: "鏈┛鐫�宸ヤ綔鏈�"
- },
- {
- value: "鐫″矖",
- label: "鐫″矖"
- }
- ],
+ scene_nameOptions: [],
ruleForm: {
time_name: "",
alarm_level: 1,
@@ -175,6 +123,14 @@
}
},
+ mounted() {
+ this.getSounds()
+ this.eventAudio.addEventListener("ended", () => {
+ this.togglePlay = true
+ })
+
+ this.scene_nameOptions = this.Constants.sceneNameOptions
+ },
methods: {
//缂栬緫鏃跺洖濉暟鎹�
initEditData() {
diff --git a/src/views/manageCenter/index.vue b/src/views/manageCenter/index.vue
index 97b7298..af17715 100644
--- a/src/views/manageCenter/index.vue
+++ b/src/views/manageCenter/index.vue
@@ -160,7 +160,7 @@
<div class="hashRate">
<div class="left">
- <div class="title">棰勮鏁版嵁鍗犳瘮:</div>
+ <div class="title">鏁存敼鏁版嵁璇︽儏</div>
<div class="info">
<div class="equipmentInfo" style="margin-top: 25px">
<div class="equipmentCard">
@@ -683,17 +683,20 @@
//key 1=璇姤鏁版嵁,2=宸叉暣鏀�,3=鏈暣鏀�,4=宸叉帓鏌� doc_count=鏁伴噺 total=鎬婚噺
decodeWarningRate(b64data) {
if (b64data) {
- this.warningTotal = 0
- this.warningSolved = 0
- this.warningChecked = 0
+ this.warningTotal = 0 // 鎬婚噺
+ this.warningSolved = 0 // 宸叉暣鏀�
+ this.warningChecked = 0 //宸叉帓鏌�
+ let falseAlarm = 0 // 璇姤
let decodeString = Base64.decode(b64data)
if (decodeString != "") {
let decodeResult = JSON.parse(decodeString)
if (decodeResult && decodeResult.total > 0) {
- this.warningTotal = decodeResult.total
decodeResult.buckets.forEach((element) => {
switch (element.key) {
+ case 1:
+ falseAlarm += element.doc_count
+ break
case 2:
this.warningSolved += element.doc_count
break
@@ -704,6 +707,10 @@
break
}
})
+
+ // 2023/4/12 淇敼, 棰勮鎬婚噺涓嶇粺璁¤鎶�
+ // this.warningTotal = decodeResult.total - falseAlarm
+ this.warningTotal = decodeResult.total
}
// console.log("WarningRate:", decodeResult)
}
diff --git a/src/views/personalCenter/components/SubAccount.vue b/src/views/personalCenter/components/SubAccount.vue
index 985a4f0..d09cca9 100644
--- a/src/views/personalCenter/components/SubAccount.vue
+++ b/src/views/personalCenter/components/SubAccount.vue
@@ -252,54 +252,6 @@
TreeMenu
},
computed: {
- taskOptions() {
- return [
- {
- value: "鏄庣伀",
- label: "鏄庣伀"
- },
- {
- value: "鐑熼浘",
- label: "鐑熼浘"
- },
- {
- value: "缈昏秺鍥存爮",
- label: "缈昏秺鍥存爮"
- },
- {
- value: "鍖哄煙鍏ヤ镜",
- label: "鍖哄煙鍏ヤ镜"
- },
- {
- value: "浜哄憳绂诲矖",
- label: "浜哄憳绂诲矖"
- },
- {
- value: "浜哄憳鑱氶泦",
- label: "浜哄憳鑱氶泦"
- },
- {
- value: "鎵撶數璇�",
- label: "鎵撶數璇�"
- },
- {
- value: "鎶界儫",
- label: "鎶界儫"
- },
- {
- value: "鏈僵鎴村畨鍏ㄥ附",
- label: "鏈僵鎴村畨鍏ㄥ附"
- },
- {
- value: "鏈┛宸ヨ",
- label: "鏈┛宸ヨ"
- },
- {
- value: "鐫″矖",
- label: "鐫″矖"
- }
- ]
- },
showHeadName() {
return this.$route.path === "/personalCenter"
}
@@ -334,6 +286,7 @@
enable: true
}
},
+ taskOptions: [],
options: {
lazy: true,
lazyLoad(node, resolve) {
@@ -435,6 +388,7 @@
this.fetchDataTree()
},
mounted() {
+ this.taskOptions = this.Constants.sceneNameOptions
this.TreeDataPool.reset()
this.TreeDataPool.multiple = true
this.VideoPhotoData.queryTaskList()
--
Gitblit v1.8.0