Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

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 . /var/app
+WORKDIR /var/app
+RUN npm cache clean -f
+RUN rm -rf package-lock.json
+RUN npm install --registry http://10.8.30.22:7000
+CMD ["node", "index.js"]

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/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 ?
@@ -113,7 +121,7 @@ const RightTop = (props) => {
                         )
                     })
                 }
-            </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])