diff --git a/.env.development b/.env.development index 6e6af9746..d235848ba 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,3 @@ GENERATE_SOURCEMAP=true -PUBLIC_URL=/tsg \ No newline at end of file +PUBLIC_URL=/tsg +REACT_APP_API_URL=http://local.gunshiiot.com:18083 \ No newline at end of file diff --git a/.env.production b/.env.production index 6dcc99b9f..0baf8bfc8 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,3 @@ GENERATE_SOURCEMAP=false -PUBLIC_URL=/tsg \ No newline at end of file +PUBLIC_URL=/tsg +REACT_APP_API_URL=http://local.gunshiiot.com:18083 diff --git a/src/utils/tools.js b/src/utils/tools.js index d2e7b6b2e..500e0f0f7 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -12,7 +12,7 @@ const { toString } = class2type; export const fileDownload = (url,params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/${url}/${params?.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/${url}/${params?.fileId}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxdd/ddjc/ddzl/form.js b/src/views/fxdd/ddjc/ddzl/form.js index f25b8f2bc..f1ab089fb 100644 --- a/src/views/fxdd/ddjc/ddzl/form.js +++ b/src/views/fxdd/ddjc/ddzl/form.js @@ -162,7 +162,7 @@ const ModalForm = ({ mode, record, onEdit, onSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfEmerDispatchR/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfEmerDispatchR/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxdd/ddjc/yjxy/emergDetail.js b/src/views/fxdd/ddjc/yjxy/emergDetail.js index b6de0ec37..fed6dd190 100644 --- a/src/views/fxdd/ddjc/yjxy/emergDetail.js +++ b/src/views/fxdd/ddjc/yjxy/emergDetail.js @@ -24,7 +24,7 @@ export default function Page({ selectDiv1, detail }) { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfEmerRespR/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfEmerRespR/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxdd/ddjc/yjxy/form.js b/src/views/fxdd/ddjc/yjxy/form.js index ac400bf6c..2c9c2ed8e 100644 --- a/src/views/fxdd/ddjc/yjxy/form.js +++ b/src/views/fxdd/ddjc/yjxy/form.js @@ -96,7 +96,7 @@ console.log("data",data); */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfEmerRespR/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfEmerRespR/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxdd/hsyb/hdhs/form.js b/src/views/fxdd/hsyb/hdhs/form.js index e0a6761b1..1d24a2720 100644 --- a/src/views/fxdd/hsyb/hdhs/form.js +++ b/src/views/fxdd/hsyb/hdhs/form.js @@ -61,7 +61,7 @@ const ModalForm = ({ mode, record, onEdit, onSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/bzFldPred/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/bzFldPred/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxdd/hsyb/skhs/form.js b/src/views/fxdd/hsyb/skhs/form.js index e0a6761b1..1d24a2720 100644 --- a/src/views/fxdd/hsyb/skhs/form.js +++ b/src/views/fxdd/hsyb/skhs/form.js @@ -61,7 +61,7 @@ const ModalForm = ({ mode, record, onEdit, onSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/bzFldPred/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/bzFldPred/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/ddgc/form.js b/src/views/fxzb/ddgc/form.js index 9e4d1cf1d..031b62245 100644 --- a/src/views/fxzb/ddgc/form.js +++ b/src/views/fxzb/ddgc/form.js @@ -90,7 +90,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/resPlanB/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/resPlanB/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 @@ -217,7 +217,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { { - loading ? 文件正在上传中，请等待 : + // loading ? 文件正在上传中，请等待 : fileList.length > 0 && fileList.map(file => { return ( diff --git a/src/views/fxzb/ddgc/index.js b/src/views/fxzb/ddgc/index.js index 404edc00e..4f6fa206e 100644 --- a/src/views/fxzb/ddgc/index.js +++ b/src/views/fxzb/ddgc/index.js @@ -47,7 +47,7 @@ export default function Zrtx() { } const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/resPlanB/file/download/${params?.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/resPlanB/file/download/${params?.fileId}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/ddgc/index.less b/src/views/fxzb/ddgc/index.less index 99536f2e7..6f8710708 100644 --- a/src/views/fxzb/ddgc/index.less +++ b/src/views/fxzb/ddgc/index.less @@ -15,13 +15,13 @@ height: 40px; // margin-right: 10px; } - span{ - display: block; - width: 180px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} +// span{ +// display: block; +// width: 180px; +// overflow: hidden; +// text-overflow: ellipsis; +// white-space: nowrap; +// } } .delete-icon{ diff --git a/src/views/fxzb/fxya/form.js b/src/views/fxzb/fxya/form.js index f07b79a0d..93e0a3e3e 100644 --- a/src/views/fxzb/fxya/form.js +++ b/src/views/fxzb/fxya/form.js @@ -90,7 +90,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/resPlanB/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/resPlanB/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 @@ -217,7 +217,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { { - loading ? 文件正在上传中，请等待 : + // loading ? 文件正在上传中，请等待 : fileList.length > 0 && fileList.map(file => { return ( diff --git a/src/views/fxzb/fxya/index.js b/src/views/fxzb/fxya/index.js index a7ca6863f..a3cead429 100644 --- a/src/views/fxzb/fxya/index.js +++ b/src/views/fxzb/fxya/index.js @@ -47,7 +47,7 @@ export default function Zrtx() { } const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/resPlanB/file/download/${params?.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/resPlanB/file/download/${params?.fileId}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/gczx/hdqz/form.js b/src/views/fxzb/gczx/hdqz/form.js index f46b5df94..9d17b2d9f 100644 --- a/src/views/fxzb/gczx/hdqz/form.js +++ b/src/views/fxzb/gczx/hdqz/form.js @@ -123,7 +123,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/gczx/ytygc/form.js b/src/views/fxzb/gczx/ytygc/form.js index e0040480d..6fde694b2 100644 --- a/src/views/fxzb/gczx/ytygc/form.js +++ b/src/views/fxzb/gczx/ytygc/form.js @@ -171,7 +171,7 @@ console.log("record",record); */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/gczx/zjgc/form.js b/src/views/fxzb/gczx/zjgc/form.js index 212fd8633..d3638ed0c 100644 --- a/src/views/fxzb/gczx/zjgc/form.js +++ b/src/views/fxzb/gczx/zjgc/form.js @@ -177,7 +177,7 @@ const ModalForm = ({ mode, record, onEdit, onSave,onDeleteGet,onCrudSuccess }) = */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/bzProjectManipulationRecord/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/qxdw/gc/form.js b/src/views/fxzb/qxdw/gc/form.js index fc72b6191..d9d0cc42b 100644 --- a/src/views/fxzb/qxdw/gc/form.js +++ b/src/views/fxzb/qxdw/gc/form.js @@ -281,7 +281,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/rescue/team/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/rescue/team/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/qxdw/zq/form.js b/src/views/fxzb/qxdw/zq/form.js index c6b766fc4..70823eb84 100644 --- a/src/views/fxzb/qxdw/zq/form.js +++ b/src/views/fxzb/qxdw/zq/form.js @@ -101,7 +101,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/rescue/team/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/rescue/team/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/qxwl/gc/form.js b/src/views/fxzb/qxwl/gc/form.js index a92458b08..45040fbba 100644 --- a/src/views/fxzb/qxwl/gc/form.js +++ b/src/views/fxzb/qxwl/gc/form.js @@ -156,7 +156,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/rescue/goods/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/rescue/goods/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 @@ -295,7 +295,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { } { - loading ? 文件正在上传中，请等待 : + // loading ? 文件正在上传中，请等待 : fileList.length > 0 && fileList.map(file => { return ( diff --git a/src/views/fxzb/qxwl/zq/form.js b/src/views/fxzb/qxwl/zq/form.js index 57ba0d705..80b8467f2 100644 --- a/src/views/fxzb/qxwl/zq/form.js +++ b/src/views/fxzb/qxwl/zq/form.js @@ -159,7 +159,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/rescue/goods/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/rescue/goods/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/sxfd/fbzrh/form.js b/src/views/fxzb/sxfd/fbzrh/form.js index b93d6f69d..7899bede5 100644 --- a/src/views/fxzb/sxfd/fbzrh/form.js +++ b/src/views/fxzb/sxfd/fbzrh/form.js @@ -123,7 +123,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => { */ const download = params => { let downloadLink = document.createElement('a') - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfIdeoHmB/file/download/${params}` + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfIdeoHmB/file/download/${params}` downloadLink.download = `${params.fileName}` downloadLink.style.display = 'none' // 将链接添加到页面中 diff --git a/src/views/fxzb/sxfd/fxkhgzh/form.js b/src/views/fxzb/sxfd/fxkhgzh/form.js index 0c3083991..774b3671a 100644 --- a/src/views/fxzb/sxfd/fxkhgzh/form.js +++ b/src/views/fxzb/sxfd/fxkhgzh/form.js @@ -107,7 +107,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfIdeoFcB/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfIdeoFcB/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/sxfd/fxkhgzh/meetingPage.js b/src/views/fxzb/sxfd/fxkhgzh/meetingPage.js index 64c30e752..4d1cd1da5 100644 --- a/src/views/fxzb/sxfd/fxkhgzh/meetingPage.js +++ b/src/views/fxzb/sxfd/fxkhgzh/meetingPage.js @@ -35,7 +35,7 @@ const Page = ({data,fileList,isMeetData=false}) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfIdeoFcB/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfIdeoFcB/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/sxfd/fxpxb/form.js b/src/views/fxzb/sxfd/fxpxb/form.js index 74c789ecf..574969f28 100644 --- a/src/views/fxzb/sxfd/fxpxb/form.js +++ b/src/views/fxzb/sxfd/fxpxb/form.js @@ -107,7 +107,7 @@ console.log(record); */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfIdeoTcB/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfIdeoTcB/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/sxfd/fxtj/form.js b/src/views/fxzb/sxfd/fxtj/form.js index 583f810c4..019f01d7f 100644 --- a/src/views/fxzb/sxfd/fxtj/form.js +++ b/src/views/fxzb/sxfd/fxtj/form.js @@ -38,7 +38,7 @@ const ModalForm = ({ mode, record,onEdit,onSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/xfIdeoImgB/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/xfIdeoImgB/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/yaxb/hsddya/form.js b/src/views/fxzb/yaxb/hsddya/form.js index 4da7a5c82..d2a4e2b9e 100644 --- a/src/views/fxzb/yaxb/hsddya/form.js +++ b/src/views/fxzb/yaxb/hsddya/form.js @@ -154,7 +154,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/bzPredictionScheme/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/bzPredictionScheme/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/fxzb/zzjg/zq/toolbar.js b/src/views/fxzb/zzjg/zq/toolbar.js index 86944a814..00d1d6a22 100644 --- a/src/views/fxzb/zzjg/zq/toolbar.js +++ b/src/views/fxzb/zzjg/zq/toolbar.js @@ -58,7 +58,7 @@ const ToolBar = ({ setSearchVal, onFileChange, onDelete, adcd, id }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/xfflood/bzOrganizationFile/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/xfflood/bzOrganizationFile/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js index f9c28d1cd..4aa1bd03a 100644 --- a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js +++ b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js @@ -15,6 +15,7 @@ const Page = () => { const [trData, setTrData] = useState([]) const [table2Data, setTable2Data] = useState([]) const [loading, setLoading] = useState(false) + const [wyObj, setWyObj] = useState(false) const wyList = ["X","Y","H"] const columns1 = [ { title: '序号', key: 'inx', dataIndex: 'inx', width: 150, align:"center"}, @@ -22,6 +23,24 @@ const Page = () => { const columns2 = [ { title: '监测日期', key: 'tm', dataIndex: 'tm', width: 250, align:"center" }, ]; + + const demoColumns = [ + columns1[0], + columns2[0], + { + title: 'WY-01', + width: 100, + align: "center", + children: { + title: "X", + key: `X_WY-01`, + dataIndex: `X_WY-01`, + width: 100, + align: "center", + render: (rec, record) => {rec ?? "-"} + } + } + ] const getDmTree = async() => { @@ -33,7 +52,7 @@ const Page = () => { } } const newCols = useMemo(() => { - if (trData.length > 0) { + if (trData.length > 0 && wyObj) { let dm = trData?.map(item => ( { title: item.stationCode, @@ -49,10 +68,12 @@ const Page = () => { })) } )) - return [...columns1,...columns2, ...dm] + + const newDm = dm.filter(item => item.title == wyObj.wy) + return [...columns1,...columns2, ...newDm] } - }, [trData]) + }, [trData,wyObj]) const getTableData = async (params) => { setLoading(true) @@ -88,6 +109,7 @@ const Page = () => { ...obj, } }) + // const demo = [{tm:"2025-01-01",inx:1,"H_WY-03":0.87,"X_WY-01":0.1}] setDataSource(result) } catch (error) { console.log(error); @@ -161,12 +183,14 @@ const Page = () => {
- {/* { ) }} - /> */} - { + /> + {/* { (newCols?.length>0 && width!==undefined)? :null - } + } */} diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/table.js b/src/views/gcaqjc/sjtjcx/ndwytjb/table.js index ff1d8fa10..5f9ee9dea 100644 --- a/src/views/gcaqjc/sjtjcx/ndwytjb/table.js +++ b/src/views/gcaqjc/sjtjcx/ndwytjb/table.js @@ -5,6 +5,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { VariableSizeGrid as Grid } from 'react-window'; const VirtualTable = (props) => { const { columns, scroll, table2Data } = props; + debugger const [tableWidth, setTableWidth] = useState(0); const widthColumnCount = columns.filter(({ width }) => !width).length; const mergedColumns = columns.map((column) => { @@ -16,6 +17,10 @@ const VirtualTable = (props) => { width: Math.floor(tableWidth / widthColumnCount), }; }); + console.log("mergedColumns", mergedColumns); + console.log("props",{...props}); + + const gridRef = useRef(); const [connectObject] = useState(() => { const obj = {}; diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js index 431ffeb83..1cb071455 100644 --- a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js @@ -7,10 +7,11 @@ import { config } from '../../../../config'; import moment from 'moment'; import { httppost2 } from '../../../../utils/request'; import apiurl from '../../../../service/apiurl'; -const ToolBar = ({ setSearchVal, setDmName, exportFile, role }) => { +const ToolBar = ({ setSearchVal, setDmName, exportFile, role,list,setWyObj }) => { const exportBtn = role?.rule?.find(item => item.menuName == "导出")||true; const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true; const [form] = Form.useForm(); + const [source, setSource] = useState() const onFinish = (values) => { let dateSo; if (values.tm) { @@ -19,17 +20,35 @@ const ToolBar = ({ setSearchVal, setDmName, exportFile, role }) => { delete values.tm setSearchVal({ ...values, year: dateSo }); } - + + const valuesChange = (v) => { + if ('wy' in v) { + setWyObj(v) + } + } + useEffect(() => { let time = moment() form.setFieldValue("tm", time) - setSearchVal({ year: moment().format("YYYY")}) -}, []) + form.setFieldValue("wy","WY-01") + setSearchVal({ year: moment().format("YYYY")}) + setWyObj({ wy: "WY-01"}) + }, []) + useEffect(() => { + if (list.length > 0) { + const newList = list.map(item => ({ + label: item.stationCode, + value:item.stationCode + })) + setSource(newList) + } + }, [list]) + return ( <>
-
+ { format={'YYYY'} /> + + + {searchBtn ? : null } diff --git a/src/views/gxsl/gsnlfx/index.js b/src/views/gxsl/gsnlfx/index.js index 0fd7124ad..6887488c6 100644 --- a/src/views/gxsl/gsnlfx/index.js +++ b/src/views/gxsl/gsnlfx/index.js @@ -150,7 +150,7 @@ export default function Gsnlfx() { 水厂流量（m³/s）
- {ssgData?.fsg?.v ?? "--"} + {ssgData?.fsg?.q ?? "--"} （{ssgData?.fsg?.tm ?? "--"}）
diff --git a/src/views/rcgl/aqgl/aqjcgl/form.js b/src/views/rcgl/aqgl/aqjcgl/form.js index bb86baf92..7ffb627a0 100644 --- a/src/views/rcgl/aqgl/aqjcgl/form.js +++ b/src/views/rcgl/aqgl/aqjcgl/form.js @@ -35,7 +35,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/safety/check/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/safety/check/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/aqgl/aqjdtz/form.js b/src/views/rcgl/aqgl/aqjdtz/form.js index ed267cc5a..36b610e01 100644 --- a/src/views/rcgl/aqgl/aqjdtz/form.js +++ b/src/views/rcgl/aqgl/aqjdtz/form.js @@ -47,7 +47,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/safety/identify/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/safety/identify/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/aqgl/aqsgdj/form.js b/src/views/rcgl/aqgl/aqsgdj/form.js index b0725f797..bdb134f5b 100644 --- a/src/views/rcgl/aqgl/aqsgdj/form.js +++ b/src/views/rcgl/aqgl/aqsgdj/form.js @@ -38,7 +38,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/safety/accident/reg/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/safety/accident/reg/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/aqgl/aqyhpc/form.js b/src/views/rcgl/aqgl/aqyhpc/form.js index 6aac999a0..030f9fd72 100644 --- a/src/views/rcgl/aqgl/aqyhpc/form.js +++ b/src/views/rcgl/aqgl/aqyhpc/form.js @@ -30,7 +30,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/safety/hazard/invest/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/safety/hazard/invest/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/aqgl/cxjgtz/form.js b/src/views/rcgl/aqgl/cxjgtz/form.js index 568e9e85e..4b36db973 100644 --- a/src/views/rcgl/aqgl/cxjgtz/form.js +++ b/src/views/rcgl/aqgl/cxjgtz/form.js @@ -38,7 +38,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/safety/reinforcement/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/safety/reinforcement/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/aqgl/fxgkqd/form.js b/src/views/rcgl/aqgl/fxgkqd/form.js index 7de9f59eb..9bd9dc1f0 100644 --- a/src/views/rcgl/aqgl/fxgkqd/form.js +++ b/src/views/rcgl/aqgl/fxgkqd/form.js @@ -74,7 +74,7 @@ const getResultList = async() => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/risk/info/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/risk/info/file/download/${params.fileId}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/byfz/fzxc/index.js b/src/views/rcgl/byfz/fzxc/index.js index ff3b49c09..6ec27e72d 100644 --- a/src/views/rcgl/byfz/fzxc/index.js +++ b/src/views/rcgl/byfz/fzxc/index.js @@ -81,7 +81,7 @@ const Page = () => { } const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/termite/adver/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/termite/adver/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/gcdsj/form.js b/src/views/rcgl/gcdsj/form.js index f97393ba3..022de3af8 100644 --- a/src/views/rcgl/gcdsj/form.js +++ b/src/views/rcgl/gcdsj/form.js @@ -31,7 +31,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/projectEvents/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/gcdsj/index.js b/src/views/rcgl/gcdsj/index.js index 8a468a0b5..60d743d5f 100644 --- a/src/views/rcgl/gcdsj/index.js +++ b/src/views/rcgl/gcdsj/index.js @@ -61,7 +61,7 @@ const Page = () => { const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/projectEvents/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/jdkh/khrwgl/form.js b/src/views/rcgl/jdkh/khrwgl/form.js index 101e92aba..a2dc9b987 100644 --- a/src/views/rcgl/jdkh/khrwgl/form.js +++ b/src/views/rcgl/jdkh/khrwgl/form.js @@ -202,7 +202,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/assessTask/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/assessTask/file/download/${params.fileId}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 @@ -662,7 +662,7 @@ const [selectPerson, setSelectPerson] = useState([]) } { - loading ? 文件正在上传中，请等待 : + // loading ? 文件正在上传中，请等待 : fileList?.length > 0 && fileList?.map(file => { return ( @@ -670,7 +670,7 @@ const [selectPerson, setSelectPerson] = useState([])
{file.name.indexOf('.docx') > -1 ?
{ download(file.response?.data?.fileId) }} + onClick={() => { download(file.response?.data) }} style={{ cursor: 'pointer' }} > -1 ?
{ download(file.response?.data?.fileId) }} + onClick={() => { download(file.response?.data) }} style={{ cursor: 'pointer' }} > @@ -696,7 +696,7 @@ const [selectPerson, setSelectPerson] = useState([]) : file.name.indexOf('.xlsx') > -1 ?
{ download(file.response?.data?.fileId) }} + onClick={() => { download(file.response?.data) }} style={{ cursor: 'pointer' }} > diff --git a/src/views/rcgl/jdkh/khwtzg/form.js b/src/views/rcgl/jdkh/khwtzg/form.js index 0295a4cf9..ce74833b1 100644 --- a/src/views/rcgl/jdkh/khwtzg/form.js +++ b/src/views/rcgl/jdkh/khwtzg/form.js @@ -31,7 +31,7 @@ console.log("record",record); */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/assessTeamRating/file/download/${params.fileId}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/assessTeamRating/file/download/${params.fileId}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/rcgl/xcxj/xjrw/detailForm.js b/src/views/rcgl/xcxj/xjrw/detailForm.js index 00b54646c..992ee7570 100644 --- a/src/views/rcgl/xcxj/xjrw/detailForm.js +++ b/src/views/rcgl/xcxj/xjrw/detailForm.js @@ -16,11 +16,10 @@ const url = "http://223.75.53.141:9100/gs-tsg" const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave,submit }) => { -console.log(record); const taskTypes = [ - {label:"日常巡查",value:0}, - {label:"特别检查",value:1}, - {label:"汛前巡检",value:2}, + {label:"日常巡查",value:1}, + {label:"特别检查",value:2}, + {label:"汛前巡检",value:3}, ] const statusTypes = [ {label:"未完成",value:0}, diff --git a/src/views/rcgl/xcxj/xjrw/form.js b/src/views/rcgl/xcxj/xjrw/form.js index a2ff7242e..a62fe2c9b 100644 --- a/src/views/rcgl/xcxj/xjrw/form.js +++ b/src/views/rcgl/xcxj/xjrw/form.js @@ -24,6 +24,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { {label:"特别检查",value:2}, {label:"汛前巡检",value:3}, ] + const [form] = Form.useForm(); const handleTree = (arr) => { @@ -312,7 +313,12 @@ try {
dateString} getValueProps={(value) => ({ value: value ? moment(value) : undefined })} @@ -323,7 +329,12 @@ try { dateString} getValueProps={(value) => ({ value: value ? moment(value) : undefined })} diff --git a/src/views/rcgl/zmjk/index.js b/src/views/rcgl/zmjk/index.js index a1c73d94a..226af3729 100644 --- a/src/views/rcgl/zmjk/index.js +++ b/src/views/rcgl/zmjk/index.js @@ -381,7 +381,7 @@ const Page = () => { const [zfjkSwData, setzfjkSwData] = useState([]) const getZfjkSwData = async () => { try { - const res = await httppost2(apiurl.gsxl.zfzl.swInfo) + const res = await httppost2(apiurl.gsxl.zfzl.swInfo,{stcd:"10196"}) if (res.code == 200) { const { rz, diff --git a/src/views/sq/qzq/gcdsj/form.js b/src/views/sq/qzq/gcdsj/form.js index c7f61e7f3..550c1e2e9 100644 --- a/src/views/sq/qzq/gcdsj/form.js +++ b/src/views/sq/qzq/gcdsj/form.js @@ -30,7 +30,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { */ const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/projectEvents/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/sq/qzq/gcdsj/index.js b/src/views/sq/qzq/gcdsj/index.js index cb9c076f5..17b1cf299 100644 --- a/src/views/sq/qzq/gcdsj/index.js +++ b/src/views/sq/qzq/gcdsj/index.js @@ -61,7 +61,7 @@ const Page = () => { const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/projectEvents/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/sq/qzq/qzqda/index.js b/src/views/sq/qzq/qzqda/index.js index 9269a7c73..adc4bf62c 100644 --- a/src/views/sq/qzq/qzqda/index.js +++ b/src/views/sq/qzq/qzqda/index.js @@ -38,7 +38,7 @@ const Page = () => { const download = (params) => { let downloadLink = document.createElement("a"); - downloadLink.href = `http://223.75.53.141:83/gunshiApp/tsg/projectEvents/file/download/${params}`; + downloadLink.href = `${process.env.REACT_APP_API_URL}/gunshiApp/tsg/projectEvents/file/download/${params}`; downloadLink.download = `${params.fileName}`; downloadLink.style.display = "none"; // 将链接添加到页面中 diff --git a/src/views/sq/qzq/qzqda/toolbar.js b/src/views/sq/qzq/qzqda/toolbar.js index 507f2058e..94acbcbb2 100644 --- a/src/views/sq/qzq/qzqda/toolbar.js +++ b/src/views/sq/qzq/qzqda/toolbar.js @@ -27,7 +27,7 @@ const ToolBar = ({ setSearchVal, onExport, storeData, role }) => {