From 0e67678458c91d2969bdbcfa85802e5966fb3a07 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 10 Mar 2023 17:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ecm/algo.vue            |  6 +++---
 src/views/ecm/algo2.vue           |  2 +-
 src/views/ecm/algo_form.vue       |  8 ++++----
 src/views/ecm/algos_form.vue      |  4 ++--
 src/views/ecm/event_cate_form.vue | 27 +++++++++++++++------------
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/views/ecm/algo.vue b/src/views/ecm/algo.vue
index 38723e02..7730de97 100644
--- a/src/views/ecm/algo.vue
+++ b/src/views/ecm/algo.vue
@@ -26,12 +26,12 @@
             <el-table-column
               label="名称"
               prop="name"
-              width="100"
+              width="120"
             ></el-table-column>
             <el-table-column
               label="标识"
               prop="code"
-              width="80"
+              width="120"
             ></el-table-column>
             <el-table-column label="触发" prop="trigger" width="80">
               <template #default="scope">
@@ -159,7 +159,7 @@ export default {
       selection: [],
       chosen_cate: "",
       apiObj1: this.$API.ecm.event_cate.list,
-      params1: { self_algo: true },
+      params1: { trigger: 10 },
       apiObj2: null,
     };
   },
diff --git a/src/views/ecm/algo2.vue b/src/views/ecm/algo2.vue
index 2771eccc..311ab654 100644
--- a/src/views/ecm/algo2.vue
+++ b/src/views/ecm/algo2.vue
@@ -76,7 +76,7 @@
             prop="vchannel_.name"
             width="150"
           ></el-table-column>
-          <el-table-column label="始终开启" prop="always_on" width="150">
+          <el-table-column label="常开" prop="always_on" width="150">
             <template #default="scope">
               <el-switch
                 v-model="scope.row.always_on"
diff --git a/src/views/ecm/algo_form.vue b/src/views/ecm/algo_form.vue
index 08838ac0..ec3b64ae 100644
--- a/src/views/ecm/algo_form.vue
+++ b/src/views/ecm/algo_form.vue
@@ -34,9 +34,9 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="始终开启" prop="always_on">
+      <el-form-item label="常开" prop="always_on">
         <el-switch v-model="form.always_on"></el-switch>
-      </el-form-item> -->
+      </el-form-item>
     </el-form>
     <template #footer>
       <!-- <el-button @click="visible = false">取 消</el-button> -->
@@ -68,7 +68,7 @@ export default {
       form: {
         algo: "",
         vchannel: "",
-        always_on: true,
+        always_on: false,
       },
       //验证规则
       rules: {
@@ -93,7 +93,7 @@ export default {
     },
      //视频列表
     getAlgo() {
-      this.$API.ecm.event_cate.list.req({ self_algo:true,page: 0 }).then((res) => {
+      this.$API.ecm.event_cate.list.req({ trigger:10, page: 0 }).then((res) => {
         this.algooptions = res;
       });
     },
diff --git a/src/views/ecm/algos_form.vue b/src/views/ecm/algos_form.vue
index 2a7efa56..b918fef2 100644
--- a/src/views/ecm/algos_form.vue
+++ b/src/views/ecm/algos_form.vue
@@ -34,7 +34,7 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="始终开启" prop="always_on">
+      <!-- <el-form-item label="常开" prop="always_on">
         <el-switch v-model="form.always_on"></el-switch>
       </el-form-item> -->
     </el-form>
@@ -68,7 +68,7 @@ export default {
       form: {
         algo: "",
         vchannels: [],
-        always_on: true,
+        always_on: false,
       },
       //验证规则
       rules: {
diff --git a/src/views/ecm/event_cate_form.vue b/src/views/ecm/event_cate_form.vue
index 008a7ad1..dac7efdb 100644
--- a/src/views/ecm/event_cate_form.vue
+++ b/src/views/ecm/event_cate_form.vue
@@ -39,11 +39,11 @@
           </el-form-item>
         </el-col>
 
-        <el-col :md="12" :sm="24">
+        <!-- <el-col :md="12" :sm="24">
           <el-form-item label="需布设" prop="self_algo">
             <el-switch v-model="form.self_algo"></el-switch>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <el-col :md="12" :sm="24">
           <el-form-item label="处理时间" prop="handle_minute">
@@ -56,6 +56,15 @@
             ></el-input-number>
           </el-form-item>
         </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="告警间隔" prop="same_allow_minute">
+            <el-input-number
+              v-model="form.same_allow_minute"
+              :min="0"
+              controls-position="right"
+            ></el-input-number>
+          </el-form-item>
+        </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="作业许可" prop="opl_cates">
             <el-select v-model="form.opl_cates" multiple>
@@ -129,15 +138,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :md="12" :sm="24">
-          <el-form-item label="允许时间" prop="same_allow_minute">
-            <el-input-number
-              v-model="form.same_allow_minute"
-              :min="0"
-              controls-position="right"
-            ></el-input-number>
-          </el-form-item>
-        </el-col>
+
 
         <!-- <el-col :md="12" :sm="24">
           <el-form-item label="开启区域" prop="filter_area_level">
@@ -183,11 +184,13 @@ export default {
       form: {
         speaker_on: true,
         self_algo: false,
-        speakers: [],
+        speakers: []
       },
       //验证规则
       rules: {
         name: [{ required: true, message: "请输入" }],
+        code: [{ required: true, message: "请输入" }],
+        trigger: [{ required: true, message: "请选择" }],
       },
       filter_area_level_options: [
         {