diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue
index 1d45b05..0c83045 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/yjList.vue
@@ -23,7 +23,7 @@
                 <!-- 操作 -->
                 <template #controls="{ row }">
                     <el-link type="primary" @click="viewDetails(row)">详情</el-link>
-                    <el-link type="primary" @click="generateReport(row)">研判报告</el-link>
+                    <el-link type="primary" @click="generateReport(row.id)">研判报告</el-link>
                 </template>
             </MyTable>
             <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -33,14 +33,20 @@
         </div>
     </div>
     <YjDetail ref="yjDetail"></YjDetail>
+     <YpModel v-model="showModel" @SaveReport="SaveReport" :heightNumber="436" v-model:textContent="textContent"></YpModel>
 </template>
 
 <script setup>
+import { timeValidate } from '@/utils/tools.js'
+import YpModel from '@/components/ypModel/index.vue'
+import { getItem } from '@/utils/storage.js'
 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";
 import Search from "@/components/aboutTable/Search.vue";
+import { jqypDywdtj, jqypfxbgJqlxtj, jqypfxbgYdfx, jqypfxbgJqlytj, jqypfxbgTj, jqypfxbgCljgf, jqypfxbgCzlfx, getDictItem } from '@/api/semanticAnalysis'
+import { textStyle, Firstlevelheading, Subheading, BiheadlinegTitle, BigTitle, headTitle, report, signature } from './content.js'
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted,defineProps, getCurrentInstance, defineEmits } from "vue";
 const props = defineProps({
@@ -49,6 +55,10 @@ const props = defineProps({
         default: {}
     }
 })
+const showModel = ref(false)
+const sortingRatioValue = ref({})
+const textContent = ref('');
+
 const emit = defineEmits(['change']);
 const { proxy } = getCurrentInstance();
 const { JQLB,JQZL} = proxy.$dict( "JQLB",'JQZL' ); //获取字典数据
@@ -90,11 +100,30 @@ const pageData = reactive({
         { label: "预警名称细类",  prop: "jqzldm" ,showSolt: true}
     ]
 });
+const timeDate = ref()
+const endYears = ref()
+
 onMounted(() => {
     tabHeightFn();
     getList();
+    Time()
 });
 
