Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

api/log/development.log

@@ -10817,8 +10817,113 @@ headers: {}
 2022-07-30 17:48:40.152 - info: [FS-AUTH] Inject auth and api mv into router.
 <<<<<<< Updated upstream
 >>>>>>> d8f96cea72338cf7a61dea293bd6d0cd5da48bb0
+<<<<<<< Updated upstream
 =======
 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
+=======
+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

web/client/src/sections/fillion/actions/infor.js

@@ -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: '编辑货运信息失败' },
+   });
+}

web/client/src/sections/fillion/components/highways/highwaysdata.js

@@ -47,7 +47,7 @@ const HightModal = (props) => {
                 }}
                 initialValues={recortd}
             >
-                {typecard == 'compile' ?
+                {/* {typecard == 'compile' ? */}
                     <ProForm.Group
                     >
                         <ProFormText
@@ -80,15 +80,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>
             {/* : ''

web/client/src/sections/fillion/components/operationalTable.js

@@ -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';
 
@@ -131,7 +131,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 +805,7 @@ const OperaTionalTable = (props) => {
                     );
                 },
             },
-        ], tab3: [
+        ], tab4: [
             {
                 title: '业户名称',
                 dataIndex: 'placeName',
@@ -1384,7 +1438,7 @@ const OperaTionalTable = (props) => {
                     );
                 },
             },
-        ], tab4: [
+        ], tab5: [
             {
                 title: '业户名称',
                 dataIndex: 'placeName',
@@ -1860,7 +1914,7 @@ const OperaTionalTable = (props) => {
                 <ProTable
                     actionRef={ref}
                     form={{
-                        submitter: rewkeys === 'keyun' ? false : true,
+                        submitter: rewkeys === 'keyun'|| rewkeys === 'huoyun'? false : true,
                     }}
                     toolbar={{
                         multipleLine: true,
@@ -1876,31 +1930,36 @@ const OperaTionalTable = (props) => {
                                         setRewkeys('keyun')
                                     }}>客运{activeKey === 'tab1'}</span>,
                                 },
-                                {
+                                 {
                                     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 +1970,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 +1992,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 +2045,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
                                 >
                                     导出

web/client/src/utils/webapi.js

@@ -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",
    //桥梁管理

web/log/development.txt

@@ -69425,11 +69425,17 @@
     '    at F:\\Highways4Good\\web\\node_modules\\koa-66\\index.js:209:56\n' +
     '    at dispatch (F:\\Highways4Good\\web\\node_modules\\koa\\node_modules\\koa-compose\\index.js:42:32)'
 }
+<<<<<<< Updated upstream
 =======
 >>>>>>> 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] 
+=======
+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
 {
   message: 'Error: connect ETIMEDOUT 10.8.30.157:9119',
   name: 'RequestError',
@@ -69443,6 +69449,7 @@
   error: { '$ref': '$["cause"]' },
   options: {
     jar: false,
+<<<<<<< Updated upstream
     url: 'http://10.8.30.157:9119/transportation/statistic?token=f512f393-bb3e-4f9b-8b9f-7dfe6bd958e5',
     headers: {
       host: '10.8.30.157:9119',
@@ -69453,6 +69460,198 @@
       'cache-control': 'no-cache,no-store,must-revalidate,max-age=-1,private',
       'x-requested-with': 'XMLHttpRequest',
       token: 'f512f393-bb3e-4f9b-8b9f-7dfe6bd958e5',
+=======
+    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
       'sec-ch-ua-platform': '"Windows"',
       expires: '-1',
       accept: '*/*',
@@ -69475,12 +69674,198 @@
   },
   response: undefined,
   stack: 'RequestError: Error: connect ETIMEDOUT 10.8.30.157:9119\n' +
+<<<<<<< Updated upstream
     '    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' +
+=======
+    '    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.582 - 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',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/screen/cockpit',
+      '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:18:59.559 - 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/department?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',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/screen',
+      '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:26:49.801 - 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/vehicle?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',
+      'sec-ch-ua-platform': '"Windows"',
+      expires: '-1',
+      accept: '*/*',
+      'sec-fetch-site': 'same-origin',
+      'sec-fetch-mode': 'cors',
+      'sec-fetch-dest': 'empty',
+      referer: 'http://localhost:5000/fillion/operational',
+      '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' +
+>>>>>>> Stashed changes
     '    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' +