From d63b28279b68f4e2ab81fb341fe2f1d28cbd9853 Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Fri, 21 Jun 2024 17:47:17 +0800
Subject: [PATCH] merge

---
 .env.development                              |  5 +-
 src/api/demo/system.ts                        |  3 +-
 src/api/monitor/index.ts                      |  7 +++
 src/api/monitor/model/index.ts                |  9 ++++
 src/components/MapboxMaps/InsertShp/index.vue | 17 ++++---
 src/components/MapboxMaps/MapComponent.vue    | 27 ++++++++++
 src/views/demo/report/index.vue               | 33 +++++++++---
 src/views/demo/report/report.data.ts          | 10 ++--
 src/views/demo/statistical/RecordList.vue     | 24 ++++-----
 src/views/demo/statistical/index.vue          | 50 +++++++++++++++++--
 src/views/demo/statistical/record.data.ts     |  8 +--
 .../demo/statistical/statistical.data.ts      | 16 +++---
 .../demo/workflow/task/process/audit.vue      |  4 +-
 src/views/demo/workflow/task/process/look.vue |  4 +-
 14 files changed, 162 insertions(+), 55 deletions(-)

diff --git a/.env.development b/.env.development
index ef4292e8..48df1097 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,10 @@ VITE_PUBLIC_PATH = /
 # Basic interface address SPA
 #VITE_GLOB_API_URL=/basic-api
 #财源
-VITE_GLOB_API_URL= http://192.168.10.102:9500
+VITE_GLOB_API_URL= http://192.168.10.102:9023
+
+# VITE_GLOB_API_URL = http://192.168.10.131:8989
+
 #基础框架
 # VITE_GLOB_API_URL=http://123.132.248.154:9104
 