+const Time = () => {
+  const currentYear = new Date().getFullYear();
+  const startOfYear = new Date(currentYear, 0, 1); // 今年1月1日
+  const endOfYear = new Date(currentYear, 11, 31, 23); // 今年12月31日23:59:59.999
+  const year = startOfYear.getFullYear();
+  const month = String(startOfYear.getMonth() + 1).padStart(2, '0');
+  const day = String(startOfYear.getDate()).padStart(2, '0');
+  const endYear = endOfYear.getFullYear();
+  const endMonth = String(endOfYear.getMonth() + 1).padStart(2, '0');
+  const endDay = String(endOfYear.getDate()).padStart(2, '0');
+  timeDate.value = `${endYear}年${endMonth}月${endDay}日`
+  endYears.value = year
+  return `${year}年${month}月${day}日 至${endYear}年${endMonth}月${endDay}日`
+}
+
 // 搜索
 const onSearch = (val) => {
     queryFrom.value = { ...queryFrom.value,...val };
@@ -116,7 +145,7 @@ const changeSize = (val) => {
 const getList = () => {
     pageData.tableConfiger.loading = true;
     let data = {
-        ypid:props.item.id,
+        yjid:props.item.id,
         ...queryFrom.value,
         pageCurrent: pageData.pageConfiger.pageCurrent,
         pageSize: pageData.pageConfiger.pageSize
@@ -137,18 +166,148 @@ const viewDetails = (row) => {
 };
 
 // 生成研判报告
-const generateReport = (row) => {
-    proxy.$message({ type: "success", message: `正在生成研判报告：${row.yjMcXl}` });
-    // 这里应该调用生成研判报告的API
-    // qcckPost({ id: row.id }, "/api/warning/generateReport")
-    //     .then(() => {
-    //         proxy.$message({ type: "success", message: "研判报告生成成功" });
-    //     })
-    //     .catch(() => {
-    //         proxy.$message({ type: "error", message: "研判报告生成失败" });
-    //     });
+const generateReport = (val) => {
+const dev = getItem('deptId')[0]
+  sortingRatioValue.value = {}
+  textContent.value = BigTitle(`${endYears.value}年度西藏公安执法数据分析`) + headTitle({
+    orgName: dev.deptName,
+    serialNumber: timeValidate("", "mm"),
+    time: timeValidate(),
+  })
+  const data = `为全面、客观、准确掌握全区公安机关的执法状况，自治区公安厅基于数据统计，对全区公安机关${endYears.value}年度的执法状况作了客观分析。`
+  textContent.value += BiheadlinegTitle('1.接处预警况') + textStyle(data) + Firstlevelheading('一、执法状况总体分析')
+  getfxbgYdfx(val)
+  getfxbgTj(val)
+  getfxbgJqlxtj(val)
+  getfxbgJqlytj(val)
+  getfxbgDywdtj(val)
+  getfxgbCljgf(val)
+  getfxgbCzlfx(val)
+  showModel.value = true;
 };
 
+//分析报告-时间维度-月分析
+const getfxbgYdfx = (val) => {
+  jqypfxbgYdfx({ yjid: val }).then(res => {
+    const model = sortingRatio(res)
+    const data = `我们将所有预警按照月份划分进行统计发现，每月预警分布较为平均。最高月份为${model[0].month}月，占到${model[0].number}；最低月份为${model[res.length - 1].month}月，占到${model[res.length - 1].number}。考虑是因为${model[0].month}月为我区传统旅游旺季，进藏人员较多。 ${model[res.length - 1].month}月一般春节及藏历新年期间，在藏人员较少。`
+    sortingRatioValue.value.ydfx = Subheading('1.1.4时间维度') + textStyle(data)
+  })
+}
+
+const getfxbgTj = (val) => {
+  jqypfxbgTj({ yjid: val }).then(res => {
+    const data = `${Time()} ，全区公安机关共接报各类预警${res.total}起,同比上升 ${res.tbbsb}%,同比上升${res.hbbsb}%`
+    textContent.value += BiheadlinegTitle('1.1接报预警') + textStyle(data)
+    dataList.XsfxTj = res
+  })
+}
+
+// 预警类型统计
+const getfxbgJqlxtj = (val) => {
+  let params = {
+    ...pageData.parameter,
+    yjid: val
+  }
+  jqypfxbgJqlxtj(params).then(res => {
+    const model = sortingRatio(res)
+    const data = `按预警类型来看，${model[0].name}最多，占到${model[0].ratio}；其次为${model[1].name}最多，占到${model[1].ratio}。`
+    sortingRatioValue.value.jqlx = Subheading('1.1.1类型维度') + textStyle(data)
+  })
+}
+
+// 预警来源统计
+const getfxbgJqlytj = (val) => {
+  jqypfxbgJqlytj({ yjid: val }).then(res => {
+    const model = sortingRatio(res)
+    const data = `按预警来源来看，${model[0].name}最多，占到${model[0].ratio}；其次为${model[1].name}最多，占到${model[1].ratio}。`
+    sortingRatioValue.value.jqly = Subheading('1.1.2来源维度') + textStyle(data)
+  })
+}
+
+// 地域统计
+const getfxbgDywdtj = (val) => {
+  jqypDywdtj({ yjid: val }).then(res => {
+    dataList.dyTj.xAxisData = res.map(it => it.ssbm)
+    dataList.dyTj.seriesData = [];
+    for (let i = 0; i < res.length; i++) {
+      dataList.dyTj.seriesData[i] = [];
+      for (let j = 0; j < res.length; j++) {
+        dataList.dyTj.seriesData[i][j] = 0;
+      }
+    }
+    for (let i = 0; i < dataList.dyTj.seriesData.length; i++) {
+      dataList.dyTj.seriesData[i][i] = res[i].number
+    }
+    const model = sortingRatio(res)
+    let data
+    if (model.length > 1) {
+      data = `从地市分布地市来看，${model[0].ssbm}预警量最大，占到全区预警总量的${model[0].number}。其次为${model[1].ssbm}和${model[2].ssbm}，两市预警量较为接近。预警量最少的为${model[model.length - 1].ssbm}。`
+    } else {
+      data = `从地市分布地市来看，${model[0].ssbm}预警量最大，占到全区预警总量的${model[0].number}。`
+    }
+    sortingRatioValue.value.dywd = Subheading('1.1.3地域维度') + textStyle(data)
+
+  })
+}
+
+// 分析报告-处理结果分析
+const getfxgbCljgf = (val) => {
+  jqypfxbgCljgf({ yjid: val }).then(res => {
+    // sortingRatioValue.Cljgf =
+    const model = sortingRatio(res)
+
+    let czjgfx = `从预警处置结果来看，`
+    model.forEach(item => {
+      czjgfx += `${item.name}，占到${item.ratio};`
+    })
+    sortingRatioValue.value.xlwdfx = BiheadlinegTitle('1.2预警处置') + Firstlevelheading('1.2.1结果维度') + textStyle(czjgfx)
+  })
+}
+
+// 分析报告-处置率分析
+const getfxgbCzlfx = (val) => {
+
+  jqypfxbgCzlfx({ yjid: val }).then(res => {
+    dataList.withinTj = [{
+      name: "超时分流(超过24小时)",
+      value: res.within24h ? res.within24h : 0
+    }, {
+      name: "按时分流(24小时内)",
+      value: res.over24h ? res.over24h : 0
+    }]
+    const data = `从处警效率来看，24小时以内处警的，占到${res.over24h}%。表明我区公安机关在接警之后能够在第一时间处警。`
+    sortingRatioValue.value.czjgfx = Subheading('1.2.2效率维度') + textStyle(data)
+  })
+}
+
+const SaveReport = (val) => {
+  ElMessageBox.prompt('请输入名称', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    // inputPattern:/[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
+    // inputErrorMessage: 'Invalid Email',
+  })
+    .then(({ value }) => {
+      const promes = {
+        bgmc:value,
+        bgnr: val,
+        yjid:chageData.value
+      }
+      qcckPost( promes , "/mosty-gsxt/gsxtYpbg/addEntity")
+        .then(() => {
+          ElMessage.success("保存成功");
+        })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消保存',
+      })
+    })
+    .catch(() => { });
+}
+
 const goback = () => {
     emit('change', { type: '研判首页', data: null })
 }
diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue
index e6ba5bf..064b4f1 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/ypHome.vue
@@ -112,7 +112,7 @@ const getLits = () => {
   let params = {
     pageCurrent: page.value,
     pageSize: 8,
-    ...formData.value,
+    ...formData.value
   }
   loading.value = true;
 
diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue
index 7950364..e008e87 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue
@@ -2,7 +2,7 @@
   <div>
     <YpHome v-if="showModel == '研判首页'" @change="changeModel"></YpHome>
     <YjList v-if="showModel == '态势预警列表'" :item="itemYj" @change="changeModel"></YjList>
-    <YjDetail v-if="showModel == '预警详情'" :item="itemDetail" @change="changeModelDetail"></YjDetail>
+    <YjDetail v-if="showModel == '预警详情'" :item="itemDetail" @change="changeModel"></YjDetail>
   </div>
 </template>
 
@@ -20,17 +20,15 @@ onMounted(()=>{
 
 function changeModel(val){
   showModel.value = val.type ;
-  if(val.type == '态势预警列表'){
-    itemYj.value = val.data
-  }else if(val.type == '预警详情'){
-    itemDetail.value = val.data
+  if(val.data){
+    if(val.type == '态势预警列表'){
+      itemYj.value = val.data
+    }else if(val.type == '预警详情'){
+      itemDetail.value = val.data
+    }
   }
 }
 
-// 预警详情返回
-function changeModelDetail(val){
-  showModel.value = val.type ;
-}
 
 </script>