lcw

2025-12-27 11:10:31 +08:00
parent 596c9f99e4
commit 3fb06e3847
34 changed files with 1747 additions and 429 deletions
--- a/src/views/home/components/keyGroups.vue
+++ b/src/views/home/components/keyGroups.vue
@ -4,24 +4,30 @@
    <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
        <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData" fixed="right">
+         fixed="right" :expand="true">
        <template #qtLb="{ row }">
          <DictTag :tag="false" :value="row.qtLb" :options="D_GS_ZDQT_LB" />
        </template>
        <template #qtFxdj="{ row }">
          <DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ" />
        </template>
-        <template #bqList="{ row }">
+        <!-- <template #bqList="{ row }">
          <ul>
            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
              item.bqFz || 0 }} 分) </li>
          </ul>
-        </template>
+        </template> -->
+
        <template #zdryList="{ row }">
          <span style="color: #0072ff">{{ row.zdryList ? row.zdryList.length : 0 }}</span>
        </template>
-        <template #qtZt="{ row }">
+        <!-- <template #qtZt="{ row }">
          <DictTag :tag="false" :value="row.qtZt" :options="D_GS_ZDQT_ZT" />
+        </template> -->
+                <template #expand="{ props }">
+          <div class="expand-content" style="max-width: 100%">
+        <ZdqtItem :row="props" :dict="{D_GS_ZDR_RYJB,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_ZDQT_ZT}" />
+          </div>
        </template>
      </MyTable>
      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@ -45,7 +51,7 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { ref, reactive, getCurrentInstance, watch } from "vue";
 import { useRoute, useRouter } from 'vue-router'
-import {timeValidate} from '@/utils/tools.js'
+import ZdqtItem from "./zdqtItem.vue";
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance()
@ -100,6 +106,7 @@ const pageData = reactive({
    loading: false,
    rowHieght: 40,
    haveControls: false,
+        showSelectType:'null'
  },
  controlsWidth: 160, //操作栏宽度
  total: 0,
@ -108,20 +115,13 @@ const pageData = reactive({
    pageCurrent: 1
  }, //分页
  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" },
+
  ],
  tableHeight: "42vh",
 });
--- a/src/views/home/components/keyPerson.vue
+++ b/src/views/home/components/keyPerson.vue
@ -6,7 +6,7 @@
    <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+        :expand="true">
        <template #bqList="{ row }">
          <ul>
            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
@ -25,22 +25,18 @@
        <template #hjdQh="{ row }">
          <DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" />
        </template>
-        <template #zdrRyjb="{ row }">
-          <DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB" />
-        </template>
-        <template #zdrBkZt="{ row }">
-          <DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" />
-        </template>
-        <template #zdrCzzt="{ row }">
-          <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
-        </template>
+
        <template #zdrZt="{ row }">
          <DictTag :tag="false" :value="row.zdrZt" :options="D_GS_ZDQT_ZT" />
        </template>
        <template #xtSjzt="{ row }">
          <div> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
        </template>
-
+        <template #expand="{ props }">
+          <div class="expand-content" style="max-width: 100%">
+        <ZdrItemfrom :row="props" :dict="{D_GS_ZDR_RYJB,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_ZDQT_ZT}" />
+          </div>
+        </template>
        <!-- 操作 -->
        <template #controls="{ row }">
          <el-link size="small" type="success" @click="handleremove(row.id)">移除</el-link>
@ -73,7 +69,8 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { ref, reactive, getCurrentInstance, watch } from "vue";
 import { useRoute, useRouter } from 'vue-router'
-import {timeValidate} from '@/utils/tools.js'
+import { timeValidate } from '@/utils/tools.js'
+import ZdrItemfrom from  './zdrItem.vue'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance()
@ -134,6 +131,7 @@ const pageData = reactive({
    loading: false,
    rowHieght: 40,
    haveControls: false,
+    showSelectType:'null'
  },
  controlsWidth: 160, //操作栏宽度
  total: 0,
@ -142,22 +140,13 @@ const pageData = reactive({
    pageCurrent: 1
  }, //分页
  tableColumn: [
-     { label: "姓名", prop: "ryXm", width: 150 },
-    { label: "性别", prop: "ryXb", showSolt: true, width: 100 },
-    { label: "籍贯", prop: "ryJg", showSolt: true, width: 100 },
-    { label: "身份证", prop: "rySfzh", width: 200 },
-    { label: "民族", prop: "ryMz", showSolt: true, width: 100 },
-    { label: "户籍地区划", prop: "hjdQh", showSolt: true, width: 150 },
-    { label: "户籍派出所", prop: "hjdPcsmc", width: 200 },
-    { label: "户籍地详址", prop: "hjdXz", width: 200 },
-    { label: "标签", prop: "bqList", showSolt: true, width: 400, showOverflowTooltip: true },
-    { label: "管辖单位", prop: "gxSsbmmc", width: 200 },
-    { label: "人员级别", prop: "zdrRyjb", showSolt: true, width: 130 },
-    { label: "管控原因", prop: "zdrLkyy", width: 200, showOverflowTooltip: true },
-    { label: "管控状态", prop: "zdrBkZt", width: 200, showOverflowTooltip: true },
-    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
-    { label: "审核状态", prop: "zdrZt", showSolt: true },
-    { label: "状态", prop: "xtSjzt", showSolt: true },
+     { label: "姓名", prop: "ryXm" },
+    { label: "性别", prop: "ryXb", showSolt: true },
+    { label: "籍贯", prop: "ryJg", showSolt: true},
+    { label: "身份证", prop: "rySfzh" },
+    { label: "民族", prop: "ryMz", showSolt: true },
+    { label: "户籍地区划", prop: "hjdQh", showSolt: true },
+    { label: "户籍派出所", prop: "hjdPcsmc" },
  ],
  tableHeight: "42vh",
 });
@ -206,4 +195,10 @@ const changeSize = (val) => {
 }
 </script>

