diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 6d9cb29..cb66292 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -51,45 +51,46 @@
 // 重大危险源
 const columnsSource: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险源名称', value: 'businessContent', align: 'center' },
-  { text: '场所级别', value: 'yhfl1', align: 'center' },
-  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
-  { text: '危险性质', value: 'equipmentName', align: 'center' },
-  { text: '存量', value: 'time', align: 'center' },
-  { text: '临界量', value: 'remark', align: 'center' },
-  { text: '分级指数', value: 'remark', align: 'center' },
-  { text: '危险物质及定量', value: 'remark', align: 'center' },
-  { text: '危险源等级', value: 'remark', align: 'center' },
+  { text: '危险源名称', value: 'riskName', align: 'center' },
+  { text: '场所级别', value: 'venueLevel', align: 'center' },
+  { text: '危险化学品名称', value: 'hazardousChemicals', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '存量', value: 'stock', align: 'center' },
+  { text: '临界量', value: 'criticalQuantity', align: 'center' },
+  { text: '分级指数', value: 'gradingIndex', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+  { text: '危险源等级', value: 'hazardLevel', align: 'center' },
 ]
 // 危险化学品场所
 const columnsChemistry: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
-  { text: '场所分类', value: 'yhfl1', align: 'center' },
-  { text: '作业活动', value: 'yhfl2', align: 'center' },
-  { text: '危化品名称', value: 'equipmentName', align: 'center' },
-  { text: '危险性质', value: 'time', align: 'center' },
-  { text: '定岗', value: 'remark', align: 'center' },
-  { text: '定员', value: 'remark', align: 'center' },
-  { text: '定量', value: 'remark', align: 'center' },
-  { text: '定寿命', value: 'remark', align: 'center' },
-  { text: '定检', value: 'remark', align: 'center' },
+  { text: '危险化学品场所', value: 'hazardousChemicalSite', align: 'center' },
+  { text: '场所分类', value: 'venueClassification', align: 'center' },
+  { text: '作业活动', value: 'content', align: 'center' },
+  { text: '危化品名称', value: 'riskName', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '定量', value: 'quantitative', align: 'center' },
+  { text: '定寿命', value: 'fixedLifespan', align: 'center' },
+  { text: '定检', value: 'regularInspection', align: 'center' },
 ]
+
 // 危险作业
 const columnsWork: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业', value: 'businessContent', align: 'center' },
-  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
-  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
-  { text: '相关部门', value: 'equipmentName', align: 'center' },
-  { text: '作业频次', value: 'time', align: 'center' },
+  { text: '危险作业', value: 'hazardousHork', align: 'center' },
+  { text: '危险作业等级', value: 'workLevel', align: 'center' },
+  { text: '主要危险描述', value: 'hazardousRemark', align: 'center' },
+  { text: '相关部门', value: 'relevantDepartments', align: 'center' },
+  { text: '作业频次', value: 'operationFrequency', align: 'center' },
 ]
 // 危险作业工序
 const columnsWorkProcesses: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业工序', value: 'businessContent', align: 'center' },
-  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
-  { text: '事故类型', value: 'yhfl2', align: 'center' },
+  { text: '危险作业工序', value: 'workProcedure', align: 'center' },
+  { text: '作业人员数量', value: 'workerNum', align: 'center' },
+  { text: '事故类型', value: 'accidentType', align: 'center' },
 ]
 // -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
@@ -142,7 +143,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -151,7 +152,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 // -------------------------------------------------------------------------------------
@@ -217,13 +218,13 @@
       editSourceDialogRef.value.initDialog('detail', active.value, row)
       break
     case '3': // 危险化学品场所
-      editChemistryDialogRef.value.initDialog('add', active.value, row)
+      editChemistryDialogRef.value.initDialog('detail', active.value, row)
       break
     case '4': // 危险作业
-      editWorkDialogRef.value.initDialog('add', active.value, row)
+      editWorkDialogRef.value.initDialog('detail', active.value, row)
       break
     case '5': // 危险作业工序
-      editWorkProcessesDialogRef.value.initDialog('add', active.value, row)
+      editWorkProcessesDialogRef.value.initDialog('detail', active.value, row)
       break
   }
 }
@@ -234,12 +235,16 @@
       editPointDialogRef.value.initDialog('edit', active.value, row)
       break
     case '2': // 重大危险源
+      editSourceDialogRef.value.initDialog('edit', active.value, row)
       break
     case '3': // 危险化学品场所
+      editChemistryDialogRef.value.initDialog('edit', active.value, row)
       break
     case '4': // 危险作业
+      editWorkDialogRef.value.initDialog('edit', active.value, row)
       break
     case '5': // 危险作业工序
+      editWorkProcessesDialogRef.value.initDialog('edit', active.value, row)
       break
   }
 }

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 6d9cb29..cb66292 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -51,45 +51,46 @@
 // 重大危险源
 const columnsSource: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险源名称', value: 'businessContent', align: 'center' },
-  { text: '场所级别', value: 'yhfl1', align: 'center' },
-  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
-  { text: '危险性质', value: 'equipmentName', align: 'center' },
-  { text: '存量', value: 'time', align: 'center' },
-  { text: '临界量', value: 'remark', align: 'center' },
-  { text: '分级指数', value: 'remark', align: 'center' },
-  { text: '危险物质及定量', value: 'remark', align: 'center' },
-  { text: '危险源等级', value: 'remark', align: 'center' },
+  { text: '危险源名称', value: 'riskName', align: 'center' },
+  { text: '场所级别', value: 'venueLevel', align: 'center' },
+  { text: '危险化学品名称', value: 'hazardousChemicals', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '存量', value: 'stock', align: 'center' },
+  { text: '临界量', value: 'criticalQuantity', align: 'center' },
+  { text: '分级指数', value: 'gradingIndex', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+  { text: '危险源等级', value: 'hazardLevel', align: 'center' },
 ]
 // 危险化学品场所
 const columnsChemistry: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
-  { text: '场所分类', value: 'yhfl1', align: 'center' },
-  { text: '作业活动', value: 'yhfl2', align: 'center' },
-  { text: '危化品名称', value: 'equipmentName', align: 'center' },
-  { text: '危险性质', value: 'time', align: 'center' },
-  { text: '定岗', value: 'remark', align: 'center' },
-  { text: '定员', value: 'remark', align: 'center' },
-  { text: '定量', value: 'remark', align: 'center' },
-  { text: '定寿命', value: 'remark', align: 'center' },
-  { text: '定检', value: 'remark', align: 'center' },
+  { text: '危险化学品场所', value: 'hazardousChemicalSite', align: 'center' },
+  { text: '场所分类', value: 'venueClassification', align: 'center' },
+  { text: '作业活动', value: 'content', align: 'center' },
+  { text: '危化品名称', value: 'riskName', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '定量', value: 'quantitative', align: 'center' },
+  { text: '定寿命', value: 'fixedLifespan', align: 'center' },
+  { text: '定检', value: 'regularInspection', align: 'center' },
 ]
+
 // 危险作业
 const columnsWork: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业', value: 'businessContent', align: 'center' },
-  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
-  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
-  { text: '相关部门', value: 'equipmentName', align: 'center' },
-  { text: '作业频次', value: 'time', align: 'center' },
+  { text: '危险作业', value: 'hazardousHork', align: 'center' },
+  { text: '危险作业等级', value: 'workLevel', align: 'center' },
+  { text: '主要危险描述', value: 'hazardousRemark', align: 'center' },
+  { text: '相关部门', value: 'relevantDepartments', align: 'center' },
+  { text: '作业频次', value: 'operationFrequency', align: 'center' },
 ]
 // 危险作业工序
 const columnsWorkProcesses: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业工序', value: 'businessContent', align: 'center' },
