diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 346f60f..afc7b03 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -85,21 +85,14 @@
     if (data.children.length !== 0) { // 点击父亲
       return
     }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
+    // if (data.device.id === currentLeafId.value) {
+    //   return
+    // }
     leafLoading.value = true // 叶子结点加载流的时候显示Loading图标
     currentLeafId.value = data.device.id
     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') { // 原始流
       if (systemType.value === 'sm') { // 商米流媒体
         // 获取原始流
@@ -118,8 +111,17 @@
       }
     }
     else if (radio.value === '2') { // 识别流
+      if (!data.device.recognitionGb) { // 在识别流且没有国标号的时候去画框
+        // -------------------------------区域绘制----------------------------------------
+        if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+          draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+        }
+        else {
+          points.value = []
+        }
+      }
       if (systemType.value === 'sm') { // sm识别流
-        // 获取原始流
+      // 获取原始流
         fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode).then((res: any) => {
           leafLoading.value = false
           mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}`
@@ -297,11 +299,7 @@
     return false
   }
   points.value = [] // 清除标注信息
-  console.log('--------标注信息----------', currentData.value.deviceBoundaryDTOS)
   if (val === '1') { // 原始流
-    if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
-      draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
-    }
     if (systemType.value === 'sm') { // 流媒体
       // 获取原始流
       leafLoading.value = true
@@ -331,6 +329,11 @@
     //   }
     // }
     // mediaUrl.value = currentData.value.recognitionUrl
+    if (!currentData.value.recognitionGb) { // 在识别流且没有国标号的时候去画框
+      if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
+        draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+      }
+    }
     if (systemType.value === 'sm') {
       leafLoading.value = true
       fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId).then((res: any) => {
@@ -491,7 +494,7 @@
             style="position: absolute"
           /> -->
           <jessibuca
-            id="container1"
+            id="containerVideoPreview"
             ref="jessibucaRef"
             :style="{ width: `${width}px`, height: `${height}px` }"
           />
@@ -512,7 +515,7 @@
             </el-icon>
 
             <!-- =======================右侧按钮========================== -->
-            <el-radio-group v-model="radio" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+            <el-radio-group v-model="radio" fill="#67c23a" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
               <el-radio-button label="1">
                 原始流
               </el-radio-button>

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 346f60f..afc7b03 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -85,21 +85,14 @@
     if (data.children.length !== 0) { // 点击父亲
       return
     }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
+    // if (data.device.id === currentLeafId.value) {
+    //   return
+    // }
     leafLoading.value = true // 叶子结点加载流的时候显示Loading图标
     currentLeafId.value = data.device.id
     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') { // 原始流
       if (systemType.value === 'sm') { // 商米流媒体
         // 获取原始流
@@ -118,8 +111,17 @@
       }
     }
     else if (radio.value === '2') { // 识别流
+      if (!data.device.recognitionGb) { // 在识别流且没有国标号的时候去画框
+        // -------------------------------区域绘制----------------------------------------
+        if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+          draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+        }
+        else {
+          points.value = []
+        }
+      }
       if (systemType.value === 'sm') { // sm识别流
-        // 获取原始流
+      // 获取原始流
         fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode).then((res: any) => {
           leafLoading.value = false
           mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}`
@@ -297,11 +299,7 @@
     return false
   }
   points.value = [] // 清除标注信息
-  console.log('--------标注信息----------', currentData.value.deviceBoundaryDTOS)
   if (val === '1') { // 原始流
-    if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
-      draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
-    }
     if (systemType.value === 'sm') { // 流媒体
       // 获取原始流
       leafLoading.value = true
@@ -331,6 +329,11 @@
     //   }
     // }
     // mediaUrl.value = currentData.value.recognitionUrl
+    if (!currentData.value.recognitionGb) { // 在识别流且没有国标号的时候去画框
+      if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
+        draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+      }
+    }
     if (systemType.value === 'sm') {
       leafLoading.value = true
       fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId).then((res: any) => {
@@ -491,7 +494,7 @@
             style="position: absolute"
           /> -->
           <jessibuca
-            id="container1"
+            id="containerVideoPreview"
             ref="jessibucaRef"
             :style="{ width: `${width}px`, height: `${height}px` }"
           />
@@ -512,7 +515,7 @@
             </el-icon>
 
             <!-- =======================右侧按钮========================== -->
-            <el-radio-group v-model="radio" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+            <el-radio-group v-model="radio" fill="#67c23a" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
               <el-radio-button label="1">
                 原始流
               </el-radio-button>
diff --git a/src/views/bigScreen/jessibuca.vue b/src/views/bigScreen/jessibuca.vue
index a6f3c57..50109da 100644
--- a/src/views/bigScreen/jessibuca.vue
+++ b/src/views/bigScreen/jessibuca.vue
@@ -65,6 +65,13 @@
   jessibuca.on('loadingTimeout', () => {
     console.log('loadingTimeout当play()的时候，如果没有数据返回，则回调: timeout')
   })
+
+  jessibuca.on('pause', (flag) => {
+    console.log('pause触发暂停事件')
+  })
+  jessibuca.on('play', (flag) => {
+    console.log('play触发播放事件')
+  })
 }
 
 // 获取视频流地址并播放视频
@@ -75,6 +82,20 @@
   playUrl && jessibuca.play(playUrl)
 }
 
+// 暂停
+function pause() {
+  jessibuca && jessibuca.pause().then(() => {
+    console.log('pause success')
+  })
+}
+
+// 恢复
+function restore() {
+  jessibuca && jessibuca.play().then(() => {
+    console.log('restore success')
+  })
+}
+
 // 销毁视频
 function destroy() {
   jessibuca && jessibuca.destroy()
@@ -93,7 +114,7 @@
 })
 
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ play, destroy })
+defineExpose({ play, destroy, pause, restore })
 </script>
 
 <template>

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 346f60f..afc7b03 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -85,21 +85,14 @@
     if (data.children.length !== 0) { // 点击父亲
       return
     }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