diff --git a/src/api/demo/system.ts b/src/api/demo/system.ts
index a050b2f4..62c4a325 100644
--- a/src/api/demo/system.ts
+++ b/src/api/demo/system.ts
@@ -67,7 +67,8 @@ enum Api {
   UpdateNotice = '/api/DroneCaseinfo/UpdateMessage',
   DeleteNotice = '/api/DroneCaseinfo/UpdateDelMessage',
   UserList = '/api/users/load',
-  StatisticalList='/api/DroneCaseinfo/CaseSynthesisCensus',
+  // StatisticalList='/api/DroneCaseinfo/CaseSynthesisCensus',
+  StatisticalList = "/api/DroneCaseinfo/CaseSynthesisCensusSingle",
   LoadNoticeDetail="/api/DroneCaseinfo/LoadMessage",
   getChildrenTree = '/api/Orgs/LoadChildren',
   GetUserRoles = '/api/Roles/UserRoles',
diff --git a/src/api/monitor/index.ts b/src/api/monitor/index.ts
index 14522d18..c9a9eb39 100644
--- a/src/api/monitor/index.ts
+++ b/src/api/monitor/index.ts
@@ -20,6 +20,9 @@ enum Api {
   // 案件列表
   // LoadCaseInfoList = '/api/DroneCaseinfo/LoadCaseInfoList',
   LoadCaseInfoList = '/api/DroneCaseInfoSingle/LoadCaseInfoList',
+  // 导出案件
+  ExportCaseInfo = "/api/DroneCaseInfoSingle/DroneCaseInfoExport",
+  // 案件统计列表
   // 获取GeoJson图层
   GetDroneGeoJson = '/api/DroneCaseinfo/GetDroneGeoJson',
   // 上报案件（案件判读保存）
@@ -60,6 +63,10 @@ export function getCaseInfo(params?: caseFlowLogParams) {
 export function getCaseInfoList(params?: caseInfoParams) {
   return defHttp.get<caseInfoModel>({ url: Api.LoadCaseInfoList, params });
 }
+
+export function exportCaseInfo(params:string){
+  return defHttp.get<string>({ url: Api.ExportCaseInfo, params });
+}
 /**
  * @description: getCaseFlowLog
  */
diff --git a/src/api/monitor/model/index.ts b/src/api/monitor/model/index.ts
index 60ce03e0..d4f39244 100644
--- a/src/api/monitor/model/index.ts
+++ b/src/api/monitor/model/index.ts
@@ -48,7 +48,16 @@ export interface caseInfoParams {
   key?: string;
   orgId?: string;
 }
+
 export type caseInfoModel = {
   items: any[];
   total: number;
 };
+
+// export interface caseInfo {
+//   id:string;
+//   caseName:string;
+//   caseDescription:string
+// }
+
+// export type caseInfoModel = caseInfo[];
\ No newline at end of file
diff --git a/src/components/MapboxMaps/InsertShp/index.vue b/src/components/MapboxMaps/InsertShp/index.vue
index c32e641e..91f2b4a2 100644
--- a/src/components/MapboxMaps/InsertShp/index.vue
+++ b/src/components/MapboxMaps/InsertShp/index.vue
@@ -215,7 +215,7 @@
                     </a-input>
                   </a-form-item>
     
-                  <a-form-item label="属性数据" name="relationTable">
+                  <a-form-item label="属性数据">
                     <a-input v-model:value="uploadFrom.attributeTable">
                       <template #addonAfter >
                         <PlusOutlined @click="handlerGetExistsTableList()" />
@@ -223,11 +223,9 @@
                     </a-input>
                   </a-form-item>
 
-                  <a-form-item label="查询字段" name="spaceType" >
-                    <a-select v-model:value="uploadFrom.attributeFiled" placeholder="请选择数据类型">
-                      <a-select-option value="point">点</a-select-option>
-                      <a-select-option value="linestring">线</a-select-option>
-                      <a-select-option value="polygon">面</a-select-option>
+                  <a-form-item label="查询字段" >
+                    <a-select v-model:value="uploadFrom.attributeField" placeholder="请选择数据类型">
+                      <a-select-option v-for="(item,index) in filedOptions" :key="index" :value="item.dbColumnName">{{item.dbColumnName}}({{item.description}})</a-select-option>
                     </a-select>
                   </a-form-item>
     
@@ -299,6 +297,12 @@
   import { FILETYPE } from '../util' 
   import {ObjectToUrl} from '../src/tool'
   import { addLayer } from '@/api/sys/layerManagement'
+  import { getOutKeyList } from '@/api/formdesign/index';
+
+  const filedOptions = ref([])
+  getOutKeyList({tableNames:"drone_caseinfo_single",dbCode:"hcsystemdb"}).then(res=>{
+    filedOptions.value = res[0].db_codecolumnsList
+  })
   import {
     getDataBaseTableList,
     getImportBaseTableList,
@@ -645,6 +649,7 @@ const handlerSelectTable = ()=> {
   const handlerCancleSelectTable = ()=>{
     openSelectTable.value = false;
   }
+
   
 </script>
 
diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue
index 96e99ef7..58f3f83b 100644
--- a/src/components/MapboxMaps/MapComponent.vue
+++ b/src/components/MapboxMaps/MapComponent.vue
@@ -262,10 +262,37 @@
                   },
               }
           }),"top-left");
+
+
+        // 应用图层绑定点击事件
+        applicationLayers.forEach((item,index)=>{
+          map.on("click",item.layer.id,(e)=>{
+            let state = findLayerAttributeInfo(applicationLayers,e.features[0].layer.id);
+            if(state){
+              createMessage.success("数据表："+state.attributeTable+"；查询字段："+state.attributeField+"字段值："+e.features[0].properties.gid)
+              console.log("EVEVEVE",state);
+            }
+            console.log("e.features[0]",e.features[0]);
+            // console.log("EVEVEVE",state);
+            // console.log("EVEVEVE",e.features);
+          })
+        })
       });
     });
     // 销毁地图
 
