diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 526b1fb..56c513a 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -163,13 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <div class="user-wrapper">
+    <div v-if="systemType !== 'sm'" class="user-wrapper" >
       {{ userStore.name }}
-      <el-icon>
+      <!-- <el-icon>
         <svg-icon name="ep:caret-bottom" />
-      </el-icon>
+      </el-icon> -->
     </div>
-    <el-dropdown v-if="false" class="user-container" size="default" @command="userCommand">
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
@@ -195,9 +195,9 @@
           <!-- <el-dropdown-item divided command="index">
             回首页
           </el-dropdown-item> -->
-          <el-dropdown-item divided command="resetPassword">
+          <!-- <el-dropdown-item divided command="resetPassword">
             修改密码
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided command="logout">
             退出登录
           </el-dropdown-item>

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 526b1fb..56c513a 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -163,13 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <div class="user-wrapper">
+    <div v-if="systemType !== 'sm'" class="user-wrapper" >
       {{ userStore.name }}
-      <el-icon>
+      <!-- <el-icon>
         <svg-icon name="ep:caret-bottom" />
-      </el-icon>
+      </el-icon> -->
     </div>
-    <el-dropdown v-if="false" class="user-container" size="default" @command="userCommand">
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
@@ -195,9 +195,9 @@
           <!-- <el-dropdown-item divided command="index">
             回首页
           </el-dropdown-item> -->
-          <el-dropdown-item divided command="resetPassword">
+          <!-- <el-dropdown-item divided command="resetPassword">
             修改密码
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided command="logout">
             退出登录
           </el-dropdown-item>
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 608bb98..debd0b0 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -11,7 +11,7 @@
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
-      if (prop.required && !item[prop.value]) {
+      if (prop.required && (`${item[prop.value]}` === '' || `${item[prop.value]}` === 'undefined' || `${item[prop.value]}` === 'null')) {
         // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
         ElMessage.warning(`请先完善${tableTitle}中【${item.typeName || item.recognitionTypeName}】的${prop.text}`)
         return false

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 526b1fb..56c513a 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -163,13 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <div class="user-wrapper">
+    <div v-if="systemType !== 'sm'" class="user-wrapper" >
       {{ userStore.name }}
-      <el-icon>
+      <!-- <el-icon>
         <svg-icon name="ep:caret-bottom" />
-      </el-icon>
+      </el-icon> -->
     </div>
-    <el-dropdown v-if="false" class="user-container" size="default" @command="userCommand">
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
@@ -195,9 +195,9 @@
           <!-- <el-dropdown-item divided command="index">
             回首页
           </el-dropdown-item> -->
-          <el-dropdown-item divided command="resetPassword">
+          <!-- <el-dropdown-item divided command="resetPassword">
             修改密码
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided command="logout">
             退出登录
           </el-dropdown-item>
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 608bb98..debd0b0 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -11,7 +11,7 @@
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
-      if (prop.required && !item[prop.value]) {
+      if (prop.required && (`${item[prop.value]}` === '' || `${item[prop.value]}` === 'undefined' || `${item[prop.value]}` === 'null')) {
         // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
         ElMessage.warning(`请先完善${tableTitle}中【${item.typeName || item.recognitionTypeName}】的${prop.text}`)
         return false
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index 9346cbc..fdf9ea0 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -7,6 +7,14 @@
     type: Array,
     default: () => [],
   },
+  width: {
+    type: Number,
+    default: 600,
+  },
+  height: {
+    type: Number,
+    default: 450,
+  },
 })
 const emits = defineEmits(['givepointsInfo'])
 const baseurl = ref(window.location.href.split('/#')[0])
@@ -33,16 +41,16 @@
           ctx.lineTo(e.boundary[3].x, e.boundary[3].y)
         }
         // ctx.strokeStyle = e.pointColor
-        ctx.strokeStyle = '#ff0000'
+        ctx.strokeStyle = e.pointColor || '#3d7eff'
         ctx.closePath()
         ctx.font = '13px Arial'
         // ctx.fillStyle = e.pointColor
-        ctx.fillStyle = '#ff0000'
+        ctx.fillStyle = e.pointColor || '#3d7eff'
         // const minY = Math.min(e.boundary[0].y, e.boundary[1].y, e.boundary[2].y, e.boundary[3].y)
         // const minX = Math.min(e.boundary[0].x, e.boundary[1].x, e.boundary[2].x, e.boundary[3].x)
-        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > 540 ? 540 : e.boundary[0].x + 3
-        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > 438 ? 438 : e.boundary[0].y - 5
-        ctx.fillText(e.recognitionTypeName, textX, textY)
+        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > props.width - 60 ? props.width - 60 : e.boundary[0].x + 3
+        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > props.height - 12 ? props.height - 12 : e.boundary[0].y - 5
+        ctx.fillText(e.remark, textX, textY)
       })
     }
     ctx.lineWidth = 1
@@ -60,14 +68,14 @@
     if (mousePos.x < 0) {
       mousePos.x = 0
     }
-    else if (mousePos.x > 600) {
-      mousePos.x = 600
+    else if (mousePos.x > props.width) {
+      mousePos.x = props.width
     }
     if (mousePos.y < 0) {
       mousePos.y = 0
     }
-    else if (mousePos.y > 450) {
-      mousePos.y = 450
+    else if (mousePos.y > props.height) {
+      mousePos.y = props.height
     }
     const { quotient, remainder } = divideAndModulo(pointIndex, 4)
     console.log(`移动的是第${quotient + 1}条数据，第${remainder + 1}个点`)
@@ -161,8 +169,8 @@
 </script>
 
 <template>
-  <div style="width: 600px;height: 450px;">
-    <canvas id="myCanvas" width="600" height="450" class="canvans" />
+  <div :style="{ width: `${props.width}px`, height: `${props.height}px` }">
+    <canvas id="myCanvas" :width="props.width" :height="props.height" class="canvans" />
     <div v-if="props.dialogStatus !== 'detail'">
       <div v-for="(e, index) in pointsInfo" :key="index">
         <div
@@ -199,7 +207,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;
@@ -214,7 +222,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 526b1fb..56c513a 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -163,13 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <div class="user-wrapper">
+    <div v-if="systemType !== 'sm'" class="user-wrapper" >
       {{ userStore.name }}
-      <el-icon>
+      <!-- <el-icon>
         <svg-icon name="ep:caret-bottom" />
-      </el-icon>
+      </el-icon> -->
     </div>
-    <el-dropdown v-if="false" class="user-container" size="default" @command="userCommand">
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
@@ -195,9 +195,9 @@
           <!-- <el-dropdown-item divided command="index">
             回首页
           </el-dropdown-item> -->
-          <el-dropdown-item divided command="resetPassword">
+          <!-- <el-dropdown-item divided command="resetPassword">
             修改密码
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided command="logout">
             退出登录
           </el-dropdown-item>
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 608bb98..debd0b0 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -11,7 +11,7 @@
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
-      if (prop.required && !item[prop.value]) {
+      if (prop.required && (`${item[prop.value]}` === '' || `${item[prop.value]}` === 'undefined' || `${item[prop.value]}` === 'null')) {
         // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
         ElMessage.warning(`请先完善${tableTitle}中【${item.typeName || item.recognitionTypeName}】的${prop.text}`)
         return false
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index 9346cbc..fdf9ea0 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -7,6 +7,14 @@
     type: Array,
     default: () => [],
   },
+  width: {
+    type: Number,
+    default: 600,
+  },
+  height: {
+    type: Number,
+    default: 450,
+  },
 })
 const emits = defineEmits(['givepointsInfo'])
 const baseurl = ref(window.location.href.split('/#')[0])
@@ -33,16 +41,16 @@
           ctx.lineTo(e.boundary[3].x, e.boundary[3].y)
         }
         // ctx.strokeStyle = e.pointColor
