diff --git a/.env.development b/.env.development index f48937fb..f9bdd477 100644 --- a/.env.development +++ b/.env.development @@ -7,9 +7,19 @@ VITE_PUBLIC_PATH = / # Basic interface address SPA #VITE_GLOB_API_URL=/basic-api #财源 +<<<<<<< HEAD # VITE_GLOB_API_URL= http://192.168.10.102:9023 #基础框架 VITE_GLOB_API_URL=http://192.168.10.102:9023 +======= +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 + +>>>>>>> 2022b43ab147f3fe325d37e6481392e73479796c # File upload address， optional # It can be forwarded by nginx or write the actual address directly VITE_GLOB_UPLOAD_URL=http://60.213.14.14:6070 diff --git a/package.json b/package.json index e94a2f9a..d4a28190 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "mapbox-extensions":"^1.3.38", "terraformer-wkt-parser": "^1.2.1", "@terraformer/wkt":"2.1.2", + "vue3-print-nb":"0.1.4", "ceel-json-editor":"^0.0.3", "@originjs/vite-plugin-commonjs":"^1.0.3", "mars3d": "^3.7.0", 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 new file mode 100644 index 00000000..c9a9eb39 --- /dev/null +++ b/src/api/monitor/index.ts @@ -0,0 +1,109 @@ +// WFProcess 流程模版基本信息 +import { defHttp } from '@/utils/http/axios'; +import { + caseFlowLogParams, + flowLogModel, + droneCaseDealModel, + droneCaseDealParams, + picListTaskParams, + caseInfoParams, + caseInfoModel, +} from './model/index'; + +enum Api { + // 获取案件详情步骤条 + GetCaseFlowLog = '/api/DroneCaseinfo/GetCaseFlowLog', + // 获取案件处理详情 + GetDroneCaseDeal = '/api/DroneCaseinfo/GetDroneCaseDeal', + // 获取案件详情 + GetCaseInfo = '/api/DroneCaseinfo/GetCaseInfo', + // 案件列表 + // LoadCaseInfoList = '/api/DroneCaseinfo/LoadCaseInfoList', + LoadCaseInfoList = '/api/DroneCaseInfoSingle/LoadCaseInfoList', + // 导出案件 + ExportCaseInfo = "/api/DroneCaseInfoSingle/DroneCaseInfoExport", + // 案件统计列表 + // 获取GeoJson图层 + GetDroneGeoJson = '/api/DroneCaseinfo/GetDroneGeoJson', + // 上报案件（案件判读保存） + AddDroneCaseInfo = '/api/DroneCaseinfo/AddDroneCaseInfo', + // 案件判读 + UpdateDroneCaseInfoIntact = '/api/DroneCaseinfo/UpdateDroneCaseInfoIntact', + // 关闭案件 + CloseDroneCaseInfo = '/api/DroneCaseinfo/CloseDroneCaseInfo', + // 上传图片任务列表 + PicListTask = '/api/DroneShpImageexif/ListTask', + // 图片上传，创建任务 + PicAddTask = '/api/DroneShpImageexif/AddTask', + // 图片上传 + AddImageexif = '/api/DroneShpImageexif/AddImageexif', +} + +/** + * @description: getCaseFlowLog + */ +export function getCaseFlowLog(params?: caseFlowLogParams) { + return defHttp.get({ url: Api.GetCaseFlowLog, params }); +} +/** + * @description: getCaseFlowLog + */ +export function getDroneCaseDeal(params?: droneCaseDealParams) { + return defHttp.get({ url: Api.GetDroneCaseDeal, params }); +} +/** + * @description: getCaseFlowLog + */ +export function getCaseInfo(params?: caseFlowLogParams) { + return defHttp.get({ url: Api.GetCaseInfo, params }); +} +/** + * @description: getCaseFlowLog + */ +export function getCaseInfoList(params?: caseInfoParams) { + return defHttp.get({ url: Api.LoadCaseInfoList, params }); +} + +export function exportCaseInfo(params:string){ + return defHttp.get({ url: Api.ExportCaseInfo, params }); +} +/** + * @description: getCaseFlowLog + */ +export function getDroneGeoJson(params?: caseFlowLogParams) { + return defHttp.get({ url: Api.GetDroneGeoJson, params }); +} + +export function addDroneCaseInfo(params) { + return defHttp.post({ + url: Api.AddDroneCaseInfo, + params, + }); +} +export function updateDroneCaseInfoIntact(params) { + return defHttp.post({ + url: Api.UpdateDroneCaseInfoIntact, + params, + }); +} +export function closeDroneCaseInfo(params?: caseFlowLogParams) { + return defHttp.get({ url: Api.CloseDroneCaseInfo, params }); +} + +export function getPicListTask(params?: picListTaskParams) { + return defHttp.get({ url: Api.PicListTask, params }); +} + +export function addPicTask(params) { + return defHttp.post({ + url: Api.PicAddTask, + params, + }); +} + +export function addImageexif(params) { + return defHttp.post({ + url: Api.AddImageexif, + params, + }); +} diff --git a/src/api/monitor/model/index.ts b/src/api/monitor/model/index.ts new file mode 100644 index 00000000..d4f39244 --- /dev/null +++ b/src/api/monitor/model/index.ts @@ -0,0 +1,63 @@ +export interface caseFlowLogParams { + id?: string; +} +export interface droneCaseDealParams { + caseid?: string; + id?: string; +} +export interface flowLog { + name: string; + time: string; + user_name: string; + status: number; + state?: string; +} +export type flowLogModel = flowLog[]; + +export interface fileList { + filePath?: string | undefined; + s_filePath?: string; +} +export type fileListModel = fileList[]; + +export type droneCaseDealModel = { + video_list?: any; + pic_info_list?: any; + after_pic_list?: any; + remove_video_list?: any; + evidence_file_list?: any; + boundary_pic_list?: any; + punish_pic_list?: any; + payment_pic_list?: any; + agree_checkout_pic_list?: any; + checkout_pic_list?: any; +}; + +export interface picListTaskParams { + beginDate?: string; + endDate?: string; +} + +export interface caseInfoParams { + page?: number; + limit?: number; + is_intact?: number; + handle_status_id?: string; + identification_user?: string; + identification_time?: string; + 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 16155ba3..91f2b4a2 100644 --- a/src/components/MapboxMaps/InsertShp/index.vue +++ b/src/components/MapboxMaps/InsertShp/index.vue @@ -92,11 +92,7 @@ - - @@ -165,70 +161,114 @@ -
+ + +
+ +
+ + + + + +
+ + + + + + + + + + + + + + + EPSG:4326 + EPSG:3857 + EPSG:900913 + + + + + + + 点 + 线 + 面 + + + + + + + + + + + + + + - - - - - - - - - - - - - - - EPSG:4326 - EPSG:3857 - EPSG:900913 - - - - - - - 点 - 线 - 面 - - - - - - - - - - - - - - - - -
- 发布服务 -
- -
+ + + {{item.dbColumnName}}({{item.description}}) + + + + +
+ 发布服务 +
+
+ + + + + - @@ -242,6 +282,7 @@ PlusOutlined, DeleteOutlined, CheckCircleOutlined, + BlockOutlined } from '@ant-design/icons-vue'; import './index.scss'; import { InboxOutlined,CloudUploadOutlined } from '@ant-design/icons-vue'; @@ -256,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, @@ -326,8 +373,6 @@ columns: importColumns, size: 'small', rowSelection: { - //多选框 - // type: 'checkbox', type: 'radio', }, useSearchForm: false, @@ -604,6 +649,7 @@ const handlerSelectTable = ()=> { const handlerCancleSelectTable = ()=>{ openSelectTable.value = false; } + @@ -709,6 +755,22 @@ const handlerSelectTable = ()=> { } .upload-form-by-database{ - padding:80px 100px 120px 100px; + padding:70px 20px; + } + + .layer-icon{ + width:200px; + height:200px; + background:#ffffff; + font-size:100px; + text-align: center; + line-height: 200px; + color:#efefef; + border:1px dashed #cfcfcf; + border-radius: 10px; + position:absolute; + top:50%; + left:50%; + transform:translate(-50%,-50%); } 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/components/MapboxMaps/MapboxMap.vue b/src/components/MapboxMaps/MapboxMap.vue index e0e0598d..63ba724d 100644 --- a/src/components/MapboxMaps/MapboxMap.vue +++ b/src/components/MapboxMaps/MapboxMap.vue @@ -240,7 +240,7 @@ }); - diff --git a/src/views/demo/onlineform/formModule/config/maps.vue b/src/views/demo/onlineform/formModule/config/maps.vue index 2b918a32..f0b6478c 100644 --- a/src/views/demo/onlineform/formModule/config/maps.vue +++ b/src/views/demo/onlineform/formModule/config/maps.vue @@ -200,7 +200,7 @@ source: { type: "raster", tiles: [ - "http://t0.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=b6585bc41ee16251dbe6b1af64f375d9", + "https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=b6585bc41ee16251dbe6b1af64f375d9", ], tileSize: 256, }, @@ -250,6 +250,7 @@ }, ]) + const baselayercolumns = reactive([ { title: '图层名称', diff --git a/src/views/demo/report/caseview/index.vue b/src/views/demo/report/caseview/index.vue new file mode 100644 index 00000000..0823f903 --- /dev/null +++ b/src/views/demo/report/caseview/index.vue @@ -0,0 +1,435 @@ + + + diff --git a/src/views/demo/report/caseview/model.ts b/src/views/demo/report/caseview/model.ts new file mode 100644 index 00000000..a920d91a --- /dev/null +++ b/src/views/demo/report/caseview/model.ts @@ -0,0 +1,51 @@ +export interface caseDetailObj { + case_no?: string; + identification_user?: string; + identification_time?: string; + handle_status_id?: number; + handle_status_name?: string; + countyname?: string; + streetname?: string; + communityname?: string; + address?: string; + lng?: number; + lat?: number; + area?: number; + typename?: string; + remark?: string; + case_description?: string; +} +export interface infoObj{ + createusername?: string; + createtime?:string; + verifystatusname?:string; + measure_name?:string; + result_name?: string; + contacts_people?: string; + contacts_phone?: string; + actual_scene_case?: string; + actual_use_to?: string; + pseudo_change_reason?: string; + actual_area?: string; + is_have_build?: number; + is_forever_build?: number; + illegal_contact?: string; + is_build_complete?: number; + is_have_checkout_condition?: number; + illegal_contact_phone?: string; + build_structure?: string; + illegal_type?: string; + remark?: string; + transactor_name?: string; + transact_time?: string; + evidence_file_name?: string; + evidence_file_number?: string; + evidence_file_indate?: string; + illegal_contact_idcard?: string; + registr_number?: string; + procedure_indate?:string; +} +export interface caseHandleInfoObj { + info:infoObj + is_illegal?: string; +} \ No newline at end of file diff --git a/src/views/demo/report/caseview/src/audit.vue b/src/views/demo/report/caseview/src/audit.vue new file mode 100644 index 00000000..8f28af72 --- /dev/null +++ b/src/views/demo/report/caseview/src/audit.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/views/demo/report/caseview/src/dismantle.vue b/src/views/demo/report/caseview/src/dismantle.vue new file mode 100644 index 00000000..b0218b89 --- /dev/null +++ b/src/views/demo/report/caseview/src/dismantle.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/views/demo/report/caseview/src/evidence.vue b/src/views/demo/report/caseview/src/evidence.vue new file mode 100644 index 00000000..ac27c34a --- /dev/null +++ b/src/views/demo/report/caseview/src/evidence.vue @@ -0,0 +1,97 @@ + + + + \ No newline at end of file diff --git a/src/views/demo/report/caseview/src/inspect.vue b/src/views/demo/report/caseview/src/inspect.vue new file mode 100644 index 00000000..ccc2c257 --- /dev/null +++ b/src/views/demo/report/caseview/src/inspect.vue @@ -0,0 +1,247 @@ + + + diff --git a/src/views/demo/report/caseview/src/investigate.vue b/src/views/demo/report/caseview/src/investigate.vue new file mode 100644 index 00000000..485af1e1 --- /dev/null +++ b/src/views/demo/report/caseview/src/investigate.vue @@ -0,0 +1,100 @@ + + + + \ No newline at end of file diff --git a/src/views/demo/report/caseview/src/issue.vue b/src/views/demo/report/caseview/src/issue.vue new file mode 100644 index 00000000..52c88abb --- /dev/null +++ b/src/views/demo/report/caseview/src/issue.vue @@ -0,0 +1,77 @@ + + + diff --git a/src/views/demo/report/caseview/src/mapDetail.vue b/src/views/demo/report/caseview/src/mapDetail.vue new file mode 100644 index 00000000..b7699081 --- /dev/null +++ b/src/views/demo/report/caseview/src/mapDetail.vue @@ -0,0 +1,205 @@ + + + diff --git a/src/views/demo/report/caseview/src/procedure.vue b/src/views/demo/report/caseview/src/procedure.vue new file mode 100644 index 00000000..34b55670 --- /dev/null +++ b/src/views/demo/report/caseview/src/procedure.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/views/demo/report/index.ts b/src/views/demo/report/index.ts new file mode 100644 index 00000000..c6027f72 --- /dev/null +++ b/src/views/demo/report/index.ts @@ -0,0 +1,18 @@ +// 案件详情首页 +export { default as CaseView } from './caseview/index.vue'; +// 【案件下发信息】 +export { default as Issue } from './caseview/src/issue.vue'; +// 【案件核查信息】 +export { default as Inspect } from './caseview/src/inspect.vue'; +// 【案件审核信息】 +export { default as Audit } from './caseview/src/audit.vue'; +// 【案件办理信息-违法-拟拆除】 +export { default as Dismantle } from './caseview/src/dismantle.vue'; +// 地图位置 +export { default as MapDetail } from './caseview/src/mapDetail.vue'; +// 案件办理信息-合法举证 +export { default as Evidence } from './caseview/src/evidence.vue'; +// 【案件办理信息-违法-查处】 +export { default as Investigate } from './caseview/src/investigate.vue'; +// 【案件办理信息-违法-拟完善手续】 +export { default as Procedure } from './caseview/src/procedure.vue'; diff --git a/src/views/demo/report/index.vue b/src/views/demo/report/index.vue new file mode 100644 index 00000000..ca1e2bad --- /dev/null +++ b/src/views/demo/report/index.vue @@ -0,0 +1,135 @@ + + + diff --git a/src/views/demo/report/page.ts b/src/views/demo/report/page.ts new file mode 100644 index 00000000..26aa161d --- /dev/null +++ b/src/views/demo/report/page.ts @@ -0,0 +1,6 @@ + +export { default as AccountModal } from './AccountModal.vue'; +export { default as ModulesModal } from './ModulesModal.vue'; +export { default as RoleDrawer } from './RoleDrawer.vue'; +export { default as RoleModal } from './RoleModal.vue'; + diff --git a/src/views/demo/report/report.data.ts b/src/views/demo/report/report.data.ts new file mode 100644 index 00000000..bc13a9be --- /dev/null +++ b/src/views/demo/report/report.data.ts @@ -0,0 +1,98 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +import { h } from 'vue'; +import { Switch,Tag } from 'ant-design-vue'; +import { setRoleStatus } from '@/api/demo/system'; +import { useMessage } from '@/hooks/web/useMessage'; + +type CheckedType = boolean | string | number; +export const columns: BasicColumn[] = [ + { + title: '案件编号', + dataIndex: 'caseNo', + width: 200, + },{ + title: '案件描述', + dataIndex: 'caseDescription', + width: 200, + },{ + title: '办结状态', + dataIndex: 'handleStatusName', + width: 200, + },{ + title: '上报人', + dataIndex: 'createUsername', + width: 200, + },{ + title: '上报时间', + dataIndex: 'createTime', + width: 200, + } +]; + +export const searchFormSchema: FormSchema[] = [ + { + field: 'key', + label: '关键字段', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'is_intact', + component: 'Select', + label: '案件状态', + colProps: { + span: 6, + }, + componentProps: { + options: [ + { + label: '全部', + value: null, + key: null, + }, + { + label: '未判读', + value: '0', + key: '0', + },{ + label: '已提交', + value: '1', + key: '1', + },{ + label: '已关闭', + value: '99', + key: '99', + }, + ], + }, + }, + +]; + +export const formSchema: FormSchema[] = [ + { + field: 'id', + label: '角色名称', + required: true, + component: 'Input', + ifShow:false, + }, + { + field: 'name', + label: '角色名称', + required: true, + component: 'Input', + }, + { + field: 'status', + label: '状态', + component: 'RadioButtonGroup', + defaultValue: 0, + componentProps: { + options: [ + { label: '启用', value: 0}, + { label: '停用', value: 1 }, + ], + }, + }, +]; diff --git a/src/views/demo/statistical/RecordList.vue b/src/views/demo/statistical/RecordList.vue new file mode 100644 index 00000000..a463ac9b --- /dev/null +++ b/src/views/demo/statistical/RecordList.vue @@ -0,0 +1,124 @@ + + + diff --git a/src/views/demo/statistical/index.vue b/src/views/demo/statistical/index.vue new file mode 100644 index 00000000..b1ef31d0 --- /dev/null +++ b/src/views/demo/statistical/index.vue @@ -0,0 +1,534 @@ + + + diff --git a/src/views/demo/statistical/page.ts b/src/views/demo/statistical/page.ts new file mode 100644 index 00000000..64f58ff9 --- /dev/null +++ b/src/views/demo/statistical/page.ts @@ -0,0 +1,3 @@ + +export { default as RecordList} from './RecordList.vue' + diff --git a/src/views/demo/statistical/record.data.ts b/src/views/demo/statistical/record.data.ts new file mode 100644 index 00000000..2d77f2ec --- /dev/null +++ b/src/views/demo/statistical/record.data.ts @@ -0,0 +1,228 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +import { h } from 'vue'; +import { Switch,Tag } from 'ant-design-vue'; +import { setRoleStatus } from '@/api/demo/system'; +import { useMessage } from '@/hooks/web/useMessage'; + +type CheckedType = boolean | string | number; + + +export const columnsDataPreview: BasicColumn[] = [ + { + title: '机构', + dataIndex: 'streetname', + width: 120, + },{ + title: '无人机发现数量', + dataIndex: 'allCount', + width: 120, + },{ + title: '外业图斑核查情况', + children:[ + { + title: '完成外业核查数量', + dataIndex: 'handleStatus', + width: 120, + },{ + title: '24h内未核查', + dataIndex: 'notDealHour24', + width: 120, + } + ] + },{ + title: '下发疑似图斑类型', + children:[ + { + title: '房屋翻新', + dataIndex: 'typeFanxinCount', + width: 120, + },{ + title: '房屋加盖', + dataIndex: 'typeJiagaiCount', + width: 120, + },{ + title: '房屋翻建', + dataIndex: 'typeFanjianCount', + width: 120, + },{ + title: '存量建设', + dataIndex: 'typeCunliangCount', + width: 120, + },{ + title: '推土', + dataIndex: 'typeTuituCount', + width: 120, + },{ + title: '其他', + dataIndex: 'typeOtherCount', + width: 120, + } + ] + },{ + title: '图斑判定', + children:[ + { + title: '合法', + dataIndex: 'illegal0Count', + width: 120, + },{ + title: '违法', + dataIndex: 'illegal1Count', + width: 120, + },{ + title: '伪变化', + dataIndex: 'illegal2Count', + width: 120, + } + ] + },{ + title: '新增违法图斑整改情况', + dataIndex: 'handle_status_name', + children:[ + { + title: '外业核实后确定违法数', + dataIndex: 'beginTime', + width: 120, + },{ + title: '违法面积', + dataIndex: 'illegalHandleAreaList', + width: 120, + },{ + title: '整改销号数', + dataIndex: 'beginTime', + width: 120, + },{ + title: '销号面积', + dataIndex: 'beginTime', + width: 120, + },{ + title: '尚未整改宗数', + dataIndex: 'beginTime', + width: 120, + },{ + title: '未整改面积', + dataIndex: 'beginTime', + width: 120, + } + ] + },{ + title: '违法图斑整改进度情况', + children:[ + { + title: '3日内未整改完成', + dataIndex: 'notComplete3', + },{ + title: '7日内未整改完成', + dataIndex: 'notComplete7', + },{ + title: '30日内未整改完成', + dataIndex: 'notComplete30', + },{ + title: '30日以上未整改完成', + dataIndex: 'notComplete30More', + } + ] + },{ + title: '百分制考核计分', + dataIndex: 'handle_status_name', + children:[ + { + title: '24h外业核查计分', + dataIndex: 'beginTime', + width: 120, + },{ + title: '整改进度计分', + dataIndex: 'beginTime', + width: 120, + } + ] + },{ + title: '备注', + dataIndex: 'createusername', + width: 200, + } +]; + +export const columns: BasicColumn[] = [ + { + title: '案件编号', + dataIndex: 'case_no', + width: 120, + } + ,{ + title: '村/社区', + dataIndex: 'communityname', + width: 120, + },{ + title: '案件描述', + dataIndex: 'case_description', + width: 120, + },{ + title: '所属类型', + dataIndex: 'typename', + width: 120, + },{ + title: '处理人', + dataIndex: 'deal_username', + width: 120, + },{ + title: '处理时间', + dataIndex: 'deal_time', + width: 120, + }, + { + title: '审核人', + dataIndex: 'verifyuser', + width: 120, + },{ + title: '审核时间', + dataIndex: 'verifytime', + width: 120, + },{ + title: '案件状态', + dataIndex: 'handle_status_name', + width: 120, + } +]; + +export const searchFormSchema: FormSchema[] = [ + { + field: '[startDate, endDate]', + label: '日期范围', + component: 'RangePicker', + colProps: { span: 8 }, + componentProps: { + format: 'YYYY-MM-DD', + placeholder: ['开始日期', '结束日期'], + }, + }, + +]; + +export const formSchema: FormSchema[] = [ + { + field: 'id', + label: '角色名称', + required: true, + component: 'Input', + ifShow:false, + }, + { + field: 'name', + label: '角色名称', + required: true, + component: 'Input', + }, + { + field: 'status', + label: '状态', + component: 'RadioButtonGroup', + defaultValue: 0, + componentProps: { + options: [ + { label: '启用', value: 0}, + { label: '停用', value: 1 }, + ], + }, + }, +]; diff --git a/src/views/demo/statistical/statistical.data.ts b/src/views/demo/statistical/statistical.data.ts new file mode 100644 index 00000000..336f37a7 --- /dev/null +++ b/src/views/demo/statistical/statistical.data.ts @@ -0,0 +1,334 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +import { h } from 'vue'; +import { Switch,Tag } from 'ant-design-vue'; +import { setRoleStatus } from '@/api/demo/system'; +import { useMessage } from '@/hooks/web/useMessage'; + +type CheckedType = boolean | string | number; + + +export const columnsDataPreview: BasicColumn[] = [ + { + title: '机构', + dataIndex: 'streetname', + width: 120, + },{ + title: '无人机发现数量', + dataIndex: 'allCount', + width: 120, + },{ + title: '外业图斑核查情况', + children:[ + { + title: '完成外业核查数量', + dataIndex: 'handleStatus', + width: 120, + },{ + title: '24h内未核查', + dataIndex: 'notDealHour24', + width: 120, + } + ] + },{ + title: '下发疑似图斑类型', + dataIndex: '', + children:[ + { + title: '房屋翻新', + dataIndex: 'typeFanxinCount', + width: 120, + },{ + title: '房屋加盖', + dataIndex: 'typeJiagaiCount', + width: 120, + },{ + title: '房屋翻建', + dataIndex: 'typeFanjianCount', + width: 120, + },{ + title: '存量建设', + dataIndex: 'typeCunliangCount', + width: 120, + },{ + title: '推土', + dataIndex: 'typeTuituCount', + width: 120, + },{ + title: '其他', + dataIndex: 'typeOtherCount', + width: 120, + } + ] + },{ + title: '图斑判定', + dataIndex:"1", + children:[ + { + title: '合法', + dataIndex: 'illegal0Count', + width: 120, + },{ + title: '违法', + dataIndex: 'illegal1Count', + width: 120, + },{ + title: '伪变化', + dataIndex: 'illegal2Count', + width: 120, + } + ] + },{ + title: '新增违法图斑整改情况', + dataIndex: '2', + children:[ + { + title: '外业核实后确定违法数', + dataIndex: 'illegal1Count1', + width: 120, + },{ + title: '违法面积', + dataIndex: 'illegalHandleAreaList', + width: 120, + },{ + title: '整改销号数', + dataIndex: 'illegalHandle2Status', + width: 120, + },{ + title: '销号面积', + dataIndex: 'illegalHandle2AreaList', + width: 120, + },{ + title: '尚未整改宗数', + dataIndex: 'illegalHandle01Status', + width: 120, + },{ + title: '未整改面积', + dataIndex: 'illegalHandle01AreaList', + width: 120, + } + ] + },{ + title: '违法图斑整改进度情况', + children:[ + { + title: '3日内未整改完成', + dataIndex: 'notComplete3', + },{ + title: '7日内未整改完成', + dataIndex: 'notComplete7', + },{ + title: '30日内未整改完成', + dataIndex: 'notComplete30', + },{ + title: '30日以上未整改完成', + dataIndex: 'notComplete30More', + } + ] + },{ + title: '百分制考核计分', + dataIndex: 'handle_status_name', + children:[ + { + title: '24h外业核查计分', + dataIndex: 'beginTime', + width: 120, + },{ + title: '整改进度计分', + dataIndex: 'beginTime', + width: 120, + } + ] + }, + { + title: '备注', + dataIndex: 'mask', + } +]; + +export const columns: BasicColumn[] = [ + { + title: '机构', + dataIndex: 'streetname', + width: 120, + },{ + title: '无人机发现数量', + dataIndex: 'allCount', + width: 120, + },{ + title: '外业图斑核查情况', + children:[ + { + title: '完成外业核查数量', + dataIndex: 'handleStatus', + width: 120, + },{ + title: '24h内未核查', + dataIndex: 'notDealHour24', + width: 120, + } + ] + },{ + title: '下发疑似图斑类型', + dataIndex: '', + children:[ + { + title: '房屋翻新', + dataIndex: 'typeFanxinCount', + width: 120, + },{ + title: '房屋加盖', + dataIndex: 'typeJiagaiCount', + width: 120, + },{ + title: '房屋翻建', + dataIndex: 'typeFanjianCount', + width: 120, + },{ + title: '存量建设', + dataIndex: 'typeCunliangCount', + width: 120, + },{ + title: '推土', + dataIndex: 'typeTuituCount', + width: 120, + },{ + title: '其他', + dataIndex: 'typeOtherCount', + width: 120, + } + ] + },{ + title: '图斑判定', + dataIndex:"1", + children:[ + { + title: '合法', + dataIndex: 'illegal0Count', + width: 120, + },{ + title: '违法', + dataIndex: 'illegal1Count', + width: 120, + },{ + title: '伪变化', + dataIndex: 'illegal2Count', + width: 120, + } + ] + },{ + title: '新增违法图斑整改情况', + dataIndex: '2', + children:[ + { + title: '外业核实后确定违法数', + dataIndex: 'illegal1Count1', + width: 120, + },{ + title: '违法面积', + dataIndex: 'illegalHandleAreaList', + width: 120, + },{ + title: '整改销号数', + dataIndex: 'illegalHandle2Status', + width: 120, + },{ + title: '销号面积', + dataIndex: 'illegalHandle2AreaList', + width: 120, + },{ + title: '尚未整改宗数', + dataIndex: 'illegalHandle01Status', + width: 120, + },{ + title: '未整改面积', + dataIndex: 'illegalHandle01AreaList', + width: 120, + } + ] + },{ + title: '违法图斑整改进度情况', + children:[ + { + title: '3日内未整改完成', + dataIndex: 'notComplete3', + },{ + title: '7日内未整改完成', + dataIndex: 'notComplete7', + },{ + title: '30日内未整改完成', + dataIndex: 'notComplete30', + },{ + title: '30日以上未整改完成', + dataIndex: 'notComplete30More', + } + ] + },{ + title: '百分制考核计分', + dataIndex: 'handle_status_name', + children:[ + { + title: '24h外业核查计分', + dataIndex: 'beginTime', + width: 120, + },{ + title: '整改进度计分', + dataIndex: 'beginTime', + width: 120, + } + ] + }, + { + title: '备注', + dataIndex: 'mask', + } +]; + +export const searchFormSchema: FormSchema[] = [ + // { + // field: 'key', + // label: '关键字段', + // component: 'Input', + // colProps: { span: 6 }, + // }, + { + field: '[identification_start_time, identification_end_time]', + label: '日期范围', + component: 'RangePicker', + colProps: { span: 8 }, + componentProps: { + format: 'YYYY-MM-DD', + placeholder: ['开始日期', '结束日期'], + }, + }, + +]; + + + +export const formSchema: FormSchema[] = [ + { + field: 'id', + label: '角色名称', + required: true, + component: 'Input', + ifShow:false, + }, + { + field: 'name', + label: '角色名称', + required: true, + component: 'Input', + }, + { + field: 'status', + label: '状态', + component: 'RadioButtonGroup', + defaultValue: 0, + componentProps: { + options: [ + { label: '启用', value: 0}, + { label: '停用', value: 1 }, + ], + }, + }, +]; diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue index 864714ef..5358154c 100644 --- a/src/views/demo/workflow/task/process/audit.vue +++ b/src/views/demo/workflow/task/process/audit.vue @@ -11,7 +11,7 @@ - + -
+
- +
- +