-  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
-  { text: '事故类型', value: 'yhfl2', align: 'center' },
+  { text: '危险作业工序', value: 'workProcedure', align: 'center' },
+  { text: '作业人员数量', value: 'workerNum', align: 'center' },
+  { text: '事故类型', value: 'accidentType', align: 'center' },
 ]
 // -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
@@ -142,7 +143,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -151,7 +152,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 // -------------------------------------------------------------------------------------
@@ -217,13 +218,13 @@
       editSourceDialogRef.value.initDialog('detail', active.value, row)
       break
     case '3': // 危险化学品场所
-      editChemistryDialogRef.value.initDialog('add', active.value, row)
+      editChemistryDialogRef.value.initDialog('detail', active.value, row)
       break
     case '4': // 危险作业
-      editWorkDialogRef.value.initDialog('add', active.value, row)
+      editWorkDialogRef.value.initDialog('detail', active.value, row)
       break
     case '5': // 危险作业工序
-      editWorkProcessesDialogRef.value.initDialog('add', active.value, row)
+      editWorkProcessesDialogRef.value.initDialog('detail', active.value, row)
       break
   }
 }
@@ -234,12 +235,16 @@
       editPointDialogRef.value.initDialog('edit', active.value, row)
       break
     case '2': // 重大危险源
+      editSourceDialogRef.value.initDialog('edit', active.value, row)
       break
     case '3': // 危险化学品场所
+      editChemistryDialogRef.value.initDialog('edit', active.value, row)
       break
     case '4': // 危险作业
+      editWorkDialogRef.value.initDialog('edit', active.value, row)
       break
     case '5': // 危险作业工序
+      editWorkProcessesDialogRef.value.initDialog('edit', active.value, row)
       break
   }
 }
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 3d9eab9..7866dea 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -101,7 +101,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -110,7 +110,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 6d9cb29..cb66292 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -51,45 +51,46 @@
 // 重大危险源
 const columnsSource: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险源名称', value: 'businessContent', align: 'center' },
-  { text: '场所级别', value: 'yhfl1', align: 'center' },
-  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
-  { text: '危险性质', value: 'equipmentName', align: 'center' },
-  { text: '存量', value: 'time', align: 'center' },
-  { text: '临界量', value: 'remark', align: 'center' },
-  { text: '分级指数', value: 'remark', align: 'center' },
-  { text: '危险物质及定量', value: 'remark', align: 'center' },
-  { text: '危险源等级', value: 'remark', align: 'center' },
+  { text: '危险源名称', value: 'riskName', align: 'center' },
+  { text: '场所级别', value: 'venueLevel', align: 'center' },
+  { text: '危险化学品名称', value: 'hazardousChemicals', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '存量', value: 'stock', align: 'center' },
+  { text: '临界量', value: 'criticalQuantity', align: 'center' },
+  { text: '分级指数', value: 'gradingIndex', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+  { text: '危险源等级', value: 'hazardLevel', align: 'center' },
 ]
 // 危险化学品场所
 const columnsChemistry: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
-  { text: '场所分类', value: 'yhfl1', align: 'center' },
-  { text: '作业活动', value: 'yhfl2', align: 'center' },
-  { text: '危化品名称', value: 'equipmentName', align: 'center' },
-  { text: '危险性质', value: 'time', align: 'center' },
-  { text: '定岗', value: 'remark', align: 'center' },
-  { text: '定员', value: 'remark', align: 'center' },
-  { text: '定量', value: 'remark', align: 'center' },
-  { text: '定寿命', value: 'remark', align: 'center' },
-  { text: '定检', value: 'remark', align: 'center' },
+  { text: '危险化学品场所', value: 'hazardousChemicalSite', align: 'center' },
+  { text: '场所分类', value: 'venueClassification', align: 'center' },
+  { text: '作业活动', value: 'content', align: 'center' },
+  { text: '危化品名称', value: 'riskName', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '定量', value: 'quantitative', align: 'center' },
+  { text: '定寿命', value: 'fixedLifespan', align: 'center' },
+  { text: '定检', value: 'regularInspection', align: 'center' },
 ]
+
 // 危险作业
 const columnsWork: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业', value: 'businessContent', align: 'center' },
-  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
-  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
-  { text: '相关部门', value: 'equipmentName', align: 'center' },
-  { text: '作业频次', value: 'time', align: 'center' },
+  { text: '危险作业', value: 'hazardousHork', align: 'center' },
+  { text: '危险作业等级', value: 'workLevel', align: 'center' },
+  { text: '主要危险描述', value: 'hazardousRemark', align: 'center' },
+  { text: '相关部门', value: 'relevantDepartments', align: 'center' },
+  { text: '作业频次', value: 'operationFrequency', align: 'center' },
 ]
 // 危险作业工序
 const columnsWorkProcesses: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业工序', value: 'businessContent', align: 'center' },
-  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
-  { text: '事故类型', value: 'yhfl2', align: 'center' },
+  { text: '危险作业工序', value: 'workProcedure', align: 'center' },
+  { text: '作业人员数量', value: 'workerNum', align: 'center' },
+  { text: '事故类型', value: 'accidentType', align: 'center' },
 ]
 // -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
@@ -142,7 +143,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -151,7 +152,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 // -------------------------------------------------------------------------------------
@@ -217,13 +218,13 @@
       editSourceDialogRef.value.initDialog('detail', active.value, row)
       break
     case '3': // 危险化学品场所
-      editChemistryDialogRef.value.initDialog('add', active.value, row)
+      editChemistryDialogRef.value.initDialog('detail', active.value, row)
       break
     case '4': // 危险作业
-      editWorkDialogRef.value.initDialog('add', active.value, row)
+      editWorkDialogRef.value.initDialog('detail', active.value, row)
       break
     case '5': // 危险作业工序
-      editWorkProcessesDialogRef.value.initDialog('add', active.value, row)
+      editWorkProcessesDialogRef.value.initDialog('detail', active.value, row)
       break
   }
 }
@@ -234,12 +235,16 @@
       editPointDialogRef.value.initDialog('edit', active.value, row)
       break
     case '2': // 重大危险源
+      editSourceDialogRef.value.initDialog('edit', active.value, row)
       break
     case '3': // 危险化学品场所
+      editChemistryDialogRef.value.initDialog('edit', active.value, row)
       break
     case '4': // 危险作业
+      editWorkDialogRef.value.initDialog('edit', active.value, row)
       break
     case '5': // 危险作业工序
+      editWorkProcessesDialogRef.value.initDialog('edit', active.value, row)
       break
   }
 }
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 3d9eab9..7866dea 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -101,7 +101,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -110,7 +110,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 
diff --git a/src/views/monitor/realTime/control-hk.vue b/src/views/monitor/realTime/control-hk.vue
index fb7bb32..23cb351 100644
--- a/src/views/monitor/realTime/control-hk.vue
+++ b/src/views/monitor/realTime/control-hk.vue
@@ -135,7 +135,7 @@
         })
       },
       (oError: any) => {
-        ElMessage.error('抓图失败!')
+        ElMessage.warning('抓图失败!')
       })
 
     // // plan B

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 6d9cb29..cb66292 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -51,45 +51,46 @@
 // 重大危险源
 const columnsSource: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险源名称', value: 'businessContent', align: 'center' },
-  { text: '场所级别', value: 'yhfl1', align: 'center' },
-  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
-  { text: '危险性质', value: 'equipmentName', align: 'center' },
-  { text: '存量', value: 'time', align: 'center' },
-  { text: '临界量', value: 'remark', align: 'center' },
-  { text: '分级指数', value: 'remark', align: 'center' },
-  { text: '危险物质及定量', value: 'remark', align: 'center' },
-  { text: '危险源等级', value: 'remark', align: 'center' },
+  { text: '危险源名称', value: 'riskName', align: 'center' },
+  { text: '场所级别', value: 'venueLevel', align: 'center' },
+  { text: '危险化学品名称', value: 'hazardousChemicals', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '存量', value: 'stock', align: 'center' },
+  { text: '临界量', value: 'criticalQuantity', align: 'center' },
+  { text: '分级指数', value: 'gradingIndex', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+  { text: '危险源等级', value: 'hazardLevel', align: 'center' },
 ]
 // 危险化学品场所
 const columnsChemistry: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
