From 1990da924ba45aba7057fb7efc0ca76e00bf4752 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Thu, 11 Dec 2025 15:00:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E9=81=BF=E5=85=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../centerHome/components/WarningCount.vue            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue
index 51c4527..6872e01 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue
@@ -45,6 +45,7 @@ const initCharts = (data) => {
     },
   ];
   data.forEach(item => {
+    item.count = isNaN(Number(item?.count) || 0) ? 0 : item.count;
     if (item.yj_jb == '10') countData[0].value = item.count;
     if (item.yj_jb == '20') countData[1].value = item.count;
     if (item.yj_jb == '30') countData[2].value = item.count;
@@ -94,12 +95,12 @@ const createChartOption = (data, colors) => {
           },
         }
       },
-  formatter: (name) => {
-const item = data.find(d => d.name === name);
-let percentage = ((item.value / total) * 100).toFixed(2);
-return `${name} ${item.value} {${item.colorType}|(${percentage}%)}`
+      formatter: (name) => {
+        const item = data.find(d => d.name === name);
+        let percentage = ((item.value / total) * 100).toFixed(2);
+        return `${name} ${item.value} {${item.colorType}|(${percentage}%)}`
 
-}
+      }
     },
     series: [
       {

From 52b9e43fe8ec7b471b0bfa5d4dd1dfe1da0cc846 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Thu, 11 Dec 2025 15:54:21 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E9=81=BF=E5=85=8D=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0NaN=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warningControl/centerHome/components/WarningCount.vue   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue
index 6872e01..e99efa5 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/centerHome/components/WarningCount.vue
@@ -97,7 +97,11 @@ const createChartOption = (data, colors) => {
       },
       formatter: (name) => {
         const item = data.find(d => d.name === name);
-        let percentage = ((item.value / total) * 100).toFixed(2);
+        // 确保value是有效数字，total不为0
+        const value = Number(item.value) || 0;
+        const totalValue = Number(total) || 0;
+        let percentage = (totalValue > 0 && value > 0) ? ((value / totalValue) * 100).toFixed(2) : '0.00';
+        // let percentage = ((item.value / total) * 100).toFixed(2);
         return `${name} ${item.value} {${item.colorType}|(${percentage}%)}`
 
       }

From 0526cd615f0c453699d8d71bd2e9570433b621ca Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Thu, 11 Dec 2025 16:19:54 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=E4=BB=85=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tsypHome/components/AddModel/yjList.vue   | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue
index fc0f031..f1046c5 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue
@@ -13,10 +13,9 @@
     <!-- 表格 -->
     <div class="tabBox">
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-       >
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
         <template #yjlx="{ row }">
-          <DictTag :tag="false" :value="row.yjlx"  :options="dict.D_BZ_TPYJLX" />
+          <DictTag :tag="false" :value="row.yjlx" :options="dict.D_BZ_TPYJLX" />
         </template>
         <template #controls="{ row }">
           <el-link type="primary" size="small" @click="opneModel(row)">打开研判报告</el-link>
@@ -31,21 +30,21 @@
     </div>
   </div>
   <YpModel v-model="showModel" @SaveReport="SaveReport" :heightNumber="436" v-model:textContent="textContent"></YpModel>
-<Yjdict ref="yjdict" :dict="dict"/>
+  <Yjdict ref="yjdict" :dict="dict" />
 </template>
 
 <script setup>
 import YpModel from '@/components/ypModel/index.vue'
 import emitter from "@/utils/eventBus.js";
-import { getYjxxPageList,getSsyjpzMxgzxl,mxglJqxqGetPageList } from "@/api/model";
+import { getYjxxPageList, getSsyjpzMxgzxl, mxglJqxqGetPageList } from "@/api/model";
 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 { timeValidate } from '@/utils/tools'
-import {  completions } from '@/api/semanticAnalysis'
+import { completions } from '@/api/semanticAnalysis'
 import { reactive, ref, onMounted, getCurrentInstance, watch } from "vue";
-import { textStyle, Firstlevelheading, Subheading, BiheadlinegTitle, newTotitle,BigTitle,fbtool, headTitle, report, signature } from '../content.js'
+import { textStyle, Firstlevelheading, Subheading, BiheadlinegTitle, newTotitle, BigTitle, fbtool, headTitle, report, signature } from '../content.js'
 import Yjdict from './yjdict.vue'
 const props = defineProps({
   item: {
@@ -59,9 +58,9 @@ const props = defineProps({
 const queryFrom = ref({})
 const searchBox = ref(); //搜索框
 const yjdict = ref(null)//详情弹窗
-const ItemData=ref()//模型数据
+const ItemData = ref()//模型数据
 const showModel = ref(false)
-const textContent=ref('')//报告数据
+const textContent = ref('')//报告数据
 const SaveReport = () => {
 }
 const opneModel = (row) => {
@@ -71,33 +70,33 @@ const opneModel = (row) => {
     yjid: row.id,
   }).then((res) => {
     let str = {
-    model: "deepseek-32b",
-    prompt: `# 角色定位\n你是一名资深警务人员，尤其擅长对警情、案件、线索等非结构化文本数据进行阅读理解，并从中提取各种对象特征信息进行结构化，并总结各种对象之间的关联关系。\n`,
-    max_tokens: 1000,
-  }
+      model: "deepseek-32b",
+      prompt: `# 角色定位\n你是一名资深警务人员，尤其擅长对警情、案件、线索等非结构化文本数据进行阅读理解，并从中提取各种对象特征信息进行结构化，并总结各种对象之间的关联关系。\n`,
+      max_tokens: 1000,
+    }
     res.forEach(item => {
       const lx = props.dict.D_BZ_JQLY.find(items => {
         return items.value == item.yjlx
       }).zdmc
-      str.prompt+=`警情内容:${item.bjnr},报警人姓名:${item.bjrmc},报警地址:${item.bjdz},报警类型:${lx},报警时间:${item.bjsj}\n`
+      str.prompt += `警情内容:${item.bjnr},报警人姓名:${item.bjrmc},报警地址:${item.bjdz},报警类型:${lx},报警时间:${item.bjsj}\n`
     })
     str.prompt += `根据以上警情信息，总结出一个解决方案`
     let jsonMatch
     completions(str).then(reslve => {
       jsonMatch = reslve.choices[0].text
       textContent.value += BigTitle("林芝市公安局情指中心") + BigTitle("研判专刊(初稿)") + newTotitle({
-    org: "市公安局情指中心编",
-    time: timeValidate()
-    }) + fbtool(`同类事件发生${res.length}次以上预警`)
-    res.forEach((item,index) => {
-      const lx = props.dict.D_BZ_JQLY.find((items) => {
-        return items.value == item.yjlx
-      }).zdmc
-      textContent.value += Subheading(`${index + 1}.警情内容`) +
-        // textStyle(`预警名称:${item.yjBt},预警人员姓名:${item.yjRyxm},身份证号:${item.yjRysfzh},车牌号:${item.yjClcph},预警地址:${item.yjDz},预警类型:${lx},预警内容:${item.yjnr},预警时间:${item.yjsj}\n`)
-    textStyle(`警情内容:${item.bjnr},报警人姓名:${item.bjrmc},报警地址:${item.bjdz},报警类型:${lx},报警时间:${item.bjsj}\n`)
+        org: "市公安局情指中心编",
+        time: timeValidate()
+      }) + fbtool(`同类事件发生${res.length}次以上预警`)
+      res.forEach((item, index) => {
+        const lx = props.dict.D_BZ_JQLY.find((items) => {
+          return items.value == item.yjlx
+        }).zdmc
+        textContent.value += Subheading(`${index + 1}.警情内容`) +
+          // textStyle(`预警名称:${item.yjBt},预警人员姓名:${item.yjRyxm},身份证号:${item.yjRysfzh},车牌号:${item.yjClcph},预警地址:${item.yjDz},预警类型:${lx},预警内容:${item.yjnr},预警时间:${item.yjsj}\n`)
+          textStyle(`警情内容:${item.bjnr},报警人姓名:${item.bjrmc},报警地址:${item.bjdz},报警类型:${lx},报警时间:${item.bjsj}\n`)
       })
-    textContent.value+=Subheading(`解决方案`)+textStyle(jsonMatch?jsonMatch:'暂无解决方案')
+      textContent.value += Subheading(`解决方案`) + textStyle(jsonMatch ? jsonMatch : '暂无解决方案')
     })
 
   })
@@ -127,8 +126,8 @@ const pageData = reactive({
   controlsWidth: 300,
   tableColumn: [
     { label: "预警时间", prop: "yjsj", showOverflowTooltip: true },
-    { label: "类型", prop: "yjlx"  ,showSolt:true },
-    { label: "内容", prop: "yjnr", showOverflowTooltip: true},
+    { label: "类型", prop: "yjlx", showSolt: true },
+    { label: "内容", prop: "yjnr", showOverflowTooltip: true },
     // ypbg
   ]
 });
@@ -141,15 +140,15 @@ const openYjdict = (val) => {
   yjdict.value.init(val)
 }
 watch(() => props.item, (val) => {
-    ItemData.value=val
-},{deep:true})
+  ItemData.value = val
+}, { deep: true })
 
 // 获取列表
 const getList = () => {
   const promes = {
     ...pageData.pageConfiger,
     ...queryFrom.value,
-    mxid:props.item.id,
+    mxid: props.item.id,
   }
   getYjxxPageList(promes).then((res) => {
     pageData.tableData = res.records
@@ -158,8 +157,8 @@ const getList = () => {
 };
 // 搜索
 const onSearch = (val) => {
-  queryFrom.value.startTime = val.startTime&&val.startTime.length > 0 ? val.startTime[0] : '';
-  queryFrom.value.endTime = val.startTime&&val.startTime.length > 0 ? val.startTime[1] : '';
+  queryFrom.value.startTime = val.startTime && val.startTime.length > 0 ? val.startTime[0] : '';
+  queryFrom.value.endTime = val.startTime && val.startTime.length > 0 ? val.startTime[1] : '';
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
@@ -180,7 +179,7 @@ const retenHome = () => {
 // 表格高度计算
 const tabHeightFn = () => {
   pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
-  window.onresize = function () {
+  window.onresize = function() {
     tabHeightFn();
   };
 };
@@ -188,7 +187,7 @@ const tabHeightFn = () => {
 const yzSsyjpzMxgzxl = (params) => {
   // getYjgzpzMxgzxl({id:'26aefb9f4c7c41b3a4bfb5b68449328b'}).then((res) => {
   // })
-    getSsyjpzMxgzxl({id:'88c166e670da48e59324906648794b05'}).then((res) => {
+  getSsyjpzMxgzxl({ id: '88c166e670da48e59324906648794b05' }).then((res) => {
   })
 }
 const warningDetails = (row) => {

From 6a7d6de03c06f86fdba791f49ba2adf37b828cb0 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Thu, 11 Dec 2025 16:55:33 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20Ai=E5=8A=A0=E8=BD=BD=E5=89=8D?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E6=B8=B2=E6=9F=93=E4=B8=80=E6=AC=A1=EF=BC=8C?=
 =?UTF-8?q?Ai=E5=87=BA=E6=9D=A5=E5=90=8E=E5=86=8D=E6=AC=A1=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tsypHome/components/AddModel/yjList.vue   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue
index f1046c5..9524ab9 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/AddModel/yjList.vue
@@ -63,12 +63,35 @@ const showModel = ref(false)
 const textContent = ref('')//报告数据
 const SaveReport = () => {
 }
+/** 获取原始报备内容
+ * @param {Array} resArr 预警信息
+ * @param {Array} dictArr 预警类型
+ * @returns {String} 原始报备内容
+ */
+const getOriginStr = (resArr, dictArr) => {
+  /** 标题前文 */
+  const preStr = BigTitle("林芝市公安局情指中心") + BigTitle("研判专刊(初稿)") + newTotitle({
+    org: "市公安局情指中心编",
+    time: timeValidate()
+  }) + fbtool(`同类事件发生${resArr.length}次以上预警`)
+  /** 警情内容 */
+  let contentStr = resArr.map((item, index) => {
+    const lx = dictArr.find(items => {
+      return items.value == item.yjlx
+    }).zdmc
+    return Subheading(`${index + 1}.警情内容`) +
+      textStyle(`警情内容:${item.bjnr},报警人姓名:${item.bjrmc},报警地址:${item.bjdz},报警类型:${lx},报警时间:${item.bjsj}\n`)
+  }).join('')
+  const endStr = Subheading(`解决方案`) + textStyle('加载中。。。')
+  return preStr + contentStr + endStr
+}
 const opneModel = (row) => {
   showModel.value = true
   textContent.value = ''
   mxglJqxqGetPageList({
     yjid: row.id,
   }).then((res) => {
+    res = Array.isArray(res) ? res : []
     let str = {
       model: "deepseek-32b",
       prompt: `# 角色定位\n你是一名资深警务人员，尤其擅长对警情、案件、线索等非结构化文本数据进行阅读理解，并从中提取各种对象特征信息进行结构化，并总结各种对象之间的关联关系。\n`,
@@ -81,9 +104,11 @@ const opneModel = (row) => {
       str.prompt += `警情内容:${item.bjnr},报警人姓名:${item.bjrmc},报警地址:${item.bjdz},报警类型:${lx},报警时间:${item.bjsj}\n`
     })
     str.prompt += `根据以上警情信息，总结出一个解决方案`
+    textContent.value = getOriginStr(res, props.dict.D_BZ_JQLY)
     let jsonMatch
     completions(str).then(reslve => {
       jsonMatch = reslve.choices[0].text
+      textContent.value = '' // 重置为空
       textContent.value += BigTitle("林芝市公安局情指中心") + BigTitle("研判专刊(初稿)") + newTotitle({
         org: "市公安局情指中心编",
         time: timeValidate()

From d164cd321c8437b4c24c08ba840c96d4d21436ad Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Thu, 11 Dec 2025 17:15:21 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E5=85=88=E5=81=9A=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=AE=80=E5=8D=95=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResearchHome/components/AnalysisReport/index.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/index.vue b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/index.vue
index f069213..40583c5 100644
--- a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/index.vue
@@ -111,7 +111,10 @@
 
       <h2>2.总结分析</h2>
       <p style="min-height: 100px;" v-loading="loading">{{ textContent }} </p>
+
     </div>
+    <el-button style="position: fixed;bottom: 0;left: 45%;" type="primary" size="default"
+      @click="downloadWithStyles">下载</el-button>
 
   </div>
   <AddForm ref="addForm" :dict="{ D_GS_XS_LX }" />
@@ -125,6 +128,8 @@ import { getItem, setItem } from '@/utils/storage'
 import { fxbgDywdtj, getDictItem, fxbgJqlxtj, fxbgJqlytj, fxbgYdfx, fxbgXsfx, fxgbCljgf, fxgbCzlfx, fxbgTj } from '@/api/semanticAnalysis'
 import { completions } from '@/api/semanticAnalysis'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick, computed, watch } from "vue";
+import { downloadDocWithStyle } from '@/utils/export.js';
+
 const props = defineProps({
   // 数据
   search: {
@@ -158,10 +163,15 @@ const tabHeight = ref(0)
 // 表格高度计算
 const tabHeightFn = () => {
   tabHeight.value = window.innerHeight - 300
-  window.onresize = function () {
+  window.onresize = function() {
     tabHeightFn();
   };
 };
+const downloadDocWithStyle = () => {
+  if (!tableBox.value?.innerHTML) return;
+  downloadDocWithStyle(tableBox.value?.innerHTML)
+}
+
 const pageData = reactive({
   parameter: {},
   total: 0,

From 74eb51c52ed414d15666230d95f55e6dbafd1c50 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Thu, 11 Dec 2025 17:57:20 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E6=9A=B4=E9=9C=B2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E7=BB=99=E7=88=B6=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E8=8E=B7=E5=8F=96=E5=9B=BE=E8=A1=A8=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AnalysisReport/components/histogram.vue   | 19 +++++++++++++++++++
 .../components/maleNightingalePicture.vue     | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/histogram.vue b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/histogram.vue
index c2040b5..f1fe4db 100644
--- a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/histogram.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/histogram.vue
@@ -161,6 +161,25 @@ const initChart = () => {
     }
   }, 100);
 };
+
+// 暴露方法给父组件，用于获取图表图片数据
+defineExpose({
+  getChartImage: () => {
+    if (myChart.value) {
+      return myChart.value.getDataURL({
+        type: 'png',
+        pixelRatio: 2,
+        backgroundColor: '#fff'
+      });
+    }
+    return null;
+  },
+  resizeChart: () => {
+    if (myChart.value) {
+      myChart.value.resize();
+    }
+  }
+});
 </script>
 
 <style scoped>
diff --git a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/maleNightingalePicture.vue b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/maleNightingalePicture.vue
index d2d936c..54101e3 100644
--- a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/maleNightingalePicture.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/AnalysisReport/components/maleNightingalePicture.vue
@@ -190,6 +190,25 @@ watch([
 ], () => {
   initChart();
 });
+
+// 暴露方法给父组件，用于获取图表图片数据
+defineExpose({
+  getChartImage: () => {
+    if (chartInstance.value) {
+      return chartInstance.value.getDataURL({
+        type: 'png',
+        pixelRatio: 2,
+        backgroundColor: '#fff'
+      });
+    }
+    return null;
+  },
+  resizeChart: () => {
+    if (chartInstance.value) {
+      chartInstance.value.resize();
+    }
+  }
+});
 </script>
 <style scoped>
 :deep(div) {

From e18096ed90a80f077bdff8ddd2046f787ff1a2ae Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Thu, 11 Dec 2025 17:58:37 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 72 ++++++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 539c16a..554fa3a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -191,7 +191,14 @@ export const publicRoutes = [
       title: "布控预警",
       icon: "article"
     }
-  }, {
+  },
+  {
+    path: "/fouColorWarning",
+    name: "fouColorWarning",
+    meta: { title: "四色预警", icon: "article" },
+    component: () => import("@/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index"),
+  },
+  {
     path: "/behaviorWarnings",
     name: "behaviorWarnings",
     meta: { title: "行为预警", icon: "article" },
@@ -675,24 +682,44 @@ export const publicRoutes = [
               icon: "article"
             }
           },
-          {
-            path: "/tacticalResearch",
-            name: "tacticalResearch",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
+           {
+            path: "/ResearchHome",
+            name: "ResearchHome",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
             meta: {
               title: "战术研判",
               icon: "article"
             }
           },
           {
-            path: "/strategicResearch",
-            name: "strategicResearch",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
+            path: "/situationHome",
+            name: "situationHome",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/situationHome/index"),
             meta: {
               title: "战略研判",
               icon: "article"
             }
           },
+
+          // 后面写的研判
+          // {
+          //   path: "/tacticalResearch",
+          //   name: "tacticalResearch",
+          //   component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
+          //   meta: {
+          //     title: "战术研判",
+          //     icon: "article"
+          //   }
+          // },
+          // {
+          //   path: "/strategicResearch",
+          //   name: "strategicResearch",
+          //   component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
+          //   meta: {
+          //     title: "战略研判",
+          //     icon: "article"
+          //   }
+          // },
           {
             path: "/judgmentCommand",
             name: "judgmentCommand",
@@ -849,36 +876,19 @@ export const publicRoutes = [
           icon: "article"
         },
         children: [
+          // {
+          //   path: "/fouColorWarning",
+          //   name: "fouColorWarning",
+          //   meta: { title: "四色预警", icon: "article" },
+          //   component: () => import("@/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index"),
+          // },
           {
-            path: "/fouColorWarning",
-            name: "fouColorWarning",
-            meta: { title: "四色预警", icon: "article" },
-            component: () => import("@/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index"),
-          }, {
             path: "/CollectCrculate",
             name: "CollectCrculate",
             component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"),
             meta: { title: "信息采集", icon: "article" },
           },
-          {
-            path: "/ResearchHome",
-            name: "ResearchHome",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
-            meta: {
-              title: "战术研判",
-              icon: "article"
-            }
-          },
 
-          {
-            path: "/situationHome",
-            name: "situationHome",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/situationHome/index"),
-            meta: {
-              title: "战略研判",
-              icon: "article"
-            }
-          },
         ]
       },
     ]