Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

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

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

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

scripts/1.2.3/schema/7.update_project.sql

@@ -0,0 +1,8 @@
+
+
+COMMENT ON COLUMN project.build_unit  IS '业主单位';
+COMMENT ON COLUMN project.qutity_unit  IS '质量监督单位';
+COMMENT ON COLUMN project.done  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 },
@@ -63,9 +64,7 @@ const DetailForm = (props) => {
                         <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', margin: '12px 0' }}>
                             <span style={{ fontSize: 16, color: 'gray', minWidth: '26%' }}>{obj.key}</span>
                             {
-
-
-                                obj.name != 'scenePic' ?
+                                obj.name != 'scenePic' && obj.name != 'handlePic' ?
                                     <Input
                                         style={{ width: '70%' }}
                                         value={
@@ -85,7 +84,14 @@ const DetailForm = (props) => {
                                                 return <div style={{ width: '44%', margin: 6 }}>
                                                     <Image src={qndmn + '/' + imgSrc} width={'100%'} style={{ marginBottom: 4 }} />
                                                 </div>
+                                            }) : data.handlePic && data.handlePic instanceof Array ? data.handlePic.map(imgSrc => {
+                                                return <div style={{ width: '44%', margin: 6 }}>
+                                                    <Image src={qndmn + '/' + imgSrc} width={'100%'} style={{ marginBottom: 4 }} />
+                                                </div>
                                             }) : '暂无图片'
+
+
+
                                         }
                                     </div>
 

web/client/src/sections/organization/containers/user.js

@@ -269,11 +269,11 @@ const UserManage = (props) => {
             <div style={{ width: '30%' }} >
                 {
                     selectedTree == id ? <>
-                        <FormOutlined onClick={() => {
+                        {user?.username === 'SuperAdmin' ? <FormOutlined onClick={() => {
                             setDepModalRecord(item)
                             setDepModalVisible(true)
                             setDepModalType('edit')
-                        }} />
+                        }} /> : null}
                         {user?.username === 'SuperAdmin' ? <Popconfirm title='是否确认删除?' onConfirm={() => { delDepartment(id) }} >
                             <DeleteOutlined style={{ marginLeft: 5 }} />
                         </Popconfirm> : ''}

web/client/src/sections/quanju/containers/footer/build/index.js

@@ -291,7 +291,7 @@ const Build = (props) => {
                     width: "100%",
                     height: " 33%", marginTop: '3%'
                 }} customize={true}>
-                    {sunonlineproject !== 0 ? <Rightcenter data={onlineproject} sundata={sunonlineproject} /> : <NoData />}
+                    {sunonlineproject !== 0 ? <Rightcenter data={onlineproject} sundata={buildingCount} /> : <NoData />}
                 </Module>
                 <Module title={"各路段技术等级统计"} style={{
                     width: "100%",