-<style scoped></style>
+<style scoped>
+
+  .expand-content{
+    max-height: 400px;
+    overflow: auto;
+  }
+</style>
--- a/src/views/home/components/numberWarnings.vue
+++ b/src/views/home/components/numberWarnings.vue
@ -74,8 +74,8 @@ const props = defineProps({
  }
 })
 const searchConfiger = ref([
-  { label: "预警级别", prop: 'yjjbList', placeholder: "请输入姓名", showType: "select", options: D_BZ_YJJB },
-  { label: "预警类型", prop: 'yjlxList', placeholder: "请输入身份证号码", showType: "select", options: D_GS_ZDQT_YJLB },
+  { label: "预警级别", prop: 'yjjbList', placeholder: "请选择预警级别", showType: "select", options: D_BZ_YJJB },
+  // { label: "预警类型", prop: 'yjlxList', placeholder: "请输入身份证号码", showType: "select", options: D_GS_ZDQT_YJLB },
  {
    label: "上报时间",
    prop: "startTime",
@ -89,6 +89,9 @@ const searchConfiger = ref([
  },
 ]);
 const emit = defineEmits(['update:modelValue'])
+    let today = new Date();
+    let startOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    let endOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999);
 const closeDialog = () => {
  emit('update:modelValue', false)
 }
@ -99,6 +102,8 @@ const pageData = reactive({
    loading: false,
    rowHieght: 40,
    haveControls: false,
+showSelectType:'null'
+
  },
  controlsWidth: 160, //操作栏宽度
  total: 0,
@ -119,13 +124,13 @@ const pageData = reactive({
    { label: "所属部门", prop: "ssbm" },
    { label: "车牌号", prop: "cph" },
  ],
-  tableHeight: "47vh",
+  tableHeight: "43vh",
 });
 const parameter = ref()
 const onSearch = (val) => {
  const promes = {
-    startTime: val.startTime && val.startTime.length > 0 ? val.startTime[0] : '',
-    endTime: val.startTime && val.startTime.length > 0 ? val.startTime[1] : '',
+    startTime: val.startTime && val.startTime.length > 0 ? val.startTime[0] : timeValidate(startOfDay),
+    endTime: val.startTime && val.startTime.length > 0 ? val.startTime[1] :timeValidate(endOfDay),
  }
  parameter.value = { ...val, ...promes }
  pageData.pageConfiger.pageCurrent = 1;
@ -134,9 +139,6 @@ const onSearch = (val) => {
 watch(() => props.modelValue, (val) => {
  if (val) {
    // 获取今天的开始时间和结束时间
-    let today = new Date();
-    let startOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate());
-    let endOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999);
    parameter.value = {startTime:timeValidate(startOfDay), endTime:timeValidate(endOfDay)}
    changePage()
  }
@ -148,7 +150,7 @@ pageData.tableConfiger.loading = true;
  const promes = {
    ...parameter.value,
    yjjbList:parameter.value.yjjbList? [parameter.value.yjjbList] : [],
-   yjlxList: parameter.value.yjlxList? [parameter.value.yjlxList] : [],
+   yjlxList:  ['01'],
    pageCurrent: pageData.pageConfiger.pageCurrent,
    pageSize: pageData.pageConfiger.pageSize
  }
--- a/src/views/home/components/totalNumberClues.vue
+++ b/src/views/home/components/totalNumberClues.vue
@ -0,0 +1,138 @@
+<template>
+  <el-dialog v-model="modelValue" :title="title" width="70%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 60vh; overflow: auto;">
+    <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
+       <MyTable
+        :tableData="pageData.tableData"
+        :tableColumn="pageData.tableColumn"
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount"
+        :tableConfiger="pageData.tableConfiger"
+        :controlsWidth="pageData.controlsWidth"
+      >
+
+        <template #zllx="{row}">
+          <DictTag :tag="false" :value="row.zllx" :options="D_GS_XS_ZLLX" />
+        </template>
+        <template #zldj="{row}">
+          <DictTag :tag="false" :value="row.zldj" :options="D_GS_ZDQT_FXDJ" />
+        </template>
+        <template #czzt="{row}">
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+        </template>
+
+      </MyTable>
+      <Pages
+        @changeNo="changeNo"
+        @changeSize="changeSize"
+        :tableHeight="pageData.tableHeight"
+        :pageConfiger="{
+          ...pageData.pageConfiger,
+          total: pageData.total
+        }"
+      ></Pages>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="closeDialog">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+ import {  xxcjXfxsSelectPage } from "@/api/xxcj.js"
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+const { proxy } = getCurrentInstance()
+const {D_GS_XS_SJLY,D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ,D_GS_XS_CZZT} = proxy.$dict('D_GS_XS_SJLY','D_GS_XS_ZLLX','D_GS_ZDQT_FXDJ','D_GS_XS_CZZT')
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dict: {
+    type: Object,
+    default: () => ({})
+  },title: {
+    default: "下发总数",
+    type: String
+  }
+})
+const searchConfiger = ref([
+  { label: "指令标题", prop: 'zlbt', placeholder: "请输入指令标题", showType: "input" },
+  { label: "指令类型", prop: 'zllx', placeholder: "请选择指令类型", showType: "select",options:D_GS_XS_ZLLX },
+  { label: "指令等级", prop: 'zldj', placeholder: "请选择指令等级", showType: "select" ,options:D_GS_ZDQT_FXDJ},
+  { label: "处置状态", prop: 'czzt', placeholder: "请选择处置状态", showType: "select" ,options:D_GS_XS_CZZT},
+]);
+const emit = defineEmits(['update:modelValue'])
+const closeDialog = () => {
+  emit('update:modelValue', false)
+}
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    loading: false,
+    rowHieght: 40,
+    haveControls: false,
+  },
+  controlsWidth: 160, //操作栏宽度
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  tableColumn: [
+    { label: '指令标题', prop: 'zlbt' },
+      { label: '指令类型', prop: 'zllx',showSolt:true  },
+      { label: '指令等级', prop: 'zldj',showSolt:true  },
+      { label: '反馈截止时间', prop: 'jssj' },
+      { label: '处置状态', prop: 'czzt',showSolt:true },
+  ],
+  tableHeight: "43vh",
+});
+const parameter = ref()
+const onSearch = (val) => {
+
+  parameter.value = { ...val }
+  pageData.pageConfiger.pageCurrent = 1;
+  changePage()
+}
+watch(() => props.modelValue, (val) => {
+  if (val) {
+    changePage()
+  }
+})
+
+const changePage = () => {
+pageData.tableConfiger.loading = true;
+  const promes = {
+    ...parameter.value,
+    pageCurrent: pageData.pageConfiger.pageCurrent,
+    pageSize: pageData.pageConfiger.pageSize
+  }
+  xxcjXfxsSelectPage(promes).then((res) => {
+    pageData.total = res.total || 0;
+    pageData.tableConfiger.loading = false;
+    pageData.tableData = res.records
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  })
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  changePage()
+}
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  changePage()
+}
+</script>
+
+<style scoped></style>
+
--- a/src/views/home/components/totalNumberDistributions.vue
+++ b/src/views/home/components/totalNumberDistributions.vue
@ -0,0 +1,129 @@
+<template>
+  <el-dialog v-model="modelValue" title="线索总数" width="70%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 60vh; overflow: auto;">
+    <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
+     <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+           <template #qblx="{row}">
+          <DictTag :tag="false" :value="row.qblx" :options="D_GS_XS_LX" />
+        </template>
+        <template #qbly="{row}">
+          <DictTag :tag="false" :value="row.qbly" :options="D_GS_XS_LY" />
+        </template>
+        <!-- <template #czzt="{row}">
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+        </template> -->
+        <template #shzt="{row}">
+          <!-- 采纳（将这条信息推送到情报管理）,退回！ -->
+          <DictTag :tag="false" :value="row.shzt" :options="D_BZ_XSSHZT" @clickTag="clickTag(row.shzt)" />
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="closeDialog">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+ import { xxcjQbcjSelectPage, xxcjXfxsSelectPage } from "@/api/xxcj.js"
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+const { proxy } = getCurrentInstance()
+const {D_GS_XS_CZZT,D_GS_XS_LY, D_GS_XS_LX ,D_BZ_XSSHZT} = proxy.$dict("D_GS_XS_CZZT","D_GS_XS_LY","D_GS_XS_LX","D_BZ_XSSHZT"); //获取字典数据
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dict: {
+    type: Object,
+    default: () => ({})
+  },
+})
+const searchConfiger = ref([
+  { label: "线索名称", prop: 'qbmc', placeholder: "请输入线索名称", showType: "input" },
+  { label: "内容关键字", prop: 'qbnr', placeholder: "请输入语义关键字", showType: "input" },
+  { label: "线索类型", prop: 'qblx', placeholder: "请选择线索类型", showType: "select",options:D_GS_XS_LX },
+  { label: "线索来源", prop: 'qbly', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
+]);
+const emit = defineEmits(['update:modelValue'])
+const closeDialog = () => {
+  emit('update:modelValue', false)
+}
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    loading: false,
+    rowHieght: 40,
+    haveControls: false,
+  },
+  controlsWidth: 160, //操作栏宽度
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  tableColumn: [
+    { label: "线索编号", prop: "xsBh" },
+    { label: "线索名称", prop: "qbmc" },
+    { label: "线索类型", prop: "qblx",showSolt:true },
+    { label: "线索来源", prop: "qbly",showSolt:true },
+    { label: "上报时间", prop: "sxsbsj",showOverflowTooltip:true },
+    { label: "线索内容", prop: "qbnr"},
+    // { label: "处置状态", prop: "czzt",showSolt: true},
+    { label: "附件", prop: "fjdz", showSolt: true },
+    { label: "审核状态", prop: "shzt", showSolt: true },
+  ],
+  tableHeight: "43vh",
+});
+const parameter = ref()
+const onSearch = (val) => {
+  parameter.value = { ...val}
+  pageData.pageConfiger.pageCurrent = 1;
+  changePage()
+}
+watch(() => props.modelValue, (val) => {
+  if (val) {
+    changePage()
+  }
+})
+
+const changePage = () => {
+pageData.tableConfiger.loading = true;
+  const promes = {
+    ...parameter.value,
+    pageCurrent: pageData.pageConfiger.pageCurrent,
+    pageSize: pageData.pageConfiger.pageSize
+  }
+  xxcjQbcjSelectPage(promes).then((res) => {
+    pageData.total = res.total || 0;
+    pageData.tableConfiger.loading = false;
+    pageData.tableData = res.records
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  })
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  changePage()
+}
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  changePage()
+}
+</script>
+
+<style scoped></style>
+
--- a/src/views/home/components/zdqtItem.vue
+++ b/src/views/home/components/zdqtItem.vue
@ -0,0 +1,194 @@
+<template>
+  <div class="warning-item" >
+
+    <el-divider content-position="left">重点群体信息</el-divider>
+    <div class="info-container">
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">户籍地详址：</span>
+          <span class="value">{{ row.hjdXz || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">管辖单位：</span>
+          <span class="value">{{ row.gxSsbmmc || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">人员级别：</span>
+          <span class="value">
+            <DictTag v-if="row.zdrRyjb" :tag="false" :value="row.zdrRyjb" :options="dict.D_GS_ZDR_RYJB" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">列控原因：</span>
+          <span class="value">{{ row.zdrLkyy || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">开始时间：</span>
+          <span class="value">{{ row.zdrRkkssj || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">截至时间：</span>
+          <span class="value">{{ row.zdrRkjssj || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">稳控人数：</span>
+          <span class="value">{{ row.zdryList?.length || 0 }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">状态：</span>
+          <span class="value">
+            <DictTag v-if="row.qtZt" :tag="false" :value="row.qtZt" :options="dict.D_GS_ZDR_CZZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">管控状态：</span>
+          <span class="value">
+               <DictTag v-if="row.zdrBkZt" :tag="false" :value="row.zdrBkZt" :options="dict.D_GS_ZDR_BK_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">处置状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrCzzt" :tag="false" :value="row.zdrCzzt" :options="dict.D_GS_ZDR_CZZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">审核状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrZt" :tag="false" :value="row.zdrZt" :options="dict.D_GS_ZDQT_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">系统状态：</span>
+          <span class="value">
+             <div v-if="row.xtSjzt"> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">创建单位：</span>
+          <span class="value">{{ row.xtCjbmmc || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">创建时间：</span>
+          <span class="value">{{ row.xtCjsj || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item full-width">
+          <span class="label">标签：</span>
+          <span class="value tag-container">
+             <ul v-if="row.bqList" style="margin: 0; padding: 0; list-style: none; display: flex; flex-wrap: wrap; align-items: flex-start; gap: 12px;">
+            <li class="" :key="index" v-for="(item, index) in row.bqList" style="white-space: normal; word-break: break-all; flex: 0 0 auto;">
+              {{ item.bqMc }}({{item.bqFz || 0 }} 分) <span v-if="index < row.bqList.length - 1">、</span>
+            </li>
+          </ul>
+          <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+  dict: {
+    type: Object,
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
+  },
+})
+
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+// 新增的信息展示样式
+.info-container {
+  margin-bottom: 15px;
+}
+
+.info-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+}
+
+.info-item {
+  flex: 1;
+  min-width: 300px;
+  margin-bottom: 8px;
+  display: flex;
+  // align-items: center;
+}
+
+.info-item.full-width {
+  flex-basis: 100%;
+  min-width: 100%;
+}
+
+.label {
+  font-weight: bold;
+  color: #606266;
+  margin-right: 8px;
+  width: 100px;
+  text-align: right;
+}
+
+.value {
+  color: #303133;
+  flex: 1;
+  word-break: break-word;
+}
+
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+}
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
+  }
+}
+
+</style>
+
+
+
+
+
--- a/src/views/home/components/zdrItem.vue
+++ b/src/views/home/components/zdrItem.vue
@ -0,0 +1,157 @@
+<template>
+  <div class="warning-item" >
+
+    <el-divider content-position="left">重点人员信息</el-divider>
+    <div class="info-container">
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">户籍地详址：</span>
+          <span class="value">{{ row.hjdXz || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">管辖单位：</span>
+          <span class="value">{{ row.gxSsbmmc || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">人员级别：</span>
+          <span class="value">
+            <DictTag v-if="row.zdrRyjb" :tag="false" :value="row.zdrRyjb" :options="dict.D_GS_ZDR_RYJB" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">管控原因：</span>
+          <span class="value">{{ row.zdrLkyy || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">管控状态：</span>
+          <span class="value">
+               <DictTag v-if="row.zdrBkZt" :tag="false" :value="row.zdrBkZt" :options="dict.D_GS_ZDR_BK_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">处置状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrCzzt" :tag="false" :value="row.zdrCzzt" :options="dict.D_GS_ZDR_CZZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">审核状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrZt" :tag="false" :value="row.zdrZt" :options="dict.D_GS_ZDQT_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">系统状态：</span>
+          <span class="value">
+             <div v-if="row.xtSjzt"> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item full-width">
+          <span class="label">标签：</span>
+          <span class="value">
+             <ul v-if="row.bqList" style="display: flex;" >
+            <li  :key="index" v-for="(item, index) in row.bqList">
+              {{ item.bqMc }}({{item.bqFz || 0 }} 分) <span v-if="index < row.bqList.length - 1">、</span>
+            </li>
+          </ul>
+          <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+  dict: {
+    type: Object,
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
+  },
+})
+
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+// 新增的信息展示样式
+.info-container {
+  margin-bottom: 15px;
+}
+
+.info-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+}
+
+.info-item {
+  flex: 1;
+  min-width: 300px;
+  margin-bottom: 8px;
+  display: flex;
+  align-items: center;
+}
+
+.info-item.full-width {
+  flex-basis: 100%;
+  min-width: 100%;
+}
+
+.label {
+  font-weight: bold;
+  color: #606266;
+  margin-right: 8px;
+  width: 100px;
+  text-align: right;
+}
+
+.value {
+  color: #303133;
+  flex: 1;
+  word-break: break-word;
+}
+
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+}
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
+  }
+}
+
+</style>
+
--- a/src/views/home/echarts/3DbarEcharts.vue
+++ b/src/views/home/echarts/3DbarEcharts.vue
@ -3,157 +3,146 @@
 </template>
 <script setup>
 import * as echarts from "echarts";
-import { defineProps, watch, nextTick } from "vue";
+import { onMounted, ref, reactive, defineProps, onUnmounted, watch, nextTick } from "vue";
 const props = defineProps({
  echartsId:{
    type:String,
-    default:'lineId'
+    default:'3DbarId'
  },
-  data:{
-    type:Object,
-    default:{
-      list:[],
-      colors:[],
-      topColor:'#1bd6c2'
-    }
+  data:{ 
+    type:Array,
+    default:[]
  }
 });
-watch(()=>props.data,val=>{
-  nextTick(()=>{ haandleData(val)  })
-},{immediate:true,deep:true})

-const haandleData = (data)=>{
-  let val = [],x_value=[]
-  let color = data.colors;
-  let topColor = data.topColor;
-  data.list.forEach(item=>{
-    val.push(item.val);
-    x_value.push(item.label);
-  })
-  chartFn(val,x_value,color,topColor)
-}
+// 保存echarts实例
+const myChart = ref(null);

-function chartFn(val,x_value,color,topColor) {
-  var myChart = echarts.init(document.getElementById(props.echartsId));
-  const sideData1 = val//[100, 110, 120, 134, 190, 230];
-  const name = ''; //"销量";
-  var x_value = x_value;//['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-  var option = {
-    tooltip: { trigger: 'axis' },
-    legend: {
-      show: false,
-    },
+// 定义resize处理函数
+const handleResize = () => {
+  if (myChart.value) {
+    myChart.value.resize();
+  }
+};
+
+function chartFn() {
+  // 如果已有实例，先销毁
+  if (myChart.value) {
+    myChart.value.dispose();
+  }
+  
+  // 创建新实例
+  myChart.value = echarts.init(document.getElementById(props.echartsId));
+  
+  // 处理数据
+  const sideData1 = props.data.map(v => {
+    return {
+      value: v.value * 1.2,
+      itemStyle: {
+        color: v.color || '#1bd6c2'
+      }
+    };
+  });
+
+  const topData1 = props.data.map(v => {
+    return {
+      value: v.value + 0.1,
+      itemStyle: {
+        color: v.color || '#1bd6c2'
+      }
+    };
+  });
+
+  const option = {
    grid: {
-      top:"30px",
-      left:"5px",
-      right:"0px",
-      bottom:"10%",
+      top: '8%',
+      left: '2%',
+      right: '2%',
+      bottom: '12%',
      containLabel: true
    },
-    toolbox: {
-      show: true,
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        lineStyle: {
+          color: '#ddd'
+        }
+      },
+      backgroundColor: 'rgba(255,255,255,1)',
+      padding: [5, 10],
+      textStyle: {
+        color: '#7588E4'
+      },
+      extraCssText: 'box-shadow: 0 0 5px rgba(0,0,0,0.3)'
    },
-    calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        splitLine: {
-          show: false
-        },
-        data: x_value,
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: "#fff" //X轴文字颜色
-          },
-        },
+    xAxis: {
+      type: 'category',
+      data: props.data.map(v => v.label),
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        show: false
+      },
+      axisLabel: {
+        show: true,
+        color: '#fff',
+        interval: 0
      }
-    ],
-    yAxis: [
-      {
-        name:'',
-        nameTextStyle: { color: "#fff" },
-        type: 'value',
-        splitLine: { show: false },
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: "#FFF" //X轴文字颜色
-          },
-        },
+    },
+    yAxis: {
+      type: 'value',
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: 'dashed',
+          color: 'rgba(14,95,255,0.5)'
+        }
+      },
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        show: false
+      },
+      axisLabel: {
+        color: '#fff'
      }
-    ],
+    },
    series: [
      {
-        name: name,
-        tooltip: { show: false },
        type: 'bar',
-        barWidth: 12,
+        data: props.data.map(v => v.value),
+        barWidth: '22', // 柱子的宽度
+        z: 1,
        itemStyle: {
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: color ? color[0] : '#28EEBF'// 0% 处的颜色
-            }, {
-              offset: 1,
-              color: color ? color[1] : '#0DBAC5', // 100% 处的颜色
-            }], false)
-          }
-        },
-        data: sideData1,
-        barGap: 0,
-        label: {
-          show: true,
-          position: 'top',
-          distance: 10,
-          textStyle: {
-            color: '#0EBBC5',
-            fontSize: 14,
-            fontWeight: 'bold',
-          },
-          formatter: '{c}'
+          color: '#004056' // 底部柱子的颜色
        }
      },
      {
-        name: name,
        type: 'bar',
-        barWidth: 12,
-        itemStyle: {
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: color ? color[0] : '#28EEBF'// 0% 处的颜色
-            }, {
-              offset: 1,
-              color: color ? color[1] : '#0DBAC5', // 100% 处的颜色
-            }], false)
-          }
-        },
-        barGap: 0,
        data: sideData1,