+    const findLayerAttributeInfo = (layers,id)=>{
+      let layer = layers?.find((itme,index)=>{
+        return itme.layer.id == id;
+      })
+      if(layer){
+        if(layer.layer.state){
+          return layer.layer.state;
+        }else{
+          return false;
+        }
+      }
+    }
     // 加载地形
     const handlerLoadTerrain = () => {
         map.addSource('mapbox-dem', {
diff --git a/src/views/demo/report/index.vue b/src/views/demo/report/index.vue
index 169b5be2..ca1e2bad 100644
--- a/src/views/demo/report/index.vue
+++ b/src/views/demo/report/index.vue
@@ -37,7 +37,7 @@
   import print from "vue3-print-nb";
   import { reactive, ref } from 'vue';
   import { BasicTable, useTable, TableAction, BasicColumn } from '@/components/Table';
-  import { getCaseInfoList } from '@/api/monitor/index';
+  import { getCaseInfoList,exportCaseInfo } from '@/api/monitor/index';
   import { useMessage } from '@/hooks/web/useMessage';
   import { PermissionBtn } from '@/components/PermissionBtn/index';
   import { searchFormSchema, columns } from './report.data';
@@ -46,6 +46,12 @@
   const { createConfirm, createMessage } = useMessage();
   const searchInfo = reactive<Recordable>({});
 
+  import { getAppEnvConfig } from '@/utils/env';
+
+  const { VITE_GLOB_API_URL } = getAppEnvConfig();
+
+
+
   const vPrint = print;
 
   const printObj = reactive({
@@ -82,23 +88,36 @@
     handleSearchInfoFn(info) {
       return info;
     },
-    actionColumn: {
-      width: 80,
-      title: '操作',
-      dataIndex: 'action',
-    },
+    // actionColumn: {
+    //   width: 80,
+    //   title: '操作',
+    //   dataIndex: 'action',
+    // },
   });
   const [registerModal, { openModal, setModalProps }] = useModal();
   const caseId = ref('');
   function onBtnClicked(domId) {
     switch (domId) {
       case 'btnExport':
-        createMessage.success("接口待对接！")
+        let rows = getSelectRows();
+        handlerDownLoad(rows[0].id);
         break;
       default:
         break;
     }
   }
+
+  function handlerDownLoad(id){
+    try{
+      exportCaseInfo({id:id}).then(res=>{
+        window.open(VITE_GLOB_API_URL+"/"+res,"_blank");
+      });
+    }catch(e){
+      createMessage.warning("导出失败！");
+      console.log(e);
+    }
+
+  }
   function viewDetail(record) {
     console.log(record);
     caseId.value = record.id;
diff --git a/src/views/demo/report/report.data.ts b/src/views/demo/report/report.data.ts
index 4f6d9a03..bc13a9be 100644
--- a/src/views/demo/report/report.data.ts
+++ b/src/views/demo/report/report.data.ts
@@ -8,23 +8,23 @@ type CheckedType = boolean | string | number;
 export const columns: BasicColumn[] = [
   {
     title: '案件编号',
-    dataIndex: 'case_no',
+    dataIndex: 'caseNo',
     width: 200,
   },{
     title: '案件描述',
-    dataIndex: 'case_description',
+    dataIndex: 'caseDescription',
     width: 200,
   },{
     title: '办结状态',
-    dataIndex: 'handle_status_name',
+    dataIndex: 'handleStatusName',
     width: 200,
   },{
     title: '上报人',
-    dataIndex: 'createusername',
+    dataIndex: 'createUsername',
     width: 200,
   },{
     title: '上报时间',
-    dataIndex: 'createtime',
+    dataIndex: 'createTime',
     width: 200,
   }
 ];
diff --git a/src/views/demo/statistical/RecordList.vue b/src/views/demo/statistical/RecordList.vue
index ab0624f1..a463ac9b 100644
--- a/src/views/demo/statistical/RecordList.vue
+++ b/src/views/demo/statistical/RecordList.vue
@@ -24,7 +24,8 @@
 <script lang="ts" setup>
 import { reactive,ref,defineProps,watch } from 'vue';
 import { BasicModal, useModal } from '@/components/Modal';
-import { getCaseInfoList } from '@/api/demo/system';
+// import { getCaseInfoList } from '@/api/demo/system';
+import { getCaseInfoList } from '@/api/monitor/index';
 // import { CaseView } from '@/views/demo/monitor/index';
 const [registerModal, { openModal, setModalProps }] = useModal();
 
@@ -35,36 +36,33 @@ const props = defineProps<{
 const caseId = ref('');
 let columns = reactive({data:[],col:[{
     title: '案件编号',
-    dataIndex: 'case_no',
+    dataIndex: 'caseNo',
   },
   {
     title: '社区/村',
-    dataIndex: 'communityname',
+    dataIndex: 'communityName',
   },
   {
     title: '案件描述',
-    dataIndex: 'case_description',
+    dataIndex: 'caseDescription',
   },{
     title: '所属类型',
-    dataIndex: 'typename',
+    dataIndex: 'typeName',
   },{
     title: '处理人',
-    dataIndex: 'deal_username',
+    dataIndex: 'dealUsername',
   },{
     title: '处理时间',
-    dataIndex: 'deal_time',
+    dataIndex: 'dealTime',
   },{
     title: '审核人',
-    dataIndex: 'verifyuser',
+    dataIndex: 'verifyUser',
   },{
     title: '审核时间',
-    dataIndex: 'verifytime',
+    dataIndex: 'verifyTime',
   },{
     title: '案件状态',
-    dataIndex: 'handle_status_name',
-  },{
-    title: '操作',
-    dataIndex: 'action',
+    dataIndex: 'handleStatusName',
   }]});
 let total = ref(0)
 
diff --git a/src/views/demo/statistical/index.vue b/src/views/demo/statistical/index.vue
index d33c8e62..b1ef31d0 100644
--- a/src/views/demo/statistical/index.vue
+++ b/src/views/demo/statistical/index.vue
@@ -6,7 +6,12 @@
       </template>
       
       <template #bodyCell="{ column, record }">
-        
+        <!-- 乡镇 -->
+        <template v-if="column.key === 'streetname'">
+          <a v-if="currentOrgLevel == 'country'" @click="getOrgCaseList(column,record)">{{record.streetname}}</a>
+          <span v-if="currentOrgLevel == 'street'">{{record.streetname}}</span>
+        </template>
+
         <!-- 无人机发现数量 -->
         <template v-if="column.key === 'allCount'">
           <a @click="handlePreViewData(column,record)">{{record.allCount}}</a>
@@ -154,13 +159,17 @@
   const [registerModal, { openModal: openRoleModal }] = useModal();
   const [registerModulesModal, { openModal: openModulesModal }] = useModal();
   const [registerAccountModal, { openModal: openAccountModal }] = useModal();
-  const searchInfo = reactive<Recordable>({});
+  const searchInfo = reactive<Recordable>({
+    countyid:null
+  });
+
+  const currentOrgLevel = ref<string>("country")
 
   const showRecordList = ref<boolean>(false);
 
   const panes = reactive<{ title: string; content: string; key: string; closable?: boolean}[]>([])
   
-  const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRows, clearSelectedRowKeys, updateTableData}] = useTable({
     // 表格名称
     title: '统计报表',
     // 获取数据的接口
@@ -176,6 +185,8 @@
     useSearchForm: true,
     // 显示表格设置工具
     showTableSetting: true,
+    // 是否显示分页
+    pagination:false,
     // 是否显示表格边框
     bordered: true,
     // 序号列
@@ -264,7 +275,8 @@
   // 查询条件
   interface searchListSchema{
     is_intact?:number;
-    streetid?:string;
+    streetid?:number;
+    countryid?:number;
     identification_start_time?:string;
     identification_end_time?:string;
     page?:number;
@@ -287,8 +299,8 @@
   
   function handlePreViewData(column,record:Recordable){
 
+    
     const searchForm = reactive<searchListSchema>({
-      streetid:record.streetid,
       identification_start_time:"",
       identification_end_time:"",
       is_intact:1,
@@ -296,6 +308,14 @@
       limit:10,
     })
 
+    if(currentOrgLevel.value == 'country'){
+      searchForm.countryid = record.streetid;
+    }else if(currentOrgLevel.value == 'street'){
+      searchForm.streetid = record.streetid;
+    }
+
+    console.log("searchForm",searchForm);
+
     switch(column.dataIndex){
       case 'allCount':
         break;
@@ -379,6 +399,20 @@
     showRecordList.value = true;
     currentListQuery.listQuery = searchForm
 
+  }
+
+  // 获取下级行政结构案件统计
+  function getOrgCaseList(column,record:Recordable){
+
+    if(currentOrgLevel.value == 'country'){
+      currentOrgLevel.value = 'street'
+    }else if(currentOrgLevel.value == 'street'){
+      currentOrgLevel.value = 'country'
+    }
+
+    searchInfo.countyid = record.streetid;
+    reload();
+    
   }
   function handleCloseAllRecordList(){
     for(let i=0;i<tablist.length;i++){
@@ -429,13 +463,19 @@
 	  createMessage.success("接口待对接！")
   }
 
+
   function handleSuccess() {
     clearSelectedRowKeys();
     reload();
 	reloadDataPreview();
   }
+  
   function onBtnClicked(domId) {
     switch (domId) {
+      case 'btnBack':
+        currentOrgLevel.value = 'street'
+        getOrgCaseList({},{streetid:null});
+        break;
       case 'btnAdd':
         handleCreate();
         break;
diff --git a/src/views/demo/statistical/record.data.ts b/src/views/demo/statistical/record.data.ts
index 4466af1b..2d77f2ec 100644
--- a/src/views/demo/statistical/record.data.ts
+++ b/src/views/demo/statistical/record.data.ts
@@ -9,7 +9,7 @@ type CheckedType = boolean | string | number;
 
 export const columnsDataPreview: BasicColumn[] = [
   {
-    title: '乡镇(街道)',
+    title: '机构',
     dataIndex: 'streetname',
     width: 120,
   },{
@@ -186,12 +186,6 @@ export const columns: BasicColumn[] = [
 ];
 
 export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'key',
-    label: '关键字段',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
   {
     field: '[startDate, endDate]',
     label: '日期范围',
diff --git a/src/views/demo/statistical/statistical.data.ts b/src/views/demo/statistical/statistical.data.ts
index 69841e4a..336f37a7 100644
--- a/src/views/demo/statistical/statistical.data.ts
+++ b/src/views/demo/statistical/statistical.data.ts
@@ -9,7 +9,7 @@ type CheckedType = boolean | string | number;
 
 export const columnsDataPreview: BasicColumn[] = [
   {
-    title: '乡镇(街道)',
+    title: '机构',
     dataIndex: 'streetname',
     width: 120,
   },{
@@ -147,7 +147,7 @@ export const columnsDataPreview: BasicColumn[] = [
 
 export const columns: BasicColumn[] = [
   {
-    title: '乡镇(街道)',
+    title: '机构',
     dataIndex: 'streetname',
     width: 120,
   },{
@@ -284,12 +284,12 @@ export const columns: BasicColumn[] = [
 ];
 
 export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'key',
-    label: '关键字段',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
+  // {
+  //   field: 'key',
+  //   label: '关键字段',
+  //   component: 'Input',
+  //   colProps: { span: 6 },
+  // },
   {
     field: '[identification_start_time, identification_end_time]',
     label: '日期范围',
diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue
index a1b9ee7f..5358154c 100644
--- a/src/views/demo/workflow/task/process/audit.vue
+++ b/src/views/demo/workflow/task/process/audit.vue
@@ -790,7 +790,9 @@
   }
 
   function getFormSuccess(formData) {
-    handlerShowGeomtrys(designerData.formCurrentNode, formData);
+    if(mapConfig.value.isShowMap){
+      handlerShowGeomtrys(designerData.formCurrentNode, formData);
+    }
   }
 
   async function handlerShowGeomtrys(currentNode, formData) {
diff --git a/src/views/demo/workflow/task/process/look.vue b/src/views/demo/workflow/task/process/look.vue
index 31f35b06..878728ec 100644
--- a/src/views/demo/workflow/task/process/look.vue
+++ b/src/views/demo/workflow/task/process/look.vue
@@ -429,7 +429,9 @@
   }
 
   function getFormSuccess(formData){
-    handlerShowGeomtrys(designerData.formCurrentNode,formData);
+    if(mapConfig.value.isShowMap){
+      handlerShowGeomtrys(designerData.formCurrentNode, formData);
+    }
   }
 
   async function handlerShowGeomtrys(currentNode,formData) {