-  { text: '场所分类', value: 'yhfl1', align: 'center' },
-  { text: '作业活动', value: 'yhfl2', align: 'center' },
-  { text: '危化品名称', value: 'equipmentName', align: 'center' },
-  { text: '危险性质', value: 'time', align: 'center' },
-  { text: '定岗', value: 'remark', align: 'center' },
-  { text: '定员', value: 'remark', align: 'center' },
-  { text: '定量', value: 'remark', align: 'center' },
-  { text: '定寿命', value: 'remark', align: 'center' },
-  { text: '定检', value: 'remark', align: 'center' },
+  { text: '危险化学品场所', value: 'hazardousChemicalSite', align: 'center' },
+  { text: '场所分类', value: 'venueClassification', align: 'center' },
+  { text: '作业活动', value: 'content', align: 'center' },
+  { text: '危化品名称', value: 'riskName', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '定量', value: 'quantitative', align: 'center' },
+  { text: '定寿命', value: 'fixedLifespan', align: 'center' },
+  { text: '定检', value: 'regularInspection', align: 'center' },
 ]
+
 // 危险作业
 const columnsWork: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业', value: 'businessContent', align: 'center' },
-  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
-  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
-  { text: '相关部门', value: 'equipmentName', align: 'center' },
-  { text: '作业频次', value: 'time', align: 'center' },
+  { text: '危险作业', value: 'hazardousHork', align: 'center' },
+  { text: '危险作业等级', value: 'workLevel', align: 'center' },
+  { text: '主要危险描述', value: 'hazardousRemark', align: 'center' },
+  { text: '相关部门', value: 'relevantDepartments', align: 'center' },
+  { text: '作业频次', value: 'operationFrequency', align: 'center' },
 ]
 // 危险作业工序
 const columnsWorkProcesses: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业工序', value: 'businessContent', align: 'center' },
-  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
-  { text: '事故类型', value: 'yhfl2', align: 'center' },
+  { text: '危险作业工序', value: 'workProcedure', align: 'center' },
+  { text: '作业人员数量', value: 'workerNum', align: 'center' },
+  { text: '事故类型', value: 'accidentType', align: 'center' },
 ]
 // -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
@@ -142,7 +143,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -151,7 +152,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 // -------------------------------------------------------------------------------------
@@ -217,13 +218,13 @@
       editSourceDialogRef.value.initDialog('detail', active.value, row)
       break
     case '3': // 危险化学品场所
-      editChemistryDialogRef.value.initDialog('add', active.value, row)
+      editChemistryDialogRef.value.initDialog('detail', active.value, row)
       break
     case '4': // 危险作业
-      editWorkDialogRef.value.initDialog('add', active.value, row)
+      editWorkDialogRef.value.initDialog('detail', active.value, row)
       break
     case '5': // 危险作业工序
-      editWorkProcessesDialogRef.value.initDialog('add', active.value, row)
+      editWorkProcessesDialogRef.value.initDialog('detail', active.value, row)
       break
   }
 }
@@ -234,12 +235,16 @@
       editPointDialogRef.value.initDialog('edit', active.value, row)
       break
     case '2': // 重大危险源
+      editSourceDialogRef.value.initDialog('edit', active.value, row)
       break
     case '3': // 危险化学品场所
+      editChemistryDialogRef.value.initDialog('edit', active.value, row)
       break
     case '4': // 危险作业
+      editWorkDialogRef.value.initDialog('edit', active.value, row)
       break
     case '5': // 危险作业工序
+      editWorkProcessesDialogRef.value.initDialog('edit', active.value, row)
       break
   }
 }
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 3d9eab9..7866dea 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -101,7 +101,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -110,7 +110,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 
diff --git a/src/views/monitor/realTime/control-hk.vue b/src/views/monitor/realTime/control-hk.vue
index fb7bb32..23cb351 100644
--- a/src/views/monitor/realTime/control-hk.vue
+++ b/src/views/monitor/realTime/control-hk.vue
@@ -135,7 +135,7 @@
         })
       },
       (oError: any) => {
-        ElMessage.error('抓图失败!')
+        ElMessage.warning('抓图失败!')
       })
 
     // // plan B
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index c0eaeea..e22a039 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -165,7 +165,7 @@
         ElMessage.success('上传成功')
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
       }
     })
   }

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 6d9cb29..cb66292 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -51,45 +51,46 @@
 // 重大危险源
 const columnsSource: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险源名称', value: 'businessContent', align: 'center' },
-  { text: '场所级别', value: 'yhfl1', align: 'center' },
-  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
-  { text: '危险性质', value: 'equipmentName', align: 'center' },
-  { text: '存量', value: 'time', align: 'center' },
-  { text: '临界量', value: 'remark', align: 'center' },
-  { text: '分级指数', value: 'remark', align: 'center' },
-  { text: '危险物质及定量', value: 'remark', align: 'center' },
-  { text: '危险源等级', value: 'remark', align: 'center' },
+  { text: '危险源名称', value: 'riskName', align: 'center' },
+  { text: '场所级别', value: 'venueLevel', align: 'center' },
+  { text: '危险化学品名称', value: 'hazardousChemicals', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '存量', value: 'stock', align: 'center' },
+  { text: '临界量', value: 'criticalQuantity', align: 'center' },
+  { text: '分级指数', value: 'gradingIndex', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+  { text: '危险源等级', value: 'hazardLevel', align: 'center' },
 ]
 // 危险化学品场所
 const columnsChemistry: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
-  { text: '场所分类', value: 'yhfl1', align: 'center' },
-  { text: '作业活动', value: 'yhfl2', align: 'center' },
-  { text: '危化品名称', value: 'equipmentName', align: 'center' },
-  { text: '危险性质', value: 'time', align: 'center' },
-  { text: '定岗', value: 'remark', align: 'center' },
-  { text: '定员', value: 'remark', align: 'center' },
-  { text: '定量', value: 'remark', align: 'center' },
-  { text: '定寿命', value: 'remark', align: 'center' },
-  { text: '定检', value: 'remark', align: 'center' },
+  { text: '危险化学品场所', value: 'hazardousChemicalSite', align: 'center' },
+  { text: '场所分类', value: 'venueClassification', align: 'center' },
+  { text: '作业活动', value: 'content', align: 'center' },
+  { text: '危化品名称', value: 'riskName', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '定量', value: 'quantitative', align: 'center' },
+  { text: '定寿命', value: 'fixedLifespan', align: 'center' },
+  { text: '定检', value: 'regularInspection', align: 'center' },
 ]
+
 // 危险作业
 const columnsWork: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业', value: 'businessContent', align: 'center' },
-  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
-  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
-  { text: '相关部门', value: 'equipmentName', align: 'center' },
-  { text: '作业频次', value: 'time', align: 'center' },
+  { text: '危险作业', value: 'hazardousHork', align: 'center' },
+  { text: '危险作业等级', value: 'workLevel', align: 'center' },
+  { text: '主要危险描述', value: 'hazardousRemark', align: 'center' },
+  { text: '相关部门', value: 'relevantDepartments', align: 'center' },
+  { text: '作业频次', value: 'operationFrequency', align: 'center' },
 ]
 // 危险作业工序
 const columnsWorkProcesses: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业工序', value: 'businessContent', align: 'center' },
-  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
-  { text: '事故类型', value: 'yhfl2', align: 'center' },
+  { text: '危险作业工序', value: 'workProcedure', align: 'center' },
+  { text: '作业人员数量', value: 'workerNum', align: 'center' },
+  { text: '事故类型', value: 'accidentType', align: 'center' },
 ]
 // -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
