feat:管养和其他三个模块

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) {

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 '是否已完成';
+
+
+

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) => {

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 },