diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js
index 2fcc0841..faa48253 100644
--- a/web/client/src/sections/fillion/actions/infor.js
+++ b/web/client/src/sections/fillion/actions/infor.js
@@ -63,7 +63,7 @@ export function putSpecificVehicle(query) {
data: query,
actionType: 'put_SPECIFIC_VEHICLE',
url: ApiTable.putSpecificVehicle,
- msg: { error: '编辑车辆信息失败' },
+ msg: { option: '编辑车辆信息' },
});
}
@@ -74,7 +74,7 @@ export function putHouseholds(query) {
data: query,
actionType: 'put_HOUSEHOLDS',
url: ApiTable.putHouseholds,
- msg: { error: '编辑业户信息失败' },
+ msg: { option: '编辑业户信息' },
});
}
@@ -107,7 +107,7 @@ export function putRoadway(query) {
data: query,
actionType: 'PUT_ROADWAY',
url: ApiTable.putRoadway,
- msg: { error: '编辑道路信息失败' },
+ msg: { option: '编辑道路信息' },
});
}
@@ -129,7 +129,7 @@ export function putBridge(query) {
data: query,
actionType: 'PUT_BRIDGE',
url: ApiTable.putBridge,
- msg: { error: '编辑桥梁信息失败' },
+ msg: { option: '编辑桥梁信息' },
});
}
@@ -151,7 +151,7 @@ export function putProject(query) {
data: query,
actionType: 'GET_PROJECT',
url: ApiTable.putProject,
- msg: { error: '编辑工程信息失败' },
+ msg: { option: '编辑工程信息' },
});
}
@@ -173,7 +173,7 @@ export function putHighways(query) {
data: query,
actionType: 'GET_HIGHWAYS',
url: ApiTable.putHighways,
- msg: { error: '编辑路政信息失败' },
+ msg: { option: '编辑路政信息' },
});
}
@@ -195,7 +195,7 @@ export function putCircuit(query) {
data: query,
actionType: 'PUT_CIRCUIT',
url: ApiTable.putCircuit,
- msg: { error: '编辑线路信息失败' },
+ msg: { option: '编辑线路信息' },
});
}
@@ -217,7 +217,7 @@ export function putVehicle(query) {
data: query,
actionType: 'PUT_VEHICLE',
url: ApiTable.putVehicle,
- msg: { error: '编辑车辆信息失败' },
+ msg: { option: '编辑车辆信息' },
});
}
@@ -227,7 +227,7 @@ export function delRoadway(query) {
dispatch: dispatch,
actionType: 'DEL_ROADWAY',
url: ApiTable.delRoadway.replace("{roadId}", query?.roadId),
- msg: { error: '删除车辆信息失败' },
+ msg: { option: '删除车辆信息' },
});
}
@@ -237,7 +237,7 @@ export function delProject(query) {
dispatch: dispatch,
actionType: 'DEL_PROJECT',
url: ApiTable.delProject.replace("{projectId}", query?.projectId),
- msg: { error: '删除工程信息失败' },
+ msg: { option: '删除工程信息' },
});
}
@@ -247,7 +247,7 @@ export function delBridge(query) {
dispatch: dispatch,
actionType: 'DEL_BRIDGE',
url: ApiTable.delBridge.replace("{bridgeId}", query?.bridgeId),
- msg: { error: '删除桥梁信息失败' },
+ msg: { option: '删除桥梁信息' },
});
}
@@ -257,7 +257,7 @@ export function delSpecificVehicle(query) {
dispatch: dispatch,
actionType: 'DEL_SPECIFICVENICLE',
url: ApiTable.delSpecificVehicle.replace("{vehicleId}", query?.vehicleId),
- msg: { error: '删除车辆信息失败' },
+ msg: { option: '删除车辆信息' },
});
}
@@ -267,7 +267,7 @@ export function delHouseholds(query) {
dispatch: dispatch,
actionType: 'DEL_HOUSEHOLDS',
url: ApiTable.delHouseholds.replace("{businessId}", query?.businessId),
- msg: { error: '删除业户信息失败' },
+ msg: { option: '删除业户信息' },
});
}
@@ -277,7 +277,7 @@ export function delCircuit(query) {
dispatch: dispatch,
actionType: 'DEL_CIRCUIT',
url: ApiTable.delCircuit.replace("{lineId}", query?.lineId),
- msg: { error: '删除运营线路信息失败' },
+ msg: { option: '删除运营线路信息' },
});
}
@@ -287,7 +287,7 @@ export function delVehicle(query) {
dispatch: dispatch,
actionType: 'DEL_VEHICLE',
url: ApiTable.delVehicle.replace("{carId}", query?.carId),
- msg: { error: '删除车辆信息失败' },
+ msg: { option: '删除车辆信息' },
});
}
@@ -310,7 +310,7 @@ export function putPurchase(query) {
data: query,
actionType: 'PUT_PURCHASE',
url: ApiTable.putPurchase,
- msg: { error: '获取治超信息失败' },
+ msg: { option: '编辑治超信息' },
});
}
@@ -320,7 +320,7 @@ export function delPurchase(query) {
dispatch: dispatch,
actionType: 'DEL_PURCHASE',
url: ApiTable.delPurchase.replace("{overspeedId}", query?.overspeedId),
- msg: { error: '删除车辆信息失败' },
+ msg: { option: '删除车辆信息' },
});
}
\ No newline at end of file
diff --git a/web/client/src/sections/fillion/components/infor/details.js b/web/client/src/sections/fillion/components/infor/details.js
index 73b24c7d..a8a125a7 100644
--- a/web/client/src/sections/fillion/components/infor/details.js
+++ b/web/client/src/sections/fillion/components/infor/details.js
@@ -1,12 +1,12 @@
import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import { Form, Spin, Table } from 'antd';
-import { DrawerForm, ProForm, ProFormText, ProFormSelect } from '@ant-design/pro-form';
+import { DrawerForm, ProForm, ProFormText, ProFormSelect,ProFormDatePicker } from '@ant-design/pro-form';
import { putRoadway, putSpecificVehicle, putHouseholds, putCircuit, putVehicle, putPurchase } from "../../actions/infor"
import { putBridge } from "../../actions/infor"
-import _ from 'lodash'
+import _ from 'lodash'
const UserModal = (props) => {
- const { visible, onVisibleChange, typecard, rewkeys, data, recortd, sitename, dispatch, setRecortd, setMonitor,setDelet,whichofits } = 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()//处理
@@ -70,6 +70,7 @@ const UserModal = (props) => {
array.push({ name: value, type: key })
});
setNewlys(array?.splice(0, 2))
+ array?.splice(6, 1)
setNewlysay(array)
}
}, [])
@@ -150,54 +151,74 @@ const UserModal = (props) => {
onFinish={(values) => {
if (Object.values(values).length > 0) {
if (rewkeys === 'transportation') {
-
- if (typecard == '111') {
+
+ if (typecard == '111') {
setDelet(values)
const query = { ...values, level: whichofits, roadId: records?.[0]?.value || '' }
dispatch(putRoadway(query)).then((res) => {
-
- })
return true
+ })
} else {
setDelet(values)
const query = { ...values, level: whichofits }
dispatch(putRoadway(query)).then((res) => {
-
-
})
+
return true
}
+
}
if (rewkeys === 'bridge') {
if (typecard == '111') {
- setDelet(values)
+ setDelet(values)
const query = { ...values, roadId: records?.[0]?.value || '' }
dispatch(putBridge(query)).then((res) => {
-
+
})
return true
} else {
- setDelet(values)
+ setDelet(values)
const query = { ...values }
dispatch(putBridge(query)).then((res) => {
-
+
})
return true
}
}
- if (rewkeys === 'weihuo' || rewkeys === 'chuzu') {
+ if (rewkeys === 'weihuo') {
if (typecard == '111') {
+
setDelet(values)
- const query = { ...values, vehicleId: records?.[0]?.value || '', type: rewkeys == 'chuzu' ? '出租车' : '危货' }
+ const query = { ...values, vehicleId: records?.[0]?.value || '', type: '危货' }
dispatch(putSpecificVehicle(query)).then((res) => {
-
+
})
return true
} else {
- setDelet(values)
- const query = { ...values, type: rewkeys == 'chuzu' ? '出租车' : '危货' }
+
+ setDelet(values)
+ const query = { ...values, type: '危货' }
dispatch(putSpecificVehicle(query)).then((res) => {
-
+
+ })
+ return true
+ }
+ }
+ if (rewkeys === 'chuzu') {
+ if (typecard == '111') {
+
+ setDelet(values)
+ const query = { ...values, vehicleId: records?.[0]?.value || '', type: '出租车' }
+ dispatch(putSpecificVehicle(query)).then((res) => {
+
+ })
+ return true
+ } else {
+
+ setDelet(values)
+ const query = { ...values, type: '出租车' }
+ dispatch(putSpecificVehicle(query)).then((res) => {
+
})
return true
}
@@ -205,16 +226,16 @@ const UserModal = (props) => {
if (rewkeys === 'yehu') {
if (typecard == '111') {
setDelet(values)
- const query = { ...values, businessId: records?.[0]?.value, type: rewkeys == 'chuzu' ? '出租车' : '危货' }
+ const query = { ...values, businessId: records?.[0]?.value, type: values.type }
dispatch(putHouseholds(query)).then((res) => {
-
+
})
return true
} else {
- setDelet(values)
- const query = { ...values, type: rewkeys === 'chuzu' ? '出租车' : '危货' }
+ setDelet(values)
+ const query = { ...values, type: values.type }
dispatch(putHouseholds(query)).then((res) => {
-
+
})
return true
}
@@ -223,14 +244,14 @@ const UserModal = (props) => {
setDelet(values)
const query = { ...values, lineId: records?.[0]?.value || '' }
dispatch(putCircuit(query)).then((res) => {
-
+
})
return true
} else {
- setDelet(values)
+ setDelet(values)
const query = { ...values }
dispatch(putCircuit(query)).then((res) => {
-
+
})
return true
}
@@ -240,14 +261,14 @@ const UserModal = (props) => {
setDelet(values)
const query = { ...values, carId: records?.[0]?.value || '' }
dispatch(putVehicle(query)).then((res) => {
-
+
})
return true
} else {
- setDelet(values)
+ setDelet(values)
const query = { ...values }
dispatch(putVehicle(query)).then((res) => {
-
+
})
return true
}
@@ -257,15 +278,15 @@ const UserModal = (props) => {
setDelet(values)
const query = { ...values, overspeedId: records?.[0]?.value || '' }
dispatch(putPurchase(query)).then((res) => {
-
+
setMonitor(res)
})
return true
} else {
- setDelet(values)
+ setDelet(values)
const query = { ...values }
dispatch(putPurchase(query)).then((res) => {
-
+
setMonitor(res)
})
return true
@@ -283,7 +304,6 @@ const UserModal = (props) => {
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
-
placeholder="请输入名称"
value={recordsay?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -291,7 +311,7 @@ const UserModal = (props) => {
name={newlys?.[1]?.type}
width="md"
label={newlys?.[1]?.name}
-
+
placeholder="请输入名称"
value={recordsay?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -312,6 +332,7 @@ const UserModal = (props) => {
label='类型'
/> : null
}
+ {rewkeys === 'zhichao'?:''}
{newlysay?.map((item, index) => {
return {
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
-
+
placeholder="请输入名称"
// value={recordssy?.[0]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -333,7 +354,7 @@ const UserModal = (props) => {
name={newlys?.[1]?.type}
width="md"
label={newlys?.[1]?.name}
-
+
placeholder="请输入名称"
// value={recordssy?.[1]?.value}
// rules={[{ required: true, message: "必填" }]}
@@ -354,10 +375,11 @@ const UserModal = (props) => {
label='类型'
/> : null
}
+ {rewkeys === 'zhichao'?:''}
{newlysay?.map((item, index) => {
return
})}
diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js
index 11b05946..7733ec5b 100644
--- a/web/client/src/sections/fillion/components/inforTable.js
+++ b/web/client/src/sections/fillion/components/inforTable.js
@@ -213,7 +213,7 @@ const InForTable = (props) => {
dataIndex: 'createdAt',
valueType: 'date',
render: (dom, record) => {
- return record.testTime
+ return record.testTime.slice(0,10)
},
fieldProps: {
onChange: (value, cs) => {
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index 119e1629..259f39de 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/web/client/src/sections/fillion/components/operationalTable.js
@@ -22,6 +22,7 @@ const OperaTionalTable = (props) => {
const [recortd, setRecortd] = useState()
const [rewkeys, setRewkeys] = useState('keyun')
const [delet, setDelet] = useState()
+ // const [, setDelet] = useState()
const ref = useRef()
useEffect(() => { ref.current.reload() }, [rewkeys, activeKey, delet])
diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js
index f94b4a48..fc292af8 100644
--- a/web/client/src/sections/fillion/components/project/project.js
+++ b/web/client/src/sections/fillion/components/project/project.js
@@ -145,7 +145,6 @@ const ProjectModal = (props) => {
label: '否',
},
]}
- width="xs"
name='done'
label='是否已完成'
rules={[{ required: true, message: "必填" }]}
diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js
index 7992b4e7..9bd358e5 100644
--- a/web/client/src/sections/fillion/components/transportationTable.js
+++ b/web/client/src/sections/fillion/components/transportationTable.js
@@ -3836,6 +3836,7 @@ const TransporTationTable = (props) => {
setRowSelected([]);
const res = await dispatch(getProject(query));
setCounts(res.payload.data)
+ console.log(res)
return {
...res,
total: res.payload.data ? res.payload.data.count : 0
diff --git a/web/log/development.txt b/web/log/development.txt
index a4666e68..048c1b69 100644
--- a/web/log/development.txt
+++ b/web/log/development.txt
@@ -24236,6 +24236,7 @@
[32m' at emitErrorCloseNT (internal/streams/destroy.js:68:3)\n'[39m +
[32m' at processTicksAndRejections (internal/process/task_queues.js:84:21)'[39m
}
+<<<<<<< Updated upstream
2022-07-28 10:08:50.687 - [31merror[39m: [FS-ERRHD]
{
message: [32m'Error: read ECONNRESET'[39m,
@@ -30704,3 +30705,9 @@
}
2022-07-28 16:51:10.270 - [34mdebug[39m: [FS-LOGGER] Init.
2022-07-28 16:51:11.180 - [32minfo[39m: [Router] Inject api: attachment/index
+=======
+2022-07-28 15:21:26.802 - [34mdebug[39m: [FS-LOGGER] Init.
+2022-07-28 15:21:27.251 - [32minfo[39m: [Router] Inject api: attachment/index
+2022-07-28 17:47:48.855 - [34mdebug[39m: [FS-LOGGER] Init.
+2022-07-28 17:47:49.287 - [32minfo[39m: [Router] Inject api: attachment/index
+>>>>>>> Stashed changes