@@ -142,7 +143,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -151,7 +152,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 // -------------------------------------------------------------------------------------
@@ -217,13 +218,13 @@
       editSourceDialogRef.value.initDialog('detail', active.value, row)
       break
     case '3': // 危险化学品场所
-      editChemistryDialogRef.value.initDialog('add', active.value, row)
+      editChemistryDialogRef.value.initDialog('detail', active.value, row)
       break
     case '4': // 危险作业
-      editWorkDialogRef.value.initDialog('add', active.value, row)
+      editWorkDialogRef.value.initDialog('detail', active.value, row)
       break
     case '5': // 危险作业工序
-      editWorkProcessesDialogRef.value.initDialog('add', active.value, row)
+      editWorkProcessesDialogRef.value.initDialog('detail', active.value, row)
       break
   }
 }
@@ -234,12 +235,16 @@
       editPointDialogRef.value.initDialog('edit', active.value, row)
       break
     case '2': // 重大危险源
+      editSourceDialogRef.value.initDialog('edit', active.value, row)
       break
     case '3': // 危险化学品场所
+      editChemistryDialogRef.value.initDialog('edit', active.value, row)
       break
     case '4': // 危险作业
+      editWorkDialogRef.value.initDialog('edit', active.value, row)
       break
     case '5': // 危险作业工序
+      editWorkProcessesDialogRef.value.initDialog('edit', active.value, row)
       break
   }
 }
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 3d9eab9..7866dea 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -101,7 +101,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -110,7 +110,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 
diff --git a/src/views/monitor/realTime/control-hk.vue b/src/views/monitor/realTime/control-hk.vue
index fb7bb32..23cb351 100644
--- a/src/views/monitor/realTime/control-hk.vue
+++ b/src/views/monitor/realTime/control-hk.vue
@@ -135,7 +135,7 @@
         })
       },
       (oError: any) => {
-        ElMessage.error('抓图失败!')
+        ElMessage.warning('抓图失败!')
       })
 
     // // plan B
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index c0eaeea..e22a039 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -165,7 +165,7 @@
         ElMessage.success('上传成功')
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
       }
     })
   }
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e9cce80..78291ea 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -94,7 +94,7 @@
             ElMessage.success('操作成功')
           }
           else {
-            ElMessage.error(res.message)
+            ElMessage.warning(res.message)
           }
         })
       }
@@ -105,7 +105,7 @@
             ElMessage.success('操作成功')
           }
           else {
-            ElMessage.error(res.message)
+            ElMessage.warning(res.message)
           }
         })
       }
@@ -135,7 +135,7 @@
         ElMessage.success('上传成功')
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
       }
     })
   }

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 6d9cb29..cb66292 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -51,45 +51,46 @@
 // 重大危险源
 const columnsSource: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险源名称', value: 'businessContent', align: 'center' },
-  { text: '场所级别', value: 'yhfl1', align: 'center' },
-  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
-  { text: '危险性质', value: 'equipmentName', align: 'center' },
-  { text: '存量', value: 'time', align: 'center' },
-  { text: '临界量', value: 'remark', align: 'center' },
-  { text: '分级指数', value: 'remark', align: 'center' },
-  { text: '危险物质及定量', value: 'remark', align: 'center' },
-  { text: '危险源等级', value: 'remark', align: 'center' },
+  { text: '危险源名称', value: 'riskName', align: 'center' },
+  { text: '场所级别', value: 'venueLevel', align: 'center' },
+  { text: '危险化学品名称', value: 'hazardousChemicals', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '存量', value: 'stock', align: 'center' },
+  { text: '临界量', value: 'criticalQuantity', align: 'center' },
+  { text: '分级指数', value: 'gradingIndex', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+  { text: '危险源等级', value: 'hazardLevel', align: 'center' },
 ]
 // 危险化学品场所
 const columnsChemistry: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
-  { text: '场所分类', value: 'yhfl1', align: 'center' },
-  { text: '作业活动', value: 'yhfl2', align: 'center' },
-  { text: '危化品名称', value: 'equipmentName', align: 'center' },
-  { text: '危险性质', value: 'time', align: 'center' },
-  { text: '定岗', value: 'remark', align: 'center' },
-  { text: '定员', value: 'remark', align: 'center' },
-  { text: '定量', value: 'remark', align: 'center' },
-  { text: '定寿命', value: 'remark', align: 'center' },
-  { text: '定检', value: 'remark', align: 'center' },
+  { text: '危险化学品场所', value: 'hazardousChemicalSite', align: 'center' },
+  { text: '场所分类', value: 'venueClassification', align: 'center' },
+  { text: '作业活动', value: 'content', align: 'center' },
+  { text: '危化品名称', value: 'riskName', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '定量', value: 'quantitative', align: 'center' },
+  { text: '定寿命', value: 'fixedLifespan', align: 'center' },
+  { text: '定检', value: 'regularInspection', align: 'center' },
 ]
+
 // 危险作业
 const columnsWork: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业', value: 'businessContent', align: 'center' },
-  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
-  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
-  { text: '相关部门', value: 'equipmentName', align: 'center' },
-  { text: '作业频次', value: 'time', align: 'center' },
+  { text: '危险作业', value: 'hazardousHork', align: 'center' },
+  { text: '危险作业等级', value: 'workLevel', align: 'center' },
+  { text: '主要危险描述', value: 'hazardousRemark', align: 'center' },
+  { text: '相关部门', value: 'relevantDepartments', align: 'center' },
+  { text: '作业频次', value: 'operationFrequency', align: 'center' },
 ]
 // 危险作业工序
 const columnsWorkProcesses: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业工序', value: 'businessContent', align: 'center' },
-  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
-  { text: '事故类型', value: 'yhfl2', align: 'center' },
+  { text: '危险作业工序', value: 'workProcedure', align: 'center' },
+  { text: '作业人员数量', value: 'workerNum', align: 'center' },
+  { text: '事故类型', value: 'accidentType', align: 'center' },
 ]
 // -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
@@ -142,7 +143,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -151,7 +152,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 // -------------------------------------------------------------------------------------
@@ -217,13 +218,13 @@
       editSourceDialogRef.value.initDialog('detail', active.value, row)
       break
     case '3': // 危险化学品场所
-      editChemistryDialogRef.value.initDialog('add', active.value, row)
+      editChemistryDialogRef.value.initDialog('detail', active.value, row)
       break
     case '4': // 危险作业
-      editWorkDialogRef.value.initDialog('add', active.value, row)
+      editWorkDialogRef.value.initDialog('detail', active.value, row)
       break
     case '5': // 危险作业工序
-      editWorkProcessesDialogRef.value.initDialog('add', active.value, row)
+      editWorkProcessesDialogRef.value.initDialog('detail', active.value, row)
       break
   }
 }
@@ -234,12 +235,16 @@
       editPointDialogRef.value.initDialog('edit', active.value, row)
       break
     case '2': // 重大危险源
+      editSourceDialogRef.value.initDialog('edit', active.value, row)
       break
     case '3': // 危险化学品场所
+      editChemistryDialogRef.value.initDialog('edit', active.value, row)
       break
     case '4': // 危险作业
+      editWorkDialogRef.value.initDialog('edit', active.value, row)
       break
     case '5': // 危险作业工序
+      editWorkProcessesDialogRef.value.initDialog('edit', active.value, row)
       break
   }
 }
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 3d9eab9..7866dea 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -101,7 +101,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -110,7 +110,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 
diff --git a/src/views/monitor/realTime/control-hk.vue b/src/views/monitor/realTime/control-hk.vue
index fb7bb32..23cb351 100644
--- a/src/views/monitor/realTime/control-hk.vue
+++ b/src/views/monitor/realTime/control-hk.vue
@@ -135,7 +135,7 @@
         })
       },
       (oError: any) => {
-        ElMessage.error('抓图失败!')
+        ElMessage.warning('抓图失败!')
       })
 
     // // plan B
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index c0eaeea..e22a039 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -165,7 +165,7 @@
         ElMessage.success('上传成功')
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
       }
     })
   }
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e9cce80..78291ea 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -94,7 +94,7 @@
             ElMessage.success('操作成功')
           }
           else {
-            ElMessage.error(res.message)
+            ElMessage.warning(res.message)
           }
         })
       }
