diff --git a/jenkinsfilenew_node b/jenkinsfilenew_node new file mode 100644 index 00000000..317b5a5a --- /dev/null +++ b/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}" + } + } +} \ No newline at end of file diff --git a/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew b/scripts/1.3.1/data/1_insert_report_data/Dockerfilenew new file mode 100644 index 00000000..4dbd4baf --- /dev/null +++ b/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"] \ No newline at end of file diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js index f35bd2a5..809a1a6a 100644 --- a/web/client/src/sections/fillion/actions/infor.js +++ b/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) { diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js index 50beed0d..109a8560 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js @@ -74,8 +74,16 @@ const RightTop = (props) => { }}> {beijing == index ? : ""} {beijing == index ? : ""} -
{item?.user?.name || '--'}
-{item.road ? item.road : "--"}
+{item?.user?.name || '--'}
+{item.road ? item.road : "--"}
{ item.time ? @@ -113,7 +121,7 @@ const RightTop = (props) => { ) }) } - + ) } diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js index 4d50a3be..939d33cc 100644 --- a/web/client/src/sections/quanju/containers/public/olMap.js +++ b/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])