+    // if (data.device.id === currentLeafId.value) {
+    //   return
+    // }
     leafLoading.value = true // 叶子结点加载流的时候显示Loading图标
     currentLeafId.value = data.device.id
     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') { // 原始流
       if (systemType.value === 'sm') { // 商米流媒体
         // 获取原始流
@@ -118,8 +111,17 @@
       }
     }
     else if (radio.value === '2') { // 识别流
+      if (!data.device.recognitionGb) { // 在识别流且没有国标号的时候去画框
+        // -------------------------------区域绘制----------------------------------------
+        if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+          draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+        }
+        else {
+          points.value = []
+        }
+      }
       if (systemType.value === 'sm') { // sm识别流
-        // 获取原始流
+      // 获取原始流
         fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode).then((res: any) => {
           leafLoading.value = false
           mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}`
@@ -297,11 +299,7 @@
     return false
   }
   points.value = [] // 清除标注信息
-  console.log('--------标注信息----------', currentData.value.deviceBoundaryDTOS)
   if (val === '1') { // 原始流
-    if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
-      draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
-    }
     if (systemType.value === 'sm') { // 流媒体
       // 获取原始流
       leafLoading.value = true
@@ -331,6 +329,11 @@
     //   }
     // }
     // mediaUrl.value = currentData.value.recognitionUrl
+    if (!currentData.value.recognitionGb) { // 在识别流且没有国标号的时候去画框
+      if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
+        draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+      }
+    }
     if (systemType.value === 'sm') {
       leafLoading.value = true
       fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId).then((res: any) => {
@@ -491,7 +494,7 @@
             style="position: absolute"
           /> -->
           <jessibuca
-            id="container1"
+            id="containerVideoPreview"
             ref="jessibucaRef"
             :style="{ width: `${width}px`, height: `${height}px` }"
           />
@@ -512,7 +515,7 @@
             </el-icon>
 
             <!-- =======================右侧按钮========================== -->
-            <el-radio-group v-model="radio" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+            <el-radio-group v-model="radio" fill="#67c23a" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
               <el-radio-button label="1">
                 原始流
               </el-radio-button>
diff --git a/src/views/bigScreen/jessibuca.vue b/src/views/bigScreen/jessibuca.vue
index a6f3c57..50109da 100644
--- a/src/views/bigScreen/jessibuca.vue
+++ b/src/views/bigScreen/jessibuca.vue
@@ -65,6 +65,13 @@
   jessibuca.on('loadingTimeout', () => {
     console.log('loadingTimeout当play()的时候，如果没有数据返回，则回调: timeout')
   })
+
+  jessibuca.on('pause', (flag) => {
+    console.log('pause触发暂停事件')
+  })
+  jessibuca.on('play', (flag) => {
+    console.log('play触发播放事件')
+  })
 }
 
 // 获取视频流地址并播放视频
@@ -75,6 +82,20 @@
   playUrl && jessibuca.play(playUrl)
 }
 
+// 暂停
+function pause() {
+  jessibuca && jessibuca.pause().then(() => {
+    console.log('pause success')
+  })
+}
+
+// 恢复
+function restore() {
+  jessibuca && jessibuca.play().then(() => {
+    console.log('restore success')
+  })
+}
+
 // 销毁视频
 function destroy() {
   jessibuca && jessibuca.destroy()
@@ -93,7 +114,7 @@
 })
 
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ play, destroy })
+defineExpose({ play, destroy, pause, restore })
 </script>
 
 <template>
diff --git a/src/views/monitor/deviceManage/editDev.vue b/src/views/monitor/deviceManage/editDev.vue
index 6506b10..b07a79e 100644
--- a/src/views/monitor/deviceManage/editDev.vue
+++ b/src/views/monitor/deviceManage/editDev.vue
@@ -421,7 +421,7 @@
               v-model.trim="formData.cameraIndexCode" :disabled="dialogStatus === 'detail' || systemType === 'gm'" placeholder="必填"
               clearable
               type="textarea"
-              maxlength="100"
+              maxlength="64"
               show-word-limit
               autosize
             />
@@ -504,8 +504,8 @@
           <el-form-item label="详细位置" class="required">
             <el-input
               v-model.trim="formData.location" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
-              maxlength="100"
               clearable
+              maxlength="100"
               show-word-limit
             />
           </el-form-item>

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 346f60f..afc7b03 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -85,21 +85,14 @@
     if (data.children.length !== 0) { // 点击父亲
       return
     }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
+    // if (data.device.id === currentLeafId.value) {
+    //   return
+    // }
     leafLoading.value = true // 叶子结点加载流的时候显示Loading图标
     currentLeafId.value = data.device.id
     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') { // 原始流
       if (systemType.value === 'sm') { // 商米流媒体
         // 获取原始流
@@ -118,8 +111,17 @@
       }
     }
     else if (radio.value === '2') { // 识别流
+      if (!data.device.recognitionGb) { // 在识别流且没有国标号的时候去画框
+        // -------------------------------区域绘制----------------------------------------
+        if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+          draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+        }
+        else {
+          points.value = []
+        }
+      }
       if (systemType.value === 'sm') { // sm识别流
-        // 获取原始流
+      // 获取原始流
         fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode).then((res: any) => {
           leafLoading.value = false
           mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}`
@@ -297,11 +299,7 @@
     return false
   }
   points.value = [] // 清除标注信息
-  console.log('--------标注信息----------', currentData.value.deviceBoundaryDTOS)
   if (val === '1') { // 原始流
-    if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
-      draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
-    }
     if (systemType.value === 'sm') { // 流媒体
       // 获取原始流
       leafLoading.value = true
@@ -331,6 +329,11 @@
     //   }
     // }
     // mediaUrl.value = currentData.value.recognitionUrl
+    if (!currentData.value.recognitionGb) { // 在识别流且没有国标号的时候去画框
+      if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
+        draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+      }
+    }
     if (systemType.value === 'sm') {
       leafLoading.value = true
       fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId).then((res: any) => {
@@ -491,7 +494,7 @@
             style="position: absolute"
           /> -->
           <jessibuca
-            id="container1"
+            id="containerVideoPreview"
             ref="jessibucaRef"
             :style="{ width: `${width}px`, height: `${height}px` }"
           />
@@ -512,7 +515,7 @@
             </el-icon>
 
             <!-- =======================右侧按钮========================== -->
-            <el-radio-group v-model="radio" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+            <el-radio-group v-model="radio" fill="#67c23a" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
               <el-radio-button label="1">
                 原始流
               </el-radio-button>
diff --git a/src/views/bigScreen/jessibuca.vue b/src/views/bigScreen/jessibuca.vue
index a6f3c57..50109da 100644
--- a/src/views/bigScreen/jessibuca.vue
+++ b/src/views/bigScreen/jessibuca.vue
@@ -65,6 +65,13 @@
   jessibuca.on('loadingTimeout', () => {
     console.log('loadingTimeout当play()的时候，如果没有数据返回，则回调: timeout')
   })
+
+  jessibuca.on('pause', (flag) => {
+    console.log('pause触发暂停事件')
+  })
+  jessibuca.on('play', (flag) => {
+    console.log('play触发播放事件')
+  })
 }
 
 // 获取视频流地址并播放视频
@@ -75,6 +82,20 @@
   playUrl && jessibuca.play(playUrl)
 }
 
