diff --git a/src/components/MarkdownEdit/index.vue b/src/components/MarkdownEdit/index.vue index cb4973c..c74df70 100644 --- a/src/components/MarkdownEdit/index.vue +++ b/src/components/MarkdownEdit/index.vue @@ -100,7 +100,7 @@ const uploadFn = (file, insertFn) => { insertFn(res); }); }; -//编辑器创建成功 +//编辑器创建成功 const handleCreated = (editor) => { editorRef.value = editor; }; diff --git a/src/components/ypModel/index.vue b/src/components/ypModel/index.vue index caecae3..8e79081 100644 --- a/src/components/ypModel/index.vue +++ b/src/components/ypModel/index.vue @@ -133,7 +133,6 @@ onBeforeUnmount(() => { }); // 带样式的下载方法 const downloadWithStyles = () => { - const wordDocument = ` diff --git a/src/router/index.js b/src/router/index.js index af8c12e..6b84dd2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -732,6 +732,15 @@ export const publicRoutes = [ // } // }, + { + path: "/permissionApply", + name: "permissionApply", + component: () => import("@/views/backOfficeSystem/HumanIntelligence/permissionApply/index"), + meta: { + title: "权限申请", + icon: "article-create" + } + }, { path: "/JobAppraisal", name: "JobAppraisal", diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue index 15e30e0..ea93356 100644 --- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue +++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue @@ -173,20 +173,18 @@ const pageData = reactive({ }, controlsWidth: 280, tableColumn: [ - { label: "群体名称", prop: "qtMc", width: 150 }, - { label: "群体类别", prop: "qtLb", showSolt: true, width: 150 }, - { label: "风险等级", prop: "qtFxdj", showSolt: true, width: 150 }, - { label: "背景资料", prop: "qtBjzl", width: 150 }, - { label: "背景信息", prop: "bgxx", showSolt: true, width: 150 }, - { label: "管辖单位", prop: "gxSsdwmc", width: 150 }, - { label: "列控原因", prop: "zdrLkyy", width: 150 }, - { label: "开始时间", prop: "zdrRkkssj", width: 150 }, - { label: "截至时间", prop: "zdrRkjssj", width: 150 }, - { label: "稳控人数", prop: "zdryList", showSolt: true, width: 150 }, - { label: "状态", prop: "qtZt", showSolt: true, width: 150 }, - { label: "标签", prop: "bqList", showSolt: true, showOverflowTooltip: true, width: 400 }, - { label: "创建单位", prop: "xtCjbmmc", width: 150 }, - { label: "创建时间", prop: "xtCjsj", width: 150 }, + { label: "群体名称", prop: "qtMc" }, + { label: "群体类别", prop: "qtLb", showSolt: true }, + { label: "风险等级", prop: "qtFxdj", showSolt: true }, + // { label: "背景资料", prop: "qtBjzl" }, + { label: "背景信息", prop: "bgxx", showSolt: true }, + { label: "管辖单位", prop: "gxSsdwmc" }, + { label: "列控原因", prop: "zdrLkyy" }, + { label: "开始时间", prop: "zdrRkkssj" }, + { label: "截至时间", prop: "zdrRkjssj" }, + { label: "稳控人数", prop: "zdryList", showSolt: true }, + { label: "状态", prop: "qtZt", showSolt: true }, + { label: "标签", prop: "bqList", showSolt: true, showOverflowTooltip: true, }, ] }); diff --git a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/components/inforReport.vue b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/components/inforReport.vue new file mode 100644 index 0000000..41eee32 --- /dev/null +++ b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/components/inforReport.vue @@ -0,0 +1,232 @@ + + + + + + + diff --git a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue index 5685dc8..6261087 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue @@ -12,7 +12,7 @@ 新增 - + @@ -30,7 +30,12 @@ 删除 - + + + + 情报信息报告 + +
@@ -49,7 +54,6 @@ -
- - - - - + + + + + + + + + - + + + + diff --git a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/headLayout.vue b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/headLayout.vue index 17bccd5..a9bbd51 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/headLayout.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/headLayout.vue @@ -10,7 +10,16 @@ {{ it.label }} 自定义： - + diff --git a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/statusCount.vue b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/statusCount.vue index 968c2c0..c2a97dc 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/statusCount.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/components/statusCount.vue @@ -31,13 +31,12 @@ const props = defineProps({ }) const legendList = ref([]) watch(() => props.data, (newVal) => { - console.log(newVal,'-------------监听'); if (newVal.length) { const total = newVal.reduce((s, v) => s + v.value, 0); legendList.value = newVal.map((d, i) => ({ name: d.name, - value: 20, - percent: Math.round((d.value / total )* 100), + value: d.value, + percent: total > 0 ? Math.round((d.value / total )* 100) : 0, dotColor: i === 0 ? 'linear-gradient(90deg, #FF8DA7 0%, #D66A8D 100%)': d.color })) nextTick(() => { diff --git a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/index.vue b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/index.vue index 208be33..4d0c3ae 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/index.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/ReportStatisticalAnalysis/index.vue @@ -17,11 +17,11 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue"; import QbtjCount from './qbtjCount.vue' import YjCount from './yjCount.vue' -import XxhjCount from './xxhjCount.vue' import QygktjCount from './qygktjCount.vue' +import XxhjCount from './xxhjCount.vue' import { ref } from "vue"; const butList=ref(["情报统计分析","预警统计",'全域管控统计','信息汇聚统计']) -const qh = ref('预警统计') +const qh = ref('情报统计分析') diff --git a/src/views/home/components/keyGroups.vue b/src/views/home/components/keyGroups.vue index e6440b1..148c153 100644 --- a/src/views/home/components/keyGroups.vue +++ b/src/views/home/components/keyGroups.vue @@ -1,7 +1,13 @@ diff --git a/src/views/home/components/keyPerson.vue b/src/views/home/components/keyPerson.vue index 42334f7..f70aa67 100644 --- a/src/views/home/components/keyPerson.vue +++ b/src/views/home/components/keyPerson.vue @@ -1,9 +1,13 @@ diff --git a/src/views/home/components/policeReports.vue b/src/views/home/components/policeReports.vue index f2024f7..b0902f0 100644 --- a/src/views/home/components/policeReports.vue +++ b/src/views/home/components/policeReports.vue @@ -1,8 +1,12 @@ diff --git a/src/views/home/components/qxsqDialog.vue b/src/views/home/components/qxsqDialog.vue new file mode 100644 index 0000000..828cf82 --- /dev/null +++ b/src/views/home/components/qxsqDialog.vue @@ -0,0 +1,77 @@ + + diff --git a/src/views/home/components/totalNumberClues.vue b/src/views/home/components/totalNumberClues.vue index c44aadc..2ac28af 100644 --- a/src/views/home/components/totalNumberClues.vue +++ b/src/views/home/components/totalNumberClues.vue @@ -1,6 +1,12 @@ diff --git a/src/views/home/components/totalNumberDistributions.vue b/src/views/home/components/totalNumberDistributions.vue index c4a6baa..f6b4855 100644 --- a/src/views/home/components/totalNumberDistributions.vue +++ b/src/views/home/components/totalNumberDistributions.vue @@ -1,6 +1,12 @@ diff --git a/src/views/home/dialog/leftDialog.vue b/src/views/home/dialog/leftDialog.vue index 9ca81ca..70d2cb7 100644 --- a/src/views/home/dialog/leftDialog.vue +++ b/src/views/home/dialog/leftDialog.vue @@ -1,5 +1,7 @@