From 1967f5d91134906dd5aa71656d91bea66597390c Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 30 Jul 2022 16:48:43 +0800 Subject: [PATCH 01/10] =?UTF-8?q?7=E7=89=9B=E6=B5=8B=E8=AF=95=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/0.0.1/data/3_init_report_pic_data/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/0.0.1/data/3_init_report_pic_data/index.js b/scripts/0.0.1/data/3_init_report_pic_data/index.js index 5ef08acb..117046fb 100644 --- a/scripts/0.0.1/data/3_init_report_pic_data/index.js +++ b/scripts/0.0.1/data/3_init_report_pic_data/index.js @@ -11,16 +11,16 @@ try { // 连接数据库 const pool = new Pool({ - user: 'postgres', - host: '10.8.30.32', - database: 'highways4good', - password: '123', + user: 'FashionAdmin', + host: '10.8.30.156', + database: 'highway4goodn0728', + password: '123456', port: 5432, }) // 7niu 验证 - const accessKey = 'XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5' - const secretKey = 'yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa' - const bucket = 'dev-highways4good' + const accessKey = '5XrM4wEB9YU6RQwT64sPzzE6cYFKZgssdP5Kj3uu' + const secretKey = 'w6j2ixR_i-aelc6I7S3HotKIX-ukMzcKmDfH6-M5' + const bucket = 'anxinyun-test' From 58faf053a8f7fc1fdda9ce9c1b3a7be822b172a1 Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Sat, 30 Jul 2022 16:49:23 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- weapp/src/pages/home/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weapp/src/pages/home/index.jsx b/weapp/src/pages/home/index.jsx index fde2864b..b6a3166c 100644 --- a/weapp/src/pages/home/index.jsx +++ b/weapp/src/pages/home/index.jsx @@ -51,13 +51,13 @@ const Index = () => { {isSuperAdmin ? '查看' : '填报'} - { + {/* { isSuperAdmin && 视 频 监 控 查看 - } + } */} ); } From b6a18936801729feca557ee7751c6f6c36db0bd3 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 30 Jul 2022 17:02:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=B7=A1=E6=9F=A5/=E5=85=BB=E6=8A=A4?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=A0=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/.vscode/launch.json | 2 +- api/log/development.log | 23 +++++++++++++++++++ .../fillion/components/maintenanceTable.js | 4 ++-- .../fillion/components/patrolTable.js | 10 ++++---- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 35dd29e4..d82da15e 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -13,7 +13,7 @@ "NODE_ENV": "development" }, "args": [ - "-p 4000", + "-p 14000", "-f http://localhost:4000", "-g postgres://postgres:123@10.8.30.32:5432/highways4good", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", diff --git a/api/log/development.log b/api/log/development.log index 5c96f980..af888562 100644 --- a/api/log/development.log +++ b/api/log/development.log @@ -10668,3 +10668,26 @@ headers: {} 2022-07-30 12:38:46.294 - debug: [FS-LOGGER] Init. 2022-07-30 12:38:46.394 - info: [FS-ATTACHMENT] Inject attachment mw into router. 2022-07-30 12:38:46.394 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-30 14:19:21.439 - debug: [FS-LOGGER] Init. +2022-07-30 14:19:21.547 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-30 14:19:21.547 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-30 14:30:16.777 - error: path: /publicity, error: Error: Invalid value { + uid: -1659162615, + name: 'video.mp4', + status: 'done', + storageUrl: 'project/45017725-be73-4ec7-99a5-f57c2fde5682/video.mp4', + url: 'http://rfkimpwbb.hn-bkt.clouddn.com/project/45017725-be73-4ec7-99a5-f57c2fde5682/video.mp4', + size: 2172089 +} +2022-07-30 14:30:47.375 - error: path: /publicity, error: Error: Invalid value { + uid: -1659162647, + name: 'video.mp4', + status: 'done', + storageUrl: 'project/ec692a52-13e2-4bd1-80fb-5cae1386c782/video.mp4', + url: 'http://rfkimpwbb.hn-bkt.clouddn.com/project/ec692a52-13e2-4bd1-80fb-5cae1386c782/video.mp4', + size: 2172089 +} +2022-07-30 16:53:41.602 - error: path: /data/export, error: 参数错误 +2022-07-30 16:59:14.475 - debug: [FS-LOGGER] Init. +2022-07-30 16:59:14.573 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-30 16:59:14.573 - info: [FS-AUTH] Inject auth and api mv into router. diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index 9af9aabc..b33c19a6 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -263,7 +263,7 @@ const PatrolNameList = (props) => { const MaintenanceTable = (props) => { - const { userList, reportList, dispatch, reportListLoading, reportDetail, reportDetailLoading, userLoading } = props; + const { userList, reportList, dispatch, reportListLoading, reportDetail, reportDetailLoading, userLoading, exports } = props; const [record, setRecord] = useState(); const [dateRange, setDateRange] = useState(); const [detailVisible, setDetailVisible] = useState(false) @@ -333,7 +333,7 @@ const MaintenanceTable = (props) => { ); }; -function mapStateToProps(state) { +function mapStateToProps (state) { const { auth, depMessage, userList, reportList, reportDetail } = state; const pakData = (dep) => { return dep.map((d) => { diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 08d408bf..e8b49e3c 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -57,7 +57,7 @@ const DetailForm = (props) => { visible={visible} footer={null} onCancel={handleClose} - title={'巡更管理详情'} + title={'巡查管理详情'} > {renderContent(data)} @@ -205,7 +205,7 @@ const PatrolNameList = (props) => { const columns = [ { - title: '巡更人员', + title: '巡查人员', key: 'name', dataIndex: 'name', align: 'center' @@ -243,7 +243,7 @@ const PatrolNameList = (props) => { return record.id == selectRoad ? 'list-row-actived' : ''; }} toolBarRender={() => [ - + ]} options={false} pagination={false} @@ -319,10 +319,10 @@ const PatrolTable = (props) => { const tabList = [ { key: 'tab1', - tab: '巡更', + tab: '巡查', }, { key: 'tab2', - tab: '巡更轨迹查询', + tab: '巡查轨迹查询', }, ]; const contentList = { From 5d9e0adf15be424b3bfdb332af847a012efeb926 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 30 Jul 2022 17:12:17 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=B7=A1=E6=9F=A5tab=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=96=E5=8F=B7=E5=B1=95=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fillion/components/maintenanceTable.js | 19 +++++++++++++++++ .../fillion/components/patrolTable.js | 21 +++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index b33c19a6..0e00c751 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -90,6 +90,8 @@ const DetailList = (props) => { } } + let daySet = {}; + const columns = [ { title: '编号', @@ -97,6 +99,14 @@ const DetailList = (props) => { dataIndex: 'id', align: 'center', render: (text, record) => { + let day = moment(record.time).format("YYYYMMDD") + if (daySet[day]) { + daySet[day].add(Symbol()) + } else { + daySet[day] = new Set() + daySet[day].add(Symbol()) + } + return day * 10000 + daySet[day].size return moment(record.time).format("YYYYMMDD") * 10000 + record.id; } }, { @@ -104,6 +114,15 @@ const DetailList = (props) => { key: 'projectType', dataIndex: 'projectType', align: 'center', + render: (text, record) => { + switch (text) { + case 'road': return '道路'; + case 'bridge': return '桥梁'; + case 'culvert ': return '涵洞'; + case 'other': return '其他'; + default: return text; + } + } }, { title: '所属道路', key: 'road', diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index e8b49e3c..c2bfd650 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -90,7 +90,7 @@ const DetailList = (props) => { }) } } - + let daySet = {}; const columns = [ { title: '编号', @@ -98,6 +98,14 @@ const DetailList = (props) => { dataIndex: 'id', align: 'center', render: (text, record) => { + let day = moment(record.time).format("YYYYMMDD") + if (daySet[day]) { + daySet[day].add(Symbol()) + } else { + daySet[day] = new Set() + daySet[day].add(Symbol()) + } + return day * 10000 + daySet[day].size return moment(record.time).format("YYYYMMDD") * 10000 + record.id; } }, @@ -106,6 +114,15 @@ const DetailList = (props) => { key: 'projectType', dataIndex: 'projectType', align: 'center', + render: (text, record) => { + switch (text) { + case 'road': return '道路'; + case 'bridge': return '桥梁'; + case 'culvert ': return '涵洞'; + case 'other': return '其他'; + default: return text; + } + } }, { title: '所属道路', @@ -388,7 +405,7 @@ const PatrolTable = (props) => { ); }; -function mapStateToProps(state) { +function mapStateToProps (state) { const { auth, depMessage, userList, reportList, reportDetail } = state; const pakData = (dep) => { return dep.map((d) => { From 5b1add12b5df57c5e30299bc602cb4c78f173ff0 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 30 Jul 2022 17:14:05 +0800 Subject: [PATCH 05/10] dockerfile --- scripts/0.0.1/data/3_init_report_pic_data/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/0.0.1/data/3_init_report_pic_data/Dockerfile b/scripts/0.0.1/data/3_init_report_pic_data/Dockerfile index 9036cb66..d0293a8f 100644 --- a/scripts/0.0.1/data/3_init_report_pic_data/Dockerfile +++ b/scripts/0.0.1/data/3_init_report_pic_data/Dockerfile @@ -4,4 +4,8 @@ COPY . /var/app WORKDIR /var/app +RUN npm cache clean -f +RUN rm -rf package-lock.json +RUN npm install --registry http://10.8.30.22:7000 + CMD ["node", "index.js"] \ No newline at end of file From 1b33d7f7358e1b347dfbfcafadfa8149a60fc659 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 30 Jul 2022 17:16:59 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=97=85=E5=AE=B3=E7=85=A7=E7=89=87?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/patrolTable.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index c2bfd650..b13dc98b 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -13,6 +13,7 @@ import moment from 'moment'; const DetailForm = (props) => { const { visible, data, handleClose, loading } = props; + const [qndmn] = useState(localStorage.getItem('qndmn')); const keyList = [ { key: '编号', name: 'id' }, { key: '工程类型', name: 'projectType' }, @@ -38,7 +39,7 @@ const DetailForm = (props) => { { data.scenePic && data.scenePic instanceof Array ? data.scenePic.map(imgSrc => { return
- +
}) : '暂无图片' } From 3158fd469141fb9f3104b5f3ade7235b40ab83c7 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 30 Jul 2022 17:18:51 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/patrolTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index b13dc98b..39cdcbb3 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -20,7 +20,7 @@ const DetailForm = (props) => { { key: '所在路段', name: 'road' }, { key: '具体位置', name: 'address' }, { key: '巡查内容', name: 'content' }, - { key: '病害照片', name: 'scenePic' }, + { key: '现场照片', name: 'scenePic' }, ]; const renderContent = (data) => { From 8bdb90a16513553b2ccfcbd2bfe344ba3b95e236 Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Sat, 30 Jul 2022 17:35:06 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=B2=BB=E8=B6=85=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/fillion/components/inforTable.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js index 88738971..91779539 100644 --- a/web/client/src/sections/fillion/components/inforTable.js +++ b/web/client/src/sections/fillion/components/inforTable.js @@ -197,7 +197,7 @@ const InForTable = (props) => { dataIndex: 'createdAt', valueType: 'date', render: (dom, record) => { - return record.testTime?.slice(0,10) + return record.testTime?.slice(0, 10) }, fieldProps: { onChange: (value, cs) => { @@ -447,10 +447,13 @@ const InForTable = (props) => { defaultCollapsed: false, optionRender: (searchConfig, formProps, dom) => [ ...dom.reverse(), - { - // console.log(rowSelected) - - props.exports(rowSelected, counts) }}> + { + // console.log(rowSelected) + rowSelected.length === 0 ? null : props.exports(rowSelected, counts) + }} + >