-        label: {
-          show: false,
-          position: 'top',
-          textStyle: {
-            color: 'white',
-            fontSize: 10
+        barWidth: '22', // 柱子的宽度
+        z: 2,
+        itemStyle: {
+          color: function(params) {
+            return params.data.itemStyle.color || '#1bd6c2';
          }
        }
-      }, 
+      },
      {
-        name: name,
-        tooltip: {
-          show: false
-        },
-        type: 'pictorialBar',
+        type: 'scatter',
+        data: topData1,
        itemStyle: {
          borderWidth: 1,
          borderColor: '#fff',
-          color: topColor || '#1bd6c2' // 顶部方块的颜色
+          color: function(params) {
+            return params.data.itemStyle.color || '#1bd6c2';
+          }
        },
        symbol: 'path://M 0,0 l 90,0 l -60,60 l -90,0 z',
-        symbolSize: ['22', '12'], // 第一个值控制顶部方形大小
-        symbolOffset: ['-0', '-6'], // 控制顶部放行 左右和上下
+        symbolSize: ['22', '12'],
+        symbolOffset: ['-0', '-6'],
        symbolRotate: -30,
        symbolPosition: 'end',
        barGap: 0,
@ -162,11 +151,29 @@ function chartFn(val,x_value,color,topColor) {
      }
    ]
  };