@@ -105,7 +105,7 @@
             ElMessage.success('操作成功')
           }
           else {
-            ElMessage.error(res.message)
+            ElMessage.warning(res.message)
           }
         })
       }
@@ -135,7 +135,7 @@
         ElMessage.success('上传成功')
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
       }
     })
   }
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index a3bc743..4867927 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -178,7 +178,7 @@
         loading.close()
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
         loading.close()
       }
     })

diff --git a/src/api/index.ts b/src/api/index.ts
index b13147a..3fe9d5b 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -103,10 +103,10 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else if (response.data.code === 500 && response.data.msg) {
-        ElMessage.error(response.data.msg)
+        ElMessage.warning(response.data.msg)
       }
       else {
         // 这里做错误提
@@ -138,7 +138,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -151,7 +151,7 @@
         const message: string = error.response.data.message
         ElMessage({
           message,
-          type: 'error',
+          type: 'warning',
         })
       }
     }
@@ -168,7 +168,7 @@
       }
       ElMessage({
         message,
-        type: 'error',
+        type: 'warning',
       })
     }
     return Promise.reject(error)
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 9304b62..02d0ee9 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -95,7 +95,7 @@
       }
       else if (response.data.code === 500 && response.data.message === '数据格式不正确' && response.data.data) {
         const mes = response.data.data.filter((item: any, index: number) => index < 2).join(',')
-        ElMessage.error(mes)
+        ElMessage.warning(mes)
       }
       else {
         // 这里做错误
@@ -133,7 +133,7 @@
         if (e && e.target!.result) {
           errMsg = JSON.parse(e.target!.result as string)
         }
-        ElMessage.error(errMsg)
+        ElMessage.warning(errMsg)
       }
     }
     else if (error.response && error.response.data) {
@@ -156,7 +156,7 @@
         message = '后端网络故障'
       }
       else if (message.includes('timeout')) {
-        message = '接口请求超时'
+        message = '收流超时'
       }
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9302b14..07b31a5 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -49,10 +49,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传文件只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传文件大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传文件大小不能超过 ${props.size}MB！`)
   }
   return isTypeOk && isSizeOk
 }
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index dc65d62..5647d7e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -77,10 +77,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 9d01e3a..c48c68e 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -97,10 +97,10 @@
   const isTypeOk = props.ext.includes(fileExt)
   const isSizeOk = file.size / 1024 / 1024 < props.size
   if (!isTypeOk) {
-    ElMessage.error(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
+    ElMessage.warning(`上传图片只支持 ${props.ext.join(' / ')} 格式！`)
   }
   if (!isSizeOk) {
-    ElMessage.error(`上传图片大小不能超过 ${props.size}MB！`)
+    ElMessage.warning(`上传图片大小不能超过 ${props.size}MB！`)
   }
   if (isTypeOk && isSizeOk) {
     uploadData.value.progress.preview = URL.createObjectURL(file)
diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts
index c97e682..3e07e69 100644
--- a/src/router/modules/monitor.ts
+++ b/src/router/modules/monitor.ts
@@ -20,10 +20,10 @@
         name: 'page',
         component: () =>
           // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路
-        // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
-        // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
-        import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
-        // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
+          // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路
+          // import('@/views/monitor/realTime/index-isc-single.vue'), // isc
+          import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路
+          // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
@@ -37,8 +37,8 @@
         name: 'control',
         // component: () => import('@/views/monitor/realTime/control-noPlugin.vue'), // SDK
         // component: () => import('@/views/monitor/realTime/control-isc.vue'), // isc
-        component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
-        // component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
+        // component: () => import('@/views/monitor/realTime/control-media.vue'), // 流媒体
+        component: () => import('@/views/monitor/realTime/control-new-gm-plugin.vue'), // 国
         meta: {
           title: '实时监控',
           auth: '/realTime',
diff --git a/src/utils/useTemplateDownload.ts b/src/utils/useTemplateDownload.ts
index a155045..305fd0f 100644
--- a/src/utils/useTemplateDownload.ts
+++ b/src/utils/useTemplateDownload.ts
@@ -26,7 +26,7 @@
           getPhotoUrl(minioFileName).then((res) => {
             download(res.data, fileName)
           }).catch(() => {
-            ElMessage.error('下载失败')
+            ElMessage.warning('下载失败')
           })
         }
         else {
diff --git a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
index 62b4a0b..cd0ea08 100644
--- a/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editChemistryDialog.vue
@@ -20,16 +20,16 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  wxhxpcs: '', // 危险化学品场所
-  csfl: '', // 场所分类
+  hazardousChemicalSite: '', // 危险化学品场所
+  venueClassification: '', // 场所分类
   content: '', // 作业活动
   riskName: '', // 危化品名称
   nature: '', // 危险性质
   assignPost: '', // 定岗
   staffQuota: 1, // 定员
-  dl: 1, // 定量
-  dsm: 1, // 定寿命
-  dj: 1, // 定检
+  quantitative: 1, // 定量
+  fixedLifespan: 1, // 定寿命
+  regularInspection: 1, // 定检
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -38,42 +38,42 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '危化品名称必填', trigger: ['blur', 'change'] }],
-  wxhxpcs: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
+  hazardousChemicalSite: [{ required: true, message: '危险化学品场所必填', trigger: ['blur', 'change'] }],
   content: [{ required: true, message: '作业活动必填', trigger: ['blur', 'change'] }],
-  csfl: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
+  venueClassification: [{ required: true, message: '场所分类必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
   assignPost: [{ required: true, message: '定岗必填', trigger: ['blur', 'change'] }],
   staffQuota: [{ required: true, message: '定员必填', trigger: ['blur', 'change'] }],
-  dl: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
-  dsm: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
-  dj: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
+  quantitative: [{ required: true, message: '定量必填', trigger: ['blur', 'change'] }],
+  fixedLifespan: [{ required: true, message: '定寿命必填', trigger: ['blur', 'change'] }],
+  regularInspection: [{ required: true, message: '定检必填', trigger: ['blur', 'change'] }],
 })
 
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险化学品场所成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  // return ElMessage.info('敬请期待')
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险化学品场所成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -82,16 +82,16 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    wxhxpcs: '', // 危险化学品场所
-    csfl: '', // 场所分类
+    hazardousChemicalSite: '', // 危险化学品场所
+    venueClassification: '', // 场所分类
     content: '', // 作业活动
     riskName: '', // 危化品名称
     nature: '', // 危险性质
     assignPost: '', // 定岗
     staffQuota: 1, // 定员
-    dl: 1, // 定量
-    dsm: 1, // 定寿命
-    dj: 1, // 定检
+    quantitative: 1, // 定量
+    fixedLifespan: 1, // 定寿命
+    regularInspection: 1, // 定检
     riskType: '', // 危险类型
   }
 }
@@ -105,15 +105,15 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 危化品名称
-    formData.value.wxhxpcs = row.wxhxpcs // 危险化学品场所
-    formData.value.csfl = row.csfl // 场所分类
+    formData.value.hazardousChemicalSite = row.hazardousChemicalSite // 危险化学品场所
+    formData.value.venueClassification = row.venueClassification // 场所分类
     formData.value.content = row.content // 作业活动
     formData.value.assignPost = row.assignPost // 定岗
     formData.value.nature = row.nature // 危险性质
     formData.value.staffQuota = Number(row.staffQuota) // 定员
-    formData.value.dl = Number(row.dl) // 定量
-    formData.value.dsm = Number(row.dsm) // 定寿命
-    formData.value.dj = Number(row.dj) // 定检
+    formData.value.quantitative = Number(row.quantitative) // 定量
+    formData.value.fixedLifespan = Number(row.fixedLifespan) // 定寿命
+    formData.value.regularInspection = Number(row.regularInspection) // 定检
   }
 
   // 详情隐藏表单校验
@@ -154,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险化学品场所" prop="wxhxpcs">
-            <el-input v-model="formData.wxhxpcs" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="危险化学品场所" prop="hazardousChemicalSite">
+            <el-input v-model="formData.hazardousChemicalSite" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所分类" prop="csfl">
-            <el-input v-model="formData.csfl" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="场所分类" prop="venueClassification">
+            <el-input v-model="formData.venueClassification" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -193,27 +193,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定量" prop="dl">
+          <el-form-item label="定量" prop="quantitative">
             <el-input-number
-              v-model="formData.dl" class="full-width-input"
+              v-model="formData.quantitative" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定寿命" prop="dsm">
+          <el-form-item label="定寿命" prop="fixedLifespan">
             <el-input-number
-              v-model="formData.dsm" class="full-width-input"
+              v-model="formData.fixedLifespan" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="定检" prop="dj">
+          <el-form-item label="定检" prop="regularInspection">
             <el-input-number
-              v-model="formData.dj" class="full-width-input"
+              v-model="formData.regularInspection" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
index 8b69e15..8016168 100644
--- a/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editSourceDialog.vue
@@ -1,4 +1,4 @@
-<!-- 新增、编辑重大危险源（pending） -->
+<!-- 新增、编辑重大危险源 -->
 <script lang="ts" setup name="EditPointDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
@@ -21,14 +21,14 @@
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
   riskName: '', // 危险源名称
-  csjb: '', // 场所级别
-  wxhxpmc: '', // 危险化学品名称
+  venueLevel: '', // 场所级别
+  hazardousChemicals: '', // 危险化学品名称
   nature: '', // 危险性质
-  cl: 0, // 存量
-  ljl: 0, // 临界量
-  fjzs: '', // 分级指数
+  stock: 0, // 存量
+  criticalQuantity: 0, // 临界量
+  gradingIndex: '', // 分级指数
   substancesQuantities: '', // 危险物质及定量
-  grade: '', // 危险源等级
+  hazardLevel: '', // 危险源等级
   riskType: '', // 类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -37,50 +37,49 @@
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
   riskName: [{ required: true, message: '重大危险源名称必填', trigger: ['blur', 'change'] }],
-  csjb: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
-  wxhxpmc: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
+  venueLevel: [{ required: true, message: '场所级别必填', trigger: ['blur', 'change'] }],
+  hazardousChemicals: [{ required: true, message: '危险化学品名称必填', trigger: ['blur', 'change'] }],
   nature: [{ required: true, message: '危险性质必填', trigger: ['blur', 'change'] }],
-  cl: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
-  ljl: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
-  fjzs: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
+  stock: [{ required: true, message: '存量必填', trigger: ['blur', 'change'] }],
+  criticalQuantity: [{ required: true, message: '临界量必填', trigger: ['blur', 'change'] }],
+  gradingIndex: [{ required: true, message: '分级指数必填', trigger: ['blur', 'change'] }],
   substancesQuantities: [{ required: true, message: '危险物质及定量必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
+  hazardLevel: [{ required: true, message: '危险源等级必填', trigger: ['blur', 'change'] }],
 })
 
 // -----------------------------------------字典--------------------------------------------------------------
-const deviceStatusList = ref<dictType[]>([]) // 重大危险源等级
+const dangerPointGradeList = ref<dictType[]>([]) // 重大危险源等级
 const getDict = async () => {
   // 重大危险源等级
   getDictByCode('dangerPointGrade').then((response) => {
-    deviceStatusList.value = response.data
+    dangerPointGradeList.value = response.data
   })
 }
 getDict()
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑重大危险源成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增重大危险源成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑重大危险源成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -90,14 +89,14 @@
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
     riskName: '', // 危险源名称
-    csjb: '', // 场所级别
-    wxhxpmc: '', // 危险化学品名称
+    venueLevel: '', // 场所级别
+    hazardousChemicals: '', // 危险化学品名称
     nature: '', // 危险性质
-    cl: 0, // 存量
-    ljl: 0, // 临界量
-    fjzs: '', // 分级指数
+    stock: 0, // 存量
+    criticalQuantity: 0, // 临界量
+    gradingIndex: '', // 分级指数
     substancesQuantities: '', // 危险物质及定量
-    grade: '', // 危险源等级
+    hazardLevel: '', // 危险源等级
     riskType: '', // 类型
   }
 }
@@ -111,14 +110,14 @@
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
     formData.value.riskName = row.riskName // 重大危险源名称
-    formData.value.csjb = row.csjb // 场所级别
-    formData.value.wxhxpmc = row.wxhxpmc // 危险化学品名称
+    formData.value.venueLevel = row.venueLevel // 场所级别
+    formData.value.hazardousChemicals = row.hazardousChemicals // 危险化学品名称
     formData.value.nature = row.nature // 危险性质
-    formData.value.cl = row.cl // 存量
-    formData.value.ljl = row.ljl // 临界量
-    formData.value.fjzs = row.fjzs // 分级指数
+    formData.value.stock = row.stock // 存量
+    formData.value.criticalQuantity = row.criticalQuantity // 临界量
+    formData.value.gradingIndex = row.gradingIndex // 分级指数
     formData.value.substancesQuantities = row.substancesQuantities // 危险物质及定量
-    formData.value.grade = row.grade // 危险源等级
+    formData.value.hazardLevel = row.hazardLevel // 危险源等级
   }
 
   // 详情隐藏表单校验
@@ -164,13 +163,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="场所级别" prop="csjb">
-            <el-input v-model="formData.csjb" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="场所级别" prop="venueLevel">
+            <el-input v-model="formData.venueLevel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="危险化学品名称" prop="wxhxpmc">
-            <el-input v-model="formData.wxhxpmc" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="危险化学品名称" prop="hazardousChemicals">
+            <el-input v-model="formData.hazardousChemicals" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -179,26 +178,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="存量" prop="cl">
+          <el-form-item label="存量" prop="stock">
             <el-input-number
-              v-model="formData.cl" class="full-width-input"
+              v-model="formData.stock" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="临界量" prop="ljl">
+          <el-form-item label="临界量" prop="criticalQuantity">
             <el-input-number
-              v-model="formData.ljl" class="full-width-input"
+              v-model="formData.criticalQuantity" class="full-width-input"
               :min="0" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="分级指数" prop="fjzs">
-            <el-input v-model="formData.fjzs" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
+          <el-form-item label="分级指数" prop="gradingIndex">
+            <el-input v-model="formData.gradingIndex" :maxlength="100" show-word-limit :disabled="dialogStatus === 'detail'" type="textarea" autosize placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -207,15 +206,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险源等级" prop="grade">
+          <el-form-item label="危险源等级" prop="hazardLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.hazardLevel"
               placeholder="必选"
               clearable
               filterable
               :disabled="dialogStatus === 'detail'"
             >
-              <el-option v-for="item of deviceStatusList" :key="item.id" :value="item.name " :label="item.name" />
+              <el-option v-for="item of dangerPointGradeList" :key="item.id" :value="item.name " :label="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
index 723d3b2..8252827 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkDialog.vue
@@ -20,11 +20,11 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业
-  grade: '', // 危险等级
-  zywxms: '', // 主要危险描述
-  xgbm: '', // 相关部门
-  zypc: 0, // 作业频次
+  hazardousHork: '', // 危险作业
+  workLevel: '', // 危险等级
+  hazardousRemark: '', // 主要危险描述
+  relevantDepartments: '', // 相关部门
+  operationFrequency: 0, // 作业频次
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -32,11 +32,11 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
-  grade: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
-  zywxms: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
-  xgbm: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
-  zypc: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
+  hazardousHork: [{ required: true, message: '危险作业必填', trigger: ['blur', 'change'] }],
+  workLevel: [{ required: true, message: '危险等级必填', trigger: ['blur', 'change'] }],
+  hazardousRemark: [{ required: true, message: '主要危险描述必填', trigger: ['blur', 'change'] }],
+  relevantDepartments: [{ required: true, message: '相关部门必填', trigger: ['blur', 'change'] }],
+  operationFrequency: [{ required: true, message: '作业频次必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const deviceStatusList = ref<dictType[]>([]) // 危险点等级
@@ -51,28 +51,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -81,11 +80,11 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业
-    grade: '', // 危险等级
-    zywxms: '', // 主要危险描述
-    xgbm: '', // 相关部门
-    zypc: 0, // 作业频次
+    hazardousHork: '', // 危险作业
+    workLevel: '', // 危险等级
+    hazardousRemark: '', // 主要危险描述
+    relevantDepartments: '', // 相关部门
+    operationFrequency: 0, // 作业频次
     riskType: '', // 危险类型
   }
 }
@@ -98,11 +97,11 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业
-    formData.value.grade = row.grade // 危险等级
-    formData.value.zywxms = row.zywxms // 主要危险描述
-    formData.value.xgbm = row.xgbm // 相关部门
-    formData.value.zypc = Number(row.zypc) // 作业频次
+    formData.value.hazardousHork = row.hazardousHork // 危险作业
+    formData.value.workLevel = row.workLevel // 危险等级
+    formData.value.hazardousRemark = row.hazardousRemark // 主要危险描述
+    formData.value.relevantDepartments = row.relevantDepartments // 相关部门
+    formData.value.operationFrequency = Number(row.operationFrequency) // 作业频次
   }
 
   // 详情隐藏表单校验
@@ -143,14 +142,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业" prop="hazardousHork">
+            <el-input v-model="formData.hazardousHork" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业等级" prop="grade">
+          <el-form-item label="危险作业等级" prop="workLevel">
             <el-select
-              v-model="formData.grade"
+              v-model="formData.workLevel"
               placeholder="必选"
               clearable
               filterable
@@ -161,19 +160,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="主要危险描述" prop="zywxms">
-            <el-input v-model="formData.zywxms" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="主要危险描述" prop="hazardousRemark">
+            <el-input v-model="formData.hazardousRemark" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="相关部门" prop="xgbm">
-            <el-input v-model="formData.xgbm" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
+          <el-form-item label="相关部门" prop="relevantDepartments">
+            <el-input v-model="formData.relevantDepartments" :disabled="dialogStatus === 'detail'" :maxlength="100" show-word-limit autosize type="textarea" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业频次" prop="zypc">
+          <el-form-item label="作业频次" prop="operationFrequency">
             <el-input-number
-              v-model="formData.zypc" class="full-width-input"
+              v-model="formData.operationFrequency" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
diff --git a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
index ad559bf..b9acd66 100644
--- a/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
+++ b/src/views/alarm/dangerAssessment/manage/editWorkProcessesDialog.vue
@@ -20,9 +20,9 @@
   id: '',
   deptId: '', // 所属单位id
   deptName: '', // 所属单位
-  riskName: '', // 危险作业工序
-  zyrysl: 0, // 作业人员数量
-  sglx: '', // 事故类型
+  workProcedure: '', // 危险作业工序
+  workerNum: 0, // 作业人员数量
+  accidentType: '', // 事故类型
   riskType: '', // 危险类型
 })
 const btnLoading = ref(false) // 保存按钮加载状态
@@ -30,9 +30,9 @@
 // 校验规则
 const rules = reactive<FormRules>({
   deptId: [{ required: true, message: '所属单位必选', trigger: ['blur', 'change'] }],
-  riskName: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
-  zyrysl: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
-  sglx: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
+  workProcedure: [{ required: true, message: '危险作业工序必填', trigger: ['blur', 'change'] }],
+  workerNum: [{ required: true, message: '作业人员数量必填', trigger: ['blur', 'change'] }],
+  accidentType: [{ required: true, message: '事故类型必填', trigger: ['blur', 'change'] }],
 })
 // -----------------------------------------字典--------------------------------------------------------------
 const eventTypeList = ref<dictType[]>([]) // 事故类型
@@ -47,28 +47,27 @@
 // -------------------------------------------------------------------------------------------
 // 表单提交
 function submitForm() {
-  return ElMessage.info('敬请期待')
-  // if (formDataRef.value) {
-  //   formDataRef.value?.validate((valid: boolean) => {
-  //     if (valid) {
-  //       const params = {
-  //         ...formData.value,
-  //       }
-  //       if (dialogStatus.value === 'add') { // 新建
-  //         addDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('新增危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //       else if (dialogStatus.value === 'edit') { // 编辑
-  //         updateDangerAssessmentManage(params).then((res) => {
-  //           ElMessage.success('编辑危险作业工序成功')
-  //           closeRefresh()
-  //         })
-  //       }
-  //     }
-  //   })
-  // }
+  if (formDataRef.value) {
+    formDataRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        const params = {
+          ...formData.value,
+        }
+        if (dialogStatus.value === 'add') { // 新建
+          addDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('新增危险作业工序成功')
+            closeRefresh()
+          })
+        }
+        else if (dialogStatus.value === 'edit') { // 编辑
+          updateDangerAssessmentManage(params).then((res) => {
+            ElMessage.success('编辑危险作业工序成功')
+            closeRefresh()
+          })
+        }
+      }
+    })
+  }
 }
 
 // 重置表单
@@ -77,9 +76,9 @@
     id: '',
     deptId: '', // 所属单位id
     deptName: '', // 所属单位
-    riskName: '', // 危险作业工序
-    zyrysl: 0, // 作业人员数量
-    sglx: '', // 事故类型
+    workProcedure: '', // 危险作业工序
+    workerNum: 0, // 作业人员数量
+    accidentType: '', // 事故类型
     riskType: '', // 危险类型
   }
 }
@@ -92,9 +91,9 @@
     formData.value.id = row.id
     formData.value.deptId = row.deptId // 所属单位id
     formData.value.deptName = row.deptName // 所属单位
-    formData.value.riskName = row.riskName // 危险作业工序
-    formData.value.zyrysl = Number(row.zyrysl) // 作业人员数量
-    formData.value.sglx = row.sglx // 事故类型
+    formData.value.workProcedure = row.workProcedure // 危险作业工序
+    formData.value.workerNum = Number(row.workerNum) // 作业人员数量
+    formData.value.accidentType = row.accidentType // 事故类型
   }
 
   // 详情隐藏表单校验
@@ -135,23 +134,23 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="危险作业工序" prop="riskName">
-            <el-input v-model="formData.riskName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
+          <el-form-item label="危险作业工序" prop="workProcedure">
+            <el-input v-model="formData.workProcedure" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="作业人员数量" prop="zyrysl">
+          <el-form-item label="作业人员数量" prop="workerNum">
             <el-input-number
-              v-model="formData.zyrysl" class="full-width-input"
+              v-model="formData.workerNum" class="full-width-input"
               :min="1" :precision="0" :step="1" placeholder="必填"
               :disabled="dialogStatus === 'detail'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="事故类型" prop="sglx">
+          <el-form-item label="事故类型" prop="accidentType">
             <el-select
-              v-model="formData.sglx"
+              v-model="formData.accidentType"
               placeholder="必选"
               clearable
               filterable
diff --git a/src/views/alarm/dangerAssessment/manage/list.vue b/src/views/alarm/dangerAssessment/manage/list.vue
index 6d9cb29..cb66292 100644
--- a/src/views/alarm/dangerAssessment/manage/list.vue
+++ b/src/views/alarm/dangerAssessment/manage/list.vue
@@ -51,45 +51,46 @@
 // 重大危险源
 const columnsSource: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险源名称', value: 'businessContent', align: 'center' },
-  { text: '场所级别', value: 'yhfl1', align: 'center' },
-  { text: '危险化学品名称', value: 'yhfl2', align: 'center' },
-  { text: '危险性质', value: 'equipmentName', align: 'center' },
-  { text: '存量', value: 'time', align: 'center' },
-  { text: '临界量', value: 'remark', align: 'center' },
-  { text: '分级指数', value: 'remark', align: 'center' },
-  { text: '危险物质及定量', value: 'remark', align: 'center' },
-  { text: '危险源等级', value: 'remark', align: 'center' },
+  { text: '危险源名称', value: 'riskName', align: 'center' },
+  { text: '场所级别', value: 'venueLevel', align: 'center' },
+  { text: '危险化学品名称', value: 'hazardousChemicals', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '存量', value: 'stock', align: 'center' },
+  { text: '临界量', value: 'criticalQuantity', align: 'center' },
+  { text: '分级指数', value: 'gradingIndex', align: 'center' },
+  { text: '危险物质及定量', value: 'substancesQuantities', align: 'center' },
+  { text: '危险源等级', value: 'hazardLevel', align: 'center' },
 ]
 // 危险化学品场所
 const columnsChemistry: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险化学品场所', value: 'businessContent', align: 'center' },
-  { text: '场所分类', value: 'yhfl1', align: 'center' },
-  { text: '作业活动', value: 'yhfl2', align: 'center' },
-  { text: '危化品名称', value: 'equipmentName', align: 'center' },
-  { text: '危险性质', value: 'time', align: 'center' },
-  { text: '定岗', value: 'remark', align: 'center' },
-  { text: '定员', value: 'remark', align: 'center' },
-  { text: '定量', value: 'remark', align: 'center' },
-  { text: '定寿命', value: 'remark', align: 'center' },
-  { text: '定检', value: 'remark', align: 'center' },
+  { text: '危险化学品场所', value: 'hazardousChemicalSite', align: 'center' },
+  { text: '场所分类', value: 'venueClassification', align: 'center' },
+  { text: '作业活动', value: 'content', align: 'center' },
+  { text: '危化品名称', value: 'riskName', align: 'center' },
+  { text: '危险性质', value: 'nature', align: 'center' },
+  { text: '定岗', value: 'assignPost', align: 'center' },
+  { text: '定员', value: 'staffQuota', align: 'center' },
+  { text: '定量', value: 'quantitative', align: 'center' },
+  { text: '定寿命', value: 'fixedLifespan', align: 'center' },
+  { text: '定检', value: 'regularInspection', align: 'center' },
 ]
+
 // 危险作业
 const columnsWork: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业', value: 'businessContent', align: 'center' },
-  { text: '危险作业等级', value: 'yhfl1', align: 'center' },
-  { text: '主要危险描述', value: 'yhfl2', align: 'center' },
-  { text: '相关部门', value: 'equipmentName', align: 'center' },
-  { text: '作业频次', value: 'time', align: 'center' },
+  { text: '危险作业', value: 'hazardousHork', align: 'center' },
+  { text: '危险作业等级', value: 'workLevel', align: 'center' },
+  { text: '主要危险描述', value: 'hazardousRemark', align: 'center' },
+  { text: '相关部门', value: 'relevantDepartments', align: 'center' },
+  { text: '作业频次', value: 'operationFrequency', align: 'center' },
 ]
 // 危险作业工序
 const columnsWorkProcesses: TableColumn[] = [
   { text: '所属单位', value: 'deptName', align: 'center' },
-  { text: '危险作业工序', value: 'businessContent', align: 'center' },
-  { text: '作业人员数量', value: 'yhfl1', align: 'center' },
-  { text: '事故类型', value: 'yhfl2', align: 'center' },
+  { text: '危险作业工序', value: 'workProcedure', align: 'center' },
+  { text: '作业人员数量', value: 'workerNum', align: 'center' },
+  { text: '事故类型', value: 'accidentType', align: 'center' },
 ]
 // -------------------------------------------------------------------------------------------
 const total = ref(0) // 数据条数
@@ -142,7 +143,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -151,7 +152,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 // -------------------------------------------------------------------------------------
@@ -217,13 +218,13 @@
       editSourceDialogRef.value.initDialog('detail', active.value, row)
       break
     case '3': // 危险化学品场所
-      editChemistryDialogRef.value.initDialog('add', active.value, row)
+      editChemistryDialogRef.value.initDialog('detail', active.value, row)
       break
     case '4': // 危险作业
-      editWorkDialogRef.value.initDialog('add', active.value, row)
+      editWorkDialogRef.value.initDialog('detail', active.value, row)
       break
     case '5': // 危险作业工序
-      editWorkProcessesDialogRef.value.initDialog('add', active.value, row)
+      editWorkProcessesDialogRef.value.initDialog('detail', active.value, row)
       break
   }
 }
@@ -234,12 +235,16 @@
       editPointDialogRef.value.initDialog('edit', active.value, row)
       break
     case '2': // 重大危险源
+      editSourceDialogRef.value.initDialog('edit', active.value, row)
       break
     case '3': // 危险化学品场所
+      editChemistryDialogRef.value.initDialog('edit', active.value, row)
       break
     case '4': // 危险作业
+      editWorkDialogRef.value.initDialog('edit', active.value, row)
       break
     case '5': // 危险作业工序
+      editWorkProcessesDialogRef.value.initDialog('edit', active.value, row)
       break
   }
 }
diff --git a/src/views/monitor/deviceManage/listDevice.vue b/src/views/monitor/deviceManage/listDevice.vue
index 3d9eab9..7866dea 100644
--- a/src/views/monitor/deviceManage/listDevice.vue
+++ b/src/views/monitor/deviceManage/listDevice.vue
@@ -101,7 +101,7 @@
           search()
         }
         else {
-          ElMessage.error(res.message)
+          ElMessage.warning(res.message)
         }
       }).catch(() => {
         console.log('上传失败')
@@ -110,7 +110,7 @@
     }
   }
   else {
-    ElMessage.error('请上传xlsx格式')
+    ElMessage.warning('请上传xlsx格式')
   }
 }
 
diff --git a/src/views/monitor/realTime/control-hk.vue b/src/views/monitor/realTime/control-hk.vue
index fb7bb32..23cb351 100644
--- a/src/views/monitor/realTime/control-hk.vue
+++ b/src/views/monitor/realTime/control-hk.vue
@@ -135,7 +135,7 @@
         })
       },
       (oError: any) => {
-        ElMessage.error('抓图失败!')
+        ElMessage.warning('抓图失败!')
       })
 
     // // plan B
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index c0eaeea..e22a039 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -165,7 +165,7 @@
         ElMessage.success('上传成功')
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
       }
     })
   }
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e9cce80..78291ea 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -94,7 +94,7 @@
             ElMessage.success('操作成功')
           }
           else {
-            ElMessage.error(res.message)
+            ElMessage.warning(res.message)
           }
         })
       }
@@ -105,7 +105,7 @@
             ElMessage.success('操作成功')
           }
           else {
-            ElMessage.error(res.message)
+            ElMessage.warning(res.message)
           }
         })
       }
@@ -135,7 +135,7 @@
         ElMessage.success('上传成功')
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
       }
     })
   }
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index a3bc743..4867927 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -178,7 +178,7 @@
         loading.close()
       }
       else {
-        ElMessage.error(res.message)
+        ElMessage.warning(res.message)
         loading.close()
       }
     })
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 4950d65..018674f 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -96,7 +96,7 @@
     addUserRef.value.initDialog('update', user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.warning('必须选中一项')
   }
 }
 // 重置密码
@@ -122,7 +122,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.warning('必须选中一项')
   }
 }
 // 删除用户
@@ -145,7 +145,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.warning('必须选中一项')
   }
 }
 // 冻结/解冻用户
@@ -182,7 +182,7 @@
     roleAssignmentRef.value.initDialog(user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.warning('必须选中一项')
   }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写