From d2764525a5ab82dd3f3feefdb97ee1557e1f9a52 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Fri, 12 Aug 2022 09:47:49 +0800
Subject: [PATCH 1/5] tijiao

---
 api/log/development.log                       | 105 +++++
 .../src/sections/fillion/actions/infor.js     |  22 +
 .../components/highways/highwaysdata.js       |  14 +-
 .../fillion/components/operationalTable.js    |  98 ++++-
 web/client/src/utils/webapi.js                |   2 +
 web/log/development.txt                       | 385 ++++++++++++++++++
 6 files changed, 601 insertions(+), 25 deletions(-)

diff --git a/api/log/development.log b/api/log/development.log
index bfbe3a7a..bfe7a236 100644
--- a/api/log/development.log
+++ b/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
diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js
index e0f884a4..d8b5fcd8 100644
--- a/web/client/src/sections/fillion/actions/infor.js
+++ b/web/client/src/sections/fillion/actions/infor.js
@@ -367,4 +367,26 @@ export function delPropagata(query) {
       msg: { option: '删除宣传视频信息' },
       // 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: '编辑货运信息失败' },
+   });
 }
\ No newline at end of file
diff --git a/web/client/src/sections/fillion/components/highways/highwaysdata.js b/web/client/src/sections/fillion/components/highways/highwaysdata.js
index c5bc3851..e25fb43b 100644
--- a/web/client/src/sections/fillion/components/highways/highwaysdata.js
+++ b/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>
             {/* : ''
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index a028fb07..39f2dbe1 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/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
                                 >
                                     导出
diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js
index f284e9ab..6730c74a 100644
--- a/web/client/src/utils/webapi.js
+++ b/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",
    //桥梁管理
diff --git a/web/log/development.txt b/web/log/development.txt
index 3bf3db6d..46e0b586 100644
--- a/web/log/development.txt
+++ b/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' +

From f8f592662e621b40e1ebb29b7a415ac8400e7d04 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 12 Aug 2022 10:16:50 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=81=93=E8=B7=AF=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/overview/conserve.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/api/app/lib/controllers/overview/conserve.js b/api/app/lib/controllers/overview/conserve.js
index 3e98400b..e8d10250 100644
--- a/api/app/lib/controllers/overview/conserve.js
+++ b/api/app/lib/controllers/overview/conserve.js
@@ -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)

From 78f1da3d1bc388f8ad41dac4564980a37626082e Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 12 Aug 2022 10:26:16 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=B4=A7=E8=BF=90?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/routes/data/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/app/lib/routes/data/index.js b/api/app/lib/routes/data/index.js
index 68f800a0..3b718194 100644
--- a/api/app/lib/routes/data/index.js
+++ b/api/app/lib/routes/data/index.js
@@ -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) {

From 4ab4d2f7955ac61edf61e6ff8fa5602c38522f0e Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Fri, 12 Aug 2022 10:47:15 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=90=E6=94=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A7=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/log/development.log | 24 ++++++++++++
 api/package.json        | 86 ++++++++++++++++++++---------------------
 web/log/development.txt |  6 +++
 web/package.json        |  2 +-
 4 files changed, 74 insertions(+), 44 deletions(-)

diff --git a/api/log/development.log b/api/log/development.log
index bfe7a236..a75f6b88 100644
--- a/api/log/development.log
+++ b/api/log/development.log
@@ -10927,3 +10927,27 @@ headers: {}
     '    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.
diff --git a/api/package.json b/api/package.json
index ecc9e7dc..29272131 100644
--- a/api/package.json
+++ b/api/package.json
@@ -1,45 +1,45 @@
 {
-    "name": "smart-emergency",
-    "version": "1.0.0",
-    "description": "fs smart emergency api",
-    "main": "server.js",
-    "scripts": {
-        "test": "set DEBUG=true&&\"node_modules/.bin/mocha\" --harmony --reporter spec app/test/*.test.js",
-        "start": "set NODE_ENV=development&&node server -p 4000 -g postgres://postgres://postgres:123@10.8.30.32:5432/highways4good -f http://localhost:14000 --qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5 --qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa --qnbkt dev-highways4good --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
-        "start:linux": "export NODE_ENV=development&&node server -p 4000 -g postgres://FashionAdmin:123456@10.8.30.39:5432/pm1",
-        "automate": "sequelize-automate -c sequelize-automate.config.js"
-    },
-    "author": "",
-    "license": "MIT",
-    "repository": {},
-    "dependencies": {
-        "@fs/attachment": "^1.0.0",
-        "archiver": "3.0.0",
-        "args": "^3.0.7",
-        "async-busboy": "^0.7.0",
-        "better-xlsx": "^0.7.6",
-        "crypto-js": "^4.0.0",
-        "file-saver": "^2.0.2",
-        "fs-web-server-scaffold": "^2.0.2",
-        "ioredis": "^4.19.4",
-        "kafka-node": "^2.2.3",
-        "koa-convert": "^1.2.0",
-        "koa-proxy": "^0.9.0",
-        "koa2-swagger-ui": "^5.3.0",
-        "md5-node": "^1.0.1",
-        "moment": "^2.24.0",
-        "path": "^0.12.7",
-        "path-to-regexp": "^3.0.0",
-        "pg": "^7.9.0",
-        "redis": "^3.1.2",
-        "request": "^2.88.2",
-        "rimraf": "^3.0.2",
-        "superagent": "^3.5.2",
-        "swagger-jsdoc": "^6.1.0",
-        "uuid": "^3.3.2",
-        "xlsx": "^0.16.9"
-    },
-    "devDependencies": {
-        "mocha": "^6.0.2"
-    }
+  "name": "smart-emergency",
+  "version": "1.0.0",
+  "description": "fs smart emergency api",
+  "main": "server.js",
+  "scripts": {
+    "test": "set DEBUG=true&&\"node_modules/.bin/mocha\" --harmony --reporter spec app/test/*.test.js",
+    "start": "set NODE_ENV=development&&node server -p 4000 -g postgres://postgres://postgres:123@10.8.30.32:5432/highways4good -f http://localhost:14000 --qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5 --qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa --qnbkt dev-highways4good --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
+    "start:linux": "export NODE_ENV=development&&node server -p 4000 -g postgres://FashionAdmin:123456@10.8.30.39:5432/pm1",
+    "automate": "sequelize-automate -c sequelize-automate.config.js"
+  },
+  "author": "",
+  "license": "MIT",
+  "repository": {},
+  "dependencies": {
+    "@fs/attachment": "^1.0.0",
+    "archiver": "3.0.0",
+    "args": "^3.0.7",
+    "async-busboy": "^0.7.0",
+    "better-xlsx": "^0.7.6",
+    "crypto-js": "^4.0.0",
+    "file-saver": "^2.0.2",
+    "fs-web-server-scaffold": "^2.0.2",
+    "ioredis": "^4.19.4",
+    "kafka-node": "^2.2.3",
+    "koa-convert": "^1.2.0",
+    "koa-proxy": "^0.9.0",
+    "koa2-swagger-ui": "^5.3.0",
+    "md5-node": "^1.0.1",
+    "moment": "^2.24.0",
+    "path": "^0.12.7",
+    "path-to-regexp": "^3.0.0",
+    "pg": "^7.9.0",
+    "redis": "^3.1.2",
+    "request": "^2.88.2",
+    "rimraf": "^3.0.2",
+    "superagent": "^3.5.2",
+    "swagger-jsdoc": "^6.1.0",
+    "uuid": "^3.3.2",
+    "xlsx": "^0.16.9"
+  },
+  "devDependencies": {
+    "mocha": "^6.0.2"
+  }
 }
diff --git a/web/log/development.txt b/web/log/development.txt
index 46e0b586..720ae50d 100644
--- a/web/log/development.txt
+++ b/web/log/development.txt
@@ -69873,3 +69873,9 @@
     '    at emitErrorAndCloseNT (internal/streams/destroy.js:60:3)\n' +
     '    at processTicksAndRejections (internal/process/task_queues.js:84:21)'
 }
+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
diff --git a/web/package.json b/web/package.json
index 548d6ed8..7cd3d607 100644
--- a/web/package.json
+++ b/web/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "test": "mocha",
     "start": "cross-env NODE_ENV=development npm run start-params",
-    "start-params": "node server -p 5000 -u http://10.8.30.157:9119/ --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
+    "start-params": "node server -p 5000 -u http://localhost:14000 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
     "deploy": "export NODE_ENV=production&&npm run color && npm run build && node server",
     "build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js",
     "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js",

From 6fc3f0d2da5ea0fafc21a362197eaf08c92d9f90 Mon Sep 17 00:00:00 2001
From: xingyongchun <xing.yongchun@free-sun.com.cn>
Date: Fri, 12 Aug 2022 10:47:32 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B4=A7=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/highways/highwaysdata.js       | 10 ++++++-
 .../fillion/components/operationalTable.js    | 30 +++++--------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/web/client/src/sections/fillion/components/highways/highwaysdata.js b/web/client/src/sections/fillion/components/highways/highwaysdata.js
index e25fb43b..70d10754 100644
--- a/web/client/src/sections/fillion/components/highways/highwaysdata.js
+++ b/web/client/src/sections/fillion/components/highways/highwaysdata.js
@@ -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)
diff --git a/web/client/src/sections/fillion/components/operationalTable.js b/web/client/src/sections/fillion/components/operationalTable.js
index 39f2dbe1..17cae8d8 100644
--- a/web/client/src/sections/fillion/components/operationalTable.js
+++ b/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,getShippingList } 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: [
             {
@@ -185,7 +169,7 @@ const OperaTionalTable = (props) => {
             },
 
         ],
-         tab3: [
+        tab3: [
             {
                 title: '业户名称',
                 dataIndex: 'placeName',
@@ -1914,7 +1898,7 @@ const OperaTionalTable = (props) => {
                 <ProTable
                     actionRef={ref}
                     form={{
-                        submitter: rewkeys === 'keyun'|| rewkeys === 'huoyun'? false : true,
+                        submitter: rewkeys === 'keyun' || rewkeys === 'huoyun' ? false : true,
                     }}
                     toolbar={{
                         multipleLine: true,
@@ -1930,7 +1914,7 @@ const OperaTionalTable = (props) => {
                                         setRewkeys('keyun')
                                     }}>客运{activeKey === 'tab1'}</span>,
                                 },
-                                 {
+                                {
                                     key: 'tab2',
                                     label: <span onClick={() => {
                                         setRewkeys('huoyun')
@@ -1970,7 +1954,7 @@ const OperaTionalTable = (props) => {
                     rowKey='id'
                     // alwaysShowAlert 
                     // tableAlertRender={true}
-                    rowSelection={rewkeys == 'keyun'||rewkeys == 'huoyun' ? false : {
+                    rowSelection={rewkeys == 'keyun' || rewkeys == 'huoyun' ? false : {
                         selectedRowKeys: rowSelected,
                         onChange: (selectedRowKeys) => {
                             setRowSelected(selectedRowKeys);
@@ -1992,7 +1976,7 @@ const OperaTionalTable = (props) => {
                                 ...res,
                                 total: res.payload.data ? res.payload.data.count : 0
                             }
-                        }if (rewkeys == 'huoyun') {
+                        } if (rewkeys == 'huoyun') {
                             const query = {}
                             setRowSelected([]);
                             const res = await dispatch(getShippingList(query));
@@ -2074,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}