From af042278e7a2a202adb2340b922f89cbc8d7a9db Mon Sep 17 00:00:00 2001 From: qzc Date: Thu, 14 Nov 2024 13:52:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B4=AA=E6=B0=B4=E9=A2=84=E6=8A=A5?= =?UTF-8?q?=E7=A6=85=E9=81=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/fxzb/csgl/index.js | 8 +++++--- src/views/fxzb/hsybjs/page2/index.js | 6 ++++-- src/views/fxzb/ybfagl/information/index.js | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/fxzb/csgl/index.js b/src/views/fxzb/csgl/index.js index 112c089a7..036db21d9 100644 --- a/src/views/fxzb/csgl/index.js +++ b/src/views/fxzb/csgl/index.js @@ -57,6 +57,8 @@ const Page = () => { const params = { search: { ...searchVal, + 'orderField':'id', + 'isAsc':true } }; search(params) @@ -77,7 +79,7 @@ const Page = () => { ref={refModal} title="" component={ModalForm} - onCrudSuccess={refresh} + onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})} /> { ref={refModal2} title="" component={ModalForm2} - onCrudSuccess={refresh} + onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})} /> { ref={refModal3} title="" component={ModalForm3} - onCrudSuccess={refresh} + onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})} /> diff --git a/src/views/fxzb/hsybjs/page2/index.js b/src/views/fxzb/hsybjs/page2/index.js index 2705ecb05..2f301f473 100644 --- a/src/views/fxzb/hsybjs/page2/index.js +++ b/src/views/fxzb/hsybjs/page2/index.js @@ -66,6 +66,8 @@ const Page = () => { const params = { search: { ...searchVal, + "orderField":"chtm", + "isAsc":false } }; search(params) @@ -82,7 +84,7 @@ const Page = () => { message.error('修改失败') return } - refresh() + refresh({search:{'orderField':'chtm','isAsc':false}}) message.success('修改成功') } @@ -108,7 +110,7 @@ const Page = () => { ref={refModal} title="" component={ModalForm} - onCrudSuccess={refresh} + onCrudSuccess={()=>refresh({search:{'orderField':'chtm','isAsc':false}})} /> diff --git a/src/views/fxzb/ybfagl/information/index.js b/src/views/fxzb/ybfagl/information/index.js index 0c802f666..96c387a8e 100644 --- a/src/views/fxzb/ybfagl/information/index.js +++ b/src/views/fxzb/ybfagl/information/index.js @@ -7,7 +7,7 @@ import drpOption from './drpOption'; import moment from 'moment'; import './index.less' import ModalForm1 from './table1' -import { httppost2 } from '../../../../utils/request'; +import { httpget2, httppost2 } from '../../../../utils/request'; import apiurl from '../../../../service/apiurl'; const Page = ({projectId,onCancel}) => { @@ -31,7 +31,7 @@ const Page = ({projectId,onCancel}) => { useEffect(()=>{ (async()=>{ - const {code , data} = await httppost2(apiurl.fxdd_xyt.hsyb.ybfagl.getData+'?projectId='+projectId) + const {code , data} = await httpget2(apiurl.fxdd_xyt.hsyb.ybfagl.getData+'?projectId='+projectId) if(code!==200){ return } @@ -46,7 +46,7 @@ const Page = ({projectId,onCancel}) => { ycMaxSwH:data.ycMaxSwH, ycMaxRkQ:data.ycMaxRkQ, ycMaxCkQ:data.ycMaxCkQ, - ycSumFlood:data.ycSumFlood, + ycSumFlood:data.ycSumFlood, }}) })() },[]) From cc259fdce29f9f8323edb37c635eceba241c0c82 Mon Sep 17 00:00:00 2001 From: qzc Date: Thu, 14 Nov 2024 15:17:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B4=AA=E6=B0=B4=E9=A2=84=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/setupProxy.js | 3 ++- src/views/fxzb/hsybjs/form.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/setupProxy.js b/src/setupProxy.js index 5fa5980f9..7227330e4 100644 --- a/src/setupProxy.js +++ b/src/setupProxy.js @@ -5,9 +5,10 @@ module.exports = function (app) { app.use( '/gunshiApp', createProxyMiddleware({ - target: 'http://local.gunshiiot.com:18083/',//测试 + // target: 'http://local.gunshiiot.com:18083/',//测试 // target: 'http://192.168.66.199:24105/',//正式 // target: 'http://36.139.207.50:18083/',//移动云 + target: 'http://192.168.66.49:24105/',//移动云 changeOrigin: true, }) ); diff --git a/src/views/fxzb/hsybjs/form.js b/src/views/fxzb/hsybjs/form.js index 63178cdaf..4831b7a53 100644 --- a/src/views/fxzb/hsybjs/form.js +++ b/src/views/fxzb/hsybjs/form.js @@ -14,6 +14,9 @@ const ModalForm = ({ mode, record,onEdit,onSave,close }) => { const [checked, setChecked] = useState(true) const onFinish = async(values) => { + const userId = localStorage.getItem("userId"); + const userName = localStorage.getItem("userName"); + const params = { ...values, forecastTm: record.tms.forecastTime, @@ -24,6 +27,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,close }) => { forecastWarm: record.tms.forecastWarm, type: record.tms.type, voList:record.data, + userId:userId+'_'+userName } if (mode === 'save') { From 0d5f4e635fc62e4b473a9de15439f07186566eba Mon Sep 17 00:00:00 2001 From: qzc Date: Thu, 14 Nov 2024 15:19:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/setupProxy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/setupProxy.js b/src/setupProxy.js index 7227330e4..84d5b7104 100644 --- a/src/setupProxy.js +++ b/src/setupProxy.js @@ -5,10 +5,10 @@ module.exports = function (app) { app.use( '/gunshiApp', createProxyMiddleware({ - // target: 'http://local.gunshiiot.com:18083/',//测试 + target: 'http://local.gunshiiot.com:18083/',//测试 // target: 'http://192.168.66.199:24105/',//正式 // target: 'http://36.139.207.50:18083/',//移动云 - target: 'http://192.168.66.49:24105/',//移动云 + // target: 'http://192.168.66.49:24105/',//移动云 changeOrigin: true, }) );