From 6485509fb97fed3d3cac2a8acd1e145037d2c255 Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 14 Jul 2023 16:31:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E5=8F=8D=E9=A6=88=E5=9B=BE=E7=89=87+?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/patrolTable.js | 2 +- web/client/src/sections/quanju/containers/footer/build/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 86790550..efc497de 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -65,7 +65,7 @@ const DetailForm = (props) => { { - obj.name != 'scenePic' ? + obj.name != 'scenePic' && obj.name != 'handlePic' ? { width: "100%", height: " 33%", marginTop: '3%' }} customize={true}> - {sunonlineproject !== 0 ? : } + {sunonlineproject !== 0 ? : } Date: Fri, 14 Jul 2023 17:14:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E7=AE=A1=E5=85=BB=E5=92=8C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=B8=89=E4=B8=AA=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/data/index.js | 5 +++-- scripts/1.2.3/schema/7.update_project.sql | 8 ++++++++ .../src/sections/fillion/components/maintenanceTable.js | 2 ++ web/client/src/sections/fillion/components/patrolTable.js | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 scripts/1.2.3/schema/7.update_project.sql diff --git a/api/app/lib/controllers/data/index.js b/api/app/lib/controllers/data/index.js index 7efc18da..e2e8135f 100644 --- a/api/app/lib/controllers/data/index.js +++ b/api/app/lib/controllers/data/index.js @@ -91,16 +91,17 @@ async function dataExport(ctx) { //过滤project部门字段 if (modalOption.tableName === 'Project') { const { entryName, projectMileage, investment, buildUnit, - constructionControlUnit, designUnit, constructionUnit, qutityUnit, startTime, remark } = tableAttributes + constructionControlUnit, designUnit, constructionUnit, qutityUnit, startTime, remark, done } = tableAttributes tableAttributesCopy = { entryName, projectMileage, investment, buildUnit, - constructionControlUnit, designUnit, constructionUnit, qutityUnit, startTime, remark + constructionControlUnit, designUnit, constructionUnit, qutityUnit, startTime, remark, done } } else { tableAttributesCopy = tableAttributes } let header = [] + console.log('tableAttributesCopy', tableAttributesCopy) for (let k in tableAttributesCopy) { let comment = tableAttributes[k].comment if (k != 'id' && comment) { diff --git a/scripts/1.2.3/schema/7.update_project.sql b/scripts/1.2.3/schema/7.update_project.sql new file mode 100644 index 00000000..4894cdf1 --- /dev/null +++ b/scripts/1.2.3/schema/7.update_project.sql @@ -0,0 +1,8 @@ + + +COMMENT ON COLUMN project.build_unit COMMENT IS '业主单位'; +COMMENT ON COLUMN project.qutity_unit COMMENT IS '质量监督单位'; +COMMENT ON COLUMN project.done COMMENT IS '是否已完成'; + + + diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index d7377c55..97c4c786 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -23,10 +23,12 @@ const DetailForm = (props) => { { key: '所在路段', name: 'road' }, { key: '具体位置', name: 'address' }, { key: '巡查内容', name: 'content' }, + { key: '路线代码', name: 'codeRoad' }, // { key: '病害照片', name: 'scenePic' }, { key: '养护前', name: 'conserveBeforePic' }, { key: '养护中', name: 'conserveUnderwayPic' }, { key: '养护后', name: 'conserveAfterPic' }, + ]; const renderContent = (data) => { diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index efc497de..7b99eb9c 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -40,13 +40,14 @@ const DetailForm = (props) => { const keyList = [ // { key: '编号', name: 'id' }, + // isPatrol ?'巡查管理详情' :isRoad ? '建设上报详情' : '异常反馈详情' { key: '工程类型', name: 'projectType', skip: !isPatrol }, { key: '反馈类型', name: 'projectType', skip: !isAnomaly }, { key: '工程名称', name: 'projectName', skip: !isRoad }, { key: '所在路段', name: 'road', skip: isRoad }, { key: '具体位置', name: 'address' }, { key: '巡查内容', name: 'content' }, - { key: '路线代码', name: 'codeRoad' }, + { key: '路线代码', name: 'codeRoad', skip: !isAnomaly && !isPatrol }, { key: '现场照片', name: 'scenePic' }, { key: '处理详情', name: 'handleContent', skip: !isAnomaly }, { key: '处理图片', name: 'handlePic', skip: !isAnomaly }, From 864ce66b6a17dc3c1dba43fc034e728dccd00989 Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 14 Jul 2023 17:50:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA+?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/models/project.js | 6 +++--- scripts/1.2.3/schema/7.update_project.sql | 6 +++--- .../src/sections/fillion/components/patrolTable.js | 9 +++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/api/app/lib/models/project.js b/api/app/lib/models/project.js index 0a7c047d..8ae65cf0 100644 --- a/api/app/lib/models/project.js +++ b/api/app/lib/models/project.js @@ -47,7 +47,7 @@ module.exports = dc => { type: DataTypes.STRING, allowNull: true, defaultValue: null, - comment: "建设单位", + comment: "业主单位", primaryKey: false, field: "build_unit", autoIncrement: false @@ -101,7 +101,7 @@ module.exports = dc => { type: DataTypes.BOOLEAN, allowNull: false, defaultValue: null, - comment: null, + comment: "是否已完成", primaryKey: false, field: "done", autoIncrement: false @@ -137,7 +137,7 @@ module.exports = dc => { type: DataTypes.STRING, allowNull: true, defaultValue: null, - comment: "质量检测单位", + comment: "质量监督单位", primaryKey: false, field: "qutity_unit", autoIncrement: false diff --git a/scripts/1.2.3/schema/7.update_project.sql b/scripts/1.2.3/schema/7.update_project.sql index 4894cdf1..f4433418 100644 --- a/scripts/1.2.3/schema/7.update_project.sql +++ b/scripts/1.2.3/schema/7.update_project.sql @@ -1,8 +1,8 @@ -COMMENT ON COLUMN project.build_unit COMMENT IS '业主单位'; -COMMENT ON COLUMN project.qutity_unit COMMENT IS '质量监督单位'; -COMMENT ON COLUMN project.done COMMENT IS '是否已完成'; +COMMENT ON COLUMN project.build_unit IS '业主单位'; +COMMENT ON COLUMN project.qutity_unit IS '质量监督单位'; +COMMENT ON COLUMN project.done IS '是否已完成'; diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 7b99eb9c..36d8b928 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -64,8 +64,6 @@ const DetailForm = (props) => {
{obj.key} { - - obj.name != 'scenePic' && obj.name != 'handlePic' ? { return
+ }) : data.handlePic && data.handlePic instanceof Array ? data.handlePic.map(imgSrc => { + return
+ +
}) : '暂无图片' + + + }
From 899b4ed435e17b3f8bef459db83dc751c8c3bd88 Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 14 Jul 2023 18:02:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=E6=96=B0=E5=BB=BA=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/organization/containers/user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js index fde71379..8d8215e2 100644 --- a/web/client/src/sections/organization/containers/user.js +++ b/web/client/src/sections/organization/containers/user.js @@ -269,11 +269,11 @@ const UserManage = (props) => {
{ selectedTree == id ? <> - { + {user?.username === 'SuperAdmin' ? { setDepModalRecord(item) setDepModalVisible(true) setDepModalType('edit') - }} /> + }} /> : null} {user?.username === 'SuperAdmin' ? { delDepartment(id) }} > : ''} From 2d6fb45dc212b2261cf65efcd5e7babf9266be92 Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 14 Jul 2023 18:10:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/overview/building.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/app/lib/controllers/overview/building.js b/api/app/lib/controllers/overview/building.js index 69ed2d13..df819587 100644 --- a/api/app/lib/controllers/overview/building.js +++ b/api/app/lib/controllers/overview/building.js @@ -196,7 +196,7 @@ async function roadState(ctx) { } } - if (p.buildUnit && p.done) { + if (p.buildUnit && !p.done) { let townName = p.buildUnit.replace('人民政府', '').replace('南昌县', '').replace('管委会', '') if (roadState.townProject[townName]) { roadState.townProject[townName] += 1