-  option && myChart.setOption(option);
-  window.addEventListener('resize',function(){
-    myChart.resize();
-  })
+  
+  option && myChart.value.setOption(option);
 }
+
+// 监听数据变化
+watch(() => props.data, val => {
+  nextTick(() => { chartFn() })
+}, { immediate: true, deep: true })
+
+// 组件挂载时初始化图表并添加事件监听
+onMounted(() => {
+  chartFn();
+  window.addEventListener('resize', handleResize);
+});
+
+// 组件卸载时清理资源
+onUnmounted(() => {
+  if (myChart.value) {
+    myChart.value.dispose();
+    myChart.value = null;
+  }
+  window.removeEventListener('resize', handleResize);
+});
 </script>

 <style lang="scss" scoped>
--- a/src/views/home/echarts/barEcharts.vue
+++ b/src/views/home/echarts/barEcharts.vue
@ -7,30 +7,42 @@ import { onMounted, ref, reactive, defineProps, onUnmounted, watch, nextTick } f
 const props = defineProps({
  echartsId:{
    type:String,
-    default:'lineId'
+    default:'barId'
  },
-  data:{
-    type:Object,
-    default:{
-      list:[],
-      colors:[]
-    }
+  color:{ 
+    type:String,
+    default:'#fff'
+  },
+  data:{ 
+    type:Array,
+    default:[]
  }
 });
-watch(()=>props.data,val=>{
-  nextTick(()=>{ 
-     chartFn()
-   })
-},{immediate:true,deep:true})
+
+// 保存echarts实例
+const myChart = ref(null);
+
+// 定义resize处理函数
+const handleResize = () => {
+  if (myChart.value) {
+    myChart.value.resize();
+  }
+};

 function chartFn() {
-  var myChart = echarts.init(document.getElementById(props.echartsId));
+  // 如果已有实例，先销毁
+  if (myChart.value) {
+    myChart.value.dispose();
+  }
+  
+  // 创建新实例
+  myChart.value = echarts.init(document.getElementById(props.echartsId));
  var option = {
    grid: {
-      top: "16%",
-      right: "2%",
-      left: "2%",
-      bottom: "4%",
+      top: "8%",
+      right: "5%",
+      left: "10%",
+      bottom: "12%",
      containLabel:true
    },
    tooltip: {
@ -45,13 +57,19 @@ function chartFn() {
      textStyle: {
        color: "#7588E4"
      },
+      extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)"
    },
    xAxis: {
      type: "category",
-      data:props.data.list.map(v=>{return v.label}),
+      data:props.data.map(v=>{return v.label}),
      axisTick: { show: false },
      axisLine: { show: false },
-      axisLabel: { color: "#fff",magin:20 },
+      axisLabel: { 
+        show: true,
+        color: props.color,
+        interval: 0, // 强制显示所有标签
+        // rotate: 15, // 标签旋转角度
+      }
    },
    yAxis: {
      type: "value",
@ -64,41 +82,47 @@ function chartFn() {
      },
      axisTick: { show: false },
      axisLine: { show: false },
-      axisLabel: { color: "#fff" },
+      axisLabel: { color: props.color },
    },
    series: [
      {
+        data: props.data.map(v=>{return v.value}),
        type: "bar",
-        barGap:'80%',
-        barWidth: "20px",
-        data: props.data.list.map(v=>{return v.val}),
-        label:{
-          normal:{show:true,position:'top',color:'#EB00FF'}
-        },
+        barWidth: "30%",
        itemStyle: {
-          normal: {
-            color:function name(params) {
-                let colorList = []
-                if(props.data.colors && props.data.colors.length>0){
-                  props.data.colors.forEach(item => {
-                    colorList.push(new echarts.graphic.LinearGradient( 0,0,0, 1,[{offset:0,color:item[0]},{offset:1,color:item[1]}]))
-                  });
-                }
-              if(colorList.length > 0) return colorList[params.dataIndex]
-              else return new echarts.graphic.LinearGradient( 0,0,0, 1,[{ offset: 0,color: "rgba(0,244,255,1)"},{ offset: 1, color: "rgba(0,77,167,1)" }])
-            },
-            shadowColor: "rgba(0,160,221,1)",
-            shadowBlur: 2
-          }
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            { offset: 0, color: "rgba(102, 195, 226, 1)" },
+            { offset: 1, color: "rgba(2, 80, 212, 1)" }
+          ]),
+          borderRadius: [4, 4, 0, 0],
+          shadowColor: "rgba(0,160,221,1)",
+          shadowBlur: 2
        },
      }
    ]
  };
