free-sun
/
Highways4Good
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

tijiao

dev
wangyue 2 years ago
parent
bc40568d7c 6fc3f0d2da
commit
26f7cc4ac2
13 changed files with 652 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      api/app/lib/controllers/overview/conserve.js
  2. 8
      api/app/lib/routes/data/index.js
  3. 141
      api/log/development.log
  4. 22
      web/client/src/sections/fillion/actions/infor.js
  5. 24
      web/client/src/sections/fillion/components/highways/highwaysdata.js
  6. 114
      web/client/src/sections/fillion/components/operationalTable.js
  7. 8
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
  8. 4
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
  9. 30
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js
  10. 5
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js
  11. 2
      web/client/src/utils/webapi.js
  12. 316
      web/log/development.txt

4
api/app/lib/controllers/overview/conserve.js
View File

@ -10,7 +10,7 @@ async function statistic (ctx) {
where: {
reportType: 'conserve',
},
attributes: ['id', 'road', 'time', 'projectType', 'projectType', 'roadSectionStart', 'roadSectionEnd'],
attributes: ['id', 'road', 'time', 'projectType', 'projectType', 'roadSectionStart', 'roadSectionEnd', 'scenePic', 'conserveBeforePic', 'conserveUnderwayPic', 'conserveAfterPic'],
include: [{
model: models.User,
attributes: ['name']
@ -18,9 +18,7 @@ async function statistic (ctx) {
}
if (projectType) {
findOption.where.projectType = projectType;
}
const reportRes = await await models.Report.findAll(findOption)

8
api/app/lib/routes/data/index.js
View File

@ -21,7 +21,7 @@ module.exports = function (app, router, opts) {
// 运政
//货运
async function setVehicleType (ctx, next) {
async function setFreightType (ctx, next) {
ctx.request.body = {
...(ctx.request.body || {}),
type: 'freight'
@ -29,13 +29,13 @@ module.exports = function (app, router, opts) {
await next()
}
app.fs.api.logAttr['GET/vehicle/freight'] = { content: '获取运政列表', visible: true };
router.get('/vehicle/freight', setVehicleType, vehicle.get);
router.get('/vehicle/freight', setFreightType, vehicle.get);
app.fs.api.logAttr['PUT/vehicle/freight'] = { content: '编辑运政数据', visible: true };
router.put('/vehicle/freight', setVehicleType, vehicle.edit);
router.put('/vehicle/freight', setFreightType, vehicle.edit);
app.fs.api.logAttr['DEL/vehicle/freight/:id'] = { content: '删除运政数据', visible: false };
router.del('/vehicle/freight/:id', setVehicleType, vehicle.del);
router.del('/vehicle/freight/:id', setFreightType, vehicle.del);
//客运车
async function setVehicleType (ctx, next) {

141
api/log/development.log
View File

@ -10818,6 +10818,7 @@ headers: {}
<<<<<<< Updated upstream
>>>>>>> d8f96cea72338cf7a61dea293bd6d0cd5da48bb0
<<<<<<< HEAD
<<<<<<< HEAD
2022-08-12 09:20:22.775 - debug: [FS-LOGGER] Init.
2022-08-12 09:20:23.676 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:20:23.676 - info: [FS-AUTH] Inject auth and api mv into router.
@ -10922,10 +10923,14 @@ headers: {}
}
=======
=======
<<<<<<< Updated upstream
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
=======
2022-08-11 09:02:08.616 - debug: [FS-LOGGER] Init.
2022-08-11 09:02:08.699 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-11 09:02:08.699 - info: [FS-AUTH] Inject auth and api mv into router.
>>>>>>> Stashed changes
<<<<<<< HEAD
>>>>>>> 19b9beb06f6736a29ddc681ae749b4770d47bbb5
2022-08-12 09:32:24.787 - debug: [FS-LOGGER] Init.
2022-08-12 09:32:24.871 - info: [FS-ATTACHMENT] Inject attachment mw into router.
@ -10933,3 +10938,139 @@ headers: {}
2022-08-12 11:04:42.222 - debug: [FS-LOGGER] Init.
2022-08-12 11:04:42.302 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 11:04:42.302 - info: [FS-AUTH] Inject auth and api mv into router.
=======
=======
2022-08-11 17:14:25.395 - debug: [FS-LOGGER] Init.
2022-08-11 17:14:25.473 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-11 17:14:25.473 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-11 17:14:25.482 - error: [app]
{
message: "Unexpected token '<<'",
stack: 'f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\controllers\\data\\index.js:84\n' +
'<<<<<<< HEAD\n' +
'^^\n' +
'\n' +
"SyntaxError: Unexpected token '<<'\n" +
' at wrapSafe (internal/modules/cjs/loader.js:915:16)\n' +
' at Module._compile (internal/modules/cjs/loader.js:963:27)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at Object.<anonymous> (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' +
' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:11:17\n' +
' at Array.forEach (<anonymous>)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:9:60\n' +
' at Array.forEach (<anonymous>)\n' +
' at module.exports (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:7:31)\n' +
' at Object.module.exports.entry (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\index.js:21:14)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\node_modules\\fs-web-server-scaffold\\index.js:74:20\n' +
' at Array.forEach (<anonymous>)'
}
2022-08-12 09:36:43.511 - debug: [FS-LOGGER] Init.
2022-08-12 09:36:43.599 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:36:43.599 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 09:36:43.608 - error: [app]
{
message: "Unexpected token '<<'",
stack: 'f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\controllers\\data\\index.js:84\n' +
'<<<<<<< HEAD\n' +
'^^\n' +
'\n' +
"SyntaxError: Unexpected token '<<'\n" +
' at wrapSafe (internal/modules/cjs/loader.js:915:16)\n' +
' at Module._compile (internal/modules/cjs/loader.js:963:27)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at Object.<anonymous> (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' +
' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:11:17\n' +
' at Array.forEach (<anonymous>)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:9:60\n' +
' at Array.forEach (<anonymous>)\n' +
' at module.exports (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:7:31)\n' +
' at Object.module.exports.entry (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\index.js:21:14)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\node_modules\\fs-web-server-scaffold\\index.js:74:20\n' +
' at Array.forEach (<anonymous>)'
}
2022-08-12 09:38:24.609 - debug: [FS-LOGGER] Init.
2022-08-12 09:38:24.681 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:38:24.681 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 09:38:24.690 - error: [app]
{
message: "Unexpected token '<<'",
stack: 'f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\controllers\\data\\index.js:84\n' +
'<<<<<<< HEAD\n' +
'^^\n' +
'\n' +
"SyntaxError: Unexpected token '<<'\n" +
' at wrapSafe (internal/modules/cjs/loader.js:915:16)\n' +
' at Module._compile (internal/modules/cjs/loader.js:963:27)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at Object.<anonymous> (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' +
' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:11:17\n' +
' at Array.forEach (<anonymous>)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:9:60\n' +
' at Array.forEach (<anonymous>)\n' +
' at module.exports (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\routes\\index.js:7:31)\n' +
' at Object.module.exports.entry (f:\\项目\\sihao\\Highways4Good\\api\\app\\lib\\index.js:21:14)\n' +
' at f:\\项目\\sihao\\Highways4Good\\api\\node_modules\\fs-web-server-scaffold\\index.js:74:20\n' +
' at Array.forEach (<anonymous>)'
}
>>>>>>> Stashed changes
2022-08-12 09:49:59.887 - debug: [FS-LOGGER] Init.
2022-08-12 09:49:59.963 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:49:59.963 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 09:50:02.270 - debug: [FS-LOGGER] Init.
2022-08-12 09:50:02.347 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:50:02.347 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 10:11:27.603 - debug: [FS-LOGGER] Init.
2022-08-12 10:11:27.679 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 10:11:27.680 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 10:29:27.908 - debug: [FS-LOGGER] Init.
2022-08-12 10:29:27.985 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 10:29:27.985 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 10:29:45.743 - debug: [FS-LOGGER] Init.
2022-08-12 10:29:45.819 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 10:29:45.819 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 10:29:47.156 - debug: [FS-LOGGER] Init.
2022-08-12 10:29:47.233 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 10:29:47.233 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 10:30:43.735 - debug: [FS-LOGGER] Init.
2022-08-12 10:30:43.811 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 10:30:43.812 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 10:36:36.953 - debug: [FS-LOGGER] Init.
2022-08-12 10:36:37.032 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 10:36:37.032 - info: [FS-AUTH] Inject auth and api mv into router.
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
2022-08-12 11:07:34.358 - debug: [FS-LOGGER] Init.
2022-08-12 11:07:34.438 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 11:07:34.438 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 11:07:40.465 - debug: [FS-LOGGER] Init.
2022-08-12 11:07:40.545 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 11:07:40.545 - info: [FS-AUTH] Inject auth and api mv into router.

22
web/client/src/sections/fillion/actions/infor.js
View File

@ -368,3 +368,25 @@ export function delPropagata(query) {
// reducer: { name: 'reportstatistic' }
});
}
export function getShippingList(query) {
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
query: query,
actionType: 'GET_SHIPPING_LIST',
url: ApiTable.getShippingList,
msg: { error: '获取货运信息失败' },
});
}
export function putShippingList(query) {
return dispatch => basicAction({
type: 'put',
dispatch: dispatch,
data: query,
actionType: 'PUT_SHIPPING_LIST',
url: ApiTable.putShippingList,
msg: { error: '编辑货运信息失败' },
});
}

24
web/client/src/sections/fillion/components/highways/highwaysdata.js
View File

@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import { Form, Spin, Table } from 'antd';
import { ModalForm, ProForm, ProFormText,ProFormSelect } from '@ant-design/pro-form';
import { putOperaTional,putHighways } from "../../actions/infor"
import { putOperaTional,putHighways,putShippingList } from "../../actions/infor"
import _ from 'lodash'
const HightModal = (props) => {
@ -32,6 +32,14 @@ const HightModal = (props) => {
})
return true
} if (rewkeys === 'freight') {
setDelet(values)
const query = { ...values, id:recortd?.id }
dispatch(putShippingList(query)).then((res) => {
setSuccess(res.success)
})
return true
}
if (rewkeys === 'highways') {
setDelet(values)
@ -47,7 +55,7 @@ const HightModal = (props) => {
}}
initialValues={recortd}
>
{typecard == 'compile' ?
{/* {typecard == 'compile' ? */}
<ProForm.Group
>
<ProFormText
@ -80,15 +88,9 @@ const HightModal = (props) => {
/>
</ProForm.Group>
: <ProForm.Group>
{/* <ProFormText
name={newlys?.[0]?.type}
width="md"
label={newlys?.[0]?.name}
placeholder="请输入名称"
/> */}
</ProForm.Group>}
{/* : <ProForm.Group>
vfdscfd
</ProForm.Group>} */}
</ModalForm>
{/* : ''

114
web/client/src/sections/fillion/components/operationalTable.js
View File

@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import { Spin, Button, Popconfirm, Badge } from 'antd';
import ProTable from '@ant-design/pro-table';
import './protable.less'
import { getOperaTional, getSpecificVehicle, getHouseholds, delSpecificVehicle, delHouseholds } from "../actions/infor"
import { getOperaTional, getSpecificVehicle, getHouseholds, delSpecificVehicle, delHouseholds, getShippingList } from "../actions/infor"
import UserModal from './infor/details';
import HightModal from './highways/highwaysdata';
@ -62,22 +62,6 @@ const OperaTionalTable = (props) => {
setModalRecord(null);
}
}
//批量导出
const exports = (ids, counts) => {
// console.log(user);
let reportIds = [];
if (ids.length)
reportIds = ids
else
reportIds = (counts || {}).ids || [];
superagent.post('/_report/http')
.send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
const resTextIs = res.text.split('/').pop()
window.open(
'/_api/' +
`attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
})
}
const columns = {
tab1: [
{
@ -131,7 +115,61 @@ const OperaTionalTable = (props) => {
}
},
], tab2: [
],
tab2: [
{
title: '类型',
dataIndex: 'placeName',
fixed: 'left',
width: 120,
options: 1,
backgroundColor: "#ffffff",
search: false,
fieldProps: {
placeholder: '请输入道路名称进行搜索',
getPopupContainer: (triggerNode) => triggerNode.parentNode,
},
render: (dom, record) => {
return record.name
},
},
{
title: '数量',
search: false,
dataIndex: 'containers',
fixed: 'left',
width: 120,
render: (dom, record) => {
return record.count
},
fieldProps: {
getPopupContainer: (triggerNode) => triggerNode.parentNode,
}
},
{
title: '操作',
dataIndex: 'creatTime',
valueType: 'dateTimeRange',
hideInSearch: true,
width: 160,
fixed: 'right',
render: (dom, record) => {
return <div><Button type="link"
onClick={() => {
hightModal('edit', record)
setTypecard('111')
setRecortd(record)
}}
>编辑</Button></div>
}
},
],
tab3: [
{
title: '业户名称',
dataIndex: 'placeName',
@ -751,7 +789,7 @@ const OperaTionalTable = (props) => {
);
},
},
], tab3: [
], tab4: [
{
title: '业户名称',
dataIndex: 'placeName',
@ -1384,7 +1422,7 @@ const OperaTionalTable = (props) => {
);
},
},
], tab4: [
], tab5: [
{
title: '业户名称',
dataIndex: 'placeName',
@ -1860,7 +1898,7 @@ const OperaTionalTable = (props) => {
<ProTable
actionRef={ref}
form={{
submitter: rewkeys === 'keyun' ? false : true,
submitter: rewkeys === 'keyun' || rewkeys === 'huoyun' ? false : true,
}}
toolbar={{
multipleLine: true,
@ -1878,29 +1916,34 @@ const OperaTionalTable = (props) => {
},
{
key: 'tab2',
label: <span onClick={() => {
setRewkeys('huoyun')
}}>货运{activeKey === 'tab2'}</span>,
},
{
key: 'tab3',
label: <span onClick={() => {
{
setRewkeys('chuzu')
}
}}>出租车{activeKey === 'tab2'}</span>,
}}>出租车{activeKey === 'tab3'}</span>,
},
{
key: 'tab3',
key: 'tab4',
label: <span onClick={() => {
{
setRewkeys('weihuo')
}
}}>危险货运{activeKey === 'tab3'}</span>,
}}>危险货运{activeKey === 'tab4'}</span>,
}, {
key: 'tab4',
key: 'tab5',
label: <span onClick={() => {
setDifferentiate('business')
setRewkeys('yehu')
}}>业户{activeKey === 'tab4'}</span>,
},
}}>业户{activeKey === 'tab5'}</span>,
}
],
},
}}
@ -1911,7 +1954,7 @@ const OperaTionalTable = (props) => {
rowKey='id'
// alwaysShowAlert
// tableAlertRender={true}
rowSelection={rewkeys == 'keyun' ? false : {
rowSelection={rewkeys == 'keyun' || rewkeys == 'huoyun' ? false : {
selectedRowKeys: rowSelected,
onChange: (selectedRowKeys) => {
setRowSelected(selectedRowKeys);
@ -1933,6 +1976,15 @@ const OperaTionalTable = (props) => {
...res,
total: res.payload.data ? res.payload.data.count : 0
}
} if (rewkeys == 'huoyun') {
const query = {}
setRowSelected([]);
const res = await dispatch(getShippingList(query));
setCounts(res.payload.data)
return {
...res,
total: res.payload.data ? res.payload.data.count : 0
}
}
if (rewkeys == 'chuzu') {
const query = {
@ -1977,7 +2029,7 @@ const OperaTionalTable = (props) => {
defaultCollapsed: false,
optionRender: (searchConfig, formProps, dom) => [
...dom.reverse(),
['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, differentiate, genre) }}>
['tab3', 'tab4', 'tab5'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, differentiate, genre) }}>
<Button
>
导出
@ -2006,7 +2058,7 @@ const OperaTionalTable = (props) => {
onVisibleChange={setModalVisibleyilan}
modalRecord={modalRecord}
typecard={typecard}
rewkeys={'passenger'}
rewkeys={rewkeys=='keyun'?'passenger':'freight'}
recortd={recortd}
setDelet={setDelet}
setRecortd={setRecortd}

8
web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
View File

@ -12,9 +12,10 @@ const Right = (props) => {
const [list, setList] = useState([])
const [roads, setRoads] = useState()
const [num, setNum] = useState()
const [shuzu, setShuzu] = useState([])
useEffect(() => {
const daolus = dispatch(getRoadmaintain()).then((res) => {
console.log(res);
// console.log(res);
setList(res.payload.data.reportList.filter((item, index) => {
return item.projectType == "road"
@ -23,6 +24,7 @@ const Right = (props) => {
return item.projectType == "road"
}))
// console.log(res.payload.data);
})
}, [])
useEffect(() => {
@ -40,6 +42,8 @@ const Right = (props) => {
{/* <Spin spinning={!nums} tip="Loading" style={{ width: "100%", height: "100%" }}> */}
{
list.map((item, index) => {
// setShuzu([{ "conserveAfterPic": item.conserveAfterPic }, { "conserveBeforePic": item.conserveBeforePic }, { "conserveUnderwayPic": item.conserveUnderwayPic }])
// console.log(item);
return (
<li className={index} style={{
height: "20px", position: "relative", width: "100%", color: "#FFFFFF", marginTop: index == 0 ? "4px" : "5px", listStyle: "none", fontSize: "14px"
@ -62,7 +66,7 @@ const Right = (props) => {
num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "50%", marginTop: "0", top: "35%" }}>
<img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}>
<Hua op={121212} />
<Hua shuzu={[{ "imgs": item.conserveAfterPic ? item.conserveAfterPic[0] : "" }, { "imgs": item.conserveBeforePic ? item.conserveBeforePic[0] : "" }, { "imgs": item.conserveUnderwayPic ? item.conserveUnderwayPic[0] : "" }]} />
</div>
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>

4
web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
View File

@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
import Lun from "../right/lunbo"
import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
import moment from 'moment'
import Hua from "./hudong"
// import { Spin } from 'antd'
@ -63,6 +64,9 @@ const Right = (props) => {
{
num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "50%", marginTop: "0", top: "35%" }}>
<img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}>
<Hua shuzu={[{ "imgs": item.conserveAfterPic ? item.conserveAfterPic[0] : "" }, { "imgs": item.conserveBeforePic ? item.conserveBeforePic[0] : "" }, { "imgs": item.conserveUnderwayPic ? item.conserveUnderwayPic[0] : "" }]} />
</div>
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>养护类型<span style={{ color: "#EEF4FF", marginLeft: "30px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>日常养护</span></p>

30
web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js
View File

@ -43,18 +43,12 @@ class ReactCarousel extends Component {
timer: null, // 定时器
show: false, // 前后按钮显示
// arr1: ""
dizhi: localStorage.getItem("qndmn")
}
// console.log(this.state.imgs);
this.state.imgs = [{ name: "南昌县迎宾大道管制路段", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段2", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段3", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段4", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段", images: "/assets/images/leadership/shiyantu.png" },
{ name: "南昌县迎宾大道管制路段", images: "/assets/images/leadership/shiyantu.png" }]
this.state.imgs = this.props.shuzu.filter((item) => {
return item.imgs !== ""
})
}
@ -65,28 +59,20 @@ class ReactCarousel extends Component {
<div className="contain"
onMouseEnter={() => { this.stop() }} //鼠标进入停止自动播放
onMouseLeave={() => { this.start() }} //鼠标退出自动播放
>
<ul className="ul">
{
this.state.imgs.map((value, index) => {
console.log(this.props);
return (
<li style={{ position: "relative", width: "100%", height: "100%", top: "-5%", fontSize: "12px" }} className={index === this.state.showIndex ? 'show' : ''}
key={index}
>
{value.name ? <div style={{ width: "100%", height: "80%", backgroundColor: "#fff", position: "absolute", top: "10%", right: "5%" }}>
<div style={{ width: "100%", height: "100%", position: "absolute", top: "80%" }}>
<div style={{ width: "100%", height: "20%", backgroundColor: "rgba(0,0,0,0.6)", overflow: "hiddden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
<img src='/assets/images/leadership/weizhis.png' style={{ width: "6%", height: "80%", marginLeft: "3%", marginRight: "3%" }} />
{Math.ceil(Math.random() * 10)}
</div>
<div style={{ width: "100%", height: "80%", position: "absolute", top: "10%", right: "5%" }}>
<img src={this.state.dizhi + "/" + value.imgs} style={{ width: "100%", height: "100%", marginLeft: "3%", marginRight: "3%" }} />
</div>
</div> : ""}
{/* <div>{value[1].name}</div>
<div>{value[2].name}</div>
<div>{value[3].name}</div> */}
</li>
)
})
}

5
web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js
View File

@ -2,6 +2,8 @@ import React, { useState, useEffect } from 'react'
import Lun from "../right/lunbo"
import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
import moment from 'moment'
import Hua from "./hudong"
const Right = (props) => {
const { dispatch } = props
@ -55,6 +57,9 @@ const Right = (props) => {
{
num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "50%", marginTop: "0", top: "35%" }}>
<img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}>
<Hua shuzu={[{ "imgs": item.conserveAfterPic ? item.conserveAfterPic[0] : "" }, { "imgs": item.conserveBeforePic ? item.conserveBeforePic[0] : "" }, { "imgs": item.conserveUnderwayPic ? item.conserveUnderwayPic[0] : "" }]} />
</div>
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>养护类型<span style={{ color: "#EEF4FF", marginLeft: "30px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>日常养护</span></p>

2
web/client/src/utils/webapi.js
View File

@ -147,6 +147,8 @@ export const ApiTable = {
getSpecificVehicle: 'vehicle/specific', putSpecificVehicle: 'vehicle/specific', delSpecificVehicle: 'vehicle/{vehicleId}/specific',
getHouseholds: 'vehicle/business', putHouseholds: 'vehicle/business', delHouseholds: 'vehicle/business/{businessId}',
getRoadway: 'road',
getShippingList:'vehicle/freight',putShippingList:'vehicle/freight',
// 获取运政统计
getYunZheng: "transportation/statistic",
//桥梁管理

316
web/log/development.txt
View File

@ -69426,6 +69426,7 @@
' at dispatch (F:\\Highways4Good\\web\\node_modules\\koa\\node_modules\\koa-compose\\index.js:42:32)'
}
<<<<<<< HEAD
<<<<<<< HEAD
2022-08-11 11:27:34.525 - error: [FS-ERRHD]
{
message: 'qndmn is not defined',
@ -69549,11 +69550,22 @@
2022-08-11 14:08:17.415 - error: [FS-ERRHD]
=======
=======
<<<<<<< Updated upstream
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
=======
>>>>>>> Stashed changes
2022-08-11 16:50:04.006 - debug: [FS-LOGGER] Init.
2022-08-11 16:50:04.815 - info: [Router] Inject api: attachment/index
2022-08-11 17:00:36.904 - error: [FS-ERRHD]
<<<<<<< HEAD
>>>>>>> 19b9beb06f6736a29ddc681ae749b4770d47bbb5
=======
=======
2022-08-11 17:15:17.090 - debug: [FS-LOGGER] Init.
2022-08-11 17:15:17.601 - info: [Router] Inject api: attachment/index
2022-08-11 17:16:30.167 - error: [FS-ERRHD]
>>>>>>> Stashed changes
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
{
message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
name: 'RequestError',
@ -69567,6 +69579,7 @@
error: { '$ref': '$["cause"]' },
options: {
jar: false,
<<<<<<< HEAD
<<<<<<< HEAD
url: 'http://10.8.30.157:9119/manage/overspeed/processed?token=f8340d18-7bef-4b38-82cc-ea472ada6e29',
headers: {
@ -69579,6 +69592,9 @@
'x-requested-with': 'XMLHttpRequest',
token: 'f8340d18-7bef-4b38-82cc-ea472ada6e29',
=======
=======
<<<<<<< Updated upstream
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
url: 'http://10.8.30.157:9119/transportation/statistic?token=f512f393-bb3e-4f9b-8b9f-7dfe6bd958e5',
headers: {
host: '10.8.30.157:9119',
@ -69589,7 +69605,202 @@
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
token: 'f512f393-bb3e-4f9b-8b9f-7dfe6bd958e5',
<<<<<<< HEAD
>>>>>>> 19b9beb06f6736a29ddc681ae749b4770d47bbb5
=======
=======
url: 'http://10.8.30.157:9119/department',
headers: {
host: '10.8.30.157:9119',
connection: 'keep-alive',
'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
expires: '-1',
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
'sec-ch-ua-mobile': '?0',
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
'sec-ch-ua-platform': '"Windows"',
accept: '*/*',
'sec-fetch-site': 'same-origin',
'sec-fetch-mode': 'cors',
'sec-fetch-dest': 'empty',
referer: 'http://localhost:5000/login',
'accept-encoding': 'gzip, deflate, br',
'accept-language': 'zh-CN,zh;q=0.9'
},
encoding: null,
followRedirect: true,
method: 'GET',
body: '[object Object]',
simple: false,
resolveWithFullResponse: true,
callback: [Function: RP$callback],
transform: undefined,
transform2xxOnly: false
},
response: undefined,
stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
' at new RequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
' at ClientRequest.emit (events.js:314:20)\n' +
' at Socket.socketErrorListener (_http_client.js:427:9)\n' +
' at Socket.emit (events.js:314:20)\n' +
' at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
' at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
' at processTicksAndRejections (internal/process/task_queues.js:84:21)'
}
2022-08-11 17:16:31.600 - error: [FS-ERRHD]
{
message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
name: 'RequestError',
cause: {
errno: 'ETIMEDOUT',
code: 'ETIMEDOUT',
syscall: 'connect',
address: '10.8.30.157',
port: 9119
},
error: { '$ref': '$["cause"]' },
options: {
jar: false,
url: 'http://10.8.30.157:9119/login',
headers: {
host: '10.8.30.157:9119',
connection: 'keep-alive',
'content-length': '55',
'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
'sec-ch-ua-mobile': '?0',
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
'content-type': 'application/json',
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
'sec-ch-ua-platform': '"Windows"',
expires: '-1',
accept: '*/*',
origin: 'http://localhost:5000',
'sec-fetch-site': 'same-origin',
'sec-fetch-mode': 'cors',
'sec-fetch-dest': 'empty',
referer: 'http://localhost:5000/signin',
'accept-encoding': 'gzip, deflate, br',
'accept-language': 'zh-CN,zh;q=0.9'
},
encoding: null,
followRedirect: true,
method: 'POST',
body: '{"username":"SuperAdmin","password":"123456","p":"456"}',
simple: false,
resolveWithFullResponse: true,
callback: [Function: RP$callback],
transform: undefined,
transform2xxOnly: false
},
response: undefined,
stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
' at new RequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
' at ClientRequest.emit (events.js:314:20)\n' +
' at Socket.socketErrorListener (_http_client.js:427:9)\n' +
' at Socket.emit (events.js:314:20)\n' +
' at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
' at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
' at processTicksAndRejections (internal/process/task_queues.js:84:21)'
}
2022-08-11 17:16:45.960 - error: [FS-ERRHD]
{
message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
name: 'RequestError',
cause: {
errno: 'ETIMEDOUT',
code: 'ETIMEDOUT',
syscall: 'connect',
address: '10.8.30.157',
port: 9119
},
error: { '$ref': '$["cause"]' },
options: {
jar: false,
url: 'http://10.8.30.157:9119/login',
headers: {
host: '10.8.30.157:9119',
connection: 'keep-alive',
'content-length': '55',
'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
'sec-ch-ua-mobile': '?0',
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
'content-type': 'application/json',
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
'sec-ch-ua-platform': '"Windows"',
expires: '-1',
accept: '*/*',
origin: 'http://localhost:5000',
'sec-fetch-site': 'same-origin',
'sec-fetch-mode': 'cors',
'sec-fetch-dest': 'empty',
referer: 'http://localhost:5000/signin',
'accept-encoding': 'gzip, deflate, br',
'accept-language': 'zh-CN,zh;q=0.9'
},
encoding: null,
followRedirect: true,
method: 'POST',
body: '{"username":"SuperAdmin","password":"123456","p":"456"}',
simple: false,
resolveWithFullResponse: true,
callback: [Function: RP$callback],
transform: undefined,
transform2xxOnly: false
},
response: undefined,
stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
' at new RequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
' at ClientRequest.emit (events.js:314:20)\n' +
' at Socket.socketErrorListener (_http_client.js:427:9)\n' +
' at Socket.emit (events.js:314:20)\n' +
' at emitErrorNT (internal/streams/destroy.js:92:8)\n' +
' at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
' at processTicksAndRejections (internal/process/task_queues.js:84:21)'
}
2022-08-11 17:18:44.156 - error: [FS-ERRHD]
{
message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
name: 'RequestError',
cause: {
errno: 'ETIMEDOUT',
code: 'ETIMEDOUT',
syscall: 'connect',
address: '10.8.30.157',
port: 9119
},
error: { '$ref': '$["cause"]' },
options: {
jar: false,
url: 'http://10.8.30.157:9119/manage/overspeed?token=bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
headers: {
host: '10.8.30.157:9119',
connection: 'keep-alive',
'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
'sec-ch-ua-mobile': '?0',
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
token: 'bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
>>>>>>> Stashed changes
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
'sec-ch-ua-platform': '"Windows"',
expires: '-1',
accept: '*/*',
@ -69616,6 +69827,7 @@
},
response: undefined,
stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
<<<<<<< HEAD
<<<<<<< HEAD
' at new RequestError (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
@ -69624,13 +69836,26 @@
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
=======
=======
<<<<<<< Updated upstream
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
' at new RequestError (E:\\code_git\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (E:\\code_git\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (E:\\code_git\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (E:\\code_git\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (E:\\code_git\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
<<<<<<< HEAD
>>>>>>> 19b9beb06f6736a29ddc681ae749b4770d47bbb5
=======
=======
' at new RequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
' at ClientRequest.emit (events.js:314:20)\n' +
' at Socket.socketErrorListener (_http_client.js:427:9)\n' +
' at Socket.emit (events.js:314:20)\n' +
@ -69639,6 +69864,7 @@
' at processTicksAndRejections (internal/process/task_queues.js:84:21)'
}
<<<<<<< HEAD
<<<<<<< HEAD
2022-08-11 14:13:00.068 - error: [FS-ERRHD]
{
message: 'qndmn is not defined',
@ -69720,6 +69946,9 @@
' at dispatch (F:\\Highways4Good\\web\\node_modules\\koa\\node_modules\\koa-compose\\index.js:42:32)'
}
2022-08-11 14:23:55.464 - error: [FS-ERRHD]
=======
2022-08-11 17:18:44.582 - error: [FS-ERRHD]
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
{
message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
name: 'RequestError',
@ -69733,7 +69962,11 @@
error: { '$ref': '$["cause"]' },
options: {
jar: false,
<<<<<<< HEAD
url: 'http://10.8.30.157:9119/transportation/statistic?token=9b53ac48-3cfd-451c-b684-2a9162d4f064',
=======
url: 'http://10.8.30.157:9119/manage/overspeed?token=bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
headers: {
host: '10.8.30.157:9119',
connection: 'keep-alive',
@ -69742,7 +69975,11 @@
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
<<<<<<< HEAD
token: '9b53ac48-3cfd-451c-b684-2a9162d4f064',
=======
token: 'bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
'sec-ch-ua-platform': '"Windows"',
expires: '-1',
accept: '*/*',
@ -69751,7 +69988,11 @@
'sec-fetch-dest': 'empty',
referer: 'http://localhost:5000/screen/cockpit',
'accept-encoding': 'gzip, deflate, br',
<<<<<<< HEAD
'accept-language': 'zh-CN,zh;q=0.9,ja;q=0.8'
=======
'accept-language': 'zh-CN,zh;q=0.9'
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
},
encoding: null,
followRedirect: true,
@ -69765,12 +70006,21 @@
},
response: undefined,
stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
<<<<<<< HEAD
' at new RequestError (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
=======
' at new RequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
' at ClientRequest.emit (events.js:314:20)\n' +
' at Socket.socketErrorListener (_http_client.js:427:9)\n' +
' at Socket.emit (events.js:314:20)\n' +
@ -69778,6 +70028,7 @@
' at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
' at processTicksAndRejections (internal/process/task_queues.js:84:21)'
}
<<<<<<< HEAD
2022-08-11 14:24:55.443 - error: [FS-ERRHD]
{
message: 'qndmn is not defined',
@ -69969,6 +70220,9 @@
' at dispatch (F:\\Highways4Good\\web\\node_modules\\koa\\node_modules\\koa-compose\\index.js:42:32)'
}
2022-08-11 14:52:23.385 - error: [FS-ERRHD]
=======
2022-08-11 17:18:59.559 - error: [FS-ERRHD]
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
{
message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
name: 'RequestError',
@ -69982,7 +70236,11 @@
error: { '$ref': '$["cause"]' },
options: {
jar: false,
<<<<<<< HEAD
url: 'http://10.8.30.157:9119/build/road_state?token=f8340d18-7bef-4b38-82cc-ea472ada6e29',
=======
url: 'http://10.8.30.157:9119/department?token=bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
headers: {
host: '10.8.30.157:9119',
connection: 'keep-alive',
@ -69991,16 +70249,26 @@
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
<<<<<<< HEAD
token: 'f8340d18-7bef-4b38-82cc-ea472ada6e29',
=======
token: 'bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
'sec-ch-ua-platform': '"Windows"',
expires: '-1',
accept: '*/*',
'sec-fetch-site': 'same-origin',
'sec-fetch-mode': 'cors',
'sec-fetch-dest': 'empty',
<<<<<<< HEAD
referer: 'http://localhost:5000/screen/cockpit',
'accept-encoding': 'gzip, deflate, br',
'accept-language': 'zh-CN,zh;q=0.9,ja;q=0.8'
=======
referer: 'http://localhost:5000/screen',
'accept-encoding': 'gzip, deflate, br',
'accept-language': 'zh-CN,zh;q=0.9'
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
},
encoding: null,
followRedirect: true,
@ -70014,12 +70282,21 @@
},
response: undefined,
stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
<<<<<<< HEAD
' at new RequestError (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
=======
' at new RequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
' at ClientRequest.emit (events.js:314:20)\n' +
' at Socket.socketErrorListener (_http_client.js:427:9)\n' +
' at Socket.emit (events.js:314:20)\n' +
@ -70027,6 +70304,7 @@
' at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
' at processTicksAndRejections (internal/process/task_queues.js:84:21)'
}
<<<<<<< HEAD
2022-08-11 14:52:43.940 - error: [FS-ERRHD]
{
message: 'qndmn is not defined',
@ -70048,6 +70326,9 @@
' at dispatch (F:\\Highways4Good\\web\\node_modules\\koa\\node_modules\\koa-compose\\index.js:42:32)'
}
2022-08-11 14:54:05.073 - error: [FS-ERRHD]
=======
2022-08-11 17:26:49.801 - error: [FS-ERRHD]
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
{
message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
name: 'RequestError',
@ -70061,7 +70342,11 @@
error: { '$ref': '$["cause"]' },
options: {
jar: false,
<<<<<<< HEAD
url: 'http://10.8.30.157:9119/transportation/statistic?token=f8340d18-7bef-4b38-82cc-ea472ada6e29',
=======
url: 'http://10.8.30.157:9119/vehicle?token=bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
headers: {
host: '10.8.30.157:9119',
connection: 'keep-alive',
@ -70070,16 +70355,26 @@
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
'x-requested-with': 'XMLHttpRequest',
<<<<<<< HEAD
token: 'f8340d18-7bef-4b38-82cc-ea472ada6e29',
=======
token: 'bce25a51-52bd-4a2e-b7a7-c06f41ecb9c8',
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
'sec-ch-ua-platform': '"Windows"',
expires: '-1',
accept: '*/*',
'sec-fetch-site': 'same-origin',
'sec-fetch-mode': 'cors',
'sec-fetch-dest': 'empty',
<<<<<<< HEAD
referer: 'http://localhost:5000/screen/cockpit',
'accept-encoding': 'gzip, deflate, br',
'accept-language': 'zh-CN,zh;q=0.9,ja;q=0.8'
=======
referer: 'http://localhost:5000/fillion/operational',
'accept-encoding': 'gzip, deflate, br',
'accept-language': 'zh-CN,zh;q=0.9'
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
},
encoding: null,
followRedirect: true,
@ -70093,12 +70388,22 @@
},
response: undefined,
stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
<<<<<<< HEAD
' at new RequestError (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
=======
' at new RequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\errors.js:14:15)\n' +
' at Request.plumbing.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:87:29)\n' +
' at Request.RP$callback [as _callback] (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request-promise-core\\lib\\plumbing.js:46:31)\n' +
' at self.callback (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:185:22)\n' +
' at Request.emit (events.js:314:20)\n' +
' at Request.onRequestError (F:\\项目\\sihao\\Highways4Good\\web\\node_modules\\request\\request.js:877:8)\n' +
>>>>>>> Stashed changes
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
' at ClientRequest.emit (events.js:314:20)\n' +
' at Socket.socketErrorListener (_http_client.js:427:9)\n' +
' at Socket.emit (events.js:314:20)\n' +
@ -70106,6 +70411,7 @@
' at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
' at processTicksAndRejections (internal/process/task_queues.js:84:21)'
}
<<<<<<< HEAD
2022-08-11 14:54:34.648 - error: [FS-ERRHD]
{
message: 'qndmn is not defined',
@ -71198,3 +71504,13 @@
>>>>>>> 19b9beb06f6736a29ddc681ae749b4770d47bbb5
2022-08-12 09:32:03.548 - debug: [FS-LOGGER] Init.
2022-08-12 09:32:03.611 - info: [Router] Inject api: attachment/index
=======
2022-08-12 09:48:32.452 - debug: [FS-LOGGER] Init.
2022-08-12 09:48:32.517 - info: [Router] Inject api: attachment/index
2022-08-12 10:13:00.182 - debug: [FS-LOGGER] Init.
2022-08-12 10:13:00.237 - info: [Router] Inject api: attachment/index
2022-08-12 10:36:42.015 - debug: [FS-LOGGER] Init.
2022-08-12 10:36:42.064 - info: [Router] Inject api: attachment/index
>>>>>>> 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90
2022-08-12 15:25:11.099 - debug: [FS-LOGGER] Init.
2022-08-12 15:25:11.168 - info: [Router] Inject api: attachment/index

Write Preview
Loading…
Cancel
Save