From fe5ff18306526f5fb03e4db97ad86da24fe4dc1e Mon Sep 17 00:00:00 2001 From: qzc Date: Tue, 15 Oct 2024 14:46:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B8=83=E7=BD=AE=E5=9B=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DashboardLayout/style.less | 118 ++++++++++++++++++ .../Home/MapCtrl/Pops/ShenLiu/drpOption.js | 31 +++-- src/views/Home/MapCtrl/Pops/ShenLiu/index.js | 41 +++++- .../Home/MapCtrl/Pops/ShenLiu/toolbar.js | 2 +- .../Home/MapCtrl/Pops/ShenYa/drpOption.js | 31 +++-- src/views/Home/MapCtrl/Pops/ShenYa/index.js | 42 ++++++- src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js | 2 +- .../Home/MapCtrl/Pops/WeiYi/drpOption.js | 32 ++++- src/views/Home/MapCtrl/Pops/WeiYi/index.js | 41 +++++- src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js | 2 +- src/views/gcaqjc/bzt/index.less | 5 + 11 files changed, 321 insertions(+), 26 deletions(-) diff --git a/src/components/DashboardLayout/style.less b/src/components/DashboardLayout/style.less index dcb98b35f..f670875ee 100644 --- a/src/components/DashboardLayout/style.less +++ b/src/components/DashboardLayout/style.less @@ -301,3 +301,121 @@ background-color: #ecf2f9 !important; .nonebox .ant-card-body { padding: 5px 20px !important; } + + + + + +.ant-radio-button-wrapper{ + height:28px; + line-height:26px; + border: 1px solid #0893FF !important; + color:#0893FF; + &.ant-radio-button-wrapper-checked{ + color: #fff !important; + } + .ant-radio-button-checked{ + background:#0893FF; + border-color:#0893FF !important; + } +} + +.normalModalStyle{ + width: 100%; + // min-height: 600px; + background-color: #fff; + .ant-card-body{ + + .ant-table-thead{ + .ant-table-cell{ + background-color: #e2edfd !important; + } + } + } + + .normalModalStyle_title{ + height: 40px; + background-color: #f7f7f7; + border-radius: 10px 10px 0 0 ; + display: flex; + align-items: center; + color: #007afd; + font-size: 16px; + font-weight: 500; + margin-bottom: 10px; + + .normalModalStyle_title_icon{ + margin: 0 10px 0 15px; + width: 5px; + height: 16px; + background: #3477f5; + } + .normalModalStyle_title_cancel{ + margin-right: 15px; + flex: 1; + display: flex; + flex-direction: row-reverse; + } + } +} + +.home_modal{ + .ant-modal-content{ + border-radius: 10px; + } +} + +.homeModal1{ + // .ant-radio-button-wrapper:not(:first-child)::before{ + // background-color: red; + // } + + + + display: flex; + flex-direction: column; + .homeModal1_content{ + height: 504px; + display: flex; + padding: 5px 20px 20px 20px; + .homeModal1_content_lf{ + width: 40%; + height: 100%; + } + .homeModal1_content_rf{ + width: 60%; + height: 100%; + } + } +} + +.homeModal2{ + display: flex; + flex-direction: column; + .homeModal2_content{ + height: 504px; + display: flex; + padding: 5px 20px 20px 20px; + } +} + +.colorTable{ + .ant-table-thead{ + th{ + height: 40px !important; + background-color: #e2edfd !important; + } + } + .ant-table-tbody{ + .ant-table-measure-row{ + td{ + padding: 0 !important; + } + } + tr:nth-child(odd) { + td{ + background-color: #f5f8fe !important; + } + } + } +} diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js b/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js index 0322950cf..a8487ff29 100644 --- a/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js +++ b/src/views/Home/MapCtrl/Pops/ShenLiu/drpOption.js @@ -1,10 +1,26 @@ -export default function drpOption(data) { +export default function drpOption(data,yjData) { console.log("data",data); const maxVal = 0//Math.max(...data.map(obj => obj.drp)) - const max1 = Math.max(...data.map(obj => obj.value)) - const min1 = Math.min(...data.map(obj => obj.value)) + const max1 = Math.max(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) + const min1 = Math.min(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) const max2 = Math.max(...data.map(obj => obj.rz)) const min2 = Math.min(...data.map(obj => obj.rz)) + const yj = yjData?.map((item,index)=>{ + return { + yAxisIndex: 0, + name: item.yjName, + type: 'line', + color: item.color, + lineStyle: { + type: "dashed", + width: 1, + }, + data: data.map(o => item.value), + symbol: 'none', // 设置标记点为'none'，即去掉圆点 + smooth: 0.5 + } + }) + return { tooltip: { @@ -85,8 +101,8 @@ export default function drpOption(data) { axisTick: { show: false, }, - min: Math.floor(max1*0.8), - max: Math.floor(min1*1.2), + min: Math.floor(min1*0.8), + max: Math.ceil(max1*1.2), }, // { // // gridIndex: 1, @@ -120,8 +136,8 @@ export default function drpOption(data) { // axisTick: { // show: false, // }, - // min: Math.floor(max2*0.8), - // max: Math.floor(min2*1.2), + // min: Math.floor(min2*0.8), + // max: Math.ceil(max2*1.2), // } ], series: [ @@ -138,6 +154,7 @@ export default function drpOption(data) { symbol: 'none', // 设置标记点为'none'，即去掉圆点 smooth: 0.5 }, + ...yj // { // // xAxisIndex: 1, // yAxisIndex: 1, diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/index.js b/src/views/Home/MapCtrl/Pops/ShenLiu/index.js index 20b2c75fa..7754dbf90 100644 --- a/src/views/Home/MapCtrl/Pops/ShenLiu/index.js +++ b/src/views/Home/MapCtrl/Pops/ShenLiu/index.js @@ -12,7 +12,8 @@ import drpOption from './drpOption'; function ShenLiu({ id, data, dispatch, onCancel }) { console.log(data); const [ tableData, setTableData ] = useState([]) - const option = useMemo(() => drpOption(tableData), [tableData]) + const [ yjData, setYjData ] = useState([]) + const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData]) const width = 780; const closePop = () => { @@ -38,7 +39,45 @@ function ShenLiu({ id, data, dispatch, onCancel }) { setTableData(data) } + const getYjData = async(stationCode)=>{ + const params = { + "pageSo": { + "pageSize": 10, + "pageNumber": 1 + }, + "stationCode": stationCode + } + + const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params) + if(code!==200){ + return + } + const linshi = [] + records?.map((item)=>{ + if(item.status===0){ + return + } + if(item.valueOne||0){ + linshi.push({ + yjName:item.level ===1?'黄色预警':'红色预警', + value:item.valueOne, + color:item.level ===1?'#f1bf42':'red' + }) + } + if(item.valueTwo||0){ + linshi.push({ + yjName:item.level ===1?'黄色预警':'红色预警', + value:item.valueTwo, + color:item.level ===1?'#f1bf42':'red' + }) + } + }) + debugger + setYjData(linshi) + } + useEffect(()=>{ + getYjData(data.stationCode) getData([moment().add(-1,'months'),moment()],data.stationCode) },[]) diff --git a/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js b/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js index d5791b3bc..4262b7727 100644 --- a/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js +++ b/src/views/Home/MapCtrl/Pops/ShenLiu/toolbar.js @@ -23,7 +23,7 @@ const ToolBar = ({search, defaultParams}) => {
{ form.setFieldValue('cysd',null) diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js b/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js index 0bdb86d26..c7f062fb4 100644 --- a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js +++ b/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js @@ -1,10 +1,26 @@ -export default function drpOption(data) { +export default function drpOption(data,yjData) { console.log("data",data); const maxVal = 0//Math.max(...data.map(obj => obj.drp)) - const max1 = Math.max(...data.map(obj => obj.value)) - const min1 = Math.min(...data.map(obj => obj.value)) + const max1 = Math.max(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) + const min1 = Math.min(...[...data.map(obj => obj.value),...yjData.map(obj => obj.value)]) const max2 = Math.max(...data.map(obj => obj.rz)) const min2 = Math.min(...data.map(obj => obj.rz)) + + const yj = yjData?.map((item,index)=>{ + return { + yAxisIndex: 0, + name: item.yjName, + type: 'line', + color: item.color, + lineStyle: { + type: "dashed", + width: 1, + }, + data: data.map(o => item.value), + symbol: 'none', // 设置标记点为'none'，即去掉圆点 + smooth: 0.5 + } + }) return { tooltip: { @@ -85,8 +101,8 @@ export default function drpOption(data) { axisTick: { show: false, }, - min: Math.floor(max1*0.8), - max: Math.floor(min1*1.2), + min: Math.floor(min1*0.8), + max: Math.ceil(max1*1.2), }, { // gridIndex: 1, @@ -120,8 +136,8 @@ export default function drpOption(data) { axisTick: { show: false, }, - min: Math.floor(max2*0.8), - max: Math.floor(min2*1.2), + min: Math.floor(min2*0.8), + max: Math.ceil(max2*1.2), } ], series: [ @@ -151,6 +167,7 @@ export default function drpOption(data) { symbol: 'none', // 设置标记点为'none'，即去掉圆点 smooth: 0.5 }, + ...yj ] }; } diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/index.js b/src/views/Home/MapCtrl/Pops/ShenYa/index.js index 4b009916e..6f7d30f86 100644 --- a/src/views/Home/MapCtrl/Pops/ShenYa/index.js +++ b/src/views/Home/MapCtrl/Pops/ShenYa/index.js @@ -10,10 +10,11 @@ import TableData from './TableData' import drpOption from './drpOption'; function ShenYa({ id, data, dispatch, onCancel }) { - console.log(data); + console.log('SY',data); const [ tableData, setTableData ] = useState([]) + const [ yjData, setYjData ] = useState([]) const [ tabVal, setTabVal ] = useState('1') - const option = useMemo(() => drpOption(tableData), [tableData]) + const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData]) const width = 780; const closePop = () => { @@ -40,7 +41,44 @@ function ShenYa({ id, data, dispatch, onCancel }) { setTableData(data) } + const getYjData = async(stationCode)=>{ + const params = { + "pageSo": { + "pageSize": 10, + "pageNumber": 1 + }, + "stationCode": stationCode + } + + const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params) + if(code!==200){ + return + } + const linshi = [] + records?.map((item)=>{ + if(item.status===0){ + return + } + if(item.valueOne||0){ + linshi.push({ + yjName:item.level ===1?'黄色预警':'红色预警', + value:item.valueOne, + color:item.level ===1?'#f1bf42':'red' + }) + } + if(item.valueTwo||0){ + linshi.push({ + yjName:item.level ===1?'黄色预警':'红色预警', + value:item.valueTwo, + color:item.level ===1?'#f1bf42':'red' + }) + } + }) + setYjData(linshi) + } + useEffect(()=>{ + getYjData(data.stationCode) getData([moment().add(-1,'months'),moment()],data.stationCode) },[]) diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js b/src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js index 54ee3e2e6..f2a56ecb4 100644 --- a/src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js +++ b/src/views/Home/MapCtrl/Pops/ShenYa/toolbar.js @@ -17,7 +17,7 @@ const ToolBar = ({search, setTabVal}) => { obj.drp)) - const max1 = Math.max(...data.map(obj => obj.x)) - const min1 = Math.min(...data.map(obj => obj.x)) + // const max1 = Math.max(...data.map(obj => obj.x)) + const max1 = Math.max(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)]) + const min1 = Math.min(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)]) + // const min1 = Math.min(...data.map(obj => obj.x)) const max2 = Math.max(...data.map(obj => obj.rz)) const min2 = Math.min(...data.map(obj => obj.rz)) + + + const yj = yjData?.map((item,index)=>{ + return { + yAxisIndex: 0, + name: item.yjName, + type: 'line', + color: item.color, + lineStyle: { + type: "dashed", + width: 1, + }, + data: data.map(o => item.value), + symbol: 'none', // 设置标记点为'none'，即去掉圆点 + smooth: 0.5 + } + }) + + return { tooltip: { @@ -85,8 +106,8 @@ export default function drpOption(data) { axisTick: { show: false, }, - max: Math.floor(max1*1.2)||100, min: Math.floor(min1*0.8)||0, + max: Math.ceil(max1*1.2)||100, }, { // gridIndex: 1, @@ -120,8 +141,8 @@ export default function drpOption(data) { axisTick: { show: false, }, - max: Math.floor(max2*1.2), min: Math.floor(min2*0.8), + max: Math.ceil(max2*1.2), } ], series: [ @@ -177,6 +198,7 @@ export default function drpOption(data) { symbol: 'none', // 设置标记点为'none'，即去掉圆点 smooth: 0.5 }, + ...yj ] }; } diff --git a/src/views/Home/MapCtrl/Pops/WeiYi/index.js b/src/views/Home/MapCtrl/Pops/WeiYi/index.js index 62c613e26..c355605e2 100644 --- a/src/views/Home/MapCtrl/Pops/WeiYi/index.js +++ b/src/views/Home/MapCtrl/Pops/WeiYi/index.js @@ -12,8 +12,10 @@ import drpOption from './drpOption'; function ShenYa({ id, data, dispatch, onCancel }) { console.log(data); const [ tableData, setTableData ] = useState([]) + const [ yjData, setYjData ] = useState([]) const [ tabVal, setTabVal ] = useState('1') - const option = useMemo(() => drpOption(tableData), [tableData]) + // const option = useMemo(() => drpOption(tableData), [tableData]) + const option = useMemo(() => drpOption(tableData,yjData), [tableData,yjData]) const width = 780; const closePop = () => { @@ -40,7 +42,44 @@ function ShenYa({ id, data, dispatch, onCancel }) { setTableData(data) } + const getYjData = async(stationCode)=>{ + const params = { + "pageSo": { + "pageSize": 10, + "pageNumber": 1 + }, + "stationCode": stationCode + } + + const { code, data:{records}} = await httppost2(apiurl.gcaqjc.gcaqyj.yjgzpz.page,params) + if(code!==200){ + return + } + const linshi = [] + records?.map((item)=>{ + if(item.status===0){ + return + } + if(item.valueOne||0){ + linshi.push({ + yjName:item.level ===1?'黄色预警':'红色预警', + value:item.valueOne, + color:item.level ===1?'#f1bf42':'red' + }) + } + if(item.valueTwo||0){ + linshi.push({ + yjName:item.level ===1?'黄色预警':'红色预警', + value:item.valueTwo, + color:item.level ===1?'#f1bf42':'red' + }) + } + }) + setYjData(linshi) + } + useEffect(()=>{ + getYjData(data.stationCode) getData([moment().add(-1,'months'),moment()],data.stationCode) },[]) diff --git a/src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js b/src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js index 54ee3e2e6..f2a56ecb4 100644 --- a/src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js +++ b/src/views/Home/MapCtrl/Pops/WeiYi/toolbar.js @@ -17,7 +17,7 @@ const ToolBar = ({search, setTabVal}) => { Date: Tue, 15 Oct 2024 16:11:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=91=E7=9D=A3?= =?UTF-8?q?=E8=80=83=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 12 ++++++------ src/views/rcgl/jdkh/khrwgl/PfDetail.js | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index ef1850f2e..85be348c9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -40,12 +40,12 @@ async function send(url, options) { } const { code } = res.data; - if (code === 401) { - //debugger; - //window.location.href = '/mgr/home';// /mgr/home /login - window.location.href = '/tsg/#/login'; - // window.location.hash = '#/login'; - } + // if (code === 401) { + // // debugger; + // //window.location.href = '/mgr/home';// /mgr/home /login + // window.location.href = '/tsg/#/login'; + // // window.location.hash = '#/login'; + // } return res.data; } catch (e) { //message.error(e); diff --git a/src/views/rcgl/jdkh/khrwgl/PfDetail.js b/src/views/rcgl/jdkh/khrwgl/PfDetail.js index 8681e893a..2636c553f 100644 --- a/src/views/rcgl/jdkh/khrwgl/PfDetail.js +++ b/src/views/rcgl/jdkh/khrwgl/PfDetail.js @@ -241,6 +241,23 @@ const EditableRow = ({ index, ...props }) => { }) return arr } + + const handleTableData2 = (obj) => { + const names = Object.values(obj)?.[0]?.map(o=>o.teamUserName) + const obj2 = {} + for(let key in obj){ + const arr = [] + names?.map((name)=>{ + obj?.[key]?.map((item)=>{ + if(name===item.teamUserName){ + arr.push(item) + } + }) + }) + obj2[key] = arr + } + return obj2 + } // 获取清单查看数据 const [qdColumns, setQdColumns] = useState(newcolumns) const [qdWidth, setQdWidth] = useState() @@ -248,7 +265,8 @@ const EditableRow = ({ index, ...props }) => { try { const res = await httpget2(apiurl.rcgl.jdkh.khrwgl.qdView + `/${id}`) if (res.code == 200) { - const result = handleTableData(res.data); + const linshi = handleTableData2(res.data)//将接口里用户的顺序统一 + const result = handleTableData(linshi); const insertCols = []; result.forEach((item, index, arr) => { const total = arr?.reduce((total, cur) => total + (cur["assessScore" + index] || 0), 0) From f9e1706b4a74c6869d109a049051c9383671daba Mon Sep 17 00:00:00 2001 From: qzc Date: Wed, 16 Oct 2024 09:06:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/xyt/fxdd/sl2.png | Bin 0 -> 2526 bytes public/assets/xyt/fxdd/sy2.png | Bin 0 -> 5221 bytes public/assets/xyt/fxdd/wy2.png | Bin 0 -> 5543 bytes src/views/gcaqjc/bzt/index.js | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 public/assets/xyt/fxdd/sl2.png create mode 100644 public/assets/xyt/fxdd/sy2.png create mode 100644 public/assets/xyt/fxdd/wy2.png diff --git a/public/assets/xyt/fxdd/sl2.png b/public/assets/xyt/fxdd/sl2.png new file mode 100644 index 0000000000000000000000000000000000000000..176cbfd647372ad3a1bac4a11f3df697f403a807 GIT binary patch literal 2526 zcmbVO3s4hh9#0G?s3`cLV70CrWaN?T<_TGd3JC~k5HuQIB4M+TElD;eiy@-;rm@mH zPdT*2QOAP4(fZ)d62N*;MbtrS!50ct3T;7wL!hE4;%yKZd*k)yx-;K?-+tfk`~Bbl z**!7Q%UmYUnM|Y6Tp}Z+tEkz-KAa{}?-rBz1vNSABjSxT+LW30L8lcSrVx&v9Nm&QVC>fH98}bB?d=$5o&GUhCpBhLS~4;5W7GiP8I`5 z2m=NP*g_V{;RgZ%A~r|Jhj~JOfD3a(5F7|`cr2KMz(Pb20E|8$CC#8pLsm({M`cl8 zVo*(zdIW+@CKKDlV-tpSh$9kF99)RYWl;#0(X1ntSuCBAImRHxjHm(ElQ^LR?2O7( zB9jz@l%{V@(CWu&b;eOQQ4WK$lzNE6hV3Se09EKXPM>Mej0jhu5T?Pjn2t13Sk5?B zuO>*ss3!gk_4x5`1W>M($;M^8R~M~zT!fJf+en!)>X7%MjdHUdgH~ZiBGZ6kVH+tm znRaXRh{S*?Nx~o}2+dfaV#ZVkxRlkvA_cBf5hkP0I~OpilElOy7v}O=9GJxs$T>oU zD?+$@KR6J9;kQs3p~BP5?}PH--{7cxQ7K8~?;}+xl13P`O3GARt4zlry)GRD#vO=A z2n}JNL{fV3-rbLsNMZ~`8m^%ZjH{M~0+C@7Ax9(>vbb!{h@vtX5~(wiN*#(tO2r`M z7B-Hn5T1Y+AP}ff7OJGuDFEejS*bi>04p_BCE}qxA&(n~jop_LXr?{*WA|16=lzui zoGL!0<`47OOVXY-NCa-A;%Oc&n$_5b(Uk@VMiK>4qV@t1gQz|7m;Yme=;2JH$B^5{%qOr1Ohb`DnoUEuHn zx|ce%+R}17*P+RS?H$gJbw+Y0#>xv)PN?}H?E06}P7^$5+AO-`^pdU#WH-C`_Or%^ zZS%VqCmcG^GI&X3>@{P{qlUGlMi&d-?ohHW3|Om}sfJ;pJnR_RG*W(X%}VC!Uk}-0eR)0Zerq zC_kyW-Cc}jSraFAomrAw6dwt(FC9Lb?H*T@&!yR%ES5Dx!*jA9B;tyVim6eXjd=;f zUXQ~dzMsrm2hH$y4KC<;_q3b!@f^)|%Zw&5Q{*|NOhRwYT585jCR$iU5 z?N-~jJV{5ajV5_BrUK=!hp0~2*wX2)*jzhUOy=LF)SCHG%{406&{7r?0d2jNsOKX;Q zp1YClbidA*eX-PW+mV8``~!QgRXe;)>ZZN^fGar9aH)I*^kmGr02uk59f0Y};| z`B^(k8bchm-Ro;Uub9s`3Ux(OP}-kjw!bX%IdC<%;#&W52Gbq7RMCgOY|=gSonBx1 z+>e%8^JnIUwL-U&67udH{p&A3>}Oc4T+d^RkiyX83-0 zc^Mqx7v&sBC`iPk&KT;Z<>51DOukoZTn(r${Jd4{r&s$ z=TDivF9nlmks@PRvSQ`>gN^E-4fj^$yN4*cr`OEj7w36-Gk2aT~$3#8kIQ@vOw9@~ltmo9bP*TDbjZO-z(_mfPhpn)Rkx)V`{KbrJ2$$Ch*2e?H7C z`=ljT78~`rYAA1i>xm$@$oSHHYUQ1hv(K+8sA}hdXl7E?YL-O z$91oc<8+C1hO}s@bWY-uVR>|V+V#gb{PEKbOt9YL#=@yP<|hF~aI*9XyR!dC(hvWX wNQ;uCtpvlAJ>lC{m79nOehu#5Z1otXi+hE~k?P0S?0;a9VbRhvp(#854Sg-t)&Kwi literal 0 HcmV?d00001 diff --git a/public/assets/xyt/fxdd/sy2.png b/public/assets/xyt/fxdd/sy2.png new file mode 100644 index 0000000000000000000000000000000000000000..8fca93848a2d922edfaa172c0098da7acecb9a1a GIT binary patch literal 5221 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 literal 0 HcmV?d00001 diff --git a/public/assets/xyt/fxdd/wy2.png b/public/assets/xyt/fxdd/wy2.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9d89a3971af806878e63eb0569b1cac3e97dc3 GIT binary patch literal 5543 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 literal 0 HcmV?d00001 diff --git a/src/views/gcaqjc/bzt/index.js b/src/views/gcaqjc/bzt/index.js index 683fc3b9a..6882653b3 100644 --- a/src/views/gcaqjc/bzt/index.js +++ b/src/views/gcaqjc/bzt/index.js @@ -138,7 +138,7 @@ export default function Page({isHome}) { setModalData(item) }}> {item.stationCode} - + ) } @@ -149,7 +149,7 @@ export default function Page({isHome}) { setModalData(item) }}> {item.stationCode} - + ) } @@ -160,7 +160,7 @@ export default function Page({isHome}) { setModalData(item) }}> {item.stationCode} - + ) } From 4c5413750721ebc365fe76363d8c20f4b7ddbf2f Mon Sep 17 00:00:00 2001 From: qzc Date: Wed, 16 Oct 2024 14:56:14 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js | 2 +- src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js | 2 +- src/views/Home/MapCtrl/Pops/ShenLiu/index.js | 1 - src/views/Home/MapCtrl/Pops/WeiYi/drpOption.js | 5 +---- src/views/Home/tqyb/index.js | 6 +++--- src/views/gcaqjc/bzt/index.js | 6 +++--- src/views/szydd/ddjl/form.js | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js index 9778c0a1a..0bdb86d26 100644 --- a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js +++ b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js @@ -31,7 +31,7 @@ export default function drpOption(data) { { type: 'category', data: data.map(o => o.tm), - inverse: true, + inverse: false, splitLine: { show: false }, diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js b/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js index f3cdc2669..9d0733e42 100644 --- a/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js +++ b/src/views/Home/MapCtrl/Pops/DuanMian/toolbar.js @@ -18,7 +18,7 @@ const ToolBar = ({search, setTabVal, setTms}) => { obj.drp)) - // const max1 = Math.max(...data.map(obj => obj.x)) const max1 = Math.max(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)]) const min1 = Math.min(...[...data.map(obj => obj.x),...data.map(obj => obj.y),...data.map(obj => obj.h),...yjData.map(obj => obj.value)]) - // const min1 = Math.min(...data.map(obj => obj.x)) const max2 = Math.max(...data.map(obj => obj.rz)) const min2 = Math.min(...data.map(obj => obj.rz)) @@ -52,7 +49,7 @@ export default function drpOption(data,yjData) { { type: 'category', data: data.map(o => o.tm), - inverse: true, + inverse: false, splitLine: { show: false }, diff --git a/src/views/Home/tqyb/index.js b/src/views/Home/tqyb/index.js index d52017f59..9ce110d1f 100644 --- a/src/views/Home/tqyb/index.js +++ b/src/views/Home/tqyb/index.js @@ -12,12 +12,13 @@ const { Panel } = Collapse; const Page = ({showPanels}) => { const dispatch = useDispatch(); const [myKey, setMyKey] = useState('1') - const [badgeType, setBadgeType] = useState('雷达回波') + const [badgeType, setBadgeType] = useState('') const [tmObj,setTmObj] = useState({ tm:moment(), hours:'08' }) useEffect(()=>{ + setBadgeType('雷达回波') dispatch.runtime.setCameraTarget({ center: [115.2, 31.18], zoom: 9, @@ -66,8 +67,7 @@ const Page = ({showPanels}) => { { - (badgeType === '雷达回波'&&myKey==='1') - ? ( + (badgeType === '雷达回波'&&myKey==='1') ? (
{v?.slice(5,16)}
}, - { title: '渗流量(L/s)', key: 'q', dataIndex: 'q',align: "center", ellipsis: true, render:(v,row)=>
{v}
}, + { title: '渗流量(L/s)', key: 'value', dataIndex: 'value',align: "center", ellipsis: true, render:(v,row)=>
{v}
}, ] const columnsWy = [ @@ -57,7 +57,7 @@ export default function Page({isHome}) { console.log(1111) // 大于0:滚轮向上滚动 小于0:滚轮向下滚动 if (e.wheelDelta > 0) { - scale += 0.05; + scale += 0.02; img.style.transform = `scale(${scale})`; } else { if (scale == 1) { @@ -66,7 +66,7 @@ export default function Page({isHome}) { } // 缩放值大于1时,可以缩小,反之亦然 if (scale > 1) { - scale -= 0.05; + scale -= 0.02; img.style.transform = `scale(${scale})`; } } diff --git a/src/views/szydd/ddjl/form.js b/src/views/szydd/ddjl/form.js index f9bb86af9..ad8ba75ff 100644 --- a/src/views/szydd/ddjl/form.js +++ b/src/views/szydd/ddjl/form.js @@ -219,7 +219,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {

} - + { fileList?.length > 0 && fileList?.map(file => { return ( From d028c9c82534213ee689ee9615f6298fb8992abf Mon Sep 17 00:00:00 2001 From: qzc Date: Wed, 16 Oct 2024 15:08:52 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/homePanelsLayoutPage/item_shuizhi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Home/homePanelsLayoutPage/item_shuizhi.js b/src/views/Home/homePanelsLayoutPage/item_shuizhi.js index 728c71c93..cb2d84c2d 100644 --- a/src/views/Home/homePanelsLayoutPage/item_shuizhi.js +++ b/src/views/Home/homePanelsLayoutPage/item_shuizhi.js @@ -116,7 +116,7 @@ const Page = () => {
-

标准文件：GB3838-2002地表水环境质量标准.pdf

+

标准文件：GB3838-2002地表水环境质量标准.pdf

本系统根据以下水质检测项目进行判断：

From 7bb758532dcf82fb7ee2cb8119081b51d8e8bf2f Mon Sep 17 00:00:00 2001 From: qzc Date: Wed, 16 Oct 2024 15:30:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sz/pxjlgl/index.js | 6 +++--- src/views/sz/pxjlgl/options.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/sz/pxjlgl/index.js b/src/views/sz/pxjlgl/index.js index 119a81d57..911611718 100644 --- a/src/views/sz/pxjlgl/index.js +++ b/src/views/sz/pxjlgl/index.js @@ -77,9 +77,9 @@ const Page = () => { const [staData, setStaData] = useState() const pxOptions = useMemo(() => { if (staData) { - return options(staData) + return options(staData,searchChartVal.teamName) } else { - return options({}) + return options({},searchChartVal.teamName) } }, [staData]) const getStaData = async (params) => { @@ -136,7 +136,7 @@ const Page = () => {
- 本年培训期数 + 本年培训人次 计划/实际 { staData?.personNum2 ?? 1} 人次/ { staData?.personNum1 ?? 1} 人次 diff --git a/src/views/sz/pxjlgl/options.js b/src/views/sz/pxjlgl/options.js index d17c2932d..73a9c43aa 100644 --- a/src/views/sz/pxjlgl/options.js +++ b/src/views/sz/pxjlgl/options.js @@ -1,4 +1,4 @@ -export default function options(data={}) { +export default function options(data={},teamName) { const xAxisData = data?.list?.map(item => item.month + "月") const maxCount = data?.list ? Math.ceil(Math.max(...data?.list?.map(obj => [obj.num1,obj.num2]).flat())) : 0 const minCount = data?.list ? Math.floor(Math.min(...data?.list?.map(obj => [obj.num1, obj.num2]).flat())) : 100 @@ -96,7 +96,7 @@ export default function options(data={}) { ], series: [ { - name: '计划期数', + name: teamName===1?'计划人次':'计划期数', type: 'bar', barWidth: 25, data: data?.list?.map(item =>item.num2), @@ -105,7 +105,7 @@ export default function options(data={}) { } }, { - name: '实际期数', + name: teamName===1?'实际期人次':'实际期数', type: 'bar', barWidth: 25, data: data?.list?.map(item =>item.num1), From f2aed121822999a8b3a7a10147bd5cb5d920bae5 Mon Sep 17 00:00:00 2001 From: qzc Date: Wed, 16 Oct 2024 17:52:43 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/homePanelsLayoutPage/item_xunchaxunjian.js | 2 +- src/views/gxsl/gstjfx/tjOption.js | 4 ++-- src/views/gxsl/gstjfx/toolbar1.js | 3 ++- src/views/rcgl/jdkh/khrwgl/PfDetail.js | 12 ++++++++++++ src/views/rcgl/jdkh/khzbgl/form.js | 1 + src/views/rcgl/xcxj/xjrw/index.js | 2 +- src/views/rcgl/xcxj/xjwtcl/toolbar.js | 2 +- src/views/rcgl/xcxj/xjxpz/form.js | 1 + src/views/sz/pxjlgl/options.js | 2 +- 9 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js index 0b58f4b57..46d77809e 100644 --- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js +++ b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js @@ -37,7 +37,7 @@ const Page = ({mySetTms}) => { const columns2 = [ { title: '上报时间', key: 'finishTime', dataIndex: 'finishTime',align: "center", ellipsis: true }, - { title: '巡检问题描述', key: 'itemDesc', dataIndex: 'itemDesc',align: "center" }, + { title: '巡检问题描述', key: 'problemDesc', dataIndex: 'problemDesc',align: "center" }, ]; useEffect(()=>{ diff --git a/src/views/gxsl/gstjfx/tjOption.js b/src/views/gxsl/gstjfx/tjOption.js index 5ecd75da1..867e19933 100644 --- a/src/views/gxsl/gstjfx/tjOption.js +++ b/src/views/gxsl/gstjfx/tjOption.js @@ -4,11 +4,11 @@ let color = ["#73a0fa", "#52c1f5"]; let echartData = [ { name: "生活供水", - value: obj?.shgs + value: parseFloat(obj?.shgs?.toFixed(2)) }, { name: "生态供水", - value: obj?.stgs, + value: parseFloat(obj?.stgs?.toFixed(2)), }, ]; diff --git a/src/views/gxsl/gstjfx/toolbar1.js b/src/views/gxsl/gstjfx/toolbar1.js index 28589a901..3fc6c9c47 100644 --- a/src/views/gxsl/gstjfx/toolbar1.js +++ b/src/views/gxsl/gstjfx/toolbar1.js @@ -7,7 +7,8 @@ const ToolBar = ({ setSearchVal, exportFile, role }) => { const exportBtn = role?.rule?.find(item => item.menuName == "导出"); const [form] = Form.useForm(); const onFinish = (values) => { - setSearchVal({...values,year: String(values.year)}); + // setSearchVal({...values,year: String(values.year)}); + setSearchVal({...values,year: moment(values.year).format("YYYY")}); } useEffect(() => { diff --git a/src/views/rcgl/jdkh/khrwgl/PfDetail.js b/src/views/rcgl/jdkh/khrwgl/PfDetail.js index 2636c553f..41b108fc2 100644 --- a/src/views/rcgl/jdkh/khrwgl/PfDetail.js +++ b/src/views/rcgl/jdkh/khrwgl/PfDetail.js @@ -373,6 +373,18 @@ const EditableRow = ({ index, ...props }) => { rectifyStatus:0 })) } + if(tableData.length>0){ + let flag = true //fasle有位评分的 + params.ratings?.map((item)=>{ + if(item.assessScore==null){ + flag = false + } + }) + if(!flag){ + message.error('请输入全部考核评分') + return + } + } try { const res = await httppost2(apiurl.rcgl.jdkh.khrwgl.confirmpf, params) if (res.code == 200) { diff --git a/src/views/rcgl/jdkh/khzbgl/form.js b/src/views/rcgl/jdkh/khzbgl/form.js index 5d901f703..8bd69afaa 100644 --- a/src/views/rcgl/jdkh/khzbgl/form.js +++ b/src/views/rcgl/jdkh/khzbgl/form.js @@ -206,6 +206,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { values.standardScore = standardScore1; if (mode === 'edit') { values.id = record.id; + values.status = record.status; onEdit(apiurl.rcgl.jdkh.khzbgl.edit,values) } if (mode === 'save') { diff --git a/src/views/rcgl/xcxj/xjrw/index.js b/src/views/rcgl/xcxj/xjrw/index.js index 64f70cfc7..3297dd4e9 100644 --- a/src/views/rcgl/xcxj/xjrw/index.js +++ b/src/views/rcgl/xcxj/xjrw/index.js @@ -65,7 +65,7 @@ const Page = () => { {title: '开始日期', key: 'startDate', dataIndex: 'startDate', width: 200}, {title: '结束日期', key: 'endDate', dataIndex: 'endDate', width: 200}, {title: '问题数量', key: 'problemNum', dataIndex: 'problemNum', width: 100,align: 'center'}, - { title: '待处理', key: 'handleNum ', dataIndex: 'handleNum ', width: 100,align: 'center'}, + { title: '待处理', key: 'handleNum', dataIndex: 'handleNum', width: 100,align: 'center'}, { title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200 }, { title: '创建人', key: 'createUserName', dataIndex: 'createUserName', width: 150 }, diff --git a/src/views/rcgl/xcxj/xjwtcl/toolbar.js b/src/views/rcgl/xcxj/xjwtcl/toolbar.js index 802cad9ed..6ee70c06e 100644 --- a/src/views/rcgl/xcxj/xjwtcl/toolbar.js +++ b/src/views/rcgl/xcxj/xjwtcl/toolbar.js @@ -5,7 +5,7 @@ import moment from 'moment'; import NormalSelect from '../../../../components/Form/NormalSelect'; const { RangePicker } = DatePicker; const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { - const searchBtn = role?.rule?.find(item => item.menuName == "查询"); + const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true; const [form] = Form.useForm(); const onFinish = (values) => { diff --git a/src/views/rcgl/xcxj/xjxpz/form.js b/src/views/rcgl/xcxj/xjxpz/form.js index 70e17abdd..48ca5bb90 100644 --- a/src/views/rcgl/xcxj/xjxpz/form.js +++ b/src/views/rcgl/xcxj/xjxpz/form.js @@ -18,6 +18,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { values.pointId = record.code; if (mode === 'edit') { values.id = record.id; + values.status = record.status; onEdit(apiurl.rcgl.xcxj.xjxpz.edit,values) } if (mode === 'save') { diff --git a/src/views/sz/pxjlgl/options.js b/src/views/sz/pxjlgl/options.js index 73a9c43aa..4a7fbca99 100644 --- a/src/views/sz/pxjlgl/options.js +++ b/src/views/sz/pxjlgl/options.js @@ -105,7 +105,7 @@ export default function options(data={},teamName) { } }, { - name: teamName===1?'实际期人次':'实际期数', + name: teamName===1?'实际人次':'实际期数', type: 'bar', barWidth: 25, data: data?.list?.map(item =>item.num1), From 3ea7b0f103a0adc5fddd0ef406bb7173f8caf5ef Mon Sep 17 00:00:00 2001 From: qzc Date: Thu, 17 Oct 2024 10:06:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=B4=AA=E6=B0=B4=E9=A2=84=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item_xunchaxunjian.js | 20 ++++++++++++------- src/views/fxzb/hsybjs/page1/table1.js | 9 ++++++++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js index 46d77809e..921360c4c 100644 --- a/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js +++ b/src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js @@ -164,14 +164,20 @@ const Page = ({mySetTms}) => { onRow={ (data)=>({ onClick:()=>{ - data.data = { - "type":"MultiLineString", - "coordinates":[[ - [114.746, 31.479], - [114.776, 31.509] - ]] + // data.data = { + // "type":"MultiLineString", + // "coordinates":[ + // [ + // [114.746, 31.479], + // [114.776, 31.509] + // ] + // ] + // } + if(!data.data){ + message.error('无轨迹信息') + return } - addHlLayer(data.data,'HlItem_'+data.id,'#00FFFF',data) + addHlLayer(data?.data,'HlItem_'+data.id,'#00FFFF',data) const center = geometryCenter({type:"LineString",coordinates:data.data.coordinates[0]}); dispatch.runtime.setFeaturePop({ id: data.id, diff --git a/src/views/fxzb/hsybjs/page1/table1.js b/src/views/fxzb/hsybjs/page1/table1.js index 0c9801103..a4a20c84d 100644 --- a/src/views/fxzb/hsybjs/page1/table1.js +++ b/src/views/fxzb/hsybjs/page1/table1.js @@ -28,9 +28,16 @@ const Page = ({record}) => { return [ { title: '序号', key: 'inx', dataIndex: 'inx', align:"center",render: (text, rec, index) => index + 1 }, { title: '时间', key: 'tm', dataIndex: 'tm', align:"center", width:180,render:v=>v.slice(0, 16)}, - { title: '预测水位', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, + { title: '实测水位(m)', key: 'realSwHValue', dataIndex: 'realSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, + { title: '预测水位(m)', key: 'ycSwHValue', dataIndex: 'ycSwHValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, { title: '预测入库流量', key: 'ycRkQValue', dataIndex: 'ycRkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, { title: '预测出库流量', key: 'ycCkQValue', dataIndex: 'ycCkQValue', align:"center",render:(v)=>v===null?'-':Number(v).toFixed(2)}, + { title: '库容(万 ㎡)', key: 'nowCap', dataIndex: 'nowCap', align:"center", + render:(v,row)=>{ + const val = v===null?'-':Number(v).toFixed(2) + return
{val}{row.realSwHValue===null?
预
:null}
+ } + }, ]; } },[record])