-  option && myChart.setOption(option);
-  window.addEventListener('resize',function(){
-    myChart.resize();
-  })
+  option && myChart.value.setOption(option);
 }
+
+// 监听数据变化
+watch(()=>props.data,val=>{
+  nextTick(()=>{ chartFn() })
+},{immediate:true,deep:true})
+
+// 组件挂载时初始化图表并添加事件监听
+onMounted(()=>{
+  chartFn();
+  window.addEventListener('resize', handleResize);
+});
+
+// 组件卸载时清理资源
+onUnmounted(()=>{
+  if (myChart.value) {
+    myChart.value.dispose();
+    myChart.value = null;
+  }
+  window.removeEventListener('resize', handleResize);
+});
 </script>

 <style lang="scss" scoped>
--- a/src/views/home/echarts/lineEcharts.vue
+++ b/src/views/home/echarts/lineEcharts.vue
@ -9,21 +9,34 @@ const props = defineProps({
    type:String,
    default:'lineId'
  },
-  color:{
+  color:{ 
    type:String,
    default:'#fff'
  },
-  data:{
+  data:{ 
    type:Array,
    default:[]
  }
 });
-watch(()=>props.data,val=>{
-  nextTick(()=>{ chartFn() })
-},{immediate:true,deep:true})
+
+// 保存echarts实例
+const myChart = ref(null);
+
+// 定义resize处理函数
+const handleResize = () => {
+  if (myChart.value) {
+    myChart.value.resize();
+  }
+};

 function chartFn() {
-  var myChart = echarts.init(document.getElementById(props.echartsId));
+  // 如果已有实例，先销毁
+  if (myChart.value) {
+    myChart.value.dispose();
+  }
+  
+  // 创建新实例
+  myChart.value = echarts.init(document.getElementById(props.echartsId));
  var option = {
    grid: {
      top: "8%",
@ -51,8 +64,7 @@ function chartFn() {
      data:props.data.map(v=>{return v.label}),
      axisTick: { show: false },
      axisLine: { show: false },
-      axisLabel: { color: "#fff" },
-      axisLabel: {
+      axisLabel: { 
        show: true,
        color: props.color,
        interval: 0, // 强制显示所有标签
@ -103,11 +115,28 @@ function chartFn() {
      }
    ]
  };
-  option && myChart.setOption(option);
-  window.addEventListener('resize',function(){
-    myChart.resize();
-  })
+  option && myChart.value.setOption(option);
 }
+
+// 监听数据变化
+watch(()=>props.data,val=>{
+  nextTick(()=>{ chartFn() })
+},{immediate:true,deep:true})
+
+// 组件挂载时初始化图表并添加事件监听
+onMounted(()=>{
+  chartFn();
+  window.addEventListener('resize', handleResize);
+});
+
+// 组件卸载时清理资源
+onUnmounted(()=>{
+  if (myChart.value) {
+    myChart.value.dispose();
+    myChart.value = null;
+  }
+  window.removeEventListener('resize', handleResize);
+});
 </script>

 <style lang="scss" scoped>
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@ -267,8 +267,8 @@ const makerCenter = () => {
        item.wd = obj.point[1];
      }
    })
-    
-    
+
+
    allDep.value = list;
    emitter.emit("addPointArea", { coords:list, icon: dw, flag: "hm", size: '14px', showTitle: false, offset: [0, -25] });
  })