-        ctx.strokeStyle = '#ff0000'
+        ctx.strokeStyle = e.pointColor || '#3d7eff'
         ctx.closePath()
         ctx.font = '13px Arial'
         // ctx.fillStyle = e.pointColor
-        ctx.fillStyle = '#ff0000'
+        ctx.fillStyle = e.pointColor || '#3d7eff'
         // const minY = Math.min(e.boundary[0].y, e.boundary[1].y, e.boundary[2].y, e.boundary[3].y)
         // const minX = Math.min(e.boundary[0].x, e.boundary[1].x, e.boundary[2].x, e.boundary[3].x)
-        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > 540 ? 540 : e.boundary[0].x + 3
-        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > 438 ? 438 : e.boundary[0].y - 5
-        ctx.fillText(e.recognitionTypeName, textX, textY)
+        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > props.width - 60 ? props.width - 60 : e.boundary[0].x + 3
+        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > props.height - 12 ? props.height - 12 : e.boundary[0].y - 5
+        ctx.fillText(e.remark, textX, textY)
       })
     }
     ctx.lineWidth = 1
@@ -60,14 +68,14 @@
     if (mousePos.x < 0) {
       mousePos.x = 0
     }
-    else if (mousePos.x > 600) {
-      mousePos.x = 600
+    else if (mousePos.x > props.width) {
+      mousePos.x = props.width
     }
     if (mousePos.y < 0) {
       mousePos.y = 0
     }
-    else if (mousePos.y > 450) {
-      mousePos.y = 450
+    else if (mousePos.y > props.height) {
+      mousePos.y = props.height
     }
     const { quotient, remainder } = divideAndModulo(pointIndex, 4)
     console.log(`移动的是第${quotient + 1}条数据，第${remainder + 1}个点`)
@@ -161,8 +169,8 @@
 </script>
 
 <template>
-  <div style="width: 600px;height: 450px;">
-    <canvas id="myCanvas" width="600" height="450" class="canvans" />
+  <div :style="{ width: `${props.width}px`, height: `${props.height}px` }">
+    <canvas id="myCanvas" :width="props.width" :height="props.height" class="canvans" />
     <div v-if="props.dialogStatus !== 'detail'">
       <div v-for="(e, index) in pointsInfo" :key="index">
         <div
@@ -199,7 +207,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;
@@ -214,7 +222,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index d60f330..3cb33d1 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -111,19 +111,21 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  // debugger
+  console.log('-------表单提交算法校验---------', recognitionList.value)
   if (`${formData.value.type}` === '0') { // 算法关联
     if (!selectModelList.value.length) {
       ElMessage.warning('请选择报警对象')
       return false
     }
-    const checkList = [] as any
-    selectModelList.value.forEach((item: { id: string }) => {
-      const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
-      if (index !== -1) {
-        checkList.push(recognitionList.value[index])
-      }
-    })
-    if (!useCheckList(checkList, columns.value, '报警对象')) {
+    // const checkList = [] as any
+    // selectModelList.value.forEach((item: { recognitionTypeId: string }) => {
+    //   const index = recognitionList.value.findIndex((i: { recognitionTypeId: string }) => i.recognitionTypeId === item.recognitionTypeId)
+    //   if (index !== -1) {
+    //     checkList.push({ ...recognitionList.value[index] })
+    //   }
+    // })
+    if (!useCheckList(recognitionList.value, columns.value, '报警对象')) {
       return false
     }
   }
@@ -132,6 +134,7 @@
       if (valid) {
         let tempList = [] as any
         if (formData.value.type === 0) { // 算法
+          // debugger
           // 把是否使用全都置为0
           recognitionList.value = recognitionList.value.map((e: { isUse: string }) => {
             return {
@@ -143,27 +146,36 @@
           points.value.forEach((itemOut: any) => {
             const index = recognitionList.value.findIndex((itemIn: any) => itemOut.recognitionTypeId === itemIn.recognitionTypeId)
             if (index !== -1) {
-              recognitionList.value[index] = { ...itemOut, isUse: '1' }
+              recognitionList.value[index] = { ...recognitionList.value[index], ...itemOut, isUse: '1' }
             }
           })
           tempList = recognitionList.value.map((item: any) => {
             return {
               ...item,
               algoModelId: formData.value.algoModelId, // 算法模型id
-              confidenceLevel:	item.confidenceLevel, // 置信度
-              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
-              threshold: item.threshold,	 // 阈值
+              // confidenceLevel:	item.confidenceLevel, // 置信度
+              // recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              // threshold: item.threshold,	 // 阈值
               remark: item.recognitionTypeName, // 危险因素描述
               boundary: item.boundary ? JSON.stringify(item.boundary) : item.boundary,
             }
           })
         }
+        else if (formData.value.type === 1) { // 业务场景
+          tempList = {
+            ...points.value[0],
+            boundary: points.value[0].boundary ? JSON.stringify(points.value[0].boundary) : points.value[0].boundary,
+            id: formData.value.id,
+            sceneId: formData.value.sceneId,
+          }
+        }
 
         const params = {
           ...formData.value,
-          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
           // eslint-disable-next-line multiline-ternary
-          deviceModelRelations: tempList,
+          deviceModelRelations: formData.value.type === 0 ? tempList : [],
+          sceneRelation: formData.value.type === 1 ? tempList : {},
         }
         console.log('要传的参数', params)
         updateMonitorPoint(params).then(() => {
@@ -209,7 +221,7 @@
 }
 // 多选
 const selectModel = (value: any) => {
-  // console.log('监听算法报警对象的变化，更新区域绘制', value)
+  console.log('监听算法报警对象的变化，更新区域绘制', value)
   selectModelList.value = value.map((item: any) => {
     return {
       ...item,
@@ -251,6 +263,32 @@
   }
 }
 
+// 监听算法变化，查询算法报警对象
+async function changeAlgoModelId(modelId: string) {
+  if (modelId) {
+    // 获取场景对象
+    const params = {
+      modelId, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    const res = await getRecognitionList(params)
+    recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+      return {
+        ...item,
+        recognitionTypeName: item.typeName,
+        recognitionTypeId: item.id,
+        id: '',
+        confidenceLevel: 0, // 置信度
+        threshold: 0, // 阈值
+      }
+    })
+  }
+  else {
+    recognitionList.value = []
+  }
+}
+
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
 function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
@@ -303,6 +341,14 @@
     }
     else if (`${row.type}` === '1') { // 业务场景
       formData.value.sceneId = row.sceneRelation.sceneId
+      points.value = [
+        {
+          id: row.sceneRelation.id,
+          remark: row.sceneRelation.remark,
+          sceneId: row.sceneRelation.sceneId,
+          boundary: row.sceneRelation.boundary ? JSON.parse(row.sceneRelation.boundary) : row.sceneRelation.boundary, // 识别边界
+        },
+      ]
     }
   }
   if (dialogstatus === 'detail') {
@@ -329,33 +375,44 @@
   emits('closeRefresh')
 }
 
-// 监听算法变化，查询算法报警对象
-async function changeAlgoModelId(modelId: string) {
-  if (modelId) {
-    // 获取场景对象
-    const params = {
-      modelId, // 模型ID
-      typeCode: '', // 类型编码
-      typeName: '', // 类型名称
-    }
-    const res = await getRecognitionList(params)
-    recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
-      return {
-        ...item,
-        recognitionTypeName: item.typeName,
-        recognitionTypeId: item.id,
-        id: '',
-      }
-    })
-  }
-}
-
 // -------------------------------------------区域绘制相关-----------------------------------------------
 const givePoints = (value: any) => {
   console.log('监听到子组件数据变化', value)
   points.value = value
 }
 
+// 监听业务场景变化，生成区域绘制数据
+const changeScene = (val: string) => {
+  console.log('业务场景变化', val)
+  let sceneName = '' // 选择的业务场景名称
+  if (val) {
+    const index = sceneList.value.findIndex((item: { id: string }) => item.id === val)
+    if (index !== -1) {
+      sceneName = sceneList.value[index].sceneName
+    }
+    points.value = [
+      {
+        id: val,
+        remark: sceneName,
+        sceneId: val,
+        boundary: [ // 标记点位置
+          { x: 50, y: 50 },
+          { x: 150, y: 50 },
+          { x: 150, y: 150 },
+          { x: 50, y: 150 },
+        ],
+      },
+    ]
+  }
+}
+
+// 监听到场景模式变化,清除区域绘制
+const changeType = () => {
+  points.value = []
+  formData.value.sceneId = '' // 业务场景id
+  formData.value.algoModelId = '' // 模型id
+  recognitionList.value = [] // 清空表格
+}
 // ----------------------------------------------取流---------------------------------------------------------
 // 拉取流--普通流
 async function fetchMediaStream(deviceId: string, channelId: string) {
@@ -447,7 +504,7 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="场景模式" prop="type">
-                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'" @change="changeType">
                   <el-radio :label="1">
                     业务场景
                   </el-radio>
@@ -463,7 +520,7 @@
               <el-form-item label="业务场景" prop="sceneId">
                 <el-select
                   v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'" @change="(val) => changeScene(val)"
                 >
                   <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
@@ -517,6 +574,7 @@
                         :min="0"
                         :precision="2"
                         controls-position="right"
+                        @change="changeInputNumber"
                       />
                       <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
                       <span v-else>{{ scope.row[item.value] }}</span>

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 526b1fb..56c513a 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -163,13 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <div class="user-wrapper">
+    <div v-if="systemType !== 'sm'" class="user-wrapper" >
       {{ userStore.name }}
-      <el-icon>
+      <!-- <el-icon>
         <svg-icon name="ep:caret-bottom" />
-      </el-icon>
+      </el-icon> -->
     </div>
-    <el-dropdown v-if="false" class="user-container" size="default" @command="userCommand">
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
@@ -195,9 +195,9 @@
           <!-- <el-dropdown-item divided command="index">
             回首页
           </el-dropdown-item> -->
-          <el-dropdown-item divided command="resetPassword">
+          <!-- <el-dropdown-item divided command="resetPassword">
             修改密码
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided command="logout">
             退出登录
           </el-dropdown-item>
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 608bb98..debd0b0 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -11,7 +11,7 @@
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
-      if (prop.required && !item[prop.value]) {
+      if (prop.required && (`${item[prop.value]}` === '' || `${item[prop.value]}` === 'undefined' || `${item[prop.value]}` === 'null')) {
         // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
         ElMessage.warning(`请先完善${tableTitle}中【${item.typeName || item.recognitionTypeName}】的${prop.text}`)
         return false
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index 9346cbc..fdf9ea0 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -7,6 +7,14 @@
     type: Array,
     default: () => [],
   },
+  width: {
+    type: Number,
+    default: 600,
+  },
+  height: {
+    type: Number,
+    default: 450,
+  },
 })
 const emits = defineEmits(['givepointsInfo'])
 const baseurl = ref(window.location.href.split('/#')[0])
@@ -33,16 +41,16 @@
           ctx.lineTo(e.boundary[3].x, e.boundary[3].y)
         }
         // ctx.strokeStyle = e.pointColor
-        ctx.strokeStyle = '#ff0000'
+        ctx.strokeStyle = e.pointColor || '#3d7eff'
         ctx.closePath()
         ctx.font = '13px Arial'
         // ctx.fillStyle = e.pointColor
-        ctx.fillStyle = '#ff0000'
+        ctx.fillStyle = e.pointColor || '#3d7eff'
         // const minY = Math.min(e.boundary[0].y, e.boundary[1].y, e.boundary[2].y, e.boundary[3].y)
         // const minX = Math.min(e.boundary[0].x, e.boundary[1].x, e.boundary[2].x, e.boundary[3].x)
-        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > 540 ? 540 : e.boundary[0].x + 3
-        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > 438 ? 438 : e.boundary[0].y - 5
-        ctx.fillText(e.recognitionTypeName, textX, textY)
+        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > props.width - 60 ? props.width - 60 : e.boundary[0].x + 3
+        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > props.height - 12 ? props.height - 12 : e.boundary[0].y - 5
+        ctx.fillText(e.remark, textX, textY)
       })
     }
     ctx.lineWidth = 1
@@ -60,14 +68,14 @@
     if (mousePos.x < 0) {
       mousePos.x = 0
     }
-    else if (mousePos.x > 600) {
-      mousePos.x = 600
+    else if (mousePos.x > props.width) {
+      mousePos.x = props.width
     }
     if (mousePos.y < 0) {
       mousePos.y = 0
     }
-    else if (mousePos.y > 450) {
-      mousePos.y = 450
+    else if (mousePos.y > props.height) {
+      mousePos.y = props.height
     }
     const { quotient, remainder } = divideAndModulo(pointIndex, 4)
     console.log(`移动的是第${quotient + 1}条数据，第${remainder + 1}个点`)
@@ -161,8 +169,8 @@
 </script>
 
 <template>
-  <div style="width: 600px;height: 450px;">
-    <canvas id="myCanvas" width="600" height="450" class="canvans" />
+  <div :style="{ width: `${props.width}px`, height: `${props.height}px` }">
+    <canvas id="myCanvas" :width="props.width" :height="props.height" class="canvans" />
     <div v-if="props.dialogStatus !== 'detail'">
       <div v-for="(e, index) in pointsInfo" :key="index">
         <div
@@ -199,7 +207,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;
@@ -214,7 +222,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index d60f330..3cb33d1 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -111,19 +111,21 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  // debugger
+  console.log('-------表单提交算法校验---------', recognitionList.value)
   if (`${formData.value.type}` === '0') { // 算法关联
     if (!selectModelList.value.length) {
       ElMessage.warning('请选择报警对象')
       return false
     }
-    const checkList = [] as any
-    selectModelList.value.forEach((item: { id: string }) => {
-      const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
-      if (index !== -1) {
-        checkList.push(recognitionList.value[index])
-      }
-    })
-    if (!useCheckList(checkList, columns.value, '报警对象')) {
+    // const checkList = [] as any
+    // selectModelList.value.forEach((item: { recognitionTypeId: string }) => {
+    //   const index = recognitionList.value.findIndex((i: { recognitionTypeId: string }) => i.recognitionTypeId === item.recognitionTypeId)
+    //   if (index !== -1) {
+    //     checkList.push({ ...recognitionList.value[index] })
+    //   }
+    // })
+    if (!useCheckList(recognitionList.value, columns.value, '报警对象')) {
       return false
     }
   }
@@ -132,6 +134,7 @@
       if (valid) {
         let tempList = [] as any
         if (formData.value.type === 0) { // 算法
+          // debugger
           // 把是否使用全都置为0
           recognitionList.value = recognitionList.value.map((e: { isUse: string }) => {
             return {
@@ -143,27 +146,36 @@
           points.value.forEach((itemOut: any) => {
             const index = recognitionList.value.findIndex((itemIn: any) => itemOut.recognitionTypeId === itemIn.recognitionTypeId)
             if (index !== -1) {
-              recognitionList.value[index] = { ...itemOut, isUse: '1' }
+              recognitionList.value[index] = { ...recognitionList.value[index], ...itemOut, isUse: '1' }
             }
           })
           tempList = recognitionList.value.map((item: any) => {
             return {
               ...item,
               algoModelId: formData.value.algoModelId, // 算法模型id
-              confidenceLevel:	item.confidenceLevel, // 置信度
-              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
-              threshold: item.threshold,	 // 阈值
+              // confidenceLevel:	item.confidenceLevel, // 置信度
+              // recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              // threshold: item.threshold,	 // 阈值
               remark: item.recognitionTypeName, // 危险因素描述
               boundary: item.boundary ? JSON.stringify(item.boundary) : item.boundary,
             }
           })
         }
+        else if (formData.value.type === 1) { // 业务场景
+          tempList = {
+            ...points.value[0],
+            boundary: points.value[0].boundary ? JSON.stringify(points.value[0].boundary) : points.value[0].boundary,
+            id: formData.value.id,
+            sceneId: formData.value.sceneId,
+          }
+        }
 
         const params = {
           ...formData.value,
-          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
           // eslint-disable-next-line multiline-ternary
-          deviceModelRelations: tempList,
+          deviceModelRelations: formData.value.type === 0 ? tempList : [],
+          sceneRelation: formData.value.type === 1 ? tempList : {},
         }
         console.log('要传的参数', params)
         updateMonitorPoint(params).then(() => {
@@ -209,7 +221,7 @@
 }
 // 多选
 const selectModel = (value: any) => {
-  // console.log('监听算法报警对象的变化，更新区域绘制', value)
+  console.log('监听算法报警对象的变化，更新区域绘制', value)
   selectModelList.value = value.map((item: any) => {
     return {
       ...item,
@@ -251,6 +263,32 @@
   }
 }
 
+// 监听算法变化，查询算法报警对象
+async function changeAlgoModelId(modelId: string) {
+  if (modelId) {
+    // 获取场景对象
+    const params = {
+      modelId, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    const res = await getRecognitionList(params)
+    recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+      return {
+        ...item,
+        recognitionTypeName: item.typeName,
+        recognitionTypeId: item.id,
+        id: '',
+        confidenceLevel: 0, // 置信度
+        threshold: 0, // 阈值
+      }
+    })
+  }
+  else {
+    recognitionList.value = []
+  }
+}
+
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
 function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
@@ -303,6 +341,14 @@
     }
     else if (`${row.type}` === '1') { // 业务场景
       formData.value.sceneId = row.sceneRelation.sceneId
+      points.value = [
+        {
+          id: row.sceneRelation.id,
+          remark: row.sceneRelation.remark,
+          sceneId: row.sceneRelation.sceneId,
+          boundary: row.sceneRelation.boundary ? JSON.parse(row.sceneRelation.boundary) : row.sceneRelation.boundary, // 识别边界
+        },
+      ]
     }
   }
   if (dialogstatus === 'detail') {
@@ -329,33 +375,44 @@
   emits('closeRefresh')
 }
 
-// 监听算法变化，查询算法报警对象
-async function changeAlgoModelId(modelId: string) {
-  if (modelId) {
-    // 获取场景对象
-    const params = {
-      modelId, // 模型ID
-      typeCode: '', // 类型编码
-      typeName: '', // 类型名称
-    }
-    const res = await getRecognitionList(params)
-    recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
-      return {
-        ...item,
-        recognitionTypeName: item.typeName,
-        recognitionTypeId: item.id,
-        id: '',
-      }
-    })
-  }
-}
-
 // -------------------------------------------区域绘制相关-----------------------------------------------
 const givePoints = (value: any) => {
   console.log('监听到子组件数据变化', value)
   points.value = value
 }
 
+// 监听业务场景变化，生成区域绘制数据
+const changeScene = (val: string) => {
+  console.log('业务场景变化', val)
+  let sceneName = '' // 选择的业务场景名称
+  if (val) {
+    const index = sceneList.value.findIndex((item: { id: string }) => item.id === val)
+    if (index !== -1) {
+      sceneName = sceneList.value[index].sceneName
+    }
+    points.value = [
+      {
+        id: val,
+        remark: sceneName,
+        sceneId: val,
+        boundary: [ // 标记点位置
+          { x: 50, y: 50 },
+          { x: 150, y: 50 },
+          { x: 150, y: 150 },
+          { x: 50, y: 150 },
+        ],
+      },
+    ]
+  }
+}
+
+// 监听到场景模式变化,清除区域绘制
+const changeType = () => {
+  points.value = []
+  formData.value.sceneId = '' // 业务场景id
+  formData.value.algoModelId = '' // 模型id
+  recognitionList.value = [] // 清空表格
+}
 // ----------------------------------------------取流---------------------------------------------------------
 // 拉取流--普通流
 async function fetchMediaStream(deviceId: string, channelId: string) {
@@ -447,7 +504,7 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="场景模式" prop="type">
-                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'" @change="changeType">
                   <el-radio :label="1">
                     业务场景
                   </el-radio>
@@ -463,7 +520,7 @@
               <el-form-item label="业务场景" prop="sceneId">
                 <el-select
                   v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'" @change="(val) => changeScene(val)"
                 >
                   <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
@@ -517,6 +574,7 @@
                         :min="0"
                         :precision="2"
                         controls-position="right"
+                        @change="changeInputNumber"
                       />
                       <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
                       <span v-else>{{ scope.row[item.value] }}</span>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 06093b7..bfa7da7 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -12,6 +12,7 @@
 const treeRef = ref(null) as any
 const filterText = ref('')
 const data = ref([])
+const points = ref() // 标注信息
 // const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
 
 const defaultProps = ref({
@@ -30,7 +31,8 @@
 const title = ref('')
 const leafLoading = ref(false)
 const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
+const radio = ref('1') // 原始流识别流切换按钮
+const currentData = ref({}) as any// 当前播放视频的设备信息
 const alarmResultList = ref([]) as any // 报警结果列表
 const alarmCount = ref(0) // 当日报警数
 
@@ -39,8 +41,12 @@
   console.log(divPlugin)
   // width.value = divPlugin.clientWidth / 2 - 20
   // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
+
+  // width.value = divPlugin.clientWidth
+  // height.value = divPlugin.clientHeight - 5
+  // 宽高比要4:3，因为监控点位管理里面在视频上画框的宽高比就是4:3，同比例同位置
+  height.value = divPlugin.clientHeight - 5 - 28
+  width.value = Number(((height.value / 3) * 4).toFixed(2))
 }
 
 function filterNode(value: any, data: { name: string | any[] }) {
@@ -52,9 +58,7 @@
   }
 }
 
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
+let treeClickCount = 0 // 用于双击事件判断
 
 function handleNodeClick(data: any, node: any, self: any) {
   console.log('设备信息', data)
@@ -72,24 +76,29 @@
     if (data.device.id === currentLeafId.value) {
       return
     }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
     leafLoading.value = true
     currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      // src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      mediaUrl.value = res
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
+    currentData.value = data.device
+    title.value = data.device.monitorName.replace('-', ' - ')
+    if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+      draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+    }
+    else {
+      points.value = []
+    }
+    if (radio.value === '1') { // 原始流
+      // 获取原始流
+      fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+        leafLoading.value = false
+        mediaUrl.value = res
+      }).catch(() => {
+        ElMessage.warning('未获取到流！请联系管理员！')
+        leafLoading.value = false
+      })
+    }
+    else if (radio.value === '2') { // 识别流
+      mediaUrl.value = data.device.recognitionUrl
+    }
   }
   treeClickCount = now
 }
@@ -107,17 +116,6 @@
   }
 }
 
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
 // 获取当日报警数数据
 const fetchAlarmData = () => {
   const params = {
@@ -142,6 +140,58 @@
   })
 }
 
