From a1b704df7938c7a7b9b272e972e836878d18d13e Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 4 Aug 2023 22:07:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=20=E5=BB=BA=E8=AE=BE=E7=9A=84=E7=82=B9?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=9C=A8=E5=85=B6=E4=BB=96tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/quanju/containers/public/olMap.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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]) From 923a65528fd6d89d7c290f1677853467d8939781 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 4 Aug 2023 22:14:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20=E5=85=BB=E6=8A=A4=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containers/footer/conserve/right/right-top.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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) => { ) }) } - + ) } From 991b5a99e836180516f7db7d46d1914a6b0f7f13 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Fri, 4 Aug 2023 14:18:59 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'jenkinsfilenew=5Fnode?= =?UTF-8?q?'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_node | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 jenkinsfilenew_node 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 From 6836d1f52579be3bcc2b73e980eefb2b31ed3b41 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Fri, 4 Aug 2023 14:19:33 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'scripts/1.3.1/data/1?= =?UTF-8?q?=5Finsert=5Freport=5Fdata/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/1.3.1/data/1_insert_report_data/Dockerfilenew | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 scripts/1.3.1/data/1_insert_report_data/Dockerfilenew 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 From 9e631c11399b41330d183500c73825951398ada2 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 4 Aug 2023 22:20:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=20=E9=81=93=E8=B7=AF=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E6=A1=A5=E6=A2=81=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/actions/infor.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) {