From 1b55cb54354904ae4e15f939285cfe533c31dce5 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Thu, 31 Jul 2025 09:50:04 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E7=9F=A5=E8=AF=86=E5=BA=93=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/FileUpload/index.js | 10 +- src/models/auth/_.ts | 6 + src/models/map/index.ts | 26 + src/models/runtime/index.ts | 2 +- src/service/apiurl.js | 27 + src/service/warn.js | 9 + src/views/AppRouters.tsx | 8 +- .../SearchResultList/index.js | 46 ++ .../SearchResultList/index.less | 104 ++++ src/views/Home/homePanelsLayoutPage/index.js | 507 +++++++++++------- src/views/Home/index.tsx | 1 - src/views/sz/ddfa/form.js | 66 ++- src/views/sz/ddfa/index.js | 19 +- src/views/sz/ddfa/toolbar.js | 25 +- .../sz/khzbgl/AdcdTreeSelector/index.less | 47 ++ .../sz/khzbgl/AdcdTreeSelector/index.tsx | 311 +++++++++++ src/views/sz/khzbgl/form.js | 130 +++++ src/views/sz/khzbgl/index.js | 120 +++++ src/views/sz/khzbgl/toolbar.js | 51 ++ src/views/sz/ywgz/form.js | 147 +++++ src/views/sz/ywgz/index.js | 98 ++++ src/views/sz/ywgz/toolbar.js | 69 +++ 22 files changed, 1583 insertions(+), 246 deletions(-) create mode 100644 src/views/Home/homePanelsLayoutPage/SearchResultList/index.js create mode 100644 src/views/Home/homePanelsLayoutPage/SearchResultList/index.less create mode 100644 src/views/sz/khzbgl/AdcdTreeSelector/index.less create mode 100644 src/views/sz/khzbgl/AdcdTreeSelector/index.tsx create mode 100644 src/views/sz/khzbgl/form.js create mode 100644 src/views/sz/khzbgl/index.js create mode 100644 src/views/sz/khzbgl/toolbar.js create mode 100644 src/views/sz/ywgz/form.js create mode 100644 src/views/sz/ywgz/index.js create mode 100644 src/views/sz/ywgz/toolbar.js diff --git a/src/components/Form/FileUpload/index.js b/src/components/Form/FileUpload/index.js index 024f964a3..6977a6216 100644 --- a/src/components/Form/FileUpload/index.js +++ b/src/components/Form/FileUpload/index.js @@ -10,7 +10,7 @@ const { RangePicker } = DatePicker const { Dragger } = Upload; const url = "http://223.75.53.141:9100/gs-tsg" -const FileUpload = ({mode, fileNum=1, value, onChange}) => { +const FileUpload = ({mode, fileNum=1, value, onChange,uploadUrl}) => { const [fileList, setFileList] = useState([]) //上传文件列表 const [loading, setLoading] = useState(false) console.log(1111111,fileList); @@ -47,8 +47,8 @@ const FileUpload = ({mode, fileNum=1, value, onChange}) => { useEffect(()=>{ if(onChange && fileList){ - let oldFiles = fileList.map(item => (item.response?.data??item)) - onChange(oldFiles) + let oldFiles = fileList.map(item => (item.response?.data.fileId)) + onChange(oldFiles.join(',')) } },[fileList]) @@ -59,7 +59,7 @@ const FileUpload = ({mode, fileNum=1, value, onChange}) => { mode!=='view' && { console.log(info.dataTransfer.files); }} fileList={fileList} @@ -73,7 +73,7 @@ const FileUpload = ({mode, fileNum=1, value, onChange}) => {

} - + ) } diff --git a/src/models/auth/_.ts b/src/models/auth/_.ts index ea39817d4..33b8c5f99 100644 --- a/src/models/auth/_.ts +++ b/src/models/auth/_.ts @@ -300,6 +300,12 @@ export async function loadMenu(): Promise { { id: id(), title: '调度方案库', path: '/mgr/sz/zsk/ddfa', }, + { + id: id(), title: '业务规则库', path: '/mgr/sz/zsk/ywgz', + }, + { + id: id(), title: '工程安全知识库', path: '/mgr/sz/zsk/gcaq', + }, ] }, diff --git a/src/models/map/index.ts b/src/models/map/index.ts index e91f00260..4858950e4 100644 --- a/src/models/map/index.ts +++ b/src/models/map/index.ts @@ -126,6 +126,28 @@ export const map = createModel()({ state: initState() as MapCtrlState, reducers: { + // 新增只关闭业务图层的方法（保留基础底图） + closeBusinessLayers(state): MapCtrlState{ + const s = { ...state }; + const businessLayersClosed: Record = {}; + + // 关闭特定的业务图层 + const businessLayers = [ + "HdswLayer", "RealDrpLayer", "SYLayer", "TuRangLayer", "PicStLayer", 'AZDLayer', "QSYDWLayer", 'YHJMHLayer', + "ShuiKuLayer" + ]; + + businessLayers.forEach(layer => { + businessLayersClosed[layer] = false; + }); + + s.layerVisible = { + ...s.layerVisible, + ...businessLayersClosed, + }; + + return s; + }, setMap(state, map) { return { ...state, @@ -248,6 +270,10 @@ export const map = createModel()({ }).filter(Boolean); dispatch.runtime.setLayerSetting({ highlight: records }) + }, + // 新增只关闭业务图层的effect方法 + closeBusinessLayersEffect() { + dispatch.map.closeBusinessLayers(); }, resetMap() { dispatch.map.reset(); diff --git a/src/models/runtime/index.ts b/src/models/runtime/index.ts index 6cab31f59..20c7195f8 100644 --- a/src/models/runtime/index.ts +++ b/src/models/runtime/index.ts @@ -25,7 +25,7 @@ export const runtime = createModel()({ layerSetting: {}, layerSettingLoop: {}, hasRightPanel: true, - showGlobalSearch: false, + showGlobalSearch: true, leftActiveTab: '', rainLayerTm: '2022070108', hasAlertBox: false, diff --git a/src/service/apiurl.js b/src/service/apiurl.js index 3527a3652..e24b471bc 100644 --- a/src/service/apiurl.js +++ b/src/service/apiurl.js @@ -10,6 +10,33 @@ const service_fxdd = '/gunshiApp/tsg' const service_xyt = '/gunshiApp/tsg'//登陆先用小玉潭 const service_shzh = '/shzh' const apiurl = { + zsk: { + ddfa: { + page: service_fxdd + "/dispatchScheme/pageByTm", + save:service_fxdd + "/dispatchScheme/add", + edit: service_fxdd + "/dispatchScheme/update", + del: service_fxdd + "/dispatchScheme/delete", + upload:service_fxdd + "/dispatchScheme/file/upload/singleSimple", + }, + ywgz: { + page: service_fxdd + "/businessRule/pageByTm", + save:service_fxdd + "/businessRule/add", + edit: service_fxdd + "/businessRule/update", + del: service_fxdd + "/businessRule/delete", + upload:service_fxdd + "/businessRule/file/upload/singleSimple", + }, + gcaq: { + page: service_fxdd + "/projectSafety/pageByTm", + save:service_fxdd + "/projectSafety/add", + edit: service_fxdd + "/projectSafety/update", + del: service_fxdd + "/projectSafety/delete", + upload: service_fxdd + "/projectSafety/file/upload/singleSimple", + tree: service_fxdd + "/projectSafety/listCategory", + saveTree: service_fxdd + "/projectSafety/addCategory", + editTree: service_fxdd + "/projectSafety/updateCategory", + deleteTree: service_fxdd + "/projectSafety/delCategory", + } + }, file:{ upload:baseFileUpLoad, download:baseFileDownLoad, diff --git a/src/service/warn.js b/src/service/warn.js index 766fb3a4a..c61da0ac6 100644 --- a/src/service/warn.js +++ b/src/service/warn.js @@ -44,6 +44,15 @@ export async function getjdTreeData(params = {}) { } return data; } + +export async function getGcaqTreeData(params = {}) { + const { data, code, msg } = await httpget(apiurl.zsk.gcaq.tree) || {}; + if (code !== 200) { + message.error(msg || '请求失败'); + return []; + } + return data; +} //获取行政区划树下拉 中电科接口 export async function getAdcdTreeData() { const { data, code, msg } = await httpget(apiurl.getTreeData); diff --git a/src/views/AppRouters.tsx b/src/views/AppRouters.tsx index e0b0dbf89..bc43ee791 100644 --- a/src/views/AppRouters.tsx +++ b/src/views/AppRouters.tsx @@ -116,7 +116,8 @@ import Ddfa from './sz/ddfa' import Krgl from './KrLine' import Gsnlfx from './gxsl/gsnlfx' import Ddjl from './szydd/ddjl' - +import Ywgz from './sz/ywgz' +import Gcaq from './sz/khzbgl' const HomePage = lazy(() => import('./Home')) @@ -284,10 +285,9 @@ const AppRouters: React.FC = () => { { path: 'sz/szzf/clyj', element: }, { path: 'sz/zsk/ddfa', element: }, + { path: 'sz/zsk/ywgz', element: }, + { path: 'sz/zsk/gcaq', element: }, - - - ], }, { path: '/login', element: }, diff --git a/src/views/Home/homePanelsLayoutPage/SearchResultList/index.js b/src/views/Home/homePanelsLayoutPage/SearchResultList/index.js new file mode 100644 index 000000000..2a5eb45d2 --- /dev/null +++ b/src/views/Home/homePanelsLayoutPage/SearchResultList/index.js @@ -0,0 +1,46 @@ +import React from 'react'; +import './index.less'; +import appconsts from '../../../../service/appconsts'; + +/** + * 搜索结果列表组件 + * @param {Array} data - 搜索结果数据数组，每个项目应包含 name 和 type 属性 + * @param {Function} onItemClick - 点击列表项的回调函数 + * @param {String} title - 可选的标题，默认为"搜索结果" + */ +const SearchResultList = ({ data = [], onItemClick, title = "搜索结果" }) => { + return ( +
+ {/*
+
{title}
+
共 {data.length} 条
+
*/} +
+
+
名称
+
类型
+
+
+ {data.length > 0 ? ( + data.map((item, index) => ( +
onItemClick && onItemClick(item)} + > +
{item.name}
+
+ {appconsts.GlobalSearch_Type[item.type] || item.type} +
+
+ )) + ) : ( +
暂无搜索结果
+ )} +
+
+
+ ); +}; + +export default SearchResultList; \ No newline at end of file diff --git a/src/views/Home/homePanelsLayoutPage/SearchResultList/index.less b/src/views/Home/homePanelsLayoutPage/SearchResultList/index.less new file mode 100644 index 000000000..1b6adc787 --- /dev/null +++ b/src/views/Home/homePanelsLayoutPage/SearchResultList/index.less @@ -0,0 +1,104 @@ +.search-result-list { + width: 100%; + background-color: #fff; + border-radius: 4px; + overflow: hidden; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1); + display: flex; + flex-direction: column; + height: 100%; +} + +.search-result-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 12px 16px; + border-bottom: 1px solid #f0f0f0; + flex-shrink: 0; /* 防止头部被压缩 */ +} + +.search-result-title { + font-size: 16px; + font-weight: 500; + color: #333; +} + +.search-result-count { + font-size: 14px; + color: #999; +} + +.search-result-table { + width: 100%; + flex: 1; + display: flex; + flex-direction: column; + overflow: hidden; /* 确保内容不溢出 */ +} + +.search-result-table-header { + display: flex; + background-color: #f0f5ff; + font-weight: 500; + flex-shrink: 0; /* 防止表头被压缩 */ +} + +.search-result-table-body { + flex: 1; + overflow-y: auto; /* 添加垂直滚动 */ + scrollbar-width: thin; /* Firefox 滚动条样式 */ +} + +/* 自定义滚动条样式 */ +.search-result-table-body::-webkit-scrollbar { + width: 6px; +} + +.search-result-table-body::-webkit-scrollbar-thumb { + background-color: #d9d9d9; + border-radius: 3px; +} + +.search-result-table-body::-webkit-scrollbar-track { + background-color: #f5f5f5; +} + +.search-result-table-row { + display: flex; + border-bottom: 1px solid #f0f0f0; + cursor: pointer; + transition: background-color 0.3s; + + &:hover { + background-color: #f5f5f5; + } + + &:last-child { + border-bottom: none; + } +} + +.search-result-table-cell { + padding: 12px 16px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.name-cell { + flex: 1; + text-align: left; +} + +.type-cell { + width: 120px; + text-align: right; +} + +.search-result-empty { + padding: 40px 0; + text-align: center; + color: #999; + font-size: 14px; +} \ No newline at end of file diff --git a/src/views/Home/homePanelsLayoutPage/index.js b/src/views/Home/homePanelsLayoutPage/index.js index ff3c8cc9e..9a597a204 100644 --- a/src/views/Home/homePanelsLayoutPage/index.js +++ b/src/views/Home/homePanelsLayoutPage/index.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react' import { useLocation } from 'react-router' import { useDispatch, useSelector } from 'react-redux' -import { Collapse, DatePicker } from 'antd'; +import { Collapse, DatePicker, Input } from 'antd'; import './index.less' import Yujing from './item_yujing/index.js' import Yuqing from './item_yuqing' @@ -30,222 +30,337 @@ import Tuli2 from '../TuLi/Tuli2.js'; import Tuli3 from '../TuLi/Tuli3.js' import Tuli4 from '../TuLi/Tuli4.js' import Tuli5 from '../TuLi/Tuli5.js' - +import SearchResultList from './SearchResultList'; import moment from 'moment'; const { Panel } = Collapse; const { RangePicker } = DatePicker; - +const { Search } = Input; const items = [ - { key:'1', label:'综合监视', children:[ - { key:'11', label:'预警', labelRight:'预警', icon:'yujing' }, - { key:'12', label:'雨情', labelRight:'统计', icon:'yuqing' }, - { key:'13', label:'水库水情', labelRight:'实时水情', icon:'shuikushuiqing' }, - { key:'19', label:'土壤墒情', labelRight:'土壤墒情', icon:'turangshangqing' }, - { key:'15', label:'工程安全', labelRight:'工程安全监测', icon:'gongchenganquan' }, - { key:'16', label:'监测设备状态', labelRight:'监测设备运行', icon:'jianceshebeizhuangtai' }, - // { key:'17', label:'水质', labelRight:'水质', icon:'shuizhi' }, - { key:'18', label:'视频点', labelRight:'视频点', icon:'shipindian' }, - ] }, - { key:'2', label:'巡查巡检', children:[ - { key:'21', label:'巡查巡检', labelRight:'工程巡检', icon:'jianceshebeizhuangtai' }, - // { key:'22', label:'大坝', labelRight:'基本信息', icon:'daba' }, - // { key:'23', label:'溢洪道', labelRight:'基本信息', icon:'yihongdao' }, - ] }, - { key:'3', label:'洪水防御', children:[ - { key:'31', label:'危险区', labelRight:'危险区列表', icon:'weixianqu' }, - { key:'32', label:'安置点', labelRight:'安置点列表', icon:'anzhidian' }, - { key:'33', label:'企事业单位', labelRight:'企事业单位列表', icon:'qishiyedanwei' }, - { key:'34', label:'沿河居民户', labelRight:'沿河居民户列表', icon:'yanhejuminhu' }, - ] }, - { key:'4', label:'水资源调度', children:[ - { key:'41', label:'供水', labelRight:'今日供水实况', icon:'gongshui' }, - ] }, - { key:'5', label:'水库工程', children:[ - { key:'51', label:'水库', labelRight:'基本信息', icon:'shuiku' }, - { key:'52', label:'大坝', labelRight:'基本信息', icon:'daba' }, - { key:'53', label:'溢洪道', labelRight:'基本信息', icon:'yihongdao' }, - ] }, + { + key: '1', label: '综合监视', children: [ + { key: '11', label: '预警', labelRight: '预警', icon: 'yujing' }, + { key: '12', label: '雨情', labelRight: '统计', icon: 'yuqing' }, + { key: '13', label: '水库水情', labelRight: '实时水情', icon: 'shuikushuiqing' }, + { key: '19', label: '土壤墒情', labelRight: '土壤墒情', icon: 'turangshangqing' }, + { key: '15', label: '工程安全', labelRight: '工程安全监测', icon: 'gongchenganquan' }, + { key: '16', label: '监测设备状态', labelRight: '监测设备运行', icon: 'jianceshebeizhuangtai' }, + // { key:'17', label:'水质', labelRight:'水质', icon:'shuizhi' }, + { key: '18', label: '视频点', labelRight: '视频点', icon: 'shipindian' }, + ] + }, + { + key: '2', label: '巡查巡检', children: [ + { key: '21', label: '巡查巡检', labelRight: '工程巡检', icon: 'jianceshebeizhuangtai' }, + // { key:'22', label:'大坝', labelRight:'基本信息', icon:'daba' }, + // { key:'23', label:'溢洪道', labelRight:'基本信息', icon:'yihongdao' }, + ] + }, + { + key: '3', label: '洪水防御', children: [ + { key: '31', label: '危险区', labelRight: '危险区列表', icon: 'weixianqu' }, + { key: '32', label: '安置点', labelRight: '安置点列表', icon: 'anzhidian' }, + { key: '33', label: '企事业单位', labelRight: '企事业单位列表', icon: 'qishiyedanwei' }, + { key: '34', label: '沿河居民户', labelRight: '沿河居民户列表', icon: 'yanhejuminhu' }, + ] + }, + { + key: '4', label: '水资源调度', children: [ + { key: '41', label: '供水', labelRight: '今日供水实况', icon: 'gongshui' }, + ] + }, + { + key: '5', label: '水库工程', children: [ + { key: '51', label: '水库', labelRight: '基本信息', icon: 'shuiku' }, + { key: '52', label: '大坝', labelRight: '基本信息', icon: 'daba' }, + { key: '53', label: '溢洪道', labelRight: '基本信息', icon: 'yihongdao' }, + ] + }, ] -const HomePage = ({showPanels}) => { +const HomePage = ({ showPanels }) => { - const dispatch = useDispatch(); - const [ checkedObj, setCheckedObj ] = useState({}) - const [ showTable, setShowTable ] = useState(false) - const [ tms , setTms ] = useState([ - moment(moment().add(-1,'days').format('YYYY-MM-DD 08:00:00')), - moment(moment().format('YYYY-MM-DD 08:00:00')), - ]) + const dispatch = useDispatch(); + const [checkedObj, setCheckedObj] = useState({}) + const [showTable, setShowTable] = useState(false) + const [tms, setTms] = useState([ + moment(moment().add(-1, 'days').format('YYYY-MM-DD 08:00:00')), + moment(moment().format('YYYY-MM-DD 08:00:00')), + ]) + + // 在 globalSearch 函数中添加搜索结果状态 + const [searchResults, setSearchResults] = useState([]); + const globalSearch = (e) => { + if (e && e.trim() !== '') { + // 设置为空白状态 + setShowTable(true); + // 创建一个新的空对象，只保留必要的属性用于显示 + setCheckedObj({ + key: 'search', + label: '搜索结果', + labelRight: `搜索：${e}`, + icon: 'search' + }); + + // 模拟数据 + setTimeout(() => { + const mockResults = [ + { id: '1', name: '檀树岗水情站', type: 'swst', lgtd: 114.75, lttd: 31.493 }, + { id: '2', name: '檀树岗雨情站', type: 'qxst', lgtd: 114.76, lttd: 31.495 }, + { id: '3', name: '檀树岗渗压站', type: 'shst', lgtd: 114.77, lttd: 31.497 }, + { id: '4', name: '檀树岗位移站', type: 'shst', lgtd: 114.78, lttd: 31.499 }, + { id: '5', name: '檀树岗渗流站', type: 'shst', lgtd: 114.79, lttd: 31.501 }, + { id: '6', name: '檀树岗土壤墒情站', type: 'stinfo', lgtd: 114.80, lttd: 31.503 }, + { id: '7', name: '檀树岗流量站', type: 'swst', lgtd: 114.81, lttd: 31.505 }, + { id: '8', name: '檀树岗视频站', type: 'picst', lgtd: 114.82, lttd: 31.507 }, + { id: '9', name: '檀树岗湾', type: 'danad', lgtd: 114.83, lttd: 31.509 }, + { id: '10', name: '檀树湾', type: 'placement', lgtd: 114.84, lttd: 31.511 }, + { id: '11', name: '七里坪镇檀树中学', type: 'bsnssinfo', lgtd: 114.85, lttd: 31.513 }, + { id: '12', name: '檀某某', type: 'flrvvlg', lgtd: 114.86, lttd: 31.515 }, + { id: '13', name: '檀树岗调度方案', type: 'reservoir', lgtd: 114.87, lttd: 31.517 }, + { id: '14', name: '檀树岗调度规则', type: 'reservoir', lgtd: 114.88, lttd: 31.519 }, + { id: '15', name: '檀树岗工程安全知识', type: 'daminfo', lgtd: 114.89, lttd: 31.521 }, + ]; + setSearchResults(mockResults); + }, 500); + } + } + + const clickItem = (item) => { + // 判断是否为知识库或安全监测站类型 + const isKnowledgeOrMonitoringStation = item.type === 'daminfo' || item.type === 'stinfo'; + // 如果有经纬度信息，则进行处理 + if (item.lgtd && item.lttd) { + // 关闭所有已打开的弹窗 + dispatch.runtime.closeFeaturePopAll(); + // 关闭所有业务图层 + // dispatch.map.closeBusinessLayersEffect(); + // 根据类型确定弹窗类型 + let popType = item.type; + + // 对特定类型进行映射 + if (item.type === 'swst') popType = 'hdsw'; // 水文站映射到河道水位 + if (item.type === 'qxst') popType = 'drp'; // 气象站映射到雨情 + if (item.type === 'picst') popType = 'picst'; // 视频站 + // 然后根据类型打开对应图层 + if (item.type === 'swst' || item.type === 'hdsw') { + dispatch.map.setLayerVisible({ HdswLayer: true }); + } else if (item.type === 'qxst' || item.type === 'drp') { + dispatch.map.setLayerVisible({ RealDrpLayer: true }); + } else if (item.type === 'picst') { + dispatch.map.setLayerVisible({ PicStLayer: true }); + } + // 显示弹窗 + dispatch.runtime.setFeaturePop({ + type: popType, + data: item, + lgtd: item.lgtd, + lttd: item.lttd, + id: item.id + }); + + // 如果不是知识库或安全监测站类型，则进行地图定位 + if (!isKnowledgeOrMonitoringStation) { + dispatch.runtime.setCameraTarget({ + center: [item.lgtd, item.lttd], + zoom: 15, + pitch: 60 + }); + } + } + } + + useEffect(() => { + dispatch.runtime.closeFeaturePopAll() + // 如果是搜索结果，不要关闭图层 + if (checkedObj.label === '搜索结果') { + // 可以选择保持当前图层状态，或者显示某些默认图层 + return; + } + if (checkedObj.label === '水库' || checkedObj.label === '大坝' || checkedObj.label === '溢洪道' || checkedObj.label === '视频点') { + dispatch.map.setLayerVisible({ PicStLayer: true }) + } else { + dispatch.map.setLayerVisible({ PicStLayer: false }) + } + + if (checkedObj.label === '危险区' || checkedObj.label === '安置点' || checkedObj.label === '企事业单位' || checkedObj.label === '沿河居民户') { + dispatch.map.setLayerVisible({ AZDLayer: true }) + dispatch.map.setLayerVisible({ QSYDWLayer: true }) + dispatch.map.setLayerVisible({ YHJMHLayer: true }) + } else { + dispatch.map.setLayerVisible({ AZDLayer: false }) + dispatch.map.setLayerVisible({ QSYDWLayer: false }) + dispatch.map.setLayerVisible({ YHJMHLayer: false }) + } + + return () => { + dispatch.runtime.closeFeaturePopAll() + dispatch.map.setLayerVisible({ PicStLayer: false }) + dispatch.map.setLayerVisible({ AZDLayer: false }) + dispatch.map.setLayerVisible({ QSYDWLayer: false }) + dispatch.map.setLayerVisible({ YHJMHLayer: false }) + } + }, [checkedObj]) + + useEffect(() => { + setCheckedObj({ key: '12', label: '雨情', labelRight: '统计', icon: 'yuqing' }) + }, []) - useEffect(()=>{ - dispatch.runtime.closeFeaturePopAll() - if(checkedObj.label==='水库'||checkedObj.label==='大坝'||checkedObj.label==='溢洪道'||checkedObj.label==='视频点'){ - - dispatch.map.setLayerVisible({ PicStLayer: true }) - }else{ - dispatch.map.setLayerVisible({ PicStLayer: false }) - } - - if(checkedObj.label==='危险区'||checkedObj.label==='安置点'||checkedObj.label==='企事业单位'||checkedObj.label==='沿河居民户'){ - dispatch.map.setLayerVisible({ AZDLayer: true }) - dispatch.map.setLayerVisible({ QSYDWLayer: true }) - dispatch.map.setLayerVisible({ YHJMHLayer: true }) - }else{ - dispatch.map.setLayerVisible({ AZDLayer: false }) - dispatch.map.setLayerVisible({ QSYDWLayer: false }) - dispatch.map.setLayerVisible({ YHJMHLayer: false }) - } - - return ()=>{ - dispatch.runtime.closeFeaturePopAll() - dispatch.map.setLayerVisible({ PicStLayer: false }) - dispatch.map.setLayerVisible({ AZDLayer: false }) - dispatch.map.setLayerVisible({ QSYDWLayer: false }) - dispatch.map.setLayerVisible({ YHJMHLayer: false }) - } - },[checkedObj]) - - useEffect(()=>{ - setCheckedObj({ key:'12', label:'雨情', labelRight:'统计', icon:'yuqing' }) - },[]) - - - return ( -
-
-
综合展示
- { - dispatch.runtime.closeFeaturePopAll() - if(a===undefined){ - setCheckedObj({ key:'12', label:'雨情', labelRight:'统计', icon:'yuqing' }) - setShowTable(false) - }else if(a==='1'){ - setShowTable(true) - dispatch.runtime.setHome() - setCheckedObj({ key:'11', label:'预警', labelRight:'预警', icon:'yujing' }) - }else if(a==='2'){ - setShowTable(true) - // dispatch.runtime.setHome() - setCheckedObj({ key:'21', label:'巡查巡检', labelRight:'工程巡检', icon:'shuiku' }) - }else if(a==='3'){ - dispatch.runtime.setCameraTarget({ - center: [114.75, 31.493], - zoom: 13.5, - pitch: 60 - }) - setShowTable(true) - setCheckedObj({ key:'31', label:'危险区', labelRight:'危险区列表', icon:'weixianqu' }) - }else if(a==='4'){ - setCheckedObj({ key:'41', label:'供水', labelRight:'今日供水实况', icon:'gongshui' }) - }else if(a==='5'){ - setCheckedObj({ key:'51', label:'水库', labelRight:'基本信息', icon:'shuiku' }) - setShowTable(true) - }else{ - } - }} expandIconPosition="end" accordion={true} bordered={false}> - { - items.map((item,index)=> - -
-
- {item.label} -
- - } - > - { - item.children.map((item)=> - { - setCheckedObj(item) - setShowTable(true) - }}> - - {item.label} - { - (checkedObj.key===item.key&&showTable)? -
-
-
- :null - } - - ) - } - - ) - } - -
+ return ( +
+
+ +
综合展示
+ { + dispatch.runtime.closeFeaturePopAll() + if (a === undefined) { + setCheckedObj({ key: '12', label: '雨情', labelRight: '统计', icon: 'yuqing' }) + setShowTable(false) + } else if (a === '1') { + setShowTable(true) + dispatch.runtime.setHome() + setCheckedObj({ key: '11', label: '预警', labelRight: '预警', icon: 'yujing' }) + } else if (a === '2') { + setShowTable(true) + // dispatch.runtime.setHome() + setCheckedObj({ key: '21', label: '巡查巡检', labelRight: '工程巡检', icon: 'shuiku' }) + } else if (a === '3') { + dispatch.runtime.setCameraTarget({ + center: [114.75, 31.493], + zoom: 13.5, + pitch: 60 + }) + setShowTable(true) + setCheckedObj({ key: '31', label: '危险区', labelRight: '危险区列表', icon: 'weixianqu' }) + } else if (a === '4') { + setCheckedObj({ key: '41', label: '供水', labelRight: '今日供水实况', icon: 'gongshui' }) + } else if (a === '5') { + setCheckedObj({ key: '51', label: '水库', labelRight: '基本信息', icon: 'shuiku' }) + setShowTable(true) + } else { + } + }} expandIconPosition="end" accordion={true} bordered={false}> + { + items.map((item, index) => + +
+
+ {item.label} +
+ + } + > + { + item.children.map((item) => + { + setCheckedObj(item) + setShowTable(true) + }}> + + {item.label} + { + (checkedObj.key === item.key && showTable) ? +
+
+
+ : null + } + + ) + } + + ) + } + +
+ { + (checkedObj.label === '预警' || checkedObj.label === '雨情') ? +
+ : null + } + { + checkedObj.labelRight ? +
{ - (checkedObj.label === '预警'||checkedObj.label === '雨情')? -
- :null + showTable ? +
+ { + checkedObj.key != 'search' ? +
+ + {checkedObj.labelRight} +
: +
+
+
{checkedObj.labelRight}
+
+ } + +
+ {/* */} +
+
: null } - { - checkedObj.labelRight? -
- { - showTable? -
-
- - {checkedObj.labelRight} -
-
- {/* */} -
-
:null - } - { checkedObj.label === '预警' ? <>:null } - { checkedObj.label === '雨情' ? :null } - { checkedObj.label === '水库水情' ? :null } - { checkedObj.label === '土壤墒情' ? :null } - { checkedObj.label === '供水' ? :null } - { checkedObj.label === '工程安全' ? :null } - { checkedObj.label === '监测设备状态' ? :null } - {/* { checkedObj.label === '水质' ? :null } */} - { checkedObj.label === '视频点' ? :null } + {checkedObj.label === '搜索结果' ?
+ clickItem(item)} + /> +
: null} + {checkedObj.label === '预警' ? <> : null} + {checkedObj.label === '雨情' ? : null} + {checkedObj.label === '水库水情' ? : null} + {checkedObj.label === '土壤墒情' ? : null} + {checkedObj.label === '供水' ? : null} + {checkedObj.label === '工程安全' ? : null} + {checkedObj.label === '监测设备状态' ? : null} + {/* { checkedObj.label === '水质' ? :null } */} + {checkedObj.label === '视频点' ? : null} - { checkedObj.label === '巡查巡检' ? :null } + {checkedObj.label === '巡查巡检' ? : null} - { checkedObj.label === '水库' ? :null } - { checkedObj.label === '大坝' ? :null } - { checkedObj.label === '溢洪道' ? :null } + {checkedObj.label === '水库' ? : null} + {checkedObj.label === '大坝' ? : null} + {checkedObj.label === '溢洪道' ? : null} - { checkedObj.label === '危险区' ? :null } - { checkedObj.label === '安置点' ? :null } - { checkedObj.label === '企事业单位' ? :null } - { checkedObj.label === '沿河居民户' ? :null } + {checkedObj.label === '危险区' ? : null} + {checkedObj.label === '安置点' ? : null} + {checkedObj.label === '企事业单位' ? : null} + {checkedObj.label === '沿河居民户' ? : null} - { checkedObj.label === '危险区' || checkedObj.label === '安置点' || checkedObj.label === '企事业单位' || checkedObj.label === '沿河居民户'?:null } -
- :null - } + {checkedObj.label === '危险区' || checkedObj.label === '安置点' || checkedObj.label === '企事业单位' || checkedObj.label === '沿河居民户' ? : null} +
+ : null + } - { - checkedObj.label === '工程安全' ?
- -
:null - } + { + checkedObj.label === '工程安全' ?
+ +
: null + } -
- { checkedObj.label==='雨情'?:null } - { checkedObj.label==='水库水情'?:null } - { checkedObj.label==='供水'?:null } - { (checkedObj.label==='水库'||checkedObj.label==='大坝'||checkedObj.label==='溢洪道'||checkedObj.label==='视频点')?:null } - { (checkedObj.label==='危险区'||checkedObj.label==='安置点'||checkedObj.label==='企事业单位'||checkedObj.label==='沿河居民户')?:null } -
- -
- ) +
+ {checkedObj.label === '雨情' ? : null} + {checkedObj.label === '水库水情' ? : null} + {checkedObj.label === '供水' ? : null} + {(checkedObj.label === '水库' || checkedObj.label === '大坝' || checkedObj.label === '溢洪道' || checkedObj.label === '视频点') ? : null} + {(checkedObj.label === '危险区' || checkedObj.label === '安置点' || checkedObj.label === '企事业单位' || checkedObj.label === '沿河居民户') ? : null} +
+ +
+ ) } export default HomePage diff --git a/src/views/Home/index.tsx b/src/views/Home/index.tsx index bbd39d234..deb9c1f08 100644 --- a/src/views/Home/index.tsx +++ b/src/views/Home/index.tsx @@ -184,7 +184,6 @@ const HomePage = () => { {/* 地图 */} - {/*首页面板*/} {pathname === '/mgr/home' ? ( diff --git a/src/views/sz/ddfa/form.js b/src/views/sz/ddfa/form.js index f61dd1ce7..b04edd837 100644 --- a/src/views/sz/ddfa/form.js +++ b/src/views/sz/ddfa/form.js @@ -8,30 +8,46 @@ import FileUpload from '../../../components/Form/FileUpload' // import "./index.less" import moment from 'moment'; +import TextArea from 'antd/lib/input/TextArea'; -const opntios=[ - {value:0,label:'党支部工作制度'}, - {value:1,label:'行政工作制度'}, - {value:2,label:'部门工作制度'}, - {value:3,label:'安全管理制度'}, - {value:4,label:'工程管理制度'}, - {value:5,label:'技术规程'}, - {value:6,label:'岗位责任制'} + const opntios = [ + {value:1,label:'防洪调度'}, + {value:2,label:'兴利调度'}, + {value:3,label:'生态调度'}, + {value:4,label:'应急调度'}, + {value:5,label:'其他'}, ] + +const opntios1 = [ + {value:0,label:'已废弃'}, + {value:1,label:'生效中'}, + ] const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { const [form] = Form.useForm(); const [loading, setLoading] = useState(false) + const [filesParams, setFilesParams] = useState([]) const onfinish = (values) => { - debugger + const userId = localStorage.getItem("userId"); + const userName = localStorage.getItem("userName"); + values.tm = moment(values.bzsj).format("YYYY-MM-DD") if (mode === 'edit') { - // onEdit(apiurl.zdgl.edit, {...record,...values}) + onEdit(apiurl.zsk.ddfa.edit, {...record,...values,createUser:userName,fileIds: filesParams, files:undefined}) } if (mode === 'save') { - // onSave(apiurl.zdgl.add, values) + onSave(apiurl.zsk.ddfa.save, {...values,createUser:userName,fileIds: filesParams, files:undefined}) } } +useEffect(() => { + if (mode != 'save') { + const tm = record?.tm ? moment(record?.tm) : ''; + form.setFieldValue('bzsj', tm) + if (record?.files.length > 0) { + setFilesParams(record?.files.split(',')) + } + } +}, [mode]) @@ -43,30 +59,30 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { onFinish={onfinish} initialValues={record} > - - + - dateString} getValueProps={(value) => ({ value: value ? moment(value) : undefined })} > @@ -76,9 +92,20 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { - + + + + + @@ -90,7 +117,8 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { labelCol={{ span: 3 }} wrapperCol={{ span: 19 }} > - diff --git a/src/views/sz/ddfa/index.js b/src/views/sz/ddfa/index.js index 663030ed0..daee655b7 100644 --- a/src/views/sz/ddfa/index.js +++ b/src/views/sz/ddfa/index.js @@ -13,7 +13,8 @@ import { httpgetExport } from '../../../utils/request'; import { exportFile } from '../../../utils/tools'; import dayjs from 'dayjs'; -const obj={0:"党支部工作制度",1:"行政工作制度",2:"部门工作制度",3:"安全管理制度",4:"工程管理制度",5:"技术规程",6:"岗位责任制"} +const obj = { 1: "防洪调度", 2: "兴利调度", 3: "生态调度", 4: "应急调度", 5: "其他" } +const sobj = {0:'已废弃',1:'生效中'} const Page = () => { const refModal = useRef(); @@ -22,12 +23,12 @@ const Page = () => { { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, { title: '方案名称', key: 'name', dataIndex: 'name', ellipsis: true }, { title: '调度类型', key: 'type', dataIndex: 'type',render:(v)=><>{obj[v]}}, - { title: '简介', key: 'releaseDate', dataIndex: 'releaseDate', render: (value) => {value ? dayjs(value).format('YYYY-MM-DD') : ''}}, - { title: '编制时间', key: 'fillUnit', dataIndex: 'fillUnit'}, - { title: '附件数', key: 'minUpTime', dataIndex: 'minUpTime'}, - { title: '状态', key: 'minUpTime', dataIndex: 'minUpTime'}, - { title: '创建人', key: 'minUpTime', dataIndex: 'minUpTime'}, - { title: '最后更新时间', key: 'minUpTime', dataIndex: 'minUpTime'}, + { title: '简介', key: 'content', dataIndex: 'content'}, + { title: '编制时间', key: 'tm', dataIndex: 'tm'}, + { title: '附件数', key: 'fileCount', dataIndex: 'fileCount'}, + { title: '状态', key: 'status', dataIndex: 'status',render:(v)=><>{sobj[v]}}, + { title: '创建人', key: 'createUser', dataIndex: 'createUser'}, + { title: '最后更新时间', key: 'updateTm', dataIndex: 'updateTm'}, { title: '操作', key: 'operation', fixed: 'right', align: 'center', render: (value, row, index) => ( @@ -49,12 +50,12 @@ const Page = () => { } else if (type === 'view') { refModal.current.showView(params); } else if (type === 'del') { - refModal.current.onDeleteGet(apiurl.zdgl.del + `/${params.id}`); + refModal.current.onDeleteGet(apiurl.zsk.ddfa.del + `/${params.id}`); } } - const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.zdgl.list).find_noCode); + const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.zsk.ddfa.page).find_noCode); useEffect(() => { diff --git a/src/views/sz/ddfa/toolbar.js b/src/views/sz/ddfa/toolbar.js index 4b17964a1..a113a80e7 100644 --- a/src/views/sz/ddfa/toolbar.js +++ b/src/views/sz/ddfa/toolbar.js @@ -9,20 +9,23 @@ const ToolBar = ({ setSearchVal, onSave }) => { const onFinish = (values) => { const {releaseDate,...ret} = values if(releaseDate){ - ret.stm = moment(values.releaseDate[0]).format('YYYY-MM-DD HH:mm:ss') - ret.etm = moment(values.releaseDate[1]).format('YYYY-MM-DD HH:mm:ss') + ret.stm = moment(values.releaseDate[0]).format('YYYY-MM-DD') + ret.etm = moment(values.releaseDate[1]).format('YYYY-MM-DD') } setSearchVal(ret); } const opntios = [ - {value:0,label:'党支部工作制度'}, - {value:1,label:'行政工作制度'}, - {value:2,label:'部门工作制度'}, - {value:3,label:'安全管理制度'}, - {value:4,label:'工程管理制度'}, - {value:5,label:'技术规程'}, - {value:6,label:'岗位责任制'} + {value:1,label:'防洪调度'}, + {value:2,label:'兴利调度'}, + {value:3,label:'生态调度'}, + {value:4,label:'应急调度'}, + {value:5,label:'其他'}, + ] + + const opntios1 = [ + {value:0,label:'已废弃'}, + {value:1,label:'生效中'}, ] return ( @@ -38,8 +41,8 @@ const ToolBar = ({ setSearchVal, onSave }) => { - - + + + + + + + + + ); +}; + +export default AdcdTreeSelector; diff --git a/src/views/sz/khzbgl/form.js b/src/views/sz/khzbgl/form.js new file mode 100644 index 000000000..3b0f9cb08 --- /dev/null +++ b/src/views/sz/khzbgl/form.js @@ -0,0 +1,130 @@ +import React, { useEffect, useState, useMemo, useRef } from 'react'; +import { Form, Button, Input, Row, Upload, Col, Table, DatePicker, InputNumber, message, Image, Modal, Typography, Select } from 'antd'; +import { DeleteOutlined, FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons'; +import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps'; +import apiurl from '../../../service/apiurl'; +import NormalSelect from '../../../components/Form/NormalSelect'; +import FileUpload from '../../../components/Form/FileUpload' + +// import "./index.less" +import moment from 'moment'; +import TextArea from 'antd/lib/input/TextArea'; + + const opntios = [ + {value:1,label:'水资源调度'}, + {value:2,label:'防洪调度'}, + {value:3,label:'工程安全'}, + {value:4,label:'应急抢险'}, + {value:5,label:'其他'}, + ] + +const opntios1 = [ + {value:0,label:'已废弃'}, + {value:1,label:'生效中'}, + ] +const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { + const [form] = Form.useForm(); + const [loading, setLoading] = useState(false) + const [filesParams, setFilesParams] = useState([]) + const onfinish = (values) => { + const userId = localStorage.getItem("userId"); + const userName = localStorage.getItem("userName"); + values.tm = moment(values.bzsj).format("YYYY-MM-DD") + if (mode === 'edit') { + onEdit(apiurl.zsk.gcaq.edit, { ...record, ...values, createUser: userName, fileIds: filesParams, files:undefined}) + } + if (mode === 'save') { + onSave(apiurl.zsk.gcaq.save, {...values,createUser:userName,fileIds:filesParams,files:undefined,type:record?.code}) + } + } + +useEffect(() => { + if (mode != 'save') { + const tm = record?.tm ? moment(record?.tm) : ''; + form.setFieldValue('bzsj', tm) + if (record?.files.length > 0) { + setFilesParams(record?.files) + } + } +}, [mode,record]) + + + + + return ( + <> +
+ + + + + + + + + dateString} + getValueProps={(value) => ({ value: value ? moment(value) : undefined })} + > + + + + + + + + + + + + + + { setFilesParams(v)}} + value={filesParams} + /> + + + + { + mode === 'view' ? null : ( + <> + + + + + ) + } +
+ + ); +} + +export default ModalForm; diff --git a/src/views/sz/khzbgl/index.js b/src/views/sz/khzbgl/index.js new file mode 100644 index 000000000..a0ea26043 --- /dev/null +++ b/src/views/sz/khzbgl/index.js @@ -0,0 +1,120 @@ +import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react'; +import BasicCrudModal from '../../../components/crud/BasicCrudModal'; +import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image, Switch } from 'antd'; +import { FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons'; +import { useSelector } from 'react-redux'; +import AdcdTreeSelector from "./AdcdTreeSelector"; +import ToolBar from './toolbar'; +import ModalForm from './form'; +import apiurl from '../../../service/apiurl'; +import usePageTable from '../../../components/crud/usePageTable2'; +import { createCrudService } from '../../../components/crud/_'; +import { CrudOpRender_text } from '../../../components/crud/CrudOpRender'; + +const url = "http://223.75.53.141:9100/gs-tsg" +const Page = () => { + const role = useSelector(state => state.auth.role); + const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true; + const delBtn = role?.rule?.find(item => item.menuName == "删除") || true; + const refModal = useRef(); + const columns = [ + { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, + { title: '标题', key: 'name', dataIndex: 'name', width: 200 }, + { title: '简介', key: 'content', dataIndex: 'content' }, + { title: '编制时间', key: 'tm', dataIndex: 'tm' }, + { title: '附件数', key: 'fileCount', dataIndex: 'fileCount' }, + { title: '创建人', key: 'createUser', dataIndex: 'createUser' }, + { title: '最后更新时间', key: 'updateTm', dataIndex: 'updateTm' }, + { + title: '操作', key: 'operation', width: 200, fixed: 'right', align: 'center', + render: (value, row, index) => ( + () => command(cmd)(row)} />) + }, + ]; + const [code, setCode] = useState() + const [searchVal, setSearchVal] = useState(false) + + + const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]); + + + + const command = (type) => (params) => { + if (type === 'save') { + refModal.current.showSave({ code }); + } else if (type === 'edit') { + refModal.current.showEdit({ ...params, code }); + } else if (type === 'view') { + refModal.current.showView(params); + } else if (type === 'del') { + refModal.current.onDeleteGet(apiurl.zsk.gcaq.del + `/${params.id}`); + } + } + + + + const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.zsk.gcaq.page).find_noCode); + + const onEdit = (path, values) => { + createCrudService(path).edit(values).then((result) => { + if (result?.code === 200) { + refresh() + } + }) + } + useEffect(() => { + if (code) { + let params = { + search: { + type: code, + ...searchVal, + } + }; + search(params) + } + }, [code, searchVal]); + + + return ( + <> +
+
+ +
+
+ + + + + + + + + + + + + ); +} + +export default Page; diff --git a/src/views/sz/khzbgl/toolbar.js b/src/views/sz/khzbgl/toolbar.js new file mode 100644 index 000000000..d5ff56d26 --- /dev/null +++ b/src/views/sz/khzbgl/toolbar.js @@ -0,0 +1,51 @@ +import React, { useEffect, useState } from 'react'; +import { Form, Input, Button, DatePicker } from 'antd'; + +import moment from 'moment'; +const { RangePicker } = DatePicker; +const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { + console.log("role", role); + + const addBtn = role?.rule?.find(item => item.menuName == "新增"); + const [form] = Form.useForm(); + + const onFinish = (values) => { + debugger + const { releaseDate, ...ret } = values + if (releaseDate) { + ret.stm = moment(values.releaseDate[0]).format('YYYY-MM-DD') + ret.etm = moment(values.releaseDate[1]).format('YYYY-MM-DD') + } + setSearchVal(ret); + } + + + + return ( + <> +
+
+ + + + + + + + + + { + + (onSave) ? + + + + : null + } + +
+ + ); +} + +export default ToolBar; \ No newline at end of file diff --git a/src/views/sz/ywgz/form.js b/src/views/sz/ywgz/form.js new file mode 100644 index 000000000..1461a9d5c --- /dev/null +++ b/src/views/sz/ywgz/form.js @@ -0,0 +1,147 @@ +import React, { useEffect, useState, useMemo, useRef } from 'react'; +import { Form, Button, Input, Row, Upload, Col, Table, DatePicker, InputNumber, message, Image, Modal, Typography, Select } from 'antd'; +import { DeleteOutlined, FileWordOutlined, FilePdfOutlined, FileZipOutlined, FileExcelOutlined } from '@ant-design/icons'; +import { formItemLayout, btnItemLayout } from '../../../components/crud/FormLayoutProps'; +import apiurl from '../../../service/apiurl'; +import NormalSelect from '../../../components/Form/NormalSelect'; +import FileUpload from '../../../components/Form/FileUpload' + +// import "./index.less" +import moment from 'moment'; +import TextArea from 'antd/lib/input/TextArea'; + + const opntios = [ + {value:1,label:'水资源调度'}, + {value:2,label:'防洪调度'}, + {value:3,label:'工程安全'}, + {value:4,label:'应急抢险'}, + {value:5,label:'其他'}, + ] + +const opntios1 = [ + {value:0,label:'已废弃'}, + {value:1,label:'生效中'}, + ] +const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { + const [form] = Form.useForm(); + const [loading, setLoading] = useState(false) + const [filesParams, setFilesParams] = useState([]) + const onfinish = (values) => { + const userId = localStorage.getItem("userId"); + const userName = localStorage.getItem("userName"); + values.tm = moment(values.bzsj).format("YYYY-MM-DD") + if (mode === 'edit') { + onEdit(apiurl.zsk.ywgz.edit, { ...record, ...values, createUser: userName, fileIds: filesParams, files:undefined}) + } + if (mode === 'save') { + onSave(apiurl.zsk.ywgz.save, {...values,createUser:userName,fileIds:filesParams,files:undefined}) + } + } + +useEffect(() => { + if (mode != 'save') { + const tm = record?.tm ? moment(record?.tm) : ''; + form.setFieldValue('bzsj', tm) + if (record?.files.length > 0) { + setFilesParams(record?.files) + } + } +}, [mode,record]) + + + + + return ( + <> +
+ + + + + + + + + + + + + + + + + + + + + { setFilesParams(v);console.log("vvvv",v); + }} + value={filesParams} + /> + + + + { + mode === 'view' ? null : ( + <> + + + + + ) + } + + + ); +} + +export default ModalForm; diff --git a/src/views/sz/ywgz/index.js b/src/views/sz/ywgz/index.js new file mode 100644 index 000000000..cde18f795 --- /dev/null +++ b/src/views/sz/ywgz/index.js @@ -0,0 +1,98 @@ +import React, { Fragment, useRef, useMemo, useEffect, useState } from 'react'; +import BasicCrudModal from '../../../components/crud/BasicCrudModal'; +import { Table, Card, Modal, Form, Input, Button, Row, Col, Timeline, message, Tabs, Image } from 'antd'; +import { FileWordOutlined, FilePdfOutlined, FileZipOutlined, PaperClipOutlined } from '@ant-design/icons'; +import { useSelector } from 'react-redux'; +import ToolBar from './toolbar'; +import ModalForm from './form'; +import apiurl from '../../../service/apiurl'; +import usePageTable from '../../../components/crud/usePageTable2'; +import { createCrudService } from '../../../components/crud/_'; +import { CrudOpRender_text } from '../../../components/crud/CrudOpRender'; +import { httpgetExport } from '../../../utils/request'; +import { exportFile } from '../../../utils/tools'; +import dayjs from 'dayjs'; + +const obj = { 1: "水资源调度", 2: "防洪调度", 3: "工程安全", 4: "应急抢险", 5: "其他" } +const sobj = {0:'已废弃',1:'生效中'} +const Page = () => { + + const refModal = useRef(); + const [searchVal, setSearchVal] = useState(false) + const columns = [ + { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" }, + { title: '方案名称', key: 'name', dataIndex: 'name', ellipsis: true }, + { title: '调度类型', key: 'type', dataIndex: 'type',render:(v)=><>{obj[v]}}, + { title: '简介', key: 'content', dataIndex: 'content'}, + { title: '编制时间', key: 'tm', dataIndex: 'tm'}, + { title: '附件数', key: 'fileCount', dataIndex: 'fileCount'}, + { title: '状态', key: 'status', dataIndex: 'status',render:(v)=><>{sobj[v]}}, + { title: '创建人', key: 'createUser', dataIndex: 'createUser'}, + { title: '最后更新时间', key: 'updateTm', dataIndex: 'updateTm'}, + { + title: '操作', key: 'operation', fixed: 'right', align: 'center', + render: (value, row, index) => ( + () => command(cmd)(row)} + /> + ) + }, + ]; + + const command = (type) => (params) => { + if (type === 'save') { + refModal.current.showSave(); + } else if (type === 'edit') { + refModal.current.showEdit({ ...params }); + } else if (type === 'view') { + refModal.current.showView(params); + } else if (type === 'del') { + refModal.current.onDeleteGet(apiurl.zsk.ywgz.del + `/${params.id}`); + } + } + + + const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.zsk.ywgz.page).find_noCode); + + + useEffect(() => { + const params = { + search: { + ...searchVal, + } + }; + search(params) + }, [searchVal]) + + + return ( + <> +
+
+ + + +
+
+ + + + + + + ); +} + +export default Page; diff --git a/src/views/sz/ywgz/toolbar.js b/src/views/sz/ywgz/toolbar.js new file mode 100644 index 000000000..d39a95093 --- /dev/null +++ b/src/views/sz/ywgz/toolbar.js @@ -0,0 +1,69 @@ +import React, { useEffect, useState } from 'react'; +import { Form, Input, Button, DatePicker, Select } from 'antd'; +import { DownOutlined, UpOutlined } from '@ant-design/icons' + +import moment from 'moment'; +const { RangePicker } = DatePicker; +const ToolBar = ({ setSearchVal, onSave }) => { + const [form] = Form.useForm(); + const onFinish = (values) => { + const {releaseDate,...ret} = values + if(releaseDate){ + ret.stm = moment(values.releaseDate[0]).format('YYYY-MM-DD') + ret.etm = moment(values.releaseDate[1]).format('YYYY-MM-DD') + } + setSearchVal(ret); + } + + const opntios = [ + {value:1,label:'水资源调度'}, + {value:2,label:'防洪调度'}, + {value:3,label:'工程安全'}, + {value:4,label:'应急抢险'}, + {value:5,label:'其他'}, + ] + + const opntios1 = [ + {value:0,label:'已废弃'}, + {value:1,label:'生效中'}, + ] + + return ( + <> +
+
+ + + + + + + + + + + + + + + { + (onSave) ? + + + + : null + } + + +
+ + ); +} + +export default ToolBar; \ No newline at end of file