+// 原始流、识别流切换
+function changeRadio(val: string) {
+  points.value = [] // 清除标注信息
+  draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+  if (val === '1') { // 原始流
+    // 获取原始流
+    leafLoading.value = true
+    fetchMediaStream(currentData.value.cameraIndexCode, currentData.value.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      mediaUrl.value = res
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  else if (val === '2') { // 识别流
+    mediaUrl.value = currentData.value.recognitionUrl
+  }
+}
+
+// 等比例计算实际数据
+const calRealData = (boundaryList: any) => {
+  if (!boundaryList.length) {
+    return false
+  }
+  const widthProportion = Number((width.value / 600).toFixed(2))
+  const heightProportion = Number((height.value / 450).toFixed(2))
+  const tempList = boundaryList.map((item: any) => {
+    return {
+      x: (item.x * widthProportion),
+      y: (item.y * heightProportion),
+    }
+  })
+  return tempList
+}
+
+// 绘制静态框
+function draw(list = []) {
+  if (!list.length) {
+    return false
+  }
+  console.log('获取到的标注信息', list)
+  const deviceBoundaryInfo = list.map((item: any) => {
+    return {
+      ...item,
+      boundary: item.boundary ? calRealData(JSON.parse(item.boundary)) : item.boundary, // 识别边界
+    }
+  })
+  points.value = deviceBoundaryInfo
+  console.log('标注绘画信息', points.value)
+}
+
 const unwatch = watch(filterText, (newVal) => {
   treeRef.value.filter(newVal)
 })
@@ -235,64 +285,71 @@
         </el-tree>
       </el-card>
       <div id="home" class="right">
-        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
-        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
-        <div style="position: relative;">
+        <div style="position: relative;display: flex;justify-content: center;width: 100%;padding-top: 30px;">
           <iframe
             id="myframe"
             :src="`${baseurl}/player/player.html?playUrl=${mediaUrl}`"
             frameborder="0"
-            :style="{ width: `${width}px`, height: `${height - 28}px` }"
-            style="position: absolute; top: 0px; left: 0px;"
+            :style="{ width: `${width}px`, height: `${height}px` }"
+            style="position: absolute"
           />
-          <draw-area ref="drawAreaRef" dialog-status="detail" :points="points" />
+          <draw-area v-show="radio === '1'" ref="drawAreaRef" dialog-status="detail" :width="width" :height="height" :points="points" />
+          <div class="title" :style="{ width: `${width}px` }">
+            {{ title }}
+            <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+              <svg-icon name="icon-qiang" color="#fff" />
+            </el-icon>
+            <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+              <svg-icon name="icon-ball" color="#fff" />
+            </el-icon>
+            <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+              <svg-icon name="icon-ball" color="#fff" />
+            </el-icon>
+            <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+              <svg-icon name="icon-ytqiang" color="#fff" />
+            </el-icon>
+
+            <!-- =======================右侧按钮========================== -->
+            <el-radio-group :disabled="!currentData" v-model="radio" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+              <el-radio-button label="1">原始流</el-radio-button>
+              <el-radio-button :disabled="!currentData && !currentData.recognitionUrl" label="2">识别流</el-radio-button>
+            </el-radio-group>
+          </div>
         </div>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
+        <!-- <div
           v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
           z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
           视频加载中，请稍等...
-        </div>
+        </div> -->
       </div>
       <!-- 右侧报警结果 -->
-      <div class="alarm-result" v-if="alarmResultList.length">
+      <div class="alarm-result">
         <div class="alarm-title">报警结果</div>
         <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>
-                <span class="alarm-data-title">识别类型：</span>
-                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+        <div v-if="alarmResultList.length">
+          <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+            <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+              <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+              <div style="padding: 14px;">
+                <div>
+                  <span class="alarm-data-title">识别类型：</span>
+                  <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+                </div>
+                <div>
+                  <span class="alarm-data-title">相机名称：</span>
+                  <span class="alarm-data-text">{{ item.deviceName }}</span>
+                </div>
+                <div class="bottom clearfix">
+                  <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                  <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+                <!-- <el-button type="text" class="button">查看详情</el-button> -->
+                </div>
+                <div class="alarm-index">{{ index + 1 }}</div>
               </div>
-              <div>
-                <span class="alarm-data-title">相机名称：</span>
-                <span class="alarm-data-text">{{ item.deviceName }}</span>
-              </div>
-              <div class="bottom clearfix">
-                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
-                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
-              <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-              <div class="alarm-index">{{ index + 1 }}</div>
-            </div>
-          </el-card>
+            </el-card>
+          </div>
         </div>
+        <el-empty v-else description="今日无报警" :size="200" />
       </div>
     </div>
   </app-container>
@@ -304,9 +361,11 @@
   box-sizing: border-box;
   flex: 1;
   margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
+  // padding-top: 30px;
+  // background: #111;
   border-radius:  15px 15px  0 0 ;
+  display: flex;
+  justify-items: center;
 }
 
 .title {
@@ -319,7 +378,7 @@
   color: white;
   font-weight: bold;
   line-height: 30px;
-  width: 100%;
+  // width: 100%;
   height: 30px;
   top: 0px;
   border-radius:  15px 15px  0 0 ;
@@ -327,7 +386,7 @@
 }
 .left {
   box-sizing: border-box;
-  width: 300px;
+  width: 380px;
   height: 100%;
   overflow-y: scroll;
   overflow-x: scroll;
@@ -365,7 +424,7 @@
 
 // 报警结果
 .alarm-result {
-  width: 300px;
+  width: 320px;
   background-color: #fff;
   margin-left: 10px;
   border-radius: 3px;

diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 526b1fb..56c513a 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -163,13 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <div class="user-wrapper">
+    <div v-if="systemType !== 'sm'" class="user-wrapper" >
       {{ userStore.name }}
-      <el-icon>
+      <!-- <el-icon>
         <svg-icon name="ep:caret-bottom" />
-      </el-icon>
+      </el-icon> -->
     </div>
-    <el-dropdown v-if="false" class="user-container" size="default" @command="userCommand">
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
@@ -195,9 +195,9 @@
           <!-- <el-dropdown-item divided command="index">
             回首页
           </el-dropdown-item> -->
-          <el-dropdown-item divided command="resetPassword">
+          <!-- <el-dropdown-item divided command="resetPassword">
             修改密码
-          </el-dropdown-item>
+          </el-dropdown-item> -->
           <el-dropdown-item divided command="logout">
             退出登录
           </el-dropdown-item>
diff --git a/src/utils/useCheckList.ts b/src/utils/useCheckList.ts
index 608bb98..debd0b0 100644
--- a/src/utils/useCheckList.ts
+++ b/src/utils/useCheckList.ts
@@ -11,7 +11,7 @@
     const item = list[index]
     for (const prop of columns) {
       // 检查必填
-      if (prop.required && !item[prop.value]) {
+      if (prop.required && (`${item[prop.value]}` === '' || `${item[prop.value]}` === 'undefined' || `${item[prop.value]}` === 'null')) {
         // ElMessage.warning(`请先完善${tableTitle}第${index + 1}行中${prop.text}`)
         ElMessage.warning(`请先完善${tableTitle}中【${item.typeName || item.recognitionTypeName}】的${prop.text}`)
         return false
diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
index 9346cbc..fdf9ea0 100644
--- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue
@@ -7,6 +7,14 @@
     type: Array,
     default: () => [],
   },
+  width: {
+    type: Number,
+    default: 600,
+  },
+  height: {
+    type: Number,
+    default: 450,
+  },
 })
 const emits = defineEmits(['givepointsInfo'])
 const baseurl = ref(window.location.href.split('/#')[0])
@@ -33,16 +41,16 @@
           ctx.lineTo(e.boundary[3].x, e.boundary[3].y)
         }
         // ctx.strokeStyle = e.pointColor
-        ctx.strokeStyle = '#ff0000'
+        ctx.strokeStyle = e.pointColor || '#3d7eff'
         ctx.closePath()
         ctx.font = '13px Arial'
         // ctx.fillStyle = e.pointColor
-        ctx.fillStyle = '#ff0000'
+        ctx.fillStyle = e.pointColor || '#3d7eff'
         // const minY = Math.min(e.boundary[0].y, e.boundary[1].y, e.boundary[2].y, e.boundary[3].y)
         // const minX = Math.min(e.boundary[0].x, e.boundary[1].x, e.boundary[2].x, e.boundary[3].x)
-        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > 540 ? 540 : e.boundary[0].x + 3
-        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > 438 ? 438 : e.boundary[0].y - 5
-        ctx.fillText(e.recognitionTypeName, textX, textY)
+        const textX = e.boundary[0].x === 0 ? 0 : e.boundary[0].x + 3 > props.width - 60 ? props.width - 60 : e.boundary[0].x + 3
+        const textY = e.boundary[0].y < 12 ? 12 : e.boundary[0].y > props.height - 12 ? props.height - 12 : e.boundary[0].y - 5
+        ctx.fillText(e.remark, textX, textY)
       })
     }
     ctx.lineWidth = 1
