Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/components/MyComponents/Department/index.vue

@@ -6,6 +6,7 @@
       :show-all-levels="false"
       clearable
       filterable
+      :disabled="props.disabled"
       :placeholder="modelValue ? placeholder : '请选择部门'"
       :options="tableData"
       v-model="oldmodelValue"
@@ -46,7 +47,11 @@ const props = defineProps({
   isAll:{
     default: false,
     type: Boolean
-  }
+  },
+  disabled:{
+    default: false,
+    type: Boolean
+  },
 });
 const firstLoad = ref(true)
 const oldmodelValue = ref([]);

src/components/aboutTable/Search.vue

@@ -152,6 +152,8 @@ import {
   reactive,
   watchEffect,
   getCurrentInstance,
+  watch,
+  computed
 } from "vue";
 import * as MOSTY from "@/components/MyComponents/index";
 const { proxy } = getCurrentInstance();
@@ -233,7 +235,7 @@ const props = defineProps({
   backgroundColor: {
     type: String,
     default: "rgb(255, 255, 255, 1)"
-  }
+  },
 });
 let loadingPage = ref(false);
 const emit = defineEmits(["submit", "reset"]);
@@ -388,7 +390,7 @@ let defaultCascader = {
   placeholder: "请选择",
   checkStrictly: true, // 控制是否父子联动（是否可以选择任意节点）
   showAllLevels: false, // 是否显示完整路径
-  lazy: true, // 是否懒加载 当设置为false时就要传入options
+  lazy: false, // 是否懒加载 当设置为false时就要传入options
   portUrl: "", // 这里必须写 接口地址
   props: {
     label: "label",
@@ -401,7 +403,7 @@ let defaultCascader = {
 const cascaderLazyProps = reactive({
   value: "value",
   label: "label",
-  lazy: true,
+  lazy: false,
   lazyLoad(node, resolve) {
     // 这里要根据实际情况修改
     const { level } = node;

src/router/index.js

@@ -609,6 +609,7 @@ export const publicRoutes = [
           icon: "article"
         },
         children: [
+        
           // {
           //   path: "/surveillanceControl",
           //   name: "surveillanceControl",

src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/detailDialog.vue

@@ -0,0 +1,96 @@
+<template>
+    <div>
+        <el-dialog :title="title" v-model="visible" width="80%">
+             <MyTable
+                :tableData="pageData.tableList"
+                :tableColumn="pageData.tableColumn"
+                :tableHeight="pageData.tableHeight"
+                :key="pageData.keyCount"
+                :tableConfiger="pageData.tableConfiger"
+                :controlsWidth="pageData.controlsWidth"
+              >
+              </MyTable>
+               <Pages
+                @changeNo="changeNo"
+                @changeSize="changeSize"
+                :tableHeight="pageData.tableHeight"
+                :pageConfiger="{ ...pageData.pageConfiger }"
+              ></Pages>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup>
+import Pages from "@/components/aboutTable/Pages.vue";
+import MyTable from "@/components/aboutTable/DarkTable.vue";
+import { ref,reactive } from 'vue'
+const title = ref('详情')
+const visible = ref(false)
+// 列表公用
+const pageData = reactive({
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false,
+    showIndex:false,
+    rowHeight: 30,
+    haveControls:false,
+  },
+  tableHeight: 600,
+  pageConfiger:{
+      page:1,
+      total:0,
+      pageSize:10,
+    },
+  tableColumn:[
+      { label: "舆情标题", prop: "yqbt",showOverflowTooltip: true},
+      { label: "舆情内容", prop: "yqnr",showOverflowTooltip: true},
+      { label: "舆情来源", prop: "yqly",showOverflowTooltip: true},
+      { label: "舆情时间", prop: "yqsj",showOverflowTooltip: true},
+    ],
+});
+
+const init = (val) => {
+  visible.value = true
+  pageData.keyCount++;
+  pageData.tableList = []
+  if(val.lx) {
+    title.value = '类型-详情';
+    pageData.tableColumn = [
+      { label: "接警单编号", prop: "jjddh",showOverflowTooltip: true},
+      { label: "报警电话", prop: "bjdh",showOverflowTooltip: true},
+      { label: "报警时间", prop: "bjsj",showOverflowTooltip: true},
+      { label: "报警内容", prop: "bjnr",showOverflowTooltip: true},
+      { label: "警情类型", prop: "jqlx",showOverflowTooltip: true},
+    ]
+  }
+  if(val.ry) {
+    title.value = '人员-详情';
+    pageData.tableColumn = [
+      { label: "姓名", prop: "xm",showOverflowTooltip: true},
+      { label: "身份证号", prop: "sfzh",showOverflowTooltip: true},
+      { label: "性别", prop: "xb",showOverflowTooltip: true},
+      { label: "所属类型", prop: "sslx",showOverflowTooltip: true},
+      { label: "事件内容", prop: "sjnr",showOverflowTooltip: true},
+      { label: "时间", prop: "sj",showOverflowTooltip: true},
+      { label: "地点", prop: "dd",showOverflowTooltip: true},
+    ]
+  }
+  if(val.dd) {
+    title.value = '地点-详情';
+    pageData.tableColumn = [
+      { label: "行政区划", prop: "xzqh",showOverflowTooltip: true},
+      { label: "详细地址", prop: "xxdz",showOverflowTooltip: true},
+      { label: "所属类型", prop: "sslx",showOverflowTooltip: true},
+      { label: "事件内容", prop: "sjnr",showOverflowTooltip: true},
+      { label: "时间", prop: "sj",showOverflowTooltip: true},
+    ]
+  }
+  
+}
+
+defineExpose({
+  init
+})
+</script>

src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue

@@ -14,6 +14,7 @@
             <MoreBarEcharts echartsId="cztjEcharts" :data="obj.data_lxtj"></MoreBarEcharts>
           </div>
         </div>
+    
         <div class="hh50">
           <div class="comm-title">会商统计</div>
           <div class="echartsBox">
@@ -30,32 +31,68 @@
         <span v-for="idx in 3" :key="idx" :class="'sircleR'+idx" class="sircle ml5"></span>
         <el-button class="btn" type="primary" @click="handleYP">研判报告</el-button>
       </div>
-      <div class="commCnt">
+      <div class="commCnt" >
         <div ref="searchBox">
-          <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+          <el-form :model="searchList" ref="searchFormRef" :inline="true">
+            <el-form-item label="类型">
+               <el-cascader @change="changeCascader" :disabled="readonly_lx" v-model="searchList.lx" clearable :options="cascaderList" :props="{ checkStrictly: true }" placeholder="请选择类型"/>
+            </el-form-item>
+            <el-form-item label="人员">
+              <el-input @change="changeRy" v-model="searchList.ry" :disabled="readonly_ry" clearable placeholder="请输入姓名或身份证"></el-input>
+            </el-form-item>
+            <el-form-item label="地点">
+              <div class="flex align-center">
+                <el-select v-model="searchList.dd" @change="changeBm" style="width: 180px;" :disabled="readonly_dd" placeholder="行政区划">
+                  <el-option label="区域" value="1"></el-option>
+                  <el-option label="部门" value="2"></el-option>
+                </el-select>
+                <el-input @change="changeRy" :disabled="readonly_dd" v-model="searchList.xxdz" clearable placeholder="请输入详细地址"></el-input>
               </div>
-        <ul class="listBox" :style="{height:pageData.boxHeight+'px'}">
+            </el-form-item>
+            <el-form-item label="时间">
+              <el-date-picker
+                v-model="searchList.datetimes"
+                type="datetimerange"
+                unlink-panels
+                :range-separator="'至'"
+                start-placeholder="开始日期时间"
+                end-placeholder="结束日期时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="onSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <ul class="listBox" :style="{ height:pageData.boxHeight +'px'}">
           <li class="list-item" ref="listBoxRef" v-for="(it,idx) in list" :key="idx">
             <div class="comm-title title-s">{{ it.title }}</div>
             <div class="list-table" >
               <MyTable
                 :tableData="it.tableList"
-                :tableColumn="pageData.tableColumn"
+                :tableColumn="it.tableColumn"
-                :tableHeight="pageData.tableHeight"
+                :key="idx+''+it.keyCount"
-                :key="it.keyCount"
-                :isScroll="true"
                 :fixed="false"
+                :tableHeight="pageData.tableHeight"
                 :tabelModel="it.title"
                 :tableConfiger="pageData.tableConfiger"
                 :controlsWidth="pageData.controlsWidth"
-                @changePage="changePage"
               >
-                <!-- 操作 -->
+              <template #jqlbdm="{ row }">
+                <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
+              </template>
                 <template #controls="{ row }">
                   <el-link type="primary" size="small" @click="handleHs(row)">网上会商</el-link>
-                  <el-link type="primary" size="small" @click="gozl(row)">处置</el-link>
                 </template>
               </MyTable>
+              <Pages
+                @changeNo="changeNo($event,it.title)"
+                @changeSize="changeSize($event,it.title)"
+                :tableHeight="pageData.tableHeight"
+                :pageConfiger="{ ...it.pageConfiger }"
+              ></Pages> 
             </div>
           </li>
         </ul>
@@ -63,62 +100,136 @@
     </div>
   </div>
   <YpModel v-model="showModel" :textContent="textContent" ></YpModel>
+  <!-- 弹窗 -->
+  <DetailDialog ref="detaileRef"></DetailDialog>
 </template>
 
 <script setup>
+import { lzJcjPjdbSelectPage } from '@/api/semanticAnalysis.js'
+import { ElMessage } from "element-plus";
+import DetailDialog from './components/detailDialog.vue'
 import YpModel from '@/components/ypModel/index.vue'
 import { qcckPost, qcckGet } from "@/api/qcckApi.js";
 import MoreBarEcharts from "@/views/home/echarts/moreBarEcharts.vue";
 import LineEcharts from "@/views/home/echarts/moreLineEcharts.vue";
-import Search from "@/components/aboutTable/Search.vue";
 import MyTable from "@/components/aboutTable/DarkTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
 import { useRoute, useRouter } from 'vue-router';
 const router = useRouter();
 import { nextTick, onMounted, reactive,getCurrentInstance ,ref, watch } from 'vue';
 const { proxy } = getCurrentInstance();
-const {D_BZ_SSZT,D_GS_XS_LY} = proxy.$dict("D_BZ_SSZT","D_GS_XS_LY"); //获取字典数据
+const { JQLB} = proxy.$dict("JQLB"); //获取字典数据
+const readonly_lx = ref(false)
+const readonly_ry = ref(false)
+const readonly_dd = ref(false)
+
+const showModel = ref(false);
+const detaileRef = ref();
 const searchBox = ref();
 const listBoxRef = ref();
-const showModel = ref(false);
 const textContent = ref('');
 // 图数据
 const obj = reactive({
    data_lxtj:{
-    xData:['上访','诈骗','敲诈勒索','盗窃','涉黄','涉毒','强奸猥亵','灾害事故','自杀'],
+    xData:['网络舆情','警情','案件','风险隐患'],
     color:[['#0DBAC5','#28EEBF'],['#F06C0D','#EEB416']],
     labelColor:'#000',
     list:[
-      {label:'总数',val:[30,20,10,60,50,60,35,45,20]},
+      {label:'总数',val:[0,0,0,0]},
     ]
   },
   data_hstj:{
-    xData:['上访','诈骗','敲诈勒索','盗窃','涉黄','涉毒','强奸猥亵','灾害事故','自杀'],
+    xData:['网络舆情','警情','案件','风险隐患'],
     color:['#0386FB','#00FFFF'],
     labelColor:'#000',
     list:[
-      {label:'总数',val:[30,20,10,60,50,60,35,45,20]},
+      {label:'总数',val:[0,0,10,0]},
     ]
   }
 })
-// 搜索
+const searchList = ref({})
-const searchConfiger = ref([
+let cascaderList = ref([
-  { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
+  { value: '01', label: '网络舆情',leaf: true },
-  { label: "线索内容", prop: "xsNr", placeholder: "请输入",  showType: "input"},
+  { value: '02', label: '警情',children:[
-  { label: "开始时间", prop: 'kssj', placeholder: "请选择开始时间", showType: "datetime" },
+    { value: '021', label: '治安警情',leaf: true },
-  { label: "结束时间", prop: 'jssj', placeholder: "请选择结束时间", showType: "datetime" },
+    { value: '022', label: '刑事警情',leaf: true },
+    { value: '023', label: '交通警情',leaf: true },
+  ] },
+  { value: '03', label: '案件',leaf: true },
+  { value: '04', label: '风险隐患',leaf: true },
 ])
 // 每个列表对应的值
-const list = ref([])
+const list = reactive([
+  {
+    title:'网络舆情', //标题
+    tableList:[], 
+    keyCount:0,
+    pageConfiger:{
+      page:1,
+      total:0,
+      pageSize:6,
+    },
+    tableColumn:[
+      { label: "舆情标题", prop: "yqbt",showOverflowTooltip: true},
+      { label: "舆情内容", prop: "yqnr",showOverflowTooltip: true},
+      { label: "舆情来源", prop: "yqly",showOverflowTooltip: true},
+      { label: "舆情时间", prop: "yqsj",showOverflowTooltip: true},
+    ],
+  },
+  {
+    title:'警情', //标题
+    tableList:[], 
+    keyCount:1,
+    pageConfiger:{
+      page:1,
+      total:0,
+      pageSize:6,
+    },
+    tableColumn:[
+      { label: "接警单编号", prop: "jjdbh",showOverflowTooltip: true},
+      { label: "报警电话", prop: "bjdh",showOverflowTooltip: true},
+      { label: "报警时间", prop: "bjsj",showOverflowTooltip: true},
+      { label: "报警内容", prop: "bjnr",showOverflowTooltip: true},
+      { label: "警情类型", prop: "jqlbdm",showSolt:true,showOverflowTooltip: true},
+    ],
+  },
+  {
+    title:'案件', //标题
+    tableList:[], 
+    keyCount:2,
+    pageConfiger:{
+      page:1,
+      total:0,
+      pageSize:6,
+    },
+    tableColumn:[
+      { label: "案件编号", prop: "ajbh",showOverflowTooltip: true},
+      { label: "案件内容", prop: "ajnr",showOverflowTooltip: true},
+      { label: "案件类型", prop: "ajlx",showOverflowTooltip: true},
+      { label: "案件时间", prop: "ajsj",showOverflowTooltip: true},
+    ],
+  },
+  {
+    title:'风险隐患', //标题
+    tableList:[],
+    keyCount:3, 
+    pageConfiger:{
+      page:1,
+      total:0,
+      pageSize:6,
+    },
+    tableColumn:[
+      { label: "隐患标题", prop: "yhbt",showOverflowTooltip: true},
+      { label: "隐患内容", prop: "yhnr",showOverflowTooltip: true},
+      { label: "隐患类型", prop: "yhlx",showOverflowTooltip: true},
+      { label: "上报时间", prop: "sbsj",showOverflowTooltip: true},
+    ],
+  },
+])
 const searchForm = ref({}) //赛选
 
 // 列表公用
 const pageData = reactive({
- tableColumn:[
-    { label: "线索标题", prop: "xsMc",showOverflowTooltip: true},
-    { label: "线索内容", prop: "xsNr",showOverflowTooltip: true},
-    { label: "涉及人数", prop: "sjrs",showOverflowTooltip: true},
-    { label: "上报时间", prop: "sxsbsj",showOverflowTooltip: true},
-  ],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -129,8 +240,11 @@ const pageData = reactive({
   },
   controlsWidth: 120, //操作栏宽度
 });
+
 onMounted(() => {
-  getCount(); //获取统计数据
+  // getCount(); //获取统计数据
+  tabHeightFn()
+  getJqList() //警情列表
 });
 
 const getCount = () => {
@@ -148,61 +262,67 @@ const getCount = () => {
   });
 };
 
-
+// 分页
-
+const changeNo = (e,type) =>{
-// 滚动加载
+  switch(type){
-const changePage = (val) => {
+    case '网络舆情':
-  list.value.forEach((item, index) => {
+      list[0].pageConfiger.page = e;
-    if(val == item.title && item.tableList.length  < item.total) {
+      break;
-      item.page++;
+    case '警情':
-      let params = { sszt: item.dm, pageNum: item.page, pageSize: 20, };
+      list[1].pageConfiger.page = e;
-      qcckPost(params, '/mosty-gsxt/qbcj/selectPage').then(res => {
+      getJqList()
-        let arr = res.records || [];
+      break;
-        list.value[index].tableList = item.page == 1 ? arr : [...list.value[index].tableList, ...arr];
+    case '案件':
-        list.value[index].total = res.total;
+      list[2].pageConfiger.page = e;
-        item.keyCount++;
+      break;
-      });
+    case '风险隐患':
+      list[3].pageConfiger.page = e;
+      break;
   }
-  });
+  getJqList()
-};
+}
+const changeSize = (e,type) =>{
+  switch(type){
+    case '网络舆情':
+      list[0].pageConfiger.pageSize = e;
+      break;
+    case '警情':
+      list[1].pageConfiger.pageSize = e;
+      getJqList()
+      break;
+    case '案件':
+      list[2].pageConfiger.pageSize = e;
+      break;
+    case '风险隐患':
+      list[3].pageConfiger.pageSize = e;
+      break;
+  }
+
+}
+
+// 警情列表
+const getJqList = () =>{
+  let params = {
+    pageCurrent: list[1].pageConfiger.page,
+    pageSize: list[1].pageConfiger.pageSize,
+  }
+  lzJcjPjdbSelectPage(params).then(res=>{
+    list[1].tableList = res.records || [];
+    list[1].pageConfiger.total = res.total;
+
+    //模拟的统计警情接口
+    obj.data_lxtj.list = [{ label: '总数', val: [0,res.total,0,0] }];
+    obj.data_hstj.list = [{ label: '总数', val: [0,res.total,0,0] }];
+  })
+}
 
 
-// 表格高度计算
-const tabHeightFn = () => {
-  pageData.boxHeight = window.innerHeight - searchBox.value.offsetHeight - 250
-  nextTick(() => {
-    pageData.tableHeight = listBoxRef.value[0].offsetHeight - 40;
-  });
-  window.onresize = function () {
-    tabHeightFn();
-  };
-};
 
-const handleGetList = () => {
-  list.value.forEach((item, index) => {
-    let params = { sszt: item.dm, pageNum: 1, pageSize: 20,...searchForm.value };
-    qcckGet(params, '/mosty-gsxt/qbcj/selectPage').then(res => {
-      list.value[index].tableList = res.records || [];
-      list.value[index].total = res.total;
-      item.keyCount++;
-    });
-  });
-};
 
 const handleHs = (val) =>{
   router.push({path:'/MeetingRoom',query:{tsypid:val.id}})
 }
 
-const gozl = () =>{
-  router.push('/InstructionInformation')
-}
-
-// 搜索
-const onSearch = (val) =>{
-  searchForm.value = val;
-  handleGetList()
-}
-
 const handleYP = () =>{
   let params = {
     hskssj:searchForm.value.kssj,
@@ -216,21 +336,63 @@ const handleYP = () =>{
     html+=`<p>${data.bc}</p>`
     html+=`<p>${data.end}</p>`
     textContent.value = html;
-    console.log(textContent.value,'textContent.value');
-    
     showModel.value = true;
   })
 }
 
+// 选择类型
+const changeCascader = (val) =>{
+  readonly_lx.value = false;
+  readonly_ry.value = val ? true : false
+  readonly_dd.value = val ? true : false
+  searchList.value.ry = ''
+  searchList.value.ssbm = ''
+}
 
-watch(()=>D_BZ_SSZT.value, (val) => {
+// 选择人员
-  let zdlist = val || [];
+const changeRy = (val) =>{
-  list.value = zdlist.map(v => ({ title: v.zdmc,dm:v.dm,keyCount:0, tableList: [],page:1,total:0 }));
+  readonly_ry.value = false;
-  if(list.value.length > 0) handleGetList();
+  readonly_lx.value = val ? true : false
-  setTimeout(() => {
+  readonly_dd.value = val ? true : false
+  searchList.value.lx = ''
+  searchList.value.ssbm = ''
+}
+// 选择地点
+const changeBm = (val) =>{
+  readonly_dd.value = false;
+  readonly_lx.value = val ? true : false
+  readonly_ry.value = val ? true : false
+  searchList.value.lx = ''
+  searchList.value.ry = ''
+}
+// 重置
+const resetForm = () =>{
+  searchForm.value = {}
+  readonly_lx.value = false
+  readonly_ry.value = false
+  readonly_dd.value = false
+}
+
+// 搜索
+const onSearch = () =>{
+  if(searchList.value.lx || searchList.value.ry || searchList.value.dd){
+    detaileRef.value.init(searchList.value)
+  }else{
+    ElMessage.warning('请选择查询条件')
+  }
+}
+
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.boxHeight = window.innerHeight - searchBox.value.offsetHeight - 250
+  nextTick(() => {
+    pageData.tableHeight = listBoxRef.value[0].offsetHeight - 70;
+  });
+  window.onresize = function () {
     tabHeightFn();
-  }, 400);
+  };
-}, { immediate: true });
+};
 
 </script>
 
@@ -327,13 +489,13 @@ watch(()=>D_BZ_SSZT.value, (val) => {
 }
 
 .listBox{
+  height: calc(100% - 110px);
   margin-top: 4px;
   border-radius: 10px;
   box-sizing: border-box;
   display: flex;
   flex-wrap: wrap;
   overflow: hidden;
-  overflow-y: auto;
   .list-item{
     width: 49.5%;
     height: calc(100% / 2 - 5px);
@@ -347,8 +509,8 @@ watch(()=>D_BZ_SSZT.value, (val) => {
       font-size: 16px;
     }
     .list-table{
-      height: calc(100% - 30px);
       margin-top: 5px;
+      overflow: hidden;
     }
   }
   .list-item:nth-child(2n+1){
@@ -391,19 +553,9 @@ watch(()=>D_BZ_SSZT.value, (val) => {
   color: red;
 }
 
-
+::v-deep .el-date-editor .el-range-separator {
-//   .bts >>>p{
+  color: #333;
-//   font-size: 16px; font-family: 黑体;
+}
-//   color: rgb(255, 0, 140);
-// }
-// .psj >>>p{
-//   text-indent: 2em;
-// }
-// .minbt >>>p{
-//   font-size: 16px; font-family: 楷体;
-// }
-// .nr >>>p{
-//   font-size: 16px; font-family: 仿宋;
-// }
 
 </style>
+

src/views/login/index.vue

@@ -155,9 +155,7 @@ const handleLogin = () => {
   loginFromRef.value.validate((valid) => {
     if (!valid) return false;
     loading.value = true;
-    store
+    store.dispatch("user/login", loginForm.value).then((res) => {
-      .dispatch("user/login", loginForm.value)
-      .then((res) => {
         loading.value = false;
         // 登录后操作
         if (res.deptList.length === 1) {