diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue
index 40a6c9f..9527138 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue
@@ -14,6 +14,12 @@
             <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn"
                 :tableHeight="pageData.tableHeight" :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger"
                 :controlsWidth="pageData.controlsWidth">
+                <template #jqlbdm="{ row }">
+                    <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
+                </template>
+                <template #jqzldm="{ row }">
+                     <DictTag :tag="false" :value="row.jqzldm" :options="JQZL" />
+                </template>
                 <!-- 操作 -->
                 <template #controls="{ row }">
                     <el-link type="primary" @click="viewDetails(row)">详情</el-link>
@@ -26,9 +32,11 @@
             }"></Pages>
         </div>
     </div>
+    <YjDetail ref="yjDetail"></YjDetail>
 </template>
 
 <script setup>
+import YjDetail from './yjDetail.vue'
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -37,9 +45,7 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, defineEmits } from "vue";
 const emit = defineEmits(['change']);
 const { proxy } = getCurrentInstance();
-const { D_GS_BQ_DJ} = proxy.$dict( "D_GS_BQ_DJ" ); //获取字典数据
-const detailDiloag = ref();
-const show = ref(false);
+const { JQLB,JQZL} = proxy.$dict( "JQLB",'JQZL' ); //获取字典数据
 const searchBox = ref(); //搜索框
 const searchConfiger = ref([
     {
@@ -55,6 +61,7 @@ const searchConfiger = ref([
         showType: "datetimerange"
     }
 ]);
+const yjDetail = ref();
 const queryFrom = ref({});
 const pageData = reactive({
     tableData: [], //表格数据
@@ -71,22 +78,10 @@ const pageData = reactive({
     }, //分页
     controlsWidth: 160, //操作栏宽度
     tableColumn: [
-        {
-            label: "预警类型",
-            prop: "ypmc"
-        },
-        {
-            label: "预警时间",
-            prop: "yjsj"
-        },
-        {
-            label: "预警名称大类",
-            prop: "yjMcDl"
-        },
-        {
-            label: "预警名称细类",
-            prop: "yjMcXl"
-        }
+        { label: "预警类型",  prop: "ypmc" },
+        { label: "预警时间", prop: "yjsj" },
+        { label: "预警名称大类", prop: "jqlbdm" ,showSolt: true },
+        { label: "预警名称细类",  prop: "jqzldm" ,showSolt: true}
     ]
 });
 onMounted(() => {
@@ -131,9 +126,7 @@ const getList = () => {
 
 // 查看详情
 const viewDetails = (row) => {
-    proxy.$message({ type: "info", message: `查看预警详情：${row.yjMcXl}` });
-    // 这里应该跳转到详情页面或打开详情弹窗
-    // router.push({ name: 'WarningDetail', params: { id: row.id } });
+    emit('change', { type: '预警详情', data: row })
 };
 
 // 生成研判报告
diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue
index 28bf2e6..4ae10d0 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue
@@ -33,6 +33,7 @@
 </template>
 
 <script setup>
+import CheckBox from '@/components/checkBox/index.vue'
 import YpModel from '@/components/ypModel/index.vue'
 import HistoricalReport from './historicalReport.vue'
 import * as MOSTY from "@/components/MyComponents/index";
@@ -70,15 +71,16 @@ const list = ref([])
 const loading = ref(false);
 const formData = ref({})
 const chageData=ref()
-watch(() => [D_SG_SJLY.value, D_SG_TSYPGZ.value], val => {
-  checkData.yplxBtn.list = val[1].map(v => v.zdmc);
-  checkData.yplxBtn.hasChoose = val[1].map(v => v.zdmc);
+watch(() => D_SG_TSYPGZ.value, val => {
+  checkData.yplxBtn.list = val.map(v => v.zdmc);
+  checkData.yplxBtn.hasChoose = val.map(v => v.zdmc);
 }, { immediate: true, deep: true });
 
 onMounted(() => {
   show.value = true;
   Time()
   tabHeightFn();
+  getLits()
 })