+// 暂停
+function pause() {
+  jessibuca && jessibuca.pause().then(() => {
+    console.log('pause success')
+  })
+}
+
+// 恢复
+function restore() {
+  jessibuca && jessibuca.play().then(() => {
+    console.log('restore success')
+  })
+}
+
 // 销毁视频
 function destroy() {
   jessibuca && jessibuca.destroy()
@@ -93,7 +114,7 @@
 })
 
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ play, destroy })
+defineExpose({ play, destroy, pause, restore })
 </script>
 
 <template>
diff --git a/src/views/monitor/deviceManage/editDev.vue b/src/views/monitor/deviceManage/editDev.vue
index 6506b10..b07a79e 100644
--- a/src/views/monitor/deviceManage/editDev.vue
+++ b/src/views/monitor/deviceManage/editDev.vue
@@ -421,7 +421,7 @@
               v-model.trim="formData.cameraIndexCode" :disabled="dialogStatus === 'detail' || systemType === 'gm'" placeholder="必填"
               clearable
               type="textarea"
-              maxlength="100"
+              maxlength="64"
               show-word-limit
               autosize
             />
@@ -504,8 +504,8 @@
           <el-form-item label="详细位置" class="required">
             <el-input
               v-model.trim="formData.location" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
-              maxlength="100"
               clearable
+              maxlength="100"
               show-word-limit
             />
           </el-form-item>
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 51fca0c..13f04c5 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -225,7 +225,7 @@
               <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
                 编辑
               </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+              <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 346f60f..afc7b03 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -85,21 +85,14 @@
     if (data.children.length !== 0) { // 点击父亲
       return
     }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
+    // if (data.device.id === currentLeafId.value) {
+    //   return
+    // }
     leafLoading.value = true // 叶子结点加载流的时候显示Loading图标
     currentLeafId.value = data.device.id
     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') { // 原始流
       if (systemType.value === 'sm') { // 商米流媒体
         // 获取原始流
@@ -118,8 +111,17 @@
       }
     }
     else if (radio.value === '2') { // 识别流
+      if (!data.device.recognitionGb) { // 在识别流且没有国标号的时候去画框
+        // -------------------------------区域绘制----------------------------------------
+        if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+          draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+        }
+        else {
+          points.value = []
+        }
+      }
       if (systemType.value === 'sm') { // sm识别流
-        // 获取原始流
+      // 获取原始流
         fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode).then((res: any) => {
           leafLoading.value = false
           mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}`
@@ -297,11 +299,7 @@
     return false
   }
   points.value = [] // 清除标注信息
-  console.log('--------标注信息----------', currentData.value.deviceBoundaryDTOS)
   if (val === '1') { // 原始流
-    if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
-      draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
-    }
     if (systemType.value === 'sm') { // 流媒体
       // 获取原始流
       leafLoading.value = true
@@ -331,6 +329,11 @@
     //   }
     // }
     // mediaUrl.value = currentData.value.recognitionUrl
+    if (!currentData.value.recognitionGb) { // 在识别流且没有国标号的时候去画框
+      if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
+        draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+      }
+    }
     if (systemType.value === 'sm') {
       leafLoading.value = true
       fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId).then((res: any) => {
@@ -491,7 +494,7 @@
             style="position: absolute"
           /> -->
           <jessibuca
-            id="container1"
+            id="containerVideoPreview"
             ref="jessibucaRef"
             :style="{ width: `${width}px`, height: `${height}px` }"
           />
@@ -512,7 +515,7 @@
             </el-icon>
 
             <!-- =======================右侧按钮========================== -->
-            <el-radio-group v-model="radio" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+            <el-radio-group v-model="radio" fill="#67c23a" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
               <el-radio-button label="1">
                 原始流
               </el-radio-button>
diff --git a/src/views/bigScreen/jessibuca.vue b/src/views/bigScreen/jessibuca.vue
index a6f3c57..50109da 100644
--- a/src/views/bigScreen/jessibuca.vue
+++ b/src/views/bigScreen/jessibuca.vue
@@ -65,6 +65,13 @@
   jessibuca.on('loadingTimeout', () => {
     console.log('loadingTimeout当play()的时候，如果没有数据返回，则回调: timeout')
   })
+
+  jessibuca.on('pause', (flag) => {
+    console.log('pause触发暂停事件')
+  })
+  jessibuca.on('play', (flag) => {
+    console.log('play触发播放事件')
+  })
 }
 
 // 获取视频流地址并播放视频
@@ -75,6 +82,20 @@
   playUrl && jessibuca.play(playUrl)
 }
 
+// 暂停
+function pause() {
+  jessibuca && jessibuca.pause().then(() => {
+    console.log('pause success')
+  })
+}
+
+// 恢复
+function restore() {
+  jessibuca && jessibuca.play().then(() => {
+    console.log('restore success')
+  })
+}
+
 // 销毁视频
 function destroy() {
   jessibuca && jessibuca.destroy()
@@ -93,7 +114,7 @@
 })
 
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ play, destroy })
+defineExpose({ play, destroy, pause, restore })
 </script>
 
 <template>
diff --git a/src/views/monitor/deviceManage/editDev.vue b/src/views/monitor/deviceManage/editDev.vue
index 6506b10..b07a79e 100644
--- a/src/views/monitor/deviceManage/editDev.vue
+++ b/src/views/monitor/deviceManage/editDev.vue
@@ -421,7 +421,7 @@
               v-model.trim="formData.cameraIndexCode" :disabled="dialogStatus === 'detail' || systemType === 'gm'" placeholder="必填"
               clearable
               type="textarea"
-              maxlength="100"
+              maxlength="64"
               show-word-limit
               autosize
             />
@@ -504,8 +504,8 @@
           <el-form-item label="详细位置" class="required">
             <el-input
               v-model.trim="formData.location" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
-              maxlength="100"
               clearable
+              maxlength="100"
               show-word-limit
             />
           </el-form-item>
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 51fca0c..13f04c5 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -225,7 +225,7 @@
               <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
                 编辑
               </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+              <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/monitor/realTime/control-media.vue b/src/views/monitor/realTime/control-media.vue
index c6eb402..46e92c7 100644
--- a/src/views/monitor/realTime/control-media.vue
+++ b/src/views/monitor/realTime/control-media.vue
@@ -217,12 +217,14 @@
 }
 // 恢复
 async function handleRealplay() {
-  video.value.play()
+  // video.value.play()
+  jessibucaRef.value.restore()
   ElMessage.success('已恢复')
 }
 // 暂停
 function handleStopPlay() {
-  video.value.pause()
+  // video.value.pause()
+  jessibucaRef.value.pause()
   ElMessage.success('已暂停')
 }
 
@@ -359,7 +361,7 @@
       class="videoControl"
     /> -->
     <jessibuca
-      id="container1"
+      id="containerControl"
       ref="jessibucaRef"
       class="videoControl"
       :showOperateBtns="true"

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 346f60f..afc7b03 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -85,21 +85,14 @@
     if (data.children.length !== 0) { // 点击父亲
       return
     }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
+    // if (data.device.id === currentLeafId.value) {
+    //   return
+    // }
     leafLoading.value = true // 叶子结点加载流的时候显示Loading图标
     currentLeafId.value = data.device.id
     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') { // 原始流
       if (systemType.value === 'sm') { // 商米流媒体
         // 获取原始流
@@ -118,8 +111,17 @@
       }
     }
     else if (radio.value === '2') { // 识别流
+      if (!data.device.recognitionGb) { // 在识别流且没有国标号的时候去画框
+        // -------------------------------区域绘制----------------------------------------
+        if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+          draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+        }
+        else {
+          points.value = []
+        }
+      }
       if (systemType.value === 'sm') { // sm识别流
-        // 获取原始流
+      // 获取原始流
         fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode).then((res: any) => {
           leafLoading.value = false
           mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}`
@@ -297,11 +299,7 @@
     return false
   }
   points.value = [] // 清除标注信息
