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

api/app/lib/controllers/data/vehicle.js

@@ -7,8 +7,8 @@ async function get(ctx) {
       const { type } = ctx.request.body;
       const { name } = ctx.query;
       const sequelize = ctx.fs.dc.orm
-      const sqlStr = `select sum(p.road_marking)  标线,sum(p.roadside_ditch) 边沟,
+      const sqlStr = `select sum(p.road_marking)  "标线(米)",sum(p.roadside_ditch) "边沟（米）",
-       sum(p.guardrail) 护栏, sum(p.roadside_trees) 行道树,sum(p.wrong_lane) 错车道
+       sum(p.guardrail) "护栏（米）", sum(p.roadside_trees) "行道树（棵）",sum(p.wrong_lane) "错车道（个）"
        from (
    select t.*,row_number() over (partition by t.luduan order by t.time desc )  rn from (
    select code_road||'-'||road_section_start||'-'||road_section_end luduan,

jenkinsfilenew_node

@@ -0,0 +1,21 @@
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
+		
+		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${SMARTCITY}/${JOB_NAME}"
+		env.IMAGE_NAME_SHORT = "${SMARTCITY}/${JOB_NAME}"
+		env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/Highways4Good.git"
+		
+	    stage('Run shell') { 
+		    git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
+		    
+		    container('image-builder') {			    
+				sh'''
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./scripts/1.3.1/data/1_insert_report_data/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+			    '''			    
+		    }
+			
+		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+		}
+	}
+}

scripts/1.3.1/data/1_insert_report_data/Dockerfilenew

@@ -0,0 +1,7 @@
+FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
+COPY ./scripts/1.3.1/data/1_insert_report_data  /var/app
+WORKDIR /var/app
+RUN npm cache clean -f
+RUN rm -rf package-lock.json
+RUN npm install --registry https://nexus.ngaiot.com/repository/fs-npm/
+CMD ["node", "index.js"]

scripts/1.3.1/data/1_insert_report_data/index.js

@@ -6,13 +6,13 @@ try {
 
     // 测试环境
     const pool = new Pool({
-        user: 'postgres',
+        user: 'FashionAdmin',
-        host: '10.8.30.32',
+        host: '10.8.40.223',
-        database: 'highways4good',
+        database: 'sihaotest',
-        password: '123',
+        password: 'Fas123_',
         port: 5432,
     })
-    const userId = 5
+    const userId = 21
 
     // 商用环境
     // const pool = new Pool({

weapp/src/packages/patrol/index.jsx

@@ -1444,12 +1444,14 @@ const Index = () => {
             isSuperAdmin && (wait === 'wait' || kind === 'handle') && <View className='appoint'>
               {
                 handleState === '待处理' && <>
+                  <View className='appoint-radio'>
                     <RadioGroup onChange={(e) => {
                       setIsAppoint(e.detail.value === '指派' ? true : false)
                     }}>
-                    <Radio value='指派' checked={isAppoint} color='#0080EE' className='radio'>指派</Radio>
+                      <Radio value='指派' checked={isAppoint} color='#0080EE'>指派</Radio>
-                    <Radio value='不处理' checked={!isAppoint} color='#0080EE' className='radio' style={{ marginLeft: 10 }}>不处理</Radio>
+                      <Radio value='不处理' checked={!isAppoint} color='#0080EE' style={{ marginLeft: 10 }}>不处理</Radio>
                     </RadioGroup>
+                  </View>
                   {
                     isAppoint && <>
                       <View className='picker'>
@@ -1463,6 +1465,7 @@ const Index = () => {
                           <Image src={arrowIcon} className='arrow' />
                         </Picker>
                       </View>
+                      <View className='handle-advice'>
                         <Textarea
                           placeholder='请输入处理意见'
                           value={handleAdvice}
@@ -1470,6 +1473,7 @@ const Index = () => {
                           disabled={isView && handleState !== '待处理'}
                           maxlength={1024}
                         />
+                      </View>
                     </>
                   }
                 </>
@@ -1478,33 +1482,33 @@ const Index = () => {
           }
 
           {
-            handleState !== '待处理' && <View style={{ backgroundColor: '#fff', padding: 10 }}>
+            handleState !== '待处理' && <View >
               {
-                isSuperAdmin && handleState === '不处理' && <Text>
+                isSuperAdmin && handleState === '不处理' && <View className='general-cell'>
                   处理结果：暂不进行处理
-                </Text>
+                </View>
               }
               {
-                (!isSuperAdmin || (isSuperAdmin && (handleState === '已指派' || handleState === '已处理'))) && <>
+                (!isSuperAdmin || (isSuperAdmin && (handleState === '已指派' || handleState === '已处理'))) && <View className='general-cell' style={{ padding: '5px 10px' }}>
                   <View>处理意见：</View>
                   <View>{handleAdvice}</View>
-                </>
+                </View>
               }
               {
-                (isSuperAdmin && (handleState === '已指派' || handleState === '已处理')) && <>
+                (isSuperAdmin && (handleState === '已指派' || handleState === '已处理')) && <View className='general-cell' >
-                  <View style={{ marginTop: 10 }}>责任人：</View>
+                  <View>责任人：</View>
                   <View>
                     {appointUser !== null ? allDepUsers.find(d => d.depId === userList.find(u => u.id === appointUser)?.departmentId)?.depName : ''}
                     -
                     {appointUser !== null ? userList.find(u => u.id === appointUser)?.name : ''}
                   </View>
-                </>
+                </View>
               }
             </View>
           }
 
           {
-            ((isSuperAdmin && handleState == '已处理') || !isSuperAdmin) && <>
+            ((isSuperAdmin && handleState == '已处理') || !isSuperAdmin) && <View style={{ marginTop: 2 }}>
               <View className='patrol-img'><Text style={{ color: 'red' }}>*</Text>处理内容：</View>
               <AtTextarea
                 placeholder='请输入处理内容'
@@ -1532,7 +1536,7 @@ const Index = () => {
                       /> : ''
                 }
               </View>
-            </>
+            </View>
           }
 
           {handle != 'handle' && handleState != '已处理' ? <AtButton type='primary' className='sub-btn' onClick={handleOk}>提交</AtButton> : ''}

weapp/src/packages/patrol/index.scss

@@ -283,14 +283,28 @@ page {
   }
 
   .appoint {
-    margin-top: 10px;
+    // margin-top: 10px;
-    padding: 10px 20px;
+    // padding: 10px 20px;
+    // background-color: #fff;
+
+    .appoint-radio {
+      height: 96px;
       background-color: #fff;
+      margin-top: 5px;
+      padding: 0 20px;
+      display: flex;
+      justify-content: start;
+      align-items: center;
+    }
 
     .picker {
-      margin: 10px 0;
+      height: 96px;
+      background-color: #fff;
+      margin-top: 5px;
+      padding: 0 20px;
       display: flex;
-      justify-content: flex-start;
+      justify-content: space-between;
+      align-items: center;
 
       .arrow {
         width: 24px;
@@ -298,5 +312,22 @@ page {
         margin: 0 10px;
       }
     }
+
+    .handle-advice {
+      background-color: #fff;
+      margin-top: 5px;
+      padding: 10px 20px;
+    }
+  }
+
+  .general-cell {
+    min-height: 96px;
+    background-color: #fff;
+    margin-top: 5px;
+    padding: 0px 20px;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    flex-wrap: wrap;
   }
 }

web/client/src/sections/fillion/actions/infor.js

@@ -108,8 +108,7 @@ export function putRoadway(query) {
       data: query,
       actionType: 'PUT_ROADWAY',
       url: ApiTable.putRoadway,
-      msg: { option: '编辑道路信息' },
+      msg: { option: query?.roadId?'编辑':'新增' + '道路信息' },
-
    });
 }
 export function getBridge(query) {

web/client/src/sections/fillion/components/highwaysTable.js

@@ -270,6 +270,7 @@ const TransporTationTable = (props) => {
                         multipleLine: true,
 
                         menu: {
+                            type: 'tab',
                             activeKey,
                             onChange: (key) => setActiveKey(key),
                             items: [
@@ -298,7 +299,7 @@ const TransporTationTable = (props) => {
                     options={false}
                     ref={c => { finishedProductTable = c; }}
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
-                    rowKey='id'
+                    //rowKey='id'
                     onReset={(v) => {
                         setSitename('')
                     }}
@@ -317,7 +318,12 @@ const TransporTationTable = (props) => {
                             }
                             setRowSelected([]);
                             const res = await dispatch(getHighways(query));
-                            let rslt = res.payload.data?.vehicleRes?.filter(item => item.name !== '路牌名')
+                            let rslt = res.payload.data?.vehicleRes?.map(item => {
+                                return {
+                                    ...item,
+                                    name: item.name + "(个)"
+                                }
+                            })
                             const additionalProperties = Object.entries(res.payload.data?.conserveData[0]).map(([key, value]) => ({
                                 id: null,
                                 name: key,

web/client/src/sections/fillion/components/luzhengmodel.js

@@ -5,14 +5,14 @@ import { unitList } from '../containers/assess'
 import { getAssess, delAssess, editAssess } from '../actions/assess';
 import moment from 'moment';
 import { getRoadadministration, addRoadadministration, delRoadadministration, modifyRoadadministration } from '../actions/luzheng';
-// import Uploads from "../../../../components/Upload/index"
+// import Uploads from "../../../../components/Upload/index"
-// import Uploads from '../../../components/Upload/index'
+// import Uploads from '../../../components/Upload/index'
 import Uploads from './uploads'
 const { Option } = Select;
 
 const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
     const [form] = Form.useForm();
-    console.log(editData,'editData')
+    // console.log(editData,'editData')
     return (
         <Modal
             title="路政信息"
@@ -21,6 +21,38 @@ const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
             cancelButtonProps={{
                 disabled: check,
             }}
+            footer={!check ? [
+                <Button key="submit" type="primary" onClick={() => {
+                    if (check) {
+                        return onCancel()
+                    }
+                    form.validateFields().then(values => {
+                        if (editData) {
+                            dispatch(modifyRoadadministration(editData?.id, {
+                                ...values
+                            })).then(res => {
+                                if (res.success) {
+                                    onCancel()
+                                }
+                            })
+                        } else {
+                            dispatch(addRoadadministration({
+                                ...values,
+                            })).then(res => {
+                                if (res.success) {
+                                    onCancel()
+                                }
+                            })
+                        }
+
+                    })
+                }}>
+                    确定
+                </Button>,
+                <Button onClick={onCancel}>
+                    取消
+                </Button>
+            ] : null}
             onOk={() => {
                 if (check) {
                     return onCancel()
@@ -65,13 +97,13 @@ const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
                 }}
             >
                 <Form.Item name="enforcementdate" label="执法日期" rules={[{ required: true, message: '请填写' }]}>
-                    {/* <Select>
+                    {/* <Select>
-                        {
+                        {
-                            unitList.map(item => (
+                            unitList.map(item => (
-                                <Option value={item} key={item} />
+                                <Option value={item} key={item} />
-                            ))
+                            ))
-                        }
+                        }
-                    </Select> */}
+                    </Select> */}
                     <DatePicker />
                 </Form.Item>
 

web/client/src/sections/fillion/containers/luzheng.js

@@ -4,7 +4,7 @@ import { getAssess, delAssess, editAssess } from '../actions/assess';
 import { getRoadadministration, addRoadadministration, delRoadadministration, modifyRoadadministration } from '../actions/luzheng';
 import ProTable from '@ant-design/pro-table';
 import AssessModal from '../components/luzhengmodel';
-import { Form, Space, DatePicker, Button, Select, Popconfirm ,Image} from 'antd'
+import { Form, Space, DatePicker, Button, Select, Popconfirm, Image, Tooltip } from 'antd'
 import moment from 'moment';
 import { values } from 'lodash';
 
@@ -66,8 +66,10 @@ function Assess(props) {
             <div style={{ marginBottom: '20px', display: 'flex', justifyContent: 'space-between' }}>
                 <Form layout="inline" onFinish={(v) => {
 
-                    setQuery({ ...query, page:1,unit: v.unit,startTime : v?.time && moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+                    setQuery({
-                    endTime : v?.time && moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss') })
+                        ...query, page: 1, unit: v.unit, startTime: v?.time && moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+                        endTime: v?.time && moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+                    })
                 }}>
 
 
@@ -97,12 +99,22 @@ function Assess(props) {
                 {
                     title: '执法道路',
                     dataIndex: 'roadname',
-                    key: 'roadname'
+                    key: 'roadname',
+                    render: (t, r) => {
+                        return <Tooltip title={r?.roadname}>
+                            <span className='shenglve'>{r?.roadname && r?.roadname?.length > 20 ? r?.roadname?.substr(0, 20) + '...' : r?.roadname}</span>
+                        </Tooltip>
+                    }
                 },
                 {
                     title: '执法成果',
                     dataIndex: 'enforcementreslt',
                     key: 'enforcementreslt',
+                    render: (t, r) => {
+                        return <Tooltip title={r?.enforcementreslt}>
+                            <span className='shenglve'>{r?.enforcementreslt && r?.enforcementreslt?.length > 20 ? r?.enforcementreslt?.substr(0, 20) + '...' : r?.enforcementreslt}</span>
+                        </Tooltip>
+                    }
                 },
                 {
                     title: '执法图片',
@@ -149,7 +161,7 @@ function Assess(props) {
                                         setLoading(false)
                                         if (res.success) {
                                             setQuery({ ...query, page: 1, pageSize: 10, limit: 10 })
-                                            // getData(page)
+                                            // getData(page)
                                         }
                                     })
                                 }}

web/client/src/sections/fillion/containers/maintenanceSpotCheck.js

@@ -479,7 +479,7 @@ const MaintenanceSpotCheck = (props) => {
                     </Form.Item>
                     <Form.Item className="ant-row" >
 
-                        <Button style={{ marginLeft: '40%' }} type='primary' onClick={extractHandler}>开始抽取</Button>
+                        <Button style={{ marginLeft: '70%' }} type='primary' onClick={extractHandler}>开始抽取</Button>
                     </Form.Item>
                     <Form.Item label='抽查总数' name='result'>
                         <Input disabled />

web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js

@@ -114,8 +114,8 @@ const LeftCenter = (props) => {
                         grid: {
                             left: '3%',
                             right: '12%',
-                            bottom: '21%',
+                            bottom: '28%',
-                            top: '4%',
+                            top: '8%',
                             containLabel: true
                         },
                     }}

web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js

@@ -115,8 +115,8 @@ const RightCenter = (props) => {
                             grid: {
                                 left: '3%',
                                 right: '4%',
-                                bottom: '21%',
+                                bottom: '28%',
-                                top: '4%',
+                                top: '8%',
                                 containLabel: true
                             },
                         }}

web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js

@@ -74,8 +74,16 @@ const RightTop = (props) => {
                             }}>
                                 {beijing == index ? <img src='/assets/images/leadership/shezhi.png' style={{ width: "2%", height: "80%", position: "absolute", top: "12%", left: "1%" }} /> : ""}
                                 {beijing == index ? <img src='/assets/images/leadership/lan.png' style={{ width: "100%", height: "120%", position: "absolute", right: "5%" }} /> : ""}
-                                <p style={{ textAlign: "center", width: "40%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item?.user?.name || '--'}</p>
+                                <p style={{
-                                <p style={{ textAlign: "left", width: "30%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
+                                    textAlign: "center", width: "40%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)",
+                                }} title={item?.user?.name}>{item?.user?.name || '--'}</p>
+                                <p style={{
+                                    textAlign: "left", width: "30%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)",
+                                    whiteSpace: 'nowrap',
+                                    overflow: 'hidden',
+                                    textOverflow: 'ellipsis',
+                                    maxWidth: '120px' // 可根据需要调整最大宽度
+                                }} title={item?.road} >{item.road ? item.road : "--"}</p>
                                 <p style={{ textAlign: "right", width: "30%", position: "absolute", right: "3%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>
                                     {
                                         item.time ?

web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js

@@ -94,7 +94,9 @@ const Right = (props) => {
                         {/* <div style={{ width: (roads?.["小桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%", borderRadius: "0 2% 2% 0" }}></div> */}
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
-                        <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>中小桥梁<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{isNaN(roads?.["小桥"] + roads?.["中桥"]) ? "" : roads?.["小桥"] + roads?.["中桥"]}</span><span style={{ marginLeft: "4%" }}>座</span></p>
+                        <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>中小桥梁<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>159</span><span style={{ marginLeft: "4%" }}>座</span></p>
+
+                        {/* <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>中小桥梁<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{isNaN(roads?.["小桥"] + roads?.["中桥"]) ? "" : roads?.["小桥"] + roads?.["中桥"]}</span><span style={{ marginLeft: "4%" }}>座</span></p> */}
                         <p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span>{isNaN((((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)) ? "" : (((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}</span><span>%</span></p>
                     </div>
                 </div>

web/client/src/sections/quanju/containers/public/olMap.js

@@ -43,6 +43,16 @@ const OlMap = (props) => {
             olMap.closeOverlay('clickOpen')
             olMap.closeOverlay('pointClickOpen')
             olMap.removeGeometryLayer('geometry0')
+            if (tab != 'conserve') {
+                patrolList.forEach((d, index) => {
+                    olMap.removeGeometryLayer('geometry_patrol_' + index)
+                })
+            }
+            if (tab != 'build') {
+                roadProjectList.forEach((d, index) => {
+                    olMap.removeGeometryLayer('geometry_road_' + index)
+                })
+            }
         }
     }, [tab])
 
@@ -282,10 +292,6 @@ const OlMap = (props) => {
                     layerName: 'geometry_patrol_' + index
                 });
             });
-        } else if (tab != 'conserve' && olMap) {
-            patrolList.forEach((d, index) => {
-                olMap.removeGeometryLayer('geometry_patrol_' + index)
-            })
         }
     }, [patrolList, olMap, tab])