@ -327,7 +327,7 @@ onMounted(() => {
  getTbYjxxGetList()
  // 初始化音频播放器
  initAudioPlayer()
-  webSoket.connect()
+  // webSoket.connect()
  // 监听音频播放事件，获取WebSocket消息数据
  emitter.on("openYp", (newsDate) => {
    // 使用工具类播放音频，自动处理静音切换
--- a/src/views/home/model/calendar.vue
+++ b/src/views/home/model/calendar.vue
@ -216,8 +216,6 @@ const gettingData = () => {


 const getAllFestivals = (date,boolean=false) => {
-  console.log(date);
-
  const time = new Date(date)
  const solar = Solar.fromDate(time)
  const lunar = solar.getLunar()
--- a/src/views/home/model/dbCount.vue
+++ b/src/views/home/model/dbCount.vue
@ -1,9 +1,10 @@
 <template>
  <div class="comom-title">
    <span class="title">线索研判盯办统计</span>
-    <el-popover placement="right" :width="430"  :visible="visible">
+    <el-popover placement="right" :width="430" :visible="visible">
      <template #reference>
-        <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;" @click="visible = true"></div>
+        <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;" @click="visible = true">
+        </div>
      </template>
      <div>
        <div class="qbltData">
@ -15,23 +16,27 @@
    </el-popover>
  </div>
  <ul class="comom-cnt xsBox flex flex-warp just-between align-center">
-    <li class="xs-item" v-for="(item, idx) in contentItem" :key="idx">
+    <li class="xs-item" v-for="(item, idx) in contentItem" :key="idx" @click="openTc(item.type)">
      {{ item.label }}:{{ item.value }}条
    </li>
  </ul>
+  <TotalNumberClues  v-model="openShow.xfzs" :title="title"/>
+  <TotalNumberDistributions v-model="openShow.xszs" />
 </template>

 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, reactive } from 'vue';
 import TimeData from '@/views/home/model/mesgSwitch/timeData.vue'
+import TotalNumberClues from '@/views/home/components/totalNumberClues.vue'
+import TotalNumberDistributions from '@/views/home/components/totalNumberDistributions.vue'
 import { qbcjDpxsCount } from "@/api/model.js"
 const contentItem = ref([
-  { label: '线索总数', value: '0' },
-  { label: '下发总数', value: '0' },
-  { label: '已处置总数', value: '0' },
-  { label: '反馈总数', value: '0' },
-  { label: '未反馈总数', value: '0' },
-  { label: '未处置总数', value: '0' },
+  { label: '线索总数', value: '0', type: 'xszs' },
+  { label: '下发总数', value: '0', type: 'xfzs' },
+  { label: '已处置总数', value: '0', type: 'yczzs' },
+  { label: '反馈总数', value: '0', type: 'fkzs' },
+  { label: '未反馈总数', value: '0', type: 'wfks' },
+  { label: '未处置总数', value: '0', type: 'wczzs' },
 ])
 const visible = ref(false)
 const changeTime = (val) => {
@ -40,22 +45,66 @@ const changeTime = (val) => {
  }
  getCount()
 }
-
+const title = ref('下发总数')
 onMounted(() => {
+
  qbcjDpxsCount({}, '/mosty-gsxt/tbXs/getXsCount').then(res => {
    res = res || {}
    // 根据API返回的数据更新contentItem
    contentItem.value = [
-      { label: '线索总数', value: res.xszs || 0 },
-      { label: '下发总数', value: res.xfzs || 0 },
-      { label: '已处置总数', value: res.yczzs || 0 },
-      { label: '反馈总数', value: res.fkzs || 0 },
-      { label: '未反馈总数', value: res.wfkzs || 0 },
-      { label: '未处置总数', value: res.wczzs || 0 },
+      { label: '线索总数', value: res.xszs || 0, type: 'xszs' },
+      { label: '下发总数', value: res.xfzs || 0, type: 'xfzs' },
+      { label: '已处置总数', value: res.yczzs || 0, type: 'yczzs' },
+      { label: '反馈总数', value: res.fkzs || 0, type: 'fkzs' },
+      { label: '未反馈总数', value: res.wfkzs || 0, type: 'wfks' },
+      { label: '未处置总数', value: res.wczzs || 0, type: 'wczzs' },
    ]
  })
 })

+const openShow=reactive({
+  xszs: false,
+  xfzs: false,
+  yczzs: false,
+  fkzs: false,
+  wfks: false,
+  wczzs: false,
+})
+const openTc = (val) => {
+  console.log(val);
+
+  switch (val) {
+    case 'xszs':
+      openShow.xszs = true
+      break;
+    case 'xfzs':
+      openShow.xfzs = true
+      title.value = '下发总数'
+      break;
+    case 'yjzs': break;
+    case 'yczzs': break;
+    case 'fkzs': break;
+    case 'wfks':
+      openShow.xfzs = true
+      title.value = '未反馈数'
+      break;
+    case 'wczzs': break;
+  }
+}
+
+
+// // 线索总数
+// const xsCount = () => {
+//   xxcjQbcjSelectPage({}).then(res => {
+//   console.log(res);
+//   })
+// }
+// // 下发总数
+// const xfxsCount = () => {
+//   xxcjXfxsSelectPage({}).then(res => {
+//     console.log(res);
+//   })
+// }
 const close = () => {
  visible.value = false
 }
@ -68,8 +117,10 @@ const close = () => {
 .xsBox {
  background: url("~@/assets/images/bg_12.png") no-repeat center center;
  background-size: 100% 100%;
-
+position: relative;
+z-index: 299;
  .xs-item {
+  cursor: pointer;
    width: 31%;
    height: 36px;
    line-height: 36px;
@ -78,6 +129,7 @@ const close = () => {
    background-size: 100% 100%;
  }
 }
+
 .qbltData {
  width: 100%;
  display: flex;
--- a/src/views/home/model/experience.vue
+++ b/src/views/home/model/experience.vue
@ -1,7 +1,7 @@
 <template>
  <div class="comom-title" @click="chooseForumPost">
    <!-- <span class="title">情报论坛</span> -->
-        <div class="title">情报论坛<span class="switchover" @click.stop="reversalPush">切换</span></div>
+        <div class="title" style="width: 100%;">情报论坛<span class="switchover" @click.stop="reversalPush">切换</span></div>
  </div>
  <div class="comom-cnt" >
    <div class="zdryBox">
@ -213,7 +213,8 @@ onBeforeUnmount(() => {
 .switchover{
  cursor: pointer;
  font-size: 14px;
-  margin-left: 20px;
+  margin-left: 20%;
+
  color: rgb(255, 146, 4);
 }
 </style>
--- a/src/views/home/model/keyPpersonneltypes.vue
+++ b/src/views/home/model/keyPpersonneltypes.vue
@ -1,7 +1,7 @@
 <template>
  <div class="comom-title">
-    <div class="title">重点人员类型<span class="switchover" @click.stop="reversalPush">切换</span></div>
-    <div class="title titleFz" style="" @click="visible = true">
+    <div class="title" style="width: 70%;">重点人员类型<span class="switchover" @click.stop="reversalPush">切换</span></div>
+    <div class="title titleFz" @click="visible = true">
      查看列表
    </div>
  </div>
@ -65,5 +65,6 @@ tbGsxtZdryzdryBqtjFn()
  font-size: 14px;
  margin-left: 20px;
  color: rgb(255, 146, 4);
+  margin-left: 23%;
 }
 </style>
--- a/src/views/home/model/mesgSwitch/intelligence.vue
+++ b/src/views/home/model/mesgSwitch/intelligence.vue
@ -37,6 +37,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import { qbcjSelectPage } from "@/api/Intelligence.js";
+import {xxcjSelectPage,xxcjXxzsx} from '@/api/xxcj.js'
 import { ref, reactive, getCurrentInstance, watch } from "vue";
 import { useRoute,useRouter } from 'vue-router'
 const route = useRoute()
@ -68,9 +69,9 @@ const searchConfiger = ref([
    options: D_BZ_QBSBLY
  }, {
    label: "上报时间",
-    prop: "lrkssj",
+    prop: "startTime",
    placeholder: "请选择时间",
-    showType: "daterange"
+    showType: "datetimerange"
  },


@ -86,7 +87,7 @@ const pageData = reactive({
  tableConfiger: {
    loading: false,
    rowHieght: 40,
-    haveControls: true,
+    haveControls: false,
  },
  controlsWidth: 160, //操作栏宽度
  total: 0,
@ -109,8 +110,8 @@ const pageData = reactive({
 const parameter = ref()
 const onSearch = (val) => {
  const promes = {
-    lrkssj: val.lrkssj && val.lrkssj.length > 0 ? val.lrkssj[0] : '',
-    lrjssj: val.lrkssj && val.lrkssj.length > 0 ? val.lrkssj[1] : '',
+    startTime: val.startTime && val.startTime.length > 0 ? val.startTime[0] : '',
+    endTime: val.startTime && val.startTime.length > 0 ? val.startTime[1] : '',
  }
  parameter.value = { ...val, ...promes }
  pageData.pageConfiger.pageCurrent = 1;
@ -123,8 +124,8 @@ watch(() => props.modelValue, (val) => {
 })
 const changePage = () => {
  pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...parameter.value };
-  qbcjSelectPage(data).then(res => {
+  let data = { ...pageData.pageConfiger, ...parameter.value,qbjb:'01' };
+  xxcjSelectPage(data).then(res => {
    pageData.tableData = res.records || [];
    pageData.total = res.total;
    pageData.tableConfiger.loading = false;
--- a/src/views/home/model/qblyType.vue
+++ b/src/views/home/model/qblyType.vue
@ -1,6 +1,6 @@
 <template>
  <div class="comom-title">
-    <div class="title">岗位标兵<span class="switchover" @click="reversalPush">切换</span></div>
+    <div class="title" style="width: 100%;">岗位标兵<span class="switchover" @click="reversalPush">切换</span></div>
    <el-popover :visible="visible" placement="right" :width="430">
      <template #reference>
        <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;" @click="visible = true">
@ -100,5 +100,6 @@ const close = () => {
  font-size: 14px;
  margin-left: 20px;
  color: rgb(255, 146, 4);
+  margin-left: 25%;
 }
 </style>
--- a/src/views/home/model/textType.vue
+++ b/src/views/home/model/textType.vue
@ -1,6 +1,6 @@
 <template>
  <div class="comom-title">
-       <div class="title">信息来源类型统计<span class="switchover" @click="reversalPush">切换</span></div>
+       <div style=" width: 100%;" class="title">信息来源类型统计<span class="switchover" @click="reversalPush">切换</span></div>
        <el-popover placement="right" :width="430"  :visible="visible">
      <template #reference>
        <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;"  @click="visible = true"></div>
@ -88,5 +88,7 @@ const close = () => {
  font-size: 14px;
  margin-left: 20px;
  color: rgb(255, 146, 4);
+  width: 100%;
+margin-left: 10%;
 }
 </style>
--- a/src/views/home/model/yszs.vue
+++ b/src/views/home/model/yszs.vue
@ -23,8 +23,8 @@ import keyPerson from "@/views/home/components/keyPerson.vue";
 import keyGroups from "@/views/home/components/keyGroups.vue";

 const contentItem = ref([
-  { type:"jqzs", label: "警情总数", value: "0" ,icon:require('@/assets/images/top-1.png')},
-  { type:"yjzs", label: "预警总数", value: "0",icon:require('@/assets/images/top-2.png') },
+  { type:"jqzs", label: "今日警情", value: "0" ,icon:require('@/assets/images/top-1.png')},
+  { type:"yjzs", label: "今日预警", value: "0",icon:require('@/assets/images/top-2.png') },
  { type:"zdry", label: "重点人员总数", value: "0",icon:require('@/assets/images/top-3.png') },
  { type:"zdqt", label: "重点群体总数", value: "0" ,icon:require('@/assets/images/top-4.png')},
 ]);