-  console.log('--------标注信息----------', currentData.value.deviceBoundaryDTOS)
   if (val === '1') { // 原始流
-    if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
-      draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
-    }
     if (systemType.value === 'sm') { // 流媒体
       // 获取原始流
       leafLoading.value = true
@@ -331,6 +329,11 @@
     //   }
     // }
     // mediaUrl.value = currentData.value.recognitionUrl
+    if (!currentData.value.recognitionGb) { // 在识别流且没有国标号的时候去画框
+      if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
+        draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+      }
+    }
     if (systemType.value === 'sm') {
       leafLoading.value = true
       fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId).then((res: any) => {
@@ -491,7 +494,7 @@
             style="position: absolute"
           /> -->
           <jessibuca
-            id="container1"
+            id="containerVideoPreview"
             ref="jessibucaRef"
             :style="{ width: `${width}px`, height: `${height}px` }"
           />
@@ -512,7 +515,7 @@
             </el-icon>
 
             <!-- =======================右侧按钮========================== -->
-            <el-radio-group v-model="radio" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+            <el-radio-group v-model="radio" fill="#67c23a" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
               <el-radio-button label="1">
                 原始流
               </el-radio-button>
diff --git a/src/views/bigScreen/jessibuca.vue b/src/views/bigScreen/jessibuca.vue
index a6f3c57..50109da 100644
--- a/src/views/bigScreen/jessibuca.vue
+++ b/src/views/bigScreen/jessibuca.vue
@@ -65,6 +65,13 @@
   jessibuca.on('loadingTimeout', () => {
     console.log('loadingTimeout当play()的时候，如果没有数据返回，则回调: timeout')
   })
+
+  jessibuca.on('pause', (flag) => {
+    console.log('pause触发暂停事件')
+  })
+  jessibuca.on('play', (flag) => {
+    console.log('play触发播放事件')
+  })
 }
 
 // 获取视频流地址并播放视频
@@ -75,6 +82,20 @@
   playUrl && jessibuca.play(playUrl)
 }
 
+// 暂停
+function pause() {
+  jessibuca && jessibuca.pause().then(() => {
+    console.log('pause success')
+  })
+}
+
+// 恢复
+function restore() {
+  jessibuca && jessibuca.play().then(() => {
+    console.log('restore success')
+  })
+}
+
 // 销毁视频
 function destroy() {
   jessibuca && jessibuca.destroy()
@@ -93,7 +114,7 @@
 })
 
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ play, destroy })
+defineExpose({ play, destroy, pause, restore })
 </script>
 
 <template>
diff --git a/src/views/monitor/deviceManage/editDev.vue b/src/views/monitor/deviceManage/editDev.vue
index 6506b10..b07a79e 100644
--- a/src/views/monitor/deviceManage/editDev.vue
+++ b/src/views/monitor/deviceManage/editDev.vue
@@ -421,7 +421,7 @@
               v-model.trim="formData.cameraIndexCode" :disabled="dialogStatus === 'detail' || systemType === 'gm'" placeholder="必填"
               clearable
               type="textarea"
-              maxlength="100"
+              maxlength="64"
               show-word-limit
               autosize
             />
@@ -504,8 +504,8 @@
           <el-form-item label="详细位置" class="required">
             <el-input
               v-model.trim="formData.location" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
-              maxlength="100"
               clearable
+              maxlength="100"
               show-word-limit
             />
           </el-form-item>
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 51fca0c..13f04c5 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -225,7 +225,7 @@
               <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
                 编辑
               </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+              <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/monitor/realTime/control-media.vue b/src/views/monitor/realTime/control-media.vue
index c6eb402..46e92c7 100644
--- a/src/views/monitor/realTime/control-media.vue
+++ b/src/views/monitor/realTime/control-media.vue
@@ -217,12 +217,14 @@
 }
 // 恢复
 async function handleRealplay() {
-  video.value.play()
+  // video.value.play()
+  jessibucaRef.value.restore()
   ElMessage.success('已恢复')
 }
 // 暂停
 function handleStopPlay() {
-  video.value.pause()
+  // video.value.pause()
+  jessibucaRef.value.pause()
   ElMessage.success('已暂停')
 }
 
@@ -359,7 +361,7 @@
       class="videoControl"
     /> -->
     <jessibuca
-      id="container1"
+      id="containerControl"
       ref="jessibucaRef"
       class="videoControl"
       :showOperateBtns="true"
diff --git a/src/views/monitor/realTime/index-media-single.vue b/src/views/monitor/realTime/index-media-single.vue
index 1d6cb9a..d8a40c7 100644
--- a/src/views/monitor/realTime/index-media-single.vue
+++ b/src/views/monitor/realTime/index-media-single.vue
@@ -257,10 +257,9 @@
           @dblclick="page(0)"
         /> -->
         <jessibuca
