Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

src/setupProxy.js

@@ -8,6 +8,7 @@ module.exports = function (app) {
        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,
     })
   );

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}})}
         />
         <BasicCrudModal
           width={1000}
@@ -85,7 +87,7 @@ const Page = () => {
           ref={refModal2}
           title=""
           component={ModalForm2}
-          onCrudSuccess={refresh}
+          onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})}
         />
         <BasicCrudModal
           width={1500}
@@ -93,7 +95,7 @@ const Page = () => {
           ref={refModal3}
           title=""
           component={ModalForm3}
-          onCrudSuccess={refresh}
+          onCrudSuccess={()=>refresh({search:{'orderField':'id','isAsc':true}})}
         />
       </div>
     </>

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') {

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}})}
         />
       </div>
     </>

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
             }