diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js
index a1c3eded..d8101bda 100644
--- a/web/client/src/sections/fillion/components/bridgeTable.js
+++ b/web/client/src/sections/fillion/components/bridgeTable.js
@@ -26,7 +26,7 @@ const BrideTable = (props) => {
const [delet, setDelet] = useState()
const ref = useRef()
- useEffect(() => { ref.current.reload() }, [modalVisible, modalVisibleyilan,whichofits,delet])
+ useEffect(() => { ref.current.reload() }, [whichofits,delet])
const columns = {
tab1: [
{
@@ -1861,6 +1861,7 @@ const BrideTable = (props) => {
rewkeys={'bridge'}
data={date}
recortd={recortd}
+ setDelet={setDelet}
// sitename={sitename}
setRecortd={setRecortd}
/> : ''}
@@ -1870,6 +1871,7 @@ const BrideTable = (props) => {
modalRecord={modalRecord}
typecard={typecard}
rewkeys={'bridge'}
+ setDelet={setDelet}
recortd={recortd}
setRecortd={setRecortd}
/> : ''}
diff --git a/web/client/src/sections/fillion/components/highways/highwaysdata.js b/web/client/src/sections/fillion/components/highways/highwaysdata.js
index ad27ef14..0ced59c2 100644
--- a/web/client/src/sections/fillion/components/highways/highwaysdata.js
+++ b/web/client/src/sections/fillion/components/highways/highwaysdata.js
@@ -6,7 +6,7 @@ import { putOperaTional,putHighways } from "../../actions/infor"
import { _ } from 'lodash'
const HightModal = (props) => {
- const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd } = props
+ const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd,setDelet } = props
const [success,setSuccess]=useState()
useEffect(() => {
@@ -25,8 +25,7 @@ const HightModal = (props) => {
onVisibleChange={onVisibleChange}
onFinish={(values) => {
if (rewkeys === 'passenger') {
-
- console.log(values)
+ setDelet(values)
const query = { ...values, id:recortd?.id }
dispatch(putOperaTional(query)).then((res) => {
setSuccess(res.success)
@@ -35,8 +34,8 @@ const HightModal = (props) => {
}
if (rewkeys === 'highways') {
+ setDelet(values)
- console.log(values)
const query = { ...values, id:recortd?.id }
dispatch(putHighways(query)).then((res) => {
setSuccess(res.success)
@@ -55,7 +54,7 @@ const HightModal = (props) => {
name='name'
width="md"
label='类型'
- tooltip="最长为 24 位"
+
placeholder="请输入名称"
// value={recortd?.[0]?.value}
disabled
@@ -65,7 +64,7 @@ const HightModal = (props) => {
name='count'
width="md"
label='数量'
- tooltip="最长为 24 位"
+
placeholder="请输入数量"
rules={[
{required: true,
@@ -86,7 +85,7 @@ const HightModal = (props) => {
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
- tooltip="最长为 24 位"
+
placeholder="请输入名称"
/> */}
}
diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js
index ce783267..f27d6124 100644
--- a/web/client/src/sections/fillion/components/highwaysTable.js
+++ b/web/client/src/sections/fillion/components/highwaysTable.js
@@ -16,9 +16,10 @@ const HigwaysTable = (props) => {
const [typecard, setTypecard] = useState();
const [recortd, setRecortd] = useState()
const [sitename, setSitename] = useState()//桥梁名称
+ const [delet, setDelet] = useState()
const ref = useRef()
- useEffect(() => { ref.current.reload() }, [ modalVisibleyilan])
+ useEffect(() => { ref.current.reload() }, [ delet])
//打开弹窗
const hightModal = (type, record) => {
setModalVisibleyilan(true);
@@ -106,18 +107,18 @@ const exports = (ids, counts) => {
actionRef={ref}
scroll={{ x: 800 }}
options={false}
- ref={c => { finishedProductTable = c; }}
+ // ref={c => { finishedProductTable = c; }}
style={{ width: "100% ", overflow: "auto", height: '760px' }}
rowKey='id'
onReset={(v) => {
setSitename('')
}}
- rowSelection={{
- selectedRowKeys: rowSelected,
- onChange: (selectedRowKeys) => {
- setRowSelected(selectedRowKeys);
- },
- }}
+ // rowSelection={{
+ // selectedRowKeys: rowSelected,
+ // onChange: (selectedRowKeys) => {
+ // setRowSelected(selectedRowKeys);
+ // },
+ // }}
columns={columns}
dataSource={counts || []}
@@ -143,6 +144,7 @@ const exports = (ids, counts) => {
rewkeys={'highways'}
recortd={recortd}
setRecortd={setRecortd}
+ setDelet={setDelet}
/> : ''}
)
diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js
index 71b000ec..26e32560 100644
--- a/web/client/src/sections/fillion/components/infor/details.js
+++ b/web/client/src/sections/fillion/components/infor/details.js
@@ -6,7 +6,7 @@ import { putRoadway, putSpecificVehicle, putHouseholds, putCircuit, putVehicle,
import { putBridge } from "../../actions/infor"
import _ from 'lodash'
const UserModal = (props) => {
- const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor } = props
+ const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor,setDelet,whichofits } = props
const [newlys, setNewlys] = useState() //必填数据
const [newlysay, setNewlysay] = useState() //处理hou
const [records, setRecords] = useState()//处理
@@ -148,32 +148,37 @@ const UserModal = (props) => {
visible={visible}
onVisibleChange={onVisibleChange}
onFinish={(values) => {
- console.log(values)
if (Object.values(values).length > 0) {
if (rewkeys === 'transportation') {
- if (typecard == '111') {
- const query = { ...values, level: sitename, roadId: records?.[0]?.value || '' }
+
+ if (typecard == '111') {
+ setDelet(values)
+ const query = { ...values, level: whichofits, roadId: records?.[0]?.value || '' }
dispatch(putRoadway(query)).then((res) => {
setSuccess(res.success)
+
})
return true
} else {
- const query = { ...values, level: sitename }
+ setDelet(values)
+ const query = { ...values, level: whichofits }
dispatch(putRoadway(query)).then((res) => {
setSuccess(res.success)
+
})
return true
}
}
if (rewkeys === 'bridge') {
if (typecard == '111') {
- console.log(values)
+ setDelet(values)
const query = { ...values, roadId: records?.[0]?.value || '' }
dispatch(putBridge(query)).then((res) => {
setSuccess(res.success)
})
return true
} else {
+ setDelet(values)
const query = { ...values }
dispatch(putBridge(query)).then((res) => {
setSuccess(res.success)
@@ -183,13 +188,14 @@ const UserModal = (props) => {
}
if (rewkeys === 'weihuo' || rewkeys === 'chuzu') {
if (typecard == '111') {
- console.log(values)
+ setDelet(values)
const query = { ...values, vehicleId: records?.[0]?.value || '', type: rewkeys === 'chuzu' ? '出租车' : '危货' }
dispatch(putSpecificVehicle(query)).then((res) => {
setSuccess(res.success)
})
return true
} else {
+ setDelet(values)
const query = { ...values, type: rewkeys }
dispatch(putSpecificVehicle(query)).then((res) => {
setSuccess(res.success)
@@ -199,13 +205,14 @@ const UserModal = (props) => {
}
if (rewkeys === 'yehu') {
if (typecard == '111') {
- console.log(values)
+ setDelet(values)
const query = { ...values, businessId: records?.[0]?.value, type: rewkeys == 'chuzu' ? '出租车' : '危货' }
dispatch(putHouseholds(query)).then((res) => {
setSuccess(res.success)
})
return true
} else {
+ setDelet(values)
const query = { ...values, type: rewkeys === 'chuzu' ? '出租车' : '危货' }
dispatch(putHouseholds(query)).then((res) => {
setSuccess(res.success)
@@ -214,13 +221,14 @@ const UserModal = (props) => {
}
} if (rewkeys === 'xianlu') {
if (typecard == '111') {
- console.log(values)
+ setDelet(values)
const query = { ...values, lineId: records?.[0]?.value || '' }
dispatch(putCircuit(query)).then((res) => {
setSuccess(res.success)
})
return true
} else {
+ setDelet(values)
const query = { ...values }
dispatch(putCircuit(query)).then((res) => {
setSuccess(res.success)
@@ -230,13 +238,14 @@ const UserModal = (props) => {
}
if (rewkeys === 'cheliang') {
if (typecard == '111') {
- console.log(values)
+ setDelet(values)
const query = { ...values, carId: records?.[0]?.value || '' }
dispatch(putVehicle(query)).then((res) => {
setSuccess(res.success)
})
return true
} else {
+ setDelet(values)
const query = { ...values }
dispatch(putVehicle(query)).then((res) => {
setSuccess(res.success)
@@ -246,7 +255,7 @@ const UserModal = (props) => {
}
if (rewkeys === 'zhichao') {
if (typecard == '111') {
- console.log(values)
+ setDelet(values)
const query = { ...values, overspeedId: records?.[0]?.value || '' }
dispatch(putPurchase(query)).then((res) => {
setSuccess(res.success)
@@ -254,6 +263,7 @@ const UserModal = (props) => {
})
return true
} else {
+ setDelet(values)
const query = { ...values }
dispatch(putPurchase(query)).then((res) => {
setSuccess(res.success)
@@ -274,7 +284,7 @@ const UserModal = (props) => {
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
- tooltip="最长为 24 位"
+
placeholder="请输入名称"
value={recordsay?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -282,7 +292,7 @@ const UserModal = (props) => {
name={newlys?.[1]?.type}
width="md"
label={newlys?.[1]?.name}
- tooltip="最长为 24 位"
+
placeholder="请输入名称"
value={recordsay?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -316,7 +326,7 @@ const UserModal = (props) => {
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
- tooltip="最长为 24 位"
+
placeholder="请输入名称"
// value={recordssy?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -324,7 +334,7 @@ const UserModal = (props) => {
name={newlys?.[1]?.type}
width="md"
label={newlys?.[1]?.name}
- tooltip="最长为 24 位"
+
placeholder="请输入名称"
// value={recordssy?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -348,7 +358,7 @@ const UserModal = (props) => {
{newlysay?.map((item, index) => {
return
畅通
+{mass ? (mass < 30 ? "畅通" : "") : ""}{mass ? (30 <= mass && mass < 50 ? "缓慢" : "") : ""}{mass ? (50 <= mass && mass < 70 ? "拥堵" : "") : ""}{mass ? (70 <= mass && mass <= 100 ? "严重拥堵" : "") : ""}
55.2Km/h
+{speed || []}Km/h
55.2Km/h
+{(speed + ((Math.random() * (3 + 0)))).toFixed(2)}Km/h