-          id="container1"
+          id="containerMediaSm"
           ref="jessibucaRef"
           :style="{ width: `${width}px`, height: `${height - 28}px` }"
-          @dblclick="page(0)"
           :showOperateBtns="true"
         />
         <div class="title">

diff --git a/public/config/config.json b/public/config/config.json
index 181a4b5..842e02c 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,9 +1,9 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.65:6909/safe-server/",
   "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************",
   "deployPath": "/alarm",
-  "mediaBaseUrl": "http://192.168.83.42:80",
+  "mediaBaseUrl": "http://192.168.83.65:8099",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
   "lat": "39.90",
@@ -12,7 +12,7 @@
   "maxZoom": "18",
   "zoom": "15",
   "timeGap": 600000,
-  "systemType": "gm",
+  "systemType": "sm",
   "lineWidth": "3",
   "lineColor": "#1aa034",
   "fontSize": "18px",
diff --git a/public/playerVideo6/jessibuca.js b/public/playerVideo6/jessibuca.js
index 1450494..601f208 100644
--- a/public/playerVideo6/jessibuca.js
+++ b/public/playerVideo6/jessibuca.js
@@ -37,8 +37,8 @@
       hasControl: !1,
       loadingText: '',
       background: '',
-      decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
-      // decoder: `/playerVideo6/decoder.js`, // 本地使用
+      // decoder: `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`, // 线上使用
+      decoder: `/playerVideo6/decoder.js`, // 本地使用
       // decoder: import.meta.env.MODE === 'development' ?  `/playerVideo6/decoder.js` : `${window.localStorage.getItem('deployPath')}/playerVideo6/decoder.js`,
       url: '',
       rotate: 0,
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 9efd4ac..88a45c5 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -97,19 +97,22 @@
  * @param fileName 文件名称
  */
 export function urlToBlob(url: string, name: string) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('get', url)
-  xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
-  xhr.onload = function () {
-    const path = URL.createObjectURL(xhr.response)
-    const link = document.createElement('a')
-    link.download = name
-    link.href = path
-    link.click()
-    link.remove()
-    window.URL.revokeObjectURL(link.href)
-  }
-  xhr.send()
+  return new Promise((resolve) => {
+    const xhr = new XMLHttpRequest()
+    xhr.open('get', url)
+    xhr.responseType = 'blob' // ""|"text"-字符串 "blob"-Blob对象 "arraybuffer"-ArrayBuffer对象
+    xhr.onload = function () {
+      const path = URL.createObjectURL(xhr.response)
+      const link = document.createElement('a')
+      link.download = name
+      link.href = path
+      link.click()
+      link.remove()
+      window.URL.revokeObjectURL(link.href)
+      resolve(null)
+    }
+    xhr.send()
+  })
 }
 
 /**
@@ -117,35 +120,48 @@
  * @param url 网络文件地址
  * @param name  文件名
  */
