From 08afdddc51c6c91f2799f943e92b6bfb46cba1ee Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Thu, 8 Jan 2026 20:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/alarm/Device.vue       |  1 +
 src/views/govern/alarm/Steady.vue       |  3 ++-
 src/views/govern/alarm/Transient.vue    |  1 +
 src/views/system/subject/form/index.vue | 13 ++++++++++---
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue
index 3ceda3f..8b0ff6d 100644
--- a/src/views/govern/alarm/Device.vue
+++ b/src/views/govern/alarm/Device.vue
@@ -222,6 +222,7 @@ const sourceChange = (e: any) => {
             tableStore.table.params.deviceTypeId = e[0] || ''
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
+            tableStore.table.params.deviceId = e[3] || ''
         }
     }
 }
diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue
index 35b27bb..8889ab7 100644
--- a/src/views/govern/alarm/Steady.vue
+++ b/src/views/govern/alarm/Steady.vue
@@ -9,7 +9,7 @@
                     @change="sourceChange"
                     :options="deviceTreeOptions"
                     :show-all-levels="false"
-                   :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+                    :props="{ checkStrictly: true, value: 'id', label: 'name' }"
                     clearable
                 ></el-cascader>
                 <!-- <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
@@ -133,6 +133,7 @@ const sourceChange = (e: any) => {
             tableStore.table.params.deviceTypeId = e[0] || ''
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
+            tableStore.table.params.deviceId = e[3] || ''
         }
     }
 }
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index 0f99888..ca92000 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -313,6 +313,7 @@ const sourceChange = (e: any) => {
             tableStore.table.params.deviceTypeId = e[0] || ''
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
+            tableStore.table.params.deviceId = e[3] || ''
         }
     }
 
diff --git a/src/views/system/subject/form/index.vue b/src/views/system/subject/form/index.vue
index 292712d..84fe293 100644
--- a/src/views/system/subject/form/index.vue
+++ b/src/views/system/subject/form/index.vue
@@ -174,6 +174,10 @@ const open = (e: any) => {
 const onSubmit = () => {
     formRef.value.validate(async valid => {
         if (valid) {
+            if (logoFile.url == '') {
+                return ElMessage.error('请上传logo')
+            }
+
             configStore.value.faviconFile = configStore.value.logoFile
             configStore.value.color = configStore.value.elementUiPrimary[0]
             let form = new FormData()
@@ -213,12 +217,18 @@ const onSubmit = () => {
                 addTheme(form).then(res => {
                     ElMessage.success('新增成功')
                     Cancel()
+                    setTimeout(() => {
+                        router.go(0)
+                    }, 500)
                 })
             }
             if (title.value == '修改主题') {
                 updateTheme(form).then(res => {
                     ElMessage.success('修改成功')
                     Cancel()
+                    setTimeout(() => {
+                        router.go(0)
+                    }, 500)
                 })
             }
         }
@@ -228,9 +238,6 @@ const onSubmit = () => {
 const Cancel = () => {
     // dialogVisible.value = false
     emit('Cancels')
-    setTimeout(() => {
-        router.go(0)
-    }, 500)
 }
 /**
  * 选择图片上传