From c88cead657c7943ec3f4be4f4a14a3cafdf8d515 Mon Sep 17 00:00:00 2001 From: sunyue Date: Thu, 21 Dec 2023 08:23:25 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'scripts/1.4.1/data/1?= =?UTF-8?q?=5Finsert=5Froad=5Fdata/index.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.4.1/data/1_insert_road_data/index.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/1.4.1/data/1_insert_road_data/index.js b/scripts/1.4.1/data/1_insert_road_data/index.js index dd1fb027..39d84865 100644 --- a/scripts/1.4.1/data/1_insert_road_data/index.js +++ b/scripts/1.4.1/data/1_insert_road_data/index.js @@ -5,23 +5,23 @@ try { const fs = require("fs"); //开发 - const pool = new Pool({ - user: 'postgres', - host: '10.8.30.32', - database: 'highways4good', - password: '123', - port: 5432, - }) - - // 测试环境 // const pool = new Pool({ - // user: 'highwayadmin', - // host: '10.8.40.223', - // database: 'highway4good', - // password: 'highway123', + // user: 'postgres', + // host: '10.8.30.32', + // database: 'highways4good', + // password: '123', // port: 5432, // }) + 测试环境 + const pool = new Pool({ + user: 'highwayadmin', + host: '10.8.40.223', + database: 'highwaytest', + password: 'highway123', + port: 5432, + }) + // 商用环境 // const pool = new Pool({ // user: 'highwayadmin', From f66b5ae6ba6a21ba9ad4492201eec75885590e7a Mon Sep 17 00:00:00 2001 From: sunyue Date: Thu, 21 Dec 2023 08:25:22 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'scripts/1.4.1/data/1?= =?UTF-8?q?=5Finsert=5Froad=5Fdata/index.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/1.4.1/data/1_insert_road_data/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/1.4.1/data/1_insert_road_data/index.js b/scripts/1.4.1/data/1_insert_road_data/index.js index 39d84865..94a8d7fe 100644 --- a/scripts/1.4.1/data/1_insert_road_data/index.js +++ b/scripts/1.4.1/data/1_insert_road_data/index.js @@ -13,7 +13,7 @@ try { // port: 5432, // }) - 测试环境 + // 测试环境 const pool = new Pool({ user: 'highwayadmin', host: '10.8.40.223', From 71c716c178eb84a0c42dbfc51936225109daa78c Mon Sep 17 00:00:00 2001 From: "peng.peng" Date: Thu, 21 Dec 2023 17:06:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E5=85=BB=E6=8A=A4?= =?UTF-8?q?=E6=8A=BD=E6=9F=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fillion/components/transportationTable.js | 46 ++++++++++++++++++- .../containers/maintenanceSpotCheck-new.js | 6 +-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js index dc469633..487f626b 100644 --- a/web/client/src/sections/fillion/components/transportationTable.js +++ b/web/client/src/sections/fillion/components/transportationTable.js @@ -1252,7 +1252,7 @@ const TransporTationTable = (props) => { } }, { - title: '是否隐藏字段', + title: '是否隐藏', search: false, dataIndex: 'time9', valueType: 'dateRange', @@ -2458,6 +2458,28 @@ const TransporTationTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, + { + title: '是否隐藏', + search: false, + dataIndex: 'time9', + valueType: 'dateRange', + + + width: 140, + + render: (dom, record) => { + console.log(record.spot) + if (record.spot) { + return "是" + } else { + return "否" + } + + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { title: '操作', dataIndex: 'creatTime', @@ -3668,6 +3690,28 @@ const TransporTationTable = (props) => { } }, + { + title: '是否隐藏', + search: false, + dataIndex: 'time9', + valueType: 'dateRange', + + + width: 140, + + render: (dom, record) => { + console.log(record.spot) + if (record.spot) { + return "是" + } else { + return "否" + } + + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { key: "direction", hideInTable: true, diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js index 20512602..4374ca62 100644 --- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js +++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js @@ -140,9 +140,9 @@ const MaintenanceSpotCheck = (props) => { const res = await dispatch(roadSpotPrepare({ countyPercentage: values.percentValue })) setPreviewId(res?.payload.data?.previewId) form.setFieldsValue({ - 'countryMil': res?.payload.data?.countryMil, - 'townMil': res?.payload.data?.townMil, - 'villageMil': res?.payload.data?.villageMil, + 'countryMil': res?.payload.data?.countryMil.toFixed(3), + 'townMil': res?.payload.data?.townMil.toFixed(3), + 'villageMil': res?.payload.data?.villageMil.toFixed(3), }) } }) From 5bbe8858124ed857758dcc9ba8278297d481aedb Mon Sep 17 00:00:00 2001 From: "peng.peng" Date: Thu, 21 Dec 2023 17:46:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/1.4.1/data/1_insert_road_data/index.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/1.4.1/data/1_insert_road_data/index.js b/scripts/1.4.1/data/1_insert_road_data/index.js index 94a8d7fe..71fd29ba 100644 --- a/scripts/1.4.1/data/1_insert_road_data/index.js +++ b/scripts/1.4.1/data/1_insert_road_data/index.js @@ -8,12 +8,12 @@ try { // const pool = new Pool({ // user: 'postgres', // host: '10.8.30.32', - // database: 'highways4good', + // database: 'highwaytest', // password: '123', // port: 5432, // }) - // 测试环境 + // // 测试环境 const pool = new Pool({ user: 'highwayadmin', host: '10.8.40.223', @@ -138,14 +138,12 @@ try { Object.keys(r).forEach(key => { arr.push(key) }) - if (r.route_name == '中心路—山上村四组路') { + if (r.route_name == '中心公路一龚乐路') { console.log(1) } let isExit = allRoads.find(s => s.route_code == r.route_code && (s.section_no == r.section_no || !s.section_no) && s.route_name == r.route_name) if (isExit) { - if (del != r.del && spot != r.spot && township_code != isExit.township_code) { - villageSql += `UPDATE road SET village_id = ${villageId}, "del" = ${del}, spot = ${spot}, "township_code" = ${township_code ? township_code : `null`} WHERE id = ${isExit.id};\n` - } + villageSql += `UPDATE road SET village_id = ${villageId}, "del" = ${del}, spot = ${spot}, "township_code" = ${township_code ? township_code : `null`} WHERE id = ${isExit.id};\n` } else { const { route_name = `null`, route_code = `null`, section_no = `null`, starting_place_name = `null`, From 85081b4246d57bfbe07755536e5e0306beed8cb8 Mon Sep 17 00:00:00 2001 From: "peng.peng" Date: Thu, 21 Dec 2023 18:16:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?(*)=20=E8=84=9A=E6=9C=AC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/1.4.1/data/1_insert_road_data/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/1.4.1/data/1_insert_road_data/index.js b/scripts/1.4.1/data/1_insert_road_data/index.js index 71fd29ba..0976267a 100644 --- a/scripts/1.4.1/data/1_insert_road_data/index.js +++ b/scripts/1.4.1/data/1_insert_road_data/index.js @@ -13,7 +13,7 @@ try { // port: 5432, // }) - // // 测试环境 + // 测试环境 const pool = new Pool({ user: 'highwayadmin', host: '10.8.40.223', @@ -118,9 +118,9 @@ try { let mark = r['mark'] if (mark) { - spot = true - } else { spot = false + } else { + spot = true } let rId = r.id