-export function download(url: string, name: string) {
-  // 下载图片
-  const photo = ['jpg', 'jpeg', 'png']
-  const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
-  if (photo.includes(fileType)) {
-    // 图片 将服务器图片地址转化成本地地址
-    const image = new Image()
-    image.setAttribute('crossOrigin', 'anonymous')
-    image.src = url
-    image.onload = () => {
-      const canvas = document.createElement('canvas')
-      canvas.width = image.width
-      canvas.height = image.height
-      const ctx = canvas.getContext('2d');
-      (ctx as CanvasRenderingContext2D).drawImage(image, 0, 0, image.width, image.height)
-      canvas.toBlob((blob) => {
-        const url = URL.createObjectURL(blob as Blob)
-        downloadImg(url, name)
-        // 用完释放URL对象
-        URL.revokeObjectURL(url)
+export async function download(url: string, name: string) {
+  return new Promise((resolve) => {
+    // 下载图片
+    const photo = ['jpg', 'jpeg', 'png']
+    const fileType = url.split('.')[url.split('.').length - 1]
+    console.log(fileType, 'fileType')
+    if (photo.includes(fileType)) {
+      // 图片 将服务器图片地址转化成本地地址
+      const image = new Image()
+      image.setAttribute('crossOrigin', 'anonymous')
+      image.src = url
+      image.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = image.width
+        canvas.height = image.height
+        const ctx = canvas.getContext('2d')
+        ;(ctx as CanvasRenderingContext2D).drawImage(
+          image,
+          0,
+          0,
+          image.width,
+          image.height,
+        )
+        canvas.toBlob((blob) => {
+          const url = URL.createObjectURL(blob as Blob)
+          downloadImg(url, name)
+          // 用完释放URL对象
+          URL.revokeObjectURL(url)
+          console.log('111111111111111111')
+          resolve(' ')
+          console.log('2222222222')
+        })
+      }
+    }
+    else {
+      // 预览一般都是用的a标签，文件下载用的window.open
+      // 1.pdf文件路径放到window.open里面，点击是进行在线预览
+      // 2.word文件和excel文件通过a标签打开时，是直接下载了
+      // 将网络地址转化为 blob地址 并下载
+      urlToBlob(url, name).then(() => {
+        resolve(' ')
       })
     }
-  }
-  else {
-    // 预览一般都是用的a标签，文件下载用的window.open
-    // 1.pdf文件路径放到window.open里面，点击是进行在线预览
-    // 2.word文件和excel文件通过a标签打开时，是直接下载了
-    // 将网络地址转化为 blob地址 并下载
-    urlToBlob(url, name)
-  }
+  })
 }
diff --git a/src/views/alarm/library/algorithm/editDialog.vue b/src/views/alarm/library/algorithm/editDialog.vue
index bc131b7..49ffbb1 100644
--- a/src/views/alarm/library/algorithm/editDialog.vue
+++ b/src/views/alarm/library/algorithm/editDialog.vue
@@ -33,6 +33,7 @@
 
 const btnLoading = ref(false) // 保存按钮加载状态
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dataFormRef = ref<FormInstance>() // 表单对象
 // 校验规则
 const rules = reactive<FormRules>({
@@ -147,6 +148,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -169,9 +171,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.modelName}模型文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // ------------------------------------------表格------------------------------------------------
 // 增加行
@@ -254,107 +264,108 @@
 
 <template>
   <el-dialog
-    v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
+    v-model="dialogVisible" :title="textMap[dialogStatus]" width="1000" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-row :gutter="20">
-      <el-col :span="10">
-        <el-form
-          ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-          class="form-container" size="default" @submit.prevent
-        >
-          <el-row :gutter="10">
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法名称" prop="modelName" class="required">
-                <el-input
-                  v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法ID" prop="code" class="required">
-                <el-input
-                  v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="版本号" prop="version" class="required">
-                <el-input
-                  v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" class="grid-cell">
-              <el-form-item label="算法简述" prop="remark" class="required">
-                <el-input
-                  v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-                  clearable type="textarea" maxlength="100" show-word-limit
-                  :autosize="{ minRows: 2 }"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
-                <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-                <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-                  {{ formData.path === '' ? '上传' : '更换附件' }}
-                </el-button>
-                <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-col>
-      <el-col :span="14">
-        <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
-          <template v-if="dialogStatus !== 'detail'" #btns-right>
-            <el-button type="primary" @click="addRow">
-              增加行
-            </el-button>
-            <el-button type="info" @click="removeRow">
-              删除行
-            </el-button>
-          </template>
-          <el-table
-            ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
-            max-height="400px" @selection-change="handleSelectionChange"
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <el-form
+            ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+            class="form-container" size="default" @submit.prevent
           >
-            <el-table-column label="序号" align="center" type="index" width="55" />
-            <el-table-column
-              v-for="item in columns"
-              :key="item.value"
-              :prop="item.value"
-              :label="item.text"
-              align="center"
+            <el-row :gutter="10">
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法名称" prop="modelName" class="required">
+                  <el-input
+                    v-model.trim="formData.modelName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法ID" prop="code" class="required">
+                  <el-input
+                    v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="版本号" prop="version" class="required">
+                  <el-input
+                    v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="grid-cell">
+                <el-form-item label="算法简述" prop="remark" class="required">
+                  <el-input
+                    v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                    clearable type="textarea" maxlength="100" show-word-limit
+                    :autosize="{ minRows: 2 }"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="模型文件(zip):" label-width="120px" prop="path">
+                  <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+                  <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                    {{ formData.path === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                  <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="14">
+          <table-container title="算法预警对象列表" style="margin: 0;padding: 0;">
+            <template v-if="dialogStatus !== 'detail'" #btns-right>
+              <el-button type="primary" @click="addRow">
+                增加行
+              </el-button>
+              <el-button type="info" @click="removeRow">
+                删除行
+              </el-button>
+            </template>
+            <el-table
+              ref="algorithmTableRef" :data="list" border stripe style="width: 100%;"
+              max-height="400px" @selection-change="handleSelectionChange"
             >
-              <template #header>
-                <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-              </template>
-              <template #default="scope">
-                <el-input
-                  v-if="dialogStatus !== 'detail'"
-                  v-model="scope.row[item.value]"
-                  placeholder="必填"
-                />
-                <span v-else>{{ scope.row[item.value] }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
-          </el-table>
-        </table-container>
-      </el-col>
-    </el-row>
-
+              <el-table-column label="序号" align="center" type="index" width="55" />
+              <el-table-column
+                v-for="item in columns"
+                :key="item.value"
+                :prop="item.value"
+                :label="item.text"
+                align="center"
+              >
+                <template #header>
+                  <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+                </template>
+                <template #default="scope">
+                  <el-input
+                    v-if="dialogStatus !== 'detail'"
+                    v-model="scope.row[item.value]"
+                    placeholder="必填"
+                  />
+                  <span v-else>{{ scope.row[item.value] }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="dialogStatus !== 'detail'" :disabled="dialogStatus === 'detail'" type="selection" width="55" align="center" />
+            </el-table>
+          </table-container>
+        </el-col>
+      </el-row>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button type="info" @click="dialogClose">
+        <el-button type="info" :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/library/scene/editDialog.vue b/src/views/alarm/library/scene/editDialog.vue
index c7cea94..f528a51 100644
--- a/src/views/alarm/library/scene/editDialog.vue
+++ b/src/views/alarm/library/scene/editDialog.vue
@@ -19,6 +19,7 @@
   add: '新增',
 }
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 // 表单数据对象
 const formData: Ref<IForm> = ref({
   id: '',
@@ -121,6 +122,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -143,9 +145,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path.slice(formData.value.path.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.sceneName}场景文件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 // -------------------------------------------文件上传--------------------------------------
 
@@ -200,61 +210,63 @@
     v-model="dialogVisible" :title="textMap[dialogStatus]" width="600" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景名称" prop="sceneName" class="required">
-            <el-input
-              v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景ID" prop="sceneCode" class="required">
-            <el-input
-              v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="版本号" prop="version" class="required">
-            <el-input
-              v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="场景简述" prop="remark" class="required">
-            <el-input
-              v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
-              clearable type="textarea" maxlength="100" show-word-limit
-              :autosize="{ minRows: 2 }"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="right" label-width="80px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景名称" prop="sceneName" class="required">
+              <el-input
+                v-model.trim="formData.sceneName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景ID" prop="sceneCode" class="required">
+              <el-input
+                v-model.trim="formData.sceneCode" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="版本号" prop="version" class="required">
+              <el-input
+                v-model.trim="formData.version" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="场景简述" prop="remark" class="required">
+              <el-input
+                v-model.trim="formData.remark" :disabled="dialogStatus === 'detail'" placeholder="必填"
+                clearable type="textarea" maxlength="100" show-word-limit
+                :autosize="{ minRows: 2 }"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="场景文件(zip):" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-show="dialogStatus !== 'detail'" :loading="btnLoading" type="primary" @click="submitForm">
+        <el-button v-show="dialogStatus !== 'detail'" :disabled="dialogLoading" :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
-        <el-button @click="dialogClose">
+        <el-button :disabled="dialogLoading" @click="dialogClose">
           关闭
         </el-button>
       </div>
diff --git a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
index 7007299..26ad262 100644
--- a/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/editDialog.vue
@@ -12,6 +12,7 @@
 const emits = defineEmits(['closeRefresh'])
 const dialogStatus = ref('add')
 const dialogLoading = ref(false)
+const loadingText = ref('拼命加载中')
 const dialogVisible = ref(false) // 弹窗显示隐藏
 // 显示标题
 const textMap: { [key: string]: string } = {
@@ -141,6 +142,7 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     dialogLoading.value = true
+    loadingText.value = '文件上传中，请耐心等待...'
     uploadFile(fd).then((res) => {
       if (res.code === 200) {
         formData.value.path = res.data
@@ -163,9 +165,17 @@
 }
 
 // 下载压缩包
-const downloadZipFile = () => {
+const downloadZipFile = async () => {
   const fileType = formData.value.path!.slice(formData.value.path!.lastIndexOf('.')) // 得到的是后缀名,且转换为大写
-  download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = true
+  loadingText.value = '文件下载中，请耐心等待...'
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  await download(`${window.localStorage.getItem('baseurl-safe')}/static/${formData.value.path}`, `${formData.value.boxName}附件${fileType}`)
+  dialogLoading.value = false
+  loading.close()
 }
 
 // ------------------------------------------区域-----------------------------------------------
@@ -235,7 +245,7 @@
 
 // 获取盒子版本
 function fetchEdgeDeviceZipVersion() {
-  getEdgeDeviceZipVersion().then(res => {
+  getEdgeDeviceZipVersion().then((res) => {
     versionList.value = res.data
   })
 }
@@ -249,69 +259,71 @@
     v-model="dialogVisible" v-loading="dialogLoading" :title="textMap[dialogStatus]" width="700" :before-close="dialogClose" append-to-body
     :open-delay="0" :close-on-click-modal="false"
   >
-    <el-form
-      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
-      class="form-container" size="default" @submit.prevent
-    >
-      <el-row :gutter="10">
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备编号：" prop="code" class="required">
-            <el-input
-              v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="设备名称：" prop="boxName" class="required">
-            <el-input
-              v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="所属区域：" prop="area">
-            <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="所属单位：" prop="deptId" class="required">
-            <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" class="grid-cell">
-          <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
-            <el-input
-              v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件(zip)：" label-width="120px" prop="path">
-            <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
-            <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
-              {{ formData.path === '' ? '上传' : '更换附件' }}
-            </el-button>
-            <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="" prop="path">
-            <el-select
-              v-model="formData.path"
-              placeholder="附件（可选）"
-              clearable
-              filterable
-              :disabled="dialogStatus === 'detail'"
-            >
-              <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+    <block v-loading="dialogLoading" :element-loading-text="loadingText">
+      <el-form
+        ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="150px"
+        class="form-container" size="default" @submit.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备编号：" prop="code" class="required">
+              <el-input
+                v-model.trim="formData.code" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="设备名称：" prop="boxName" class="required">
+              <el-input
+                v-model.trim="formData.boxName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属区域：" prop="area">
+              <el-input style="width: 100%;" :value="formData.areaName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必选" @click="openAreaSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="所属单位：" prop="deptId" class="required">
+              <dept-select v-model="formData.deptId" :disabled="dialogStatus === 'detail'" :dept-show="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="grid-cell">
+            <el-form-item label="ip地址(包括端口)：" prop="ip" class="required">
+              <el-input
+                v-model.trim="formData.ip" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="附件(zip)：" label-width="120px" prop="path">
+              <span class="link" @click="downloadZipFile">{{ formData.path }}</span>
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" :disabled="dialogStatus === 'detail'" :style="{ 'margin-left': formData.path === '' ? '0px' : '20px' }" @click="upload">
+                {{ formData.path === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" prop="path">
+              <el-select
+                v-model="formData.path"
+                placeholder="附件（可选）"
+                clearable
+                filterable
+                :disabled="dialogStatus === 'detail'"
+              >
+                <el-option v-for="item of versionList" :key="item.filePath" :value="item.filePath " :label="item.version" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </block>
     <template #footer>
       <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
diff --git a/src/views/alarm/policyConfig/edgeDevice/list.vue b/src/views/alarm/policyConfig/edgeDevice/list.vue
index b64c5cc..1346ca0 100644
--- a/src/views/alarm/policyConfig/edgeDevice/list.vue
+++ b/src/views/alarm/policyConfig/edgeDevice/list.vue
@@ -108,7 +108,7 @@
   const title = type === 'restart' ? '重启' : type === 'upgrade' ? '升级' : '同步'
   ElMessageBox.confirm(
     `确定要${title}${row.boxName}吗？`,
-    '确认重启',
+    `确认${title}`,
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -183,7 +183,7 @@
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/restart`)" type="warning" link size="small" class="table-text-button" @click="control(scope.row, 'restart')">
                 重启
               </el-button>
-              <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
+              <el-button :disabled="!scope.row.path || `${scope.row.deviceStatus}` !== '1'" v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/upgrade`)" type="primary" link size="small" class="table-text-button" @click="control(scope.row, 'upgrade')">
                 升级
               </el-button>
               <el-button v-if="proxy.hasPerm(`/alarm/policyConfig/edgeDevice/delete`)" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
index 96d2bea..62c2b3d 100644
--- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
+++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue
@@ -70,7 +70,7 @@
   recognitionUrl: [{ required: true, message: '识别流地址必填', trigger: ['blur', 'change'] }],
   rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }],
   mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }],
-  recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
+  // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }],
 })
 
 // 算法表格表头
@@ -687,10 +687,10 @@
                   :disabled="dialogStatus === 'detail'"
                 >
                   <el-option v-for="item of edgeDeviceList" :key="item.id" :label="item.boxName" :value="item.id">
-                    <div style="display: flex;justify-content: space-between;">
-                      <span style="font-weight: 600;">{{ item.boxName }}</span>
-                      <span style="color: #8492a6; font-size: 13px" :style="{ color: `${item.deviceStatus}` === '0' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '0' ? '在线' : '离线' }}</span>
-                      <span style="color: #8492a6; font-size: 13px">{{ item.ip }}</span>
+                    <div style="display: flex;">
+                      <span style="font-weight: 600;flex: 2;">{{ item.boxName }}</span>
+                      <span style="color: #8492a6; font-size: 13px;text-align: left;flex: 1;" :style="{ color: `${item.deviceStatus}` === '1' ? '#0e932e' : '#979797' }">{{ `${item.deviceStatus}` === '1' ? '在线' : '离线' }}</span>
+                      <span style="color: #8492a6; font-size: 13px;flex: 2;text-align: right;">{{ item.ip }}</span>
                     </div>
                   </el-option>
                 </el-select>
diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
index 346f60f..afc7b03 100644
--- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
+++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue
@@ -85,21 +85,14 @@
     if (data.children.length !== 0) { // 点击父亲
       return
     }
-    if (data.device.id === currentLeafId.value) {
-      return
-    }
+    // if (data.device.id === currentLeafId.value) {
+    //   return
+    // }
     leafLoading.value = true // 叶子结点加载流的时候显示Loading图标
     currentLeafId.value = data.device.id
     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') { // 原始流
       if (systemType.value === 'sm') { // 商米流媒体
         // 获取原始流
@@ -118,8 +111,17 @@
       }
     }
     else if (radio.value === '2') { // 识别流
+      if (!data.device.recognitionGb) { // 在识别流且没有国标号的时候去画框
+        // -------------------------------区域绘制----------------------------------------
+        if (data.device.deviceBoundaryDTOS && data.device.deviceBoundaryDTOS.length) {
+          draw(data.device.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+        }
+        else {
+          points.value = []
+        }
+      }
       if (systemType.value === 'sm') { // sm识别流
-        // 获取原始流
+      // 获取原始流
         fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode).then((res: any) => {
           leafLoading.value = false
           mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}`
@@ -297,11 +299,7 @@
     return false
   }
   points.value = [] // 清除标注信息
-  console.log('--------标注信息----------', currentData.value.deviceBoundaryDTOS)
   if (val === '1') { // 原始流
-    if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
-      draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
-    }
     if (systemType.value === 'sm') { // 流媒体
       // 获取原始流
       leafLoading.value = true
@@ -331,6 +329,11 @@
     //   }
     // }
     // mediaUrl.value = currentData.value.recognitionUrl
+    if (!currentData.value.recognitionGb) { // 在识别流且没有国标号的时候去画框
+      if (currentData.value.deviceBoundaryDTOS && Array.isArray(currentData.value.deviceBoundaryDTOS)) {
+        draw(currentData.value.deviceBoundaryDTOS.filter((item: { boundary: string }) => item.boundary))
+      }
+    }
     if (systemType.value === 'sm') {
       leafLoading.value = true
       fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId).then((res: any) => {
@@ -491,7 +494,7 @@
             style="position: absolute"
           /> -->
           <jessibuca
-            id="container1"
+            id="containerVideoPreview"
             ref="jessibucaRef"
             :style="{ width: `${width}px`, height: `${height}px` }"
           />
@@ -512,7 +515,7 @@
             </el-icon>
 
             <!-- =======================右侧按钮========================== -->
-            <el-radio-group v-model="radio" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
+            <el-radio-group v-model="radio" fill="#67c23a" :disabled="!currentData" size="small" style="float: right;margin-right: 30px;" @change="changeRadio">
               <el-radio-button label="1">
                 原始流
               </el-radio-button>
diff --git a/src/views/bigScreen/jessibuca.vue b/src/views/bigScreen/jessibuca.vue
index a6f3c57..50109da 100644
--- a/src/views/bigScreen/jessibuca.vue
+++ b/src/views/bigScreen/jessibuca.vue
@@ -65,6 +65,13 @@
   jessibuca.on('loadingTimeout', () => {
     console.log('loadingTimeout当play()的时候，如果没有数据返回，则回调: timeout')
   })
+
+  jessibuca.on('pause', (flag) => {
+    console.log('pause触发暂停事件')
+  })
+  jessibuca.on('play', (flag) => {
+    console.log('play触发播放事件')
+  })
 }
 
 // 获取视频流地址并播放视频
@@ -75,6 +82,20 @@
   playUrl && jessibuca.play(playUrl)
 }
 
+// 暂停
+function pause() {
+  jessibuca && jessibuca.pause().then(() => {
+    console.log('pause success')
+  })
+}
+
+// 恢复
+function restore() {
+  jessibuca && jessibuca.play().then(() => {
+    console.log('restore success')
+  })
+}
+
 // 销毁视频
 function destroy() {
   jessibuca && jessibuca.destroy()
@@ -93,7 +114,7 @@
 })
 
 // ----------------------- 以下是暴露的方法内容 ----------------------------
-defineExpose({ play, destroy })
+defineExpose({ play, destroy, pause, restore })
 </script>
 
 <template>
diff --git a/src/views/monitor/deviceManage/editDev.vue b/src/views/monitor/deviceManage/editDev.vue
index 6506b10..b07a79e 100644
--- a/src/views/monitor/deviceManage/editDev.vue
+++ b/src/views/monitor/deviceManage/editDev.vue
@@ -421,7 +421,7 @@
               v-model.trim="formData.cameraIndexCode" :disabled="dialogStatus === 'detail' || systemType === 'gm'" placeholder="必填"
               clearable
               type="textarea"
-              maxlength="100"
+              maxlength="64"
               show-word-limit
               autosize
             />
@@ -504,8 +504,8 @@
           <el-form-item label="详细位置" class="required">
             <el-input
               v-model.trim="formData.location" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
-              maxlength="100"
               clearable
+              maxlength="100"
               show-word-limit
             />
           </el-form-item>
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 51fca0c..13f04c5 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -225,7 +225,7 @@
               <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
                 编辑
               </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+              <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/monitor/realTime/control-media.vue b/src/views/monitor/realTime/control-media.vue
index c6eb402..46e92c7 100644
--- a/src/views/monitor/realTime/control-media.vue
+++ b/src/views/monitor/realTime/control-media.vue
@@ -217,12 +217,14 @@
 }
 // 恢复
 async function handleRealplay() {
-  video.value.play()
+  // video.value.play()
+  jessibucaRef.value.restore()
   ElMessage.success('已恢复')
 }
 // 暂停
 function handleStopPlay() {
-  video.value.pause()
+  // video.value.pause()
+  jessibucaRef.value.pause()
   ElMessage.success('已暂停')
 }
 
@@ -359,7 +361,7 @@
       class="videoControl"
     /> -->
     <jessibuca
-      id="container1"
+      id="containerControl"
       ref="jessibucaRef"
       class="videoControl"
       :showOperateBtns="true"
diff --git a/src/views/monitor/realTime/index-media-single.vue b/src/views/monitor/realTime/index-media-single.vue
index 1d6cb9a..d8a40c7 100644
--- a/src/views/monitor/realTime/index-media-single.vue
+++ b/src/views/monitor/realTime/index-media-single.vue
@@ -257,10 +257,9 @@
           @dblclick="page(0)"
         /> -->
         <jessibuca
-          id="container1"
+          id="containerMediaSm"
           ref="jessibucaRef"
           :style="{ width: `${width}px`, height: `${height - 28}px` }"
-          @dblclick="page(0)"
           :showOperateBtns="true"
         />
         <div class="title">
diff --git a/src/views/monitor/realTime/index-new-gm-plugin.vue b/src/views/monitor/realTime/index-new-gm-plugin.vue
index 6df394a..eb8a20c 100644
--- a/src/views/monitor/realTime/index-new-gm-plugin.vue
+++ b/src/views/monitor/realTime/index-new-gm-plugin.vue
@@ -312,7 +312,7 @@
           :style="{ width: `${width}px`, height: `${height - 28}px` }"
         /> -->
         <jessibuca
-          id="container1"
+          id="containerNewGmPlugin"
           ref="jessibucaRef"
           :style="{ width: `${width}px`, height: `${height - 28}px` }"
           :showOperateBtns="true"