@@ -60,14 +68,14 @@
     if (mousePos.x < 0) {
       mousePos.x = 0
     }
-    else if (mousePos.x > 600) {
-      mousePos.x = 600
+    else if (mousePos.x > props.width) {
+      mousePos.x = props.width
     }
     if (mousePos.y < 0) {
       mousePos.y = 0
     }
-    else if (mousePos.y > 450) {
-      mousePos.y = 450
+    else if (mousePos.y > props.height) {
+      mousePos.y = props.height
     }
     const { quotient, remainder } = divideAndModulo(pointIndex, 4)
     console.log(`移动的是第${quotient + 1}条数据，第${remainder + 1}个点`)
@@ -161,8 +169,8 @@
 </script>
 
 <template>
-  <div style="width: 600px;height: 450px;">
-    <canvas id="myCanvas" width="600" height="450" class="canvans" />
+  <div :style="{ width: `${props.width}px`, height: `${props.height}px` }">
+    <canvas id="myCanvas" :width="props.width" :height="props.height" class="canvans" />
     <div v-if="props.dialogStatus !== 'detail'">
       <div v-for="(e, index) in pointsInfo" :key="index">
         <div
@@ -199,7 +207,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;
@@ -214,7 +222,7 @@
   height: 10px;
   position: absolute;
   border-radius: 50%;
-  background-color: red;
+  background-color: #3d7eff;
   opacity: 0.5;
   top: 0;
   left: 0;
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index d60f330..3cb33d1 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -111,19 +111,21 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
+  // debugger
+  console.log('-------表单提交算法校验---------', recognitionList.value)
   if (`${formData.value.type}` === '0') { // 算法关联
     if (!selectModelList.value.length) {
       ElMessage.warning('请选择报警对象')
       return false
     }
-    const checkList = [] as any
-    selectModelList.value.forEach((item: { id: string }) => {
-      const index = recognitionList.value.findIndex((i: { id: string }) => i.id === item.id)
-      if (index !== -1) {
-        checkList.push(recognitionList.value[index])
-      }
-    })
-    if (!useCheckList(checkList, columns.value, '报警对象')) {
+    // const checkList = [] as any
+    // selectModelList.value.forEach((item: { recognitionTypeId: string }) => {
+    //   const index = recognitionList.value.findIndex((i: { recognitionTypeId: string }) => i.recognitionTypeId === item.recognitionTypeId)
+    //   if (index !== -1) {
+    //     checkList.push({ ...recognitionList.value[index] })
+    //   }
+    // })
+    if (!useCheckList(recognitionList.value, columns.value, '报警对象')) {
       return false
     }
   }
@@ -132,6 +134,7 @@
       if (valid) {
         let tempList = [] as any
         if (formData.value.type === 0) { // 算法
+          // debugger
           // 把是否使用全都置为0
           recognitionList.value = recognitionList.value.map((e: { isUse: string }) => {
             return {
@@ -143,27 +146,36 @@
           points.value.forEach((itemOut: any) => {
             const index = recognitionList.value.findIndex((itemIn: any) => itemOut.recognitionTypeId === itemIn.recognitionTypeId)
             if (index !== -1) {
-              recognitionList.value[index] = { ...itemOut, isUse: '1' }
+              recognitionList.value[index] = { ...recognitionList.value[index], ...itemOut, isUse: '1' }
             }
           })
           tempList = recognitionList.value.map((item: any) => {
             return {
               ...item,
               algoModelId: formData.value.algoModelId, // 算法模型id
-              confidenceLevel:	item.confidenceLevel, // 置信度
-              recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
-              threshold: item.threshold,	 // 阈值
+              // confidenceLevel:	item.confidenceLevel, // 置信度
+              // recognitionTypeId:	item.recognitionTypeId, // 模型识别类型
+              // threshold: item.threshold,	 // 阈值
               remark: item.recognitionTypeName, // 危险因素描述
               boundary: item.boundary ? JSON.stringify(item.boundary) : item.boundary,
             }
           })
         }
+        else if (formData.value.type === 1) { // 业务场景
+          tempList = {
+            ...points.value[0],
+            boundary: points.value[0].boundary ? JSON.stringify(points.value[0].boundary) : points.value[0].boundary,
+            id: formData.value.id,
+            sceneId: formData.value.sceneId,
+          }
+        }
 
         const params = {
           ...formData.value,
-          sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
+          // sceneRelation: formData.value.type === 1 ? { id: formData.value.id, sceneId: formData.value.sceneId } : null,
           // eslint-disable-next-line multiline-ternary
-          deviceModelRelations: tempList,
+          deviceModelRelations: formData.value.type === 0 ? tempList : [],
+          sceneRelation: formData.value.type === 1 ? tempList : {},
         }
         console.log('要传的参数', params)
         updateMonitorPoint(params).then(() => {
@@ -209,7 +221,7 @@
 }
 // 多选
 const selectModel = (value: any) => {
-  // console.log('监听算法报警对象的变化，更新区域绘制', value)
+  console.log('监听算法报警对象的变化，更新区域绘制', value)
   selectModelList.value = value.map((item: any) => {
     return {
       ...item,
@@ -251,6 +263,32 @@
   }
 }
 
+// 监听算法变化，查询算法报警对象
+async function changeAlgoModelId(modelId: string) {
+  if (modelId) {
+    // 获取场景对象
+    const params = {
+      modelId, // 模型ID
+      typeCode: '', // 类型编码
+      typeName: '', // 类型名称
+    }
+    const res = await getRecognitionList(params)
+    recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
+      return {
+        ...item,
+        recognitionTypeName: item.typeName,
+        recognitionTypeId: item.id,
+        id: '',
+        confidenceLevel: 0, // 置信度
+        threshold: 0, // 阈值
+      }
+    })
+  }
+  else {
+    recognitionList.value = []
+  }
+}
+
 // -----------------------------------初始化、关闭对话框相关-----------------------------------------
 function initDialog(dialogstatus: string, row: any) {
   dialogVisible.value = true
@@ -303,6 +341,14 @@
     }
     else if (`${row.type}` === '1') { // 业务场景
       formData.value.sceneId = row.sceneRelation.sceneId
+      points.value = [
+        {
+          id: row.sceneRelation.id,
+          remark: row.sceneRelation.remark,
+          sceneId: row.sceneRelation.sceneId,
+          boundary: row.sceneRelation.boundary ? JSON.parse(row.sceneRelation.boundary) : row.sceneRelation.boundary, // 识别边界
+        },
+      ]
     }
   }
   if (dialogstatus === 'detail') {
@@ -329,33 +375,44 @@
   emits('closeRefresh')
 }
 
-// 监听算法变化，查询算法报警对象
-async function changeAlgoModelId(modelId: string) {
-  if (modelId) {
-    // 获取场景对象
-    const params = {
-      modelId, // 模型ID
-      typeCode: '', // 类型编码
-      typeName: '', // 类型名称
-    }
-    const res = await getRecognitionList(params)
-    recognitionList.value = res.data.map((item: { id: string; typeName: string }) => {
-      return {
-        ...item,
-        recognitionTypeName: item.typeName,
-        recognitionTypeId: item.id,
-        id: '',
-      }
-    })
-  }
-}
-
 // -------------------------------------------区域绘制相关-----------------------------------------------
 const givePoints = (value: any) => {
   console.log('监听到子组件数据变化', value)
   points.value = value
 }
 
+// 监听业务场景变化，生成区域绘制数据
+const changeScene = (val: string) => {
+  console.log('业务场景变化', val)
+  let sceneName = '' // 选择的业务场景名称
+  if (val) {
+    const index = sceneList.value.findIndex((item: { id: string }) => item.id === val)
+    if (index !== -1) {
+      sceneName = sceneList.value[index].sceneName
+    }
+    points.value = [
+      {
+        id: val,
+        remark: sceneName,
+        sceneId: val,
+        boundary: [ // 标记点位置
+          { x: 50, y: 50 },
+          { x: 150, y: 50 },
+          { x: 150, y: 150 },
+          { x: 50, y: 150 },
+        ],
+      },
+    ]
+  }
+}
+
+// 监听到场景模式变化,清除区域绘制
+const changeType = () => {
+  points.value = []
+  formData.value.sceneId = '' // 业务场景id
+  formData.value.algoModelId = '' // 模型id
+  recognitionList.value = [] // 清空表格
+}
 // ----------------------------------------------取流---------------------------------------------------------
 // 拉取流--普通流
 async function fetchMediaStream(deviceId: string, channelId: string) {
@@ -447,7 +504,7 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="场景模式" prop="type">
-                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'">
+                <el-radio-group v-model="formData.type" :disabled="dialogStatus === 'detail'" @change="changeType">
                   <el-radio :label="1">
                     业务场景
                   </el-radio>
@@ -463,7 +520,7 @@
               <el-form-item label="业务场景" prop="sceneId">
                 <el-select
                   v-model="formData.sceneId" placeholder="业务场景" clearable class="select"
-                  style="width: 100%;" :disabled="dialogStatus === 'detail'"
+                  style="width: 100%;" :disabled="dialogStatus === 'detail'" @change="(val) => changeScene(val)"
                 >
                   <el-option v-for="item in sceneList" :key="item.id" :value="item.id" :label="item.sceneName">
                     <div style="display: flex;justify-content: space-between;">
@@ -517,6 +574,7 @@
                         :min="0"
                         :precision="2"
                         controls-position="right"
+                        @change="changeInputNumber"
                       />
                       <!-- <el-input-number v-if="item.value === 'threshold'" v-model="scope.row[item.value]" controls-position="right" :min="0" /> -->
                       <span v-else>{{ scope.row[item.value] }}</span>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 06093b7..bfa7da7 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -12,6 +12,7 @@
 const treeRef = ref(null) as any
 const filterText = ref('')
 const data = ref([])
+const points = ref() // 标注信息
 // const palyUrl = `${url}?token=${window.localStorage.getItem('token')}`
 
 const defaultProps = ref({
@@ -30,7 +31,8 @@
 const title = ref('')
 const leafLoading = ref(false)
 const currentLeafId = ref('')
-const currentData = ref() // 当前播放视频的设备信息
+const radio = ref('1') // 原始流识别流切换按钮
+const currentData = ref({}) as any// 当前播放视频的设备信息
 const alarmResultList = ref([]) as any // 报警结果列表
 const alarmCount = ref(0) // 当日报警数
 
@@ -39,8 +41,12 @@
   console.log(divPlugin)
   // width.value = divPlugin.clientWidth / 2 - 20
   // height.value = divPlugin.clientHeight / 2 - 5
-  width.value = divPlugin.clientWidth
-  height.value = divPlugin.clientHeight - 5
+
+  // width.value = divPlugin.clientWidth
+  // height.value = divPlugin.clientHeight - 5
+  // 宽高比要4:3，因为监控点位管理里面在视频上画框的宽高比就是4:3，同比例同位置
+  height.value = divPlugin.clientHeight - 5 - 28
+  width.value = Number(((height.value / 3) * 4).toFixed(2))
 }
 
 function filterNode(value: any, data: { name: string | any[] }) {
@@ -52,9 +58,7 @@
   }
 }
 
-let treeClickCount = 0
-let currentIndex = 0
-const currentCameras = [{}, {}, {}, {}] as any
+let treeClickCount = 0 // 用于双击事件判断
 
 function handleNodeClick(data: any, node: any, self: any) {
   console.log('设备信息', data)
@@ -72,24 +76,29 @@
     if (data.device.id === currentLeafId.value) {
       return
     }
-
-    currentIndex = 0
-    // ElMessage.warning('正在加载流，请稍等！')
     leafLoading.value = true
     currentLeafId.value = data.device.id
-    // 获取视频流接口
-    fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
-      leafLoading.value = false
-      // src.value[currentIndex] = `${res}?token=${window.localStorage.getItem('token')}`
-      mediaUrl.value = res
-      currentCameras[currentIndex] = data
-      title.value = data.device.monitorName.replace('-', ' - ')
-      currentData.value = data.device
-      currentIndex++
-    }).catch(() => {
-      ElMessage.warning('未获取到流！请联系管理员！')
-      leafLoading.value = false
-    })
+    currentData.value = data.device
+    title.value = data.device.monitorName.replace('-', ' - ')
+    if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+      draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+    }
+    else {
+      points.value = []
+    }
+    if (radio.value === '1') { // 原始流
+      // 获取原始流
+      fetchMediaStream(data.device.cameraIndexCode, data.device.nvrIndexCode).then((res: any) => {
+        leafLoading.value = false
+        mediaUrl.value = res
+      }).catch(() => {
+        ElMessage.warning('未获取到流！请联系管理员！')
+        leafLoading.value = false
+      })
+    }
+    else if (radio.value === '2') { // 识别流
+      mediaUrl.value = data.device.recognitionUrl
+    }
   }
   treeClickCount = now
 }
@@ -107,17 +116,6 @@
   }
 }
 
-function page(index: any) {
-  if (src.value[index] !== '') {
-    router.push({
-      path: '/realTime/control',
-      query: {
-        id: currentCameras[index].id,
-      },
-    })
-  }
-}
-
 // 获取当日报警数数据
 const fetchAlarmData = () => {
   const params = {
@@ -142,6 +140,58 @@
   })
 }
 
+// 原始流、识别流切换
+function changeRadio(val: string) {
+  points.value = [] // 清除标注信息
+  draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+  if (val === '1') { // 原始流
+    // 获取原始流
+    leafLoading.value = true
+    fetchMediaStream(currentData.value.cameraIndexCode, currentData.value.nvrIndexCode).then((res: any) => {
+      leafLoading.value = false
+      mediaUrl.value = res
+    }).catch(() => {
+      ElMessage.warning('未获取到流！请联系管理员！')
+      leafLoading.value = false
+    })
+  }
+  else if (val === '2') { // 识别流
+    mediaUrl.value = currentData.value.recognitionUrl
+  }
+}
+
+// 等比例计算实际数据
+const calRealData = (boundaryList: any) => {
+  if (!boundaryList.length) {
+    return false
+  }
+  const widthProportion = Number((width.value / 600).toFixed(2))
+  const heightProportion = Number((height.value / 450).toFixed(2))
+  const tempList = boundaryList.map((item: any) => {
+    return {
+      x: (item.x * widthProportion),
+      y: (item.y * heightProportion),
+    }
+  })
+  return tempList
+}
+
+// 绘制静态框
+function draw(list = []) {
+  if (!list.length) {
+    return false
+  }
+  console.log('获取到的标注信息', list)
+  const deviceBoundaryInfo = list.map((item: any) => {
+    return {
+      ...item,
+      boundary: item.boundary ? calRealData(JSON.parse(item.boundary)) : item.boundary, // 识别边界
+    }
+  })
+  points.value = deviceBoundaryInfo
+  console.log('标注绘画信息', points.value)
+}
+
 const unwatch = watch(filterText, (newVal) => {
   treeRef.value.filter(newVal)
 })
@@ -235,64 +285,71 @@
         </el-tree>
       </el-card>
       <div id="home" class="right">
-        <!-- <video id="video0" :src="src[0]" autoPlay :width="width" :height="height - 24" @dblclick="page(0)"/> -->
-        <!-- :src="`${baseurl}/player/player.html?playUrl=${src[0]}`" -->
-        <div style="position: relative;">
+        <div style="position: relative;display: flex;justify-content: center;width: 100%;padding-top: 30px;">
           <iframe
             id="myframe"
             :src="`${baseurl}/player/player.html?playUrl=${mediaUrl}`"
             frameborder="0"
-            :style="{ width: `${width}px`, height: `${height - 28}px` }"
-            style="position: absolute; top: 0px; left: 0px;"
+            :style="{ width: `${width}px`, height: `${height}px` }"
+            style="position: absolute"
           />
-          <draw-area ref="drawAreaRef" dialog-status="detail" :points="points" />
+          <draw-area v-show="radio === '1'" ref="drawAreaRef" dialog-status="detail" :width="width" :height="height" :points="points" />
+          <div class="title" :style="{ width: `${width}px` }">
+            {{ title }}
+            <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
+              <svg-icon name="icon-qiang" color="#fff" />
+            </el-icon>
+            <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
+              <svg-icon name="icon-ball" color="#fff" />
+            </el-icon>
+            <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
+              <svg-icon name="icon-ball" color="#fff" />
+            </el-icon>
+            <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
+              <svg-icon name="icon-ytqiang" color="#fff" />
+            </el-icon>
+
+            <!-- =======================右侧按钮========================== -->
+            <el-radio-group :disabled="!currentData" v-model="radio" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+              <el-radio-button label="1">原始流</el-radio-button>
+              <el-radio-button :disabled="!currentData && !currentData.recognitionUrl" label="2">识别流</el-radio-button>
+            </el-radio-group>
+          </div>
         </div>
-        <div class="title">
-          {{ title }}
-          <el-icon v-if="currentData && currentData.deviceType === '0'" style="margin-left: 3px;">
-            <svg-icon name="icon-qiang" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && (currentData.deviceType === '1' || currentData.deviceType === '2')" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '3'" style="margin-left: 3px;">
-            <svg-icon name="icon-ball" color="#fff" />
-          </el-icon>
-          <el-icon v-if="currentData && currentData.deviceType === '4'" style="margin-left: 3px;">
-            <svg-icon name="icon-ytqiang" color="#fff" />
-          </el-icon>
-        </div>
-        <div
+        <!-- <div
           v-if="leafLoading" style="font-size: 28px;color: #fff;font-weight: 600;position: absolute;
           z-index: 1000;top: 50%;left: 35%;letter-spacing: 4px;">
           视频加载中，请稍等...
-        </div>
+        </div> -->
       </div>
       <!-- 右侧报警结果 -->
-      <div class="alarm-result" v-if="alarmResultList.length">
+      <div class="alarm-result">
         <div class="alarm-title">报警结果</div>
         <div class="main-title">当日报警数: <span class="count">{{ alarmCount }}</span></div>
-        <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
-          <el-card :body-style="{ padding: '10px', position: 'relative' }" >
-            <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
-            <div style="padding: 14px;">
-              <div>
-                <span class="alarm-data-title">识别类型：</span>
-                <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+        <div v-if="alarmResultList.length">
+          <div v-for="(item, index) in alarmResultList" :key="index" style="margin-top: 6px;">
+            <el-card :body-style="{ padding: '10px', position: 'relative' }" >
+              <el-image :src="item.url" :preview-src-list="[item.url]" style="width: 100%; height: 160px;" />
+              <div style="padding: 14px;">
+                <div>
+                  <span class="alarm-data-title">识别类型：</span>
+                  <span class="alarm-data-text">{{ item.recognitionTypeName || item.sceneName }}</span>
+                </div>
+                <div>
+                  <span class="alarm-data-title">相机名称：</span>
+                  <span class="alarm-data-text">{{ item.deviceName }}</span>
+                </div>
+                <div class="bottom clearfix">
+                  <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
+                  <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
+                <!-- <el-button type="text" class="button">查看详情</el-button> -->
+                </div>
+                <div class="alarm-index">{{ index + 1 }}</div>
               </div>
-              <div>
-                <span class="alarm-data-title">相机名称：</span>
-                <span class="alarm-data-text">{{ item.deviceName }}</span>
-              </div>
-              <div class="bottom clearfix">
-                <span class="alarm-data-title alarm-data-title-time">记录时间：</span>
-                <span class="alarm-data-text  alarm-data-text-time">{{ item.alarmTime }}</span>
-              <!-- <el-button type="text" class="button">查看详情</el-button> -->
-              </div>
-              <div class="alarm-index">{{ index + 1 }}</div>
-            </div>
-          </el-card>
+            </el-card>
+          </div>
         </div>
+        <el-empty v-else description="今日无报警" :size="200" />
       </div>
     </div>
   </app-container>
@@ -304,9 +361,11 @@
   box-sizing: border-box;
   flex: 1;
   margin-left: 10px;
-  padding-top: 30px;
-  background: #111;
+  // padding-top: 30px;
+  // background: #111;
   border-radius:  15px 15px  0 0 ;
+  display: flex;
+  justify-items: center;
 }
 
 .title {
@@ -319,7 +378,7 @@
   color: white;
   font-weight: bold;
   line-height: 30px;
-  width: 100%;
+  // width: 100%;
   height: 30px;
   top: 0px;
   border-radius:  15px 15px  0 0 ;
@@ -327,7 +386,7 @@
 }
 .left {
   box-sizing: border-box;
-  width: 300px;
+  width: 380px;
   height: 100%;
   overflow-y: scroll;
   overflow-x: scroll;
@@ -365,7 +424,7 @@
 
 // 报警结果
 .alarm-result {
-  width: 300px;
+  width: 320px;
   background-color: #fff;
   margin-left: 10px;
   border-radius: 3px;
diff --git a/src/views/smGateway.vue b/src/views/smGateway.vue
index ed3841f..df2eec4 100644
--- a/src/views/smGateway.vue
+++ b/src/views/smGateway.vue
@@ -174,8 +174,8 @@
   <div style="display: flex;justify-content: center;align-items: center;height: 100%;margin-top: -80px;">
     <div class="main">
       <div class="main-title">
-        <!-- 安全生产智慧监管系统 -->
-        <span class="load-span">安</span>
+        <span style="color: #fff;">安全生产智慧监管系统</span>
+        <!-- <span class="load-span">安</span>
         <span class="load-span">全</span>
         <span class="load-span">生</span>
         <span class="load-span">产</span>
@@ -184,7 +184,7 @@
         <span class="load-span">监</span>
         <span class="load-span">管</span>
         <span class="load-span">系</span>
-        <span class="load-span">统</span>
+        <span class="load-span">统</span> -->
       </div>
       <div class="exe">
         <!-- <el-result v-if="!haveExe" icon="warning" title="警告提示" sub-title="未安装PNXClient插件，请先下载安装插件">
@@ -387,18 +387,18 @@
     transition: box-shadow 0.3s, background-color 0.3s, color 0.3s;
   }
 
-  .glow-button:hover {
-    background-color: var(--btn-color);
-    color: #fff;
-    box-shadow: 0 0 5px var(--btn-color), 0 0 25px var(--btn-color), 0 0 50px var(--btn-color), 0 0 100px var(--btn-color);
-  }
+  // .glow-button:hover {
+  //   background-color: var(--btn-color);
+  //   color: #fff;
+  //   box-shadow: 0 0 5px var(--btn-color), 0 0 25px var(--btn-color), 0 0 50px var(--btn-color), 0 0 100px var(--btn-color);
+  // }
 
-  .glow-button:active {
-    background-color: var(--btn-color);
-    color: #fff;
-    box-shadow: 0 0 15px var(--btn-color), 0 0 30px var(--btn-color), 0 0 60px var(--btn-color), 0 0 120px var(--btn-color);
-    transform: scale(0.95);
-  }
+  // .glow-button:active {
+  //   background-color: var(--btn-color);
+  //   color: #fff;
+  //   box-shadow: 0 0 15px var(--btn-color), 0 0 30px var(--btn-color), 0 0 60px var(--btn-color), 0 0 120px var(--btn-color);
+  //   transform: scale(0.95);
+  // }
 
   .border-lines {
     position: absolute;