diff --git a/src/components/DashboardLayout/TopMenu.tsx b/src/components/DashboardLayout/TopMenu.tsx
index 11b94db26..20c17aa19 100644
--- a/src/components/DashboardLayout/TopMenu.tsx
+++ b/src/components/DashboardLayout/TopMenu.tsx
@@ -62,7 +62,7 @@ const TopMenu: React.FC<{
const menuClicked = (id: any) => {
const menuItem:any = menu.find(m => m.id == id);
if (menuItem.title === "雨水工灾情") {
- getReadStatus()
+ // getReadStatus()
}
const url = getMenuUrl(menuItem);
@@ -74,17 +74,17 @@ const TopMenu: React.FC<{
* @description 由于进入雨水工灾情 初始化进入是这个页面 发请求来获取未读和已读状态
*
*/
- const getReadStatus = () => {
- createCrudService(apiurl.ssyq.status).delGet().then((res) => {
- if (res.code === 200) {
- dispatch.runtime.setIsReadObject(res.data)
- }
- })
- }
+// const getReadStatus = () => {
+// createCrudService(apiurl.ssyq.status).delGet().then((res) => {
+// if (res.code === 200) {
+// dispatch.runtime.setIsReadObject(res.data)
+// }
+// })
+// }
-useEffect(() => {
- getReadStatus()
-}, [])
+// useEffect(() => {
+// getReadStatus()
+// }, [])
return (
diff --git a/src/service/apiurl.js b/src/service/apiurl.js
index fe8045cd8..cc6b6531b 100644
--- a/src/service/apiurl.js
+++ b/src/service/apiurl.js
@@ -1,5 +1,4 @@
import { config } from '../config'
-import Zfzl from '../views/gxsl/zfzl'
const pubapi_old = 'https://owrsvr.cloudowr.cn/svr'
const pubapi = 'https://owrsvr.cloudowr.cn/pubapi'
@@ -342,7 +341,9 @@ const apiurl = {
},
byfz: {
bypc: {
- page: service_fxdd + "/termite/survey/page",
+ // page: service_fxdd + "/termite/survey/page",
+ page: service_fxdd + "/termite/survey/pageDetail",
+ count:service_fxdd + "/termite/survey/count",
save: service_fxdd + "/termite/survey/insert",
edit: service_fxdd + "/termite/survey/update",
delete: service_fxdd + "/termite/survey/del",
@@ -972,6 +973,10 @@ const apiurl = {
update: service_fxdd + "/attResBase/update",
getFile:service_fxdd + "/attResBase/file/get"
},
+ buildInfo: {
+ detail: service_fxdd + "/attResBuilding/info",
+ update: service_fxdd + "/attResBuilding/update",
+ },
kr: {
list: service_fxdd + "/stZvarlB/list",
save: service_fxdd + "/stZvarlB/insert",
diff --git a/src/setupProxy.js b/src/setupProxy.js
index d6ab7969a..84556480f 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -5,11 +5,11 @@ 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.32:24105/', //ls
+ // target: 'http://192.168.66.32:24105/', //ls
changeOrigin: true,
})
);
diff --git a/src/views/rcgl/byfz/bypc/index.js b/src/views/rcgl/byfz/bypc/index.js
index f8893b4c2..030abf020 100644
--- a/src/views/rcgl/byfz/bypc/index.js
+++ b/src/views/rcgl/byfz/bypc/index.js
@@ -8,6 +8,7 @@ import ModalForm from './form';
import apiurl from '../../../../service/apiurl';
import usePageTable from '../../../../components/crud/usePageTable2';
import { createCrudService } from '../../../../components/crud/_';
+import { httppost2 } from '../../../../utils/request';
import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender';
import './index.less';
const url = "http://223.75.53.141:9102/test.by-lyf.tmp"
@@ -40,6 +41,7 @@ const Page = () => {
}
const refModal = useRef();
const [searchVal, setSearchVal] = useState({})
+ const [count, setCount] = useState({})
// const columns = [
// { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
// {title: '填报日期', key: 'reportDate', dataIndex: 'reportDate', width: 140,},
@@ -74,30 +76,46 @@ const Page = () => {
const columns = [
{
title: '监测时间',
- dataIndex: 'time',
- key: 'time',
- width: 180
+ dataIndex: 'reportDate',
+ key: 'reportDate',
+ width: 180,
+ align:'center'
},
{
title: '测点编号',
- dataIndex: 'code',
- key: 'code',
- width: 120
+ dataIndex: 'pileNumber',
+ key: 'pileNumber',
+ width: 120,
+ align:'center'
},
{
title: '有无白蚁',
- dataIndex: 'hasMosquito',
- key: 'hasMosquito',
+ dataIndex: 'isHarm',
+ align:'center',
+ key: 'isHarm',
width: 100,
- render: (text) => (
-
- {text ? '有' : '无'}
-
- )
+ render:(text, record) => {
+ // 如果 isHarm 为 null 或 undefined,显示无
+ if (text == null) {
+ return
无;
+ }
+
+ // 如果 isHandle 为 null 或 undefined,当作 false 处理
+ const isHandle = record.isHandle ?? false;
+
+ return (
+
+ {text ? (isHandle ? '无' : '有') : '无'}
+
+ );
+ }
}
];
const width = useMemo(() => columns.reduce((total, cur) => total + (cur.width), 0), [columns]);
-
+
const command = (type) => (params) => {
if (type === 'save') {
refModal.current.showSave();
@@ -119,7 +137,27 @@ const Page = () => {
*/
const successCallback = () => {
refresh()
-}
+ }
+
+ // 获取白蚁统计数量
+ const getCount = async () => {
+ const params = {
+ pageSo: {
+ pageNumber: 1,
+ pageSize: 99999,
+ }
+ }
+ try {
+ const res = await httppost2(apiurl.rcgl.byfz.bypc.count, params);
+ setCount(res.data);
+ } catch (error) {
+ console.log(error);
+
+ }
+ }
+ useEffect(() => {
+ getCount();
+ }, [])
useEffect(() => {
if (searchVal) {
const params = {
@@ -140,7 +178,7 @@ const Page = () => {
- {stats.total}
+ {count.totalPoint}
个
总监测点数
@@ -149,7 +187,7 @@ const Page = () => {
- {stats.withMosquito}
+ {count.hasAnt}
个
有白蚁
@@ -158,7 +196,7 @@ const Page = () => {
- {stats.withoutMosquito}
+ {count.notAnt}
个
无白蚁
@@ -167,7 +205,7 @@ const Page = () => {
- {stats.noData}
+ {count.noData}
个
无数据
diff --git a/src/views/rcgl/byfz/bypc/toolbar.js b/src/views/rcgl/byfz/bypc/toolbar.js
index 94f298666..97a4ab865 100644
--- a/src/views/rcgl/byfz/bypc/toolbar.js
+++ b/src/views/rcgl/byfz/bypc/toolbar.js
@@ -12,10 +12,10 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
const onFinish = (values) => {
let dateSo;
if (values.year) {
- dateSo = moment(values.year).format('YYYY')
+ dateSo = moment(values.year).format('YYYY-MM-DD')
}
delete values.year
- setSearchVal({...values, year:Number(dateSo)});
+ setSearchVal({...values, searchDate:dateSo});
}
// useEffect(() => {
@@ -34,13 +34,13 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-
+
{/*
diff --git a/src/views/sq/qys/gcys/buildInfo/index.js b/src/views/sq/qys/gcys/buildInfo/index.js
index 56ee758b7..b1d300bd0 100644
--- a/src/views/sq/qys/gcys/buildInfo/index.js
+++ b/src/views/sq/qys/gcys/buildInfo/index.js
@@ -1,13 +1,47 @@
import React, { useState, useEffect } from 'react'
import { Row, Col, Form, Input, Divider, DatePicker, Button, Upload, message, Modal } from "antd"
import { formItemLayout } from '../../../../../components/crud/FormLayoutProps'
+import { httpget2, httppost2 } from '../../../../../utils/request';
+import apiurl from '../../../../../service/apiurl';
import './index.less'
export default function BuildInfo() {
const [form] = Form.useForm();
const [skdisabled, setSkDisabled] = useState(true)
- const onFinish = async () => {
-
+ const [data, setData] = useState()
+ const getData = async () => {
+ try {
+ const res = await httpget2(apiurl.dataResourcesCenter.projectAndWater.buildInfo.detail)
+ if (res.code == 200) {
+ form.setFieldsValue(res.data)
+ setData(res.data)
+ }
+ } catch (error) {
+ console.log(error);
}
+ }
+ const onFinish = async () => {
+ try {
+ const values = form.getFieldsValue();
+ const params = {
+ ...data,
+ ...values,
+ }
+ const res = await httppost2(apiurl.dataResourcesCenter.projectAndWater.buildInfo.update, params)
+ if (res.code == 200) {
+ message.success("修改成功")
+ setSkDisabled(true)
+ getData()
+ }
+ } catch (error) {
+ console.log(error);
+
+ }
+ }
+
+
+ useEffect(() => {
+ getData()
+ }, [])
return (
@@ -31,7 +65,7 @@ export default function BuildInfo() {
@@ -40,7 +74,7 @@ export default function BuildInfo() {
@@ -49,7 +83,7 @@ export default function BuildInfo() {
@@ -57,7 +91,7 @@ export default function BuildInfo() {
@@ -72,7 +106,7 @@ export default function BuildInfo() {
@@ -81,7 +115,7 @@ export default function BuildInfo() {
@@ -90,7 +124,7 @@ export default function BuildInfo() {
@@ -99,7 +133,7 @@ export default function BuildInfo() {
@@ -107,7 +141,7 @@ export default function BuildInfo() {
@@ -122,7 +156,7 @@ export default function BuildInfo() {
@@ -131,7 +165,7 @@ export default function BuildInfo() {
@@ -140,7 +174,7 @@ export default function BuildInfo() {
@@ -149,7 +183,7 @@ export default function BuildInfo() {
@@ -158,7 +192,7 @@ export default function BuildInfo() {
@@ -167,31 +201,31 @@ export default function BuildInfo() {
@@ -206,7 +240,7 @@ export default function BuildInfo() {
@@ -215,7 +249,7 @@ export default function BuildInfo() {
@@ -224,7 +258,7 @@ export default function BuildInfo() {
@@ -233,7 +267,7 @@ export default function BuildInfo() {
@@ -242,7 +276,7 @@ export default function BuildInfo() {
@@ -251,15 +285,15 @@ export default function BuildInfo() {
@@ -267,7 +301,7 @@ export default function BuildInfo() {
@@ -275,7 +309,7 @@ export default function BuildInfo() {
@@ -290,7 +324,7 @@ export default function BuildInfo() {
@@ -299,7 +333,7 @@ export default function BuildInfo() {
@@ -308,7 +342,7 @@ export default function BuildInfo() {
@@ -317,7 +351,7 @@ export default function BuildInfo() {
@@ -326,7 +360,7 @@ export default function BuildInfo() {
@@ -335,15 +369,15 @@ export default function BuildInfo() {
@@ -351,7 +385,7 @@ export default function BuildInfo() {
@@ -359,7 +393,7 @@ export default function BuildInfo() {
@@ -374,7 +408,7 @@ export default function BuildInfo() {
@@ -383,7 +417,7 @@ export default function BuildInfo() {
@@ -392,7 +426,7 @@ export default function BuildInfo() {
@@ -401,7 +435,7 @@ export default function BuildInfo() {
@@ -409,7 +443,7 @@ export default function BuildInfo() {
@@ -424,7 +458,7 @@ export default function BuildInfo() {
@@ -433,7 +467,7 @@ export default function BuildInfo() {