From b94da8f63e4e614d62d88fedad79db4b3952db20 Mon Sep 17 00:00:00 2001
From: sd <shidong@jhsoft.cc>
Date: 星期四, 31 七月 2025 10:03:31 +0800
Subject: [PATCH] 检测内容、预警规则整合进系统设置里边； 预警规则增加图标； 摄像机配置样式调整、预警规则更名为任务描述并调整数据结构； 实时监控右侧样式调整，预警数据按所有任务进行筛选。
---
src/pages/cameraAccess/components/SceneRule.vue | 379 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 254 insertions(+), 125 deletions(-)
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index 8bcc9ab..8bfea00 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -1,34 +1,24 @@
<template>
<div class="scene-edit-container">
<div class="scene-title">
- <b style="font-size: 14px; line-height: 18px">鍦烘櫙</b>
- <el-button
- type="primary"
- size="mini"
- @click="handleCreate"
- style="margin-left: 90%"
- v-show="!editScene && TreeDataPool.selectedNode.type !== 'MENU'"
- >+ 娣诲姞鍦烘櫙</el-button
- >
+ <b style="font-size: 14px; line-height: 18px">AI浠诲姟</b>
+ <el-button type="primary" size="mini" @click="handleCreate" style="margin-left: 90%"
+ v-show="!editScene && TreeDataPool.selectedNode.type !== 'MENU'">+ 娣诲姞浠诲姟</el-button>
</div>
<el-form ref="form" label-width="80px" v-show="editScene">
<div class="flex-form">
<div class="left">
- <el-form-item label="鍦烘櫙鍚嶇О">
- <el-input
- v-model="sceneForm.scene_name"
- size="mini"
- maxlength="15"
- ></el-input>
+ <el-form-item label="鍥炬爣">
+ <!-- 鍥剧墖棰勮 -->
+ <div class="icon-preview-container">
+ <el-image v-if="sceneForm.iconUrl" :src="sceneForm.iconUrl" fit="cover" />
+ <!-- <el-image v-else src="@/assets/img/瀹瑰櫒@1x.png" fit="cover" /> -->
+ <img style="width: 60px;" v-else src="@/assets/img/瀹瑰櫒@1x.png" />
+ </div>
</el-form-item>
<el-form-item label="浜嬩欢绛夌骇">
- <el-select
- v-model="sceneForm.alarm_level"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 250px"
- >
+ <el-select v-model="sceneForm.alarm_level" placeholder="璇烽�夋嫨" size="mini" style="width: 250px">
<el-option label="涓�绾�" :value="1"></el-option>
<el-option label="浜岀骇" :value="2"></el-option>
<el-option label="涓夌骇" :value="3"></el-option>
@@ -37,29 +27,49 @@
</el-select>
</el-form-item>
<el-form-item label="鏃堕棿娈�">
- <el-select
- v-model="sceneForm.time_rule_id"
- placeholder="璇烽�夋嫨"
- size="mini"
- >
- <el-option
- v-for="item in VideoManageData.TimeRules"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- ></el-option>
+ <el-select v-model="sceneForm.workTimeId" placeholder="璇烽�夋嫨" size="mini">
+ <el-option v-for="item in VideoManageData.TimeRules" :key="item.id" :label="item.name"
+ :value="item.id"></el-option>
</el-select>
</el-form-item>
+ <!-- 妫�娴嬪唴瀹� -->
+ <!-- <el-form-item label="妫�娴嬪唴瀹�">
+ <el-select v-model="sceneForm.checkContents" multiple placeholder="璇烽�夋嫨" size="mini">
+ <el-option v-for="item in VideoManageData.checkOptions" :key="item.checkId" :label="item.fileName"
+ :value="item.checkId"></el-option>
+ </el-select>
+ </el-form-item> -->
+
+
</div>
<div class="right">
- <el-form-item label="鍦烘櫙鎻忚堪">
- <el-input
- v-model="sceneForm.desc"
- type="textarea"
- size="mini"
- ></el-input>
+
+ <el-form-item label="浠诲姟鍚嶇О">
+ <el-input v-model="sceneForm.scene_name" size="mini" maxlength="15"></el-input>
</el-form-item>
- <el-form-item label="浜嬩欢澹伴煶">
+ <!-- 棰勮瑙勫垯 -->
+ <el-form-item label="浠诲姟鎻忚堪">
+ <!-- <el-select v-model="sceneForm.warningRules" placeholder="璇烽�夋嫨" size="mini" multiple>
+ <el-option v-for="item in VideoManageData.ruleOptions" :key="item.ruleId" :label="item.fileName"
+ :value="item.ruleId"></el-option>
+ </el-select> -->
+ <!-- <el-select v-model="sceneForm.warningRules" placeholder="璇烽�夋嫨" size="mini" filterable>
+ <el-option v-for="item in VideoManageData.ruleOptions" :key="item.ruleId" :label="item.fileName"
+ :value="item.ruleId"></el-option>
+ </el-select> -->
+ <ruleSelect :initial-rules="VideoManageData.ruleOptions" :selected-rule="currentRule"
+ @rule-selected="handleRuleSelect"
+ @rule-created="handleRuleCreate" />
+ </el-form-item>
+ <!-- 鐭ヨ瘑搴� -->
+ <el-form-item label="鍏宠仈鐭ヨ瘑搴�" size="mini">
+ <el-cascader v-model="sceneForm.knowsList" :options="VideoManageData.knowsList" :props="knowledgeProps"
+ clearable filterable placeholder="璇烽�夋嫨" class="knowledge-cascader" :show-all-levels="false"></el-cascader>
+ </el-form-item>
+ <el-form-item label="澶囨敞">
+ <el-input v-model="sceneForm.desc" type="textarea" size="mini"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="浜嬩欢澹伴煶">
<el-select
v-model="sceneForm.voice"
placeholder="绌�"
@@ -90,48 +100,38 @@
style="font-size: 26px; vertical-align: middle; color: #409eff"
></i>
</span>
- </el-form-item>
+ </el-form-item> -->
</div>
</div>
- <scene-editor
+ <!-- <scene-editor
ref="sceneEditor"
:isLinkRule="linkRule"
:Cameras="seletedCameras"
:ruleList="templateRules"
@sdkNameChange="getSceneName"
- ></scene-editor>
+ ></scene-editor> -->
+
<el-form-item style="width: 60%; min-width: 1048px">
<el-button size="mini" @click="editScene = false">鍙栨秷</el-button>
- <el-button type="primary" size="mini" @click="saveSceneRule"
- >淇濆瓨</el-button
- >
+ <el-button type="primary" size="mini" @click="saveSceneRule">淇濆瓨</el-button>
</el-form-item>
</el-form>
<!-- 瑙勫垯鍒楄〃 -->
<div class="edit-rule-table" v-show="!editScene">
<div class="task-rules-table-box">
- <el-table
- :data="tableRuleList"
- border
- style="width: 100%"
- :cell-style="cellStyle"
- :header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
- >
- <el-table-column
- label="搴忓彿"
- type="index"
- align="center"
- ></el-table-column>
- <el-table-column
- label="鍦烘櫙鍚嶇О"
- prop="scene_name"
- align="center"
- show-overflow-tooltip
- ></el-table-column>
- <el-table-column
+ <el-table :data="tableRuleList" border style="width: 100%" :cell-style="cellStyle"
+ :header-cell-style="{ background: '#f8f8f8', color: '#222222' }">
+ <el-table-column label="搴忓彿" type="index" align="center"></el-table-column>
+ <el-table-column label="浠诲姟鍚嶇О" prop="scene_name" align="center" show-overflow-tooltip></el-table-column>
+ <el-table-column label="浜嬩欢绛夌骇" align="center">
+ <template slot-scope="scope">
+ <span>{{ scope.row.alarm_level | alarmLevel }}</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column
label="绛栫暐"
prop="group_text"
align="center"
@@ -140,58 +140,49 @@
<template slot-scope="scope">
<span v-html="scope.row.group_text"></span>
</template>
+ </el-table-column>workTimeId -->
+ <el-table-column label="鏃堕棿娈�" prop="time_name" align="center">
+ <template slot-scope="scope">
+ <!-- {{(scope.row.workingTime || []).map(r => r.labelName).join(' / ') || ''}} -->
+ <span v-for="(tag, idx) in VideoManageData.TimeRules.filter(t => t.id === scope.row.workTimeId)"
+ :key="idx">
+ {{ tag.name }}</span>
+ </template>
</el-table-column>
- <el-table-column
- label="鏃堕棿娈�"
- prop="time_name"
- align="center"
- ></el-table-column>
- <el-table-column
- label="鎻忚堪"
- prop="desc"
- align="center"
- min-width="120"
- ></el-table-column>
+ <!-- <el-table-column label="妫�娴嬪唴瀹�" prop="checkContent" align="center">
+ <template slot-scope="scope">
+ {{(scope.row.checkContent || []).map(r => r.fileName).join(' / ') || ''}}
+ </template>
+ </el-table-column> -->
+ <el-table-column label="浠诲姟鎻忚堪" prop="warningRule" align="center">
+ <template slot-scope="scope">
+ {{(scope.row.warningRule || []).map(r => r.fileName).join(' / ') || ''}}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍏宠仈鐭ヨ瘑搴�" prop="knowledge" align="center">
+ <template slot-scope="scope">
+ {{(scope.row.knowledge || []).map(r => r.fileName).join(' / ') || ''}}
+ </template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" prop="desc" align="center" min-width="120"></el-table-column>
<!-- <el-table-column label="鐘舵��" align="center" width="90">
<template slot-scope="scope">
<el-switch v-model="scope.row.defence_state" @change="updateDefence(scope.row)"></el-switch>
</template>
</el-table-column>-->
- <el-table-column label="浜嬩欢澹伴煶" align="center">
+ <!-- <el-table-column label="浜嬩欢澹伴煶" align="center">
<template slot-scope="scope">
<span>{{ getSoundById(scope.row.voiceId) }}</span>
</template>
- </el-table-column>
- <el-table-column label="浜嬩欢绛夌骇" align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.alarm_level | alarmLevel }}</span>
- </template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鎿嶄綔" fixed="right" align="center">
<template slot-scope="scope">
- <el-tooltip
- content="缂栬緫"
- :hide-after="700"
- placement="top"
- popper-class="atooltip"
- >
- <i
- class="iconfont iconbianji1 btn-icon"
- style="font-size: 28px"
- @click="handleEdit(scope.row)"
- ></i>
+ <el-tooltip content="缂栬緫" :hide-after="700" placement="top" popper-class="atooltip">
+ <i class="iconfont iconbianji1 btn-icon" style="font-size: 28px" @click="handleEdit(scope.row)"></i>
</el-tooltip>
- <el-tooltip
- content="鍒犻櫎"
- :hide-after="700"
- placement="top"
- popper-class="atooltipgroup_"
- >
- <i
- class="iconfont iconshanchu4 btn-icon"
- style="font-size: 28px; color: red"
- @click="handleDelScene(scope.row)"
- ></i>
+ <el-tooltip content="鍒犻櫎" :hide-after="700" placement="top" popper-class="atooltipgroup_">
+ <i class="iconfont iconshanchu4 btn-icon" style="font-size: 28px; color: red"
+ @click="handleDelScene(scope.row)"></i>
</el-tooltip>
</template>
</el-table-column>
@@ -202,15 +193,18 @@
</template>
<script>
-import { saveCameraScene, deleteCameraScene } from "@/api/scene";
+import { saveCameraScene, deleteCameraScene, deleteCameraSceneTwo } from "@/api/scene";
import RuleEditor from "@/components/subComponents/RuleEditor";
import SceneEditor from "./scene/Editor";
import { getSoundList } from "@/api/event";
+import ruleSelect from "../components/ruleSelect/ruleSelect.vue";
+import { forEach } from "jszip";
export default {
name: "SceneRuleEditor",
components: {
SceneEditor,
+ ruleSelect,
},
props: {
seletedCameras: {
@@ -264,6 +258,13 @@
},
data() {
return {
+ currentRule:null,// 鍒濆鏃犻�変腑瑙勫垯
+ knowledgeProps: {
+ multiple: true, // 鏀寔澶氶��
+ value: 'id', // 鎸囧畾閫夐」鍊煎瓧娈�
+ label: 'title', // 鎸囧畾閫夐」鏍囩瀛楁
+ children: 'files' // 鎸囧畾瀛愰�夐」瀛楁锛堟枃浠跺垪琛級
+ },
editScene: false,
sceneTemplates: [],
sceneForm: {
@@ -278,7 +279,6 @@
},
templateSdks: [],
templateRules: "",
- ruleList: [],
sceneNameStore: [],
eventAudio: new Audio(),
soundList: [],
@@ -286,6 +286,19 @@
};
},
methods: {
+ handleRuleSelect(rule) {
+ // console.log('閫変腑瑙勫垯:', rule);
+ this.sceneForm.warningRules = [rule.ruleId]
+ this.sceneForm.ruleName = null
+ // 鎵ц棰勮鍒ゆ柇閫昏緫
+ },
+ handleRuleCreate(newRule) {
+ // console.log('鍒涘缓鏂拌鍒�:', newRule);
+ this.sceneForm.ruleName = newRule.fileName
+ this.sceneForm.warningRules = []
+ this.sceneForm.rules = []
+ // 灏嗘柊瑙勫垯淇濆瓨鍒板悗绔�
+ },
getSoundById(id) {
if (id) {
let sound = this.soundList.find((item) => item.id == id);
@@ -368,8 +381,8 @@
voice: {},
voiceId: "",
};
- this.$refs.sceneEditor.cleanRule();
- this.$refs.sceneEditor.getSdkConnection();
+ // this.$refs.sceneEditor.cleanRule();
+ // this.$refs.sceneEditor.getSdkConnection();
},
handleCreate() {
if (this.linkRule && this.TreeDataPool.selectedNodes.length < 2) {
@@ -420,6 +433,17 @@
},
handleEdit(scene) {
this.sceneForm = JSON.parse(JSON.stringify(scene));
+ // 淇鐭ヨ瘑搴撴枃浠惰浆鎹㈤�昏緫
+ if (scene.knowledge) {
+ const convertKnowledge = scene.knowledge.map(file => {
+ const library = this.VideoManageData.knowsList.find(lib =>
+ lib.files.some(f => f.id === file.id)
+ )
+ return library ? [library.id, file.id] : null
+ }).filter(item => item !== null) || []
+ this.sceneForm.knowsList = convertKnowledge
+ // console.info("know:" + JSON.stringify(convertKnowledge))
+ }
// this.originSceneInfo = JSON.parse(JSON.stringify(scene));
this.sceneForm.voice = this.soundList.find((o) => o.id === scene.voiceId);
@@ -433,14 +457,19 @@
this.templateSdks = selectedTpl.sdks;
this.templateRules = JSON.stringify(scene.rules);
- this.$refs.sceneEditor.editHandle(this.templateRules);
+ this.sceneForm.iconUrl = this.VideoManageData.ruleOptions.find(rue =>
+ rue.ruleId === scene.warningRule[0].ruleId
+ ).iconUrl
+ this.currentRule = this.sceneForm.warningRule[0]
+ console.info(this.currentRule)
+ // this.$refs.sceneEditor.editHandle(this.templateRules);//绠楁硶鐩稿叧
},
validateForm() {
if (!this.sceneForm.scene_name.trim()) {
this.$notify({
type: "warning",
- message: "鍦烘櫙鍚嶄笉鑳戒负绌�",
+ message: "浠诲姟鍚嶄笉鑳戒负绌�",
});
return false;
} else if (!this.sceneForm.alarm_level) {
@@ -449,40 +478,94 @@
message: "浜嬩欢绛夌骇涓嶈兘涓虹┖",
});
return false;
- } else if (!this.sceneForm.time_rule_id) {
+ } else if (!this.sceneForm.workTimeId) {
this.$notify({
type: "warning",
message: "鏃堕棿娈典笉鑳戒负绌�",
});
return false;
}
+ // else if (!this.sceneForm.checkContents) {
+ // this.$notify({
+ // type: "warning",
+ // message: "妫�娴嬪唴瀹逛笉鑳戒负绌�",
+ // });
+ // return false;
+ // }
+ else if (!this.sceneForm.warningRules) {
+ this.$notify({
+ type: "warning",
+ message: "棰勮瑙勫垯涓嶈兘涓虹┖",
+ });
+ return false;
+ }
+ // else if (!this.sceneForm.knowsList) {
+ // this.$notify({
+ // type: "warning",
+ // message: "鐭ヨ瘑搴撲笉鑳戒负绌�",
+ // });
+ // return false;
+ // }
return true;
},
saveSceneRule() {
if (!this.validateForm()) {
return;
}
- let editorResp = this.$refs.sceneEditor.submitRule();
- if (!editorResp) {
- return;
+ // let editorResp = this.$refs.sceneEditor.submitRule();
+ // if (!editorResp) {
+ // return;
+ // }
+ // this.sceneForm.rules = editorResp.rules;
+ // this.sceneForm.id = editorResp.id;
+ // this.sceneForm.group_text = editorResp.text;
+ // const workTimes = [this.sceneForm.workingTimes].map(id => {
+ // const timeOption = this.VideoManageData.TimeRules.find(opt => opt.id === id)
+ // return {
+ // labelId: id,
+ // labelName: timeOption ? timeOption.name : ''
+ // }
+ // })
+ let fileIds = []
+ if (this.sceneForm.knowsList) {
+ fileIds = this.sceneForm.knowsList.map(
+ path => {
+ // 鎻愬彇鏈�鍚庝竴绾х殑鏂囦欢ID骞惰浆鎹负鏁板瓧
+ const id = path[path.length - 1];
+ return Number(id); // 鎴栬�呬娇鐢� parseInt(id) 鎴� +id
+ }
+ )
}
- this.sceneForm.rules = editorResp.rules;
- this.sceneForm.id = editorResp.id;
- this.sceneForm.group_text = editorResp.text;
-
- this.onSaveScene(this.sceneForm);
+ this.sceneForm.taskName = this.sceneForm.scene_name
+ this.sceneForm.eventLevel = this.sceneForm.alarm_level
+ // this.sceneForm.checks = this.sceneForm.checkContents
+ this.sceneForm.checks = [this.VideoManageData.checkOptions[0].checkId]
+ this.sceneForm.rules = this.sceneForm.warningRules
+ // this.sceneForm.workTimes = workTimes
+ this.sceneForm.taskDescription = this.sceneForm.desc
+ this.sceneForm.knows = fileIds,
+
+ // console.info(this.sceneForm)
+ this.onSaveScene(this.sceneForm);
},
+
handleDelScene(groupRule) {
let _this = this;
- this.$confirm("鎻愮ず锛氬垹闄ゅ悗锛岃鏉¤鍒欏皢澶辨晥锛屾槸鍚﹀垹闄わ紵", {
+ this.$confirm("鎻愮ず锛氬垹闄ゅ悗锛岃鏉′换鍔″皢澶辨晥锛屾槸鍚﹀垹闄わ紵", {
center: true,
cancelButtonClass: "comfirm-class-cancle",
confirmButtonClass: "comfirm-class-sure",
})
.then(() => {
- deleteCameraScene(groupRule.id).then((res) => {
+ // console.info("groupRule锛�"+JSON.stringify(groupRule))
+ deleteCameraSceneTwo(
+ {
+ taskId: groupRule.taskId
+ }
+ ).then((res) => {
this.$emit("delete-rule");
- if (res && res.success) {
+ if (res && res.status === 200) {
+ // console.info("鍒犻櫎鎴愬姛")
this.$notify({
type: "success",
message: "鍒犻櫎鎴愬姛",
@@ -496,7 +579,7 @@
}
});
})
- .catch(() => {});
+ .catch(() => { });
},
cellStyle(obj) {
if (obj.column.label == "绛栫暐" || obj.column.label == "浜嬩欢澹伴煶") {
@@ -508,50 +591,92 @@
</script>
<style lang="scss">
+.icon-preview-container {
+ margin-right: 240px;
+ width: 60px;
+ height: 60px;
+ border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ overflow: hidden;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .el-image {
+ width: 100%;
+ height: 100%;
+ }
+
+ .el-icon-plus {
+ font-size: 28px;
+ color: #8c939d;
+ }
+
+ &:hover {
+ border-color: #409EFF;
+ }
+}
+
.scene-edit-container {
.scene-title {
height: 30px;
text-align: left;
margin: 10px 0px;
}
+
.flex-form {
display: flex;
width: 80%;
padding-left: 25px;
+
.left,
.right {
width: 43.3%;
min-width: 550px;
+
.el-form-item {
margin-bottom: 16px;
}
+
.el-form-item__label {
text-align: left;
+ // min-width: 82px;
+ font-size: 13px;
}
+
.el-form-item__content {
text-align: left;
+
.el-input,
.el-select {
width: 400px !important;
}
}
+
textarea {
- height: 92px;
+ height: 72px;
+ width: 400px;
}
}
+
.right {
padding-top: 6px;
}
}
+
.edit-rule-table {
.task-rules-table-box {
width: 98%;
padding: 0px;
box-sizing: border-box;
}
+
.el-form-item {
width: calc(100% - 30px);
}
+
.el-input__inner {
border: 0px !important;
border-radius: 2px;
@@ -562,17 +687,21 @@
.el-input__suffix {
right: 8px;
}
+
span {
cursor: pointer;
}
+
.cell {
padding-left: 0 !important;
+
i {
outline: none !important;
}
}
}
- .el-table th.el-table__cell > .cell {
+
+ .el-table th.el-table__cell>.cell {
padding-right: 0;
}
}
--
Gitblit v1.8.0