From 8d91c1f64eb1f9a31f3d10934ca21cb34a4d00fd Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Fri, 29 Jul 2022 14:10:57 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E4=B8=80=E8=A7=88?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/project/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js index 59809f4c..17894cf5 100644 --- a/web/client/src/sections/fillion/components/project/project.js +++ b/web/client/src/sections/fillion/components/project/project.js @@ -113,7 +113,7 @@ const ProjectModal = (props) => { } } }} - initialValues={{ ...recortd, done: recortd.done ? 'true' : 'false' }} + initialValues={{ ...recortd, done: typecard == 'compile'?recortd?.done ? 'true' : 'false':'' }} > {typecard == 'compile' ? Date: Fri, 29 Jul 2022 14:19:42 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/quanju/containers/example.js | 6 ++++-- .../quanju/containers/footer/conserve/index.js | 2 -- .../sections/quanju/containers/footer/conserve/left.js | 10 +++++----- .../quanju/containers/footer/conserve/right.js | 10 +++++----- .../src/sections/quanju/containers/footer/gis/gis.js | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/web/client/src/sections/quanju/containers/example.js b/web/client/src/sections/quanju/containers/example.js index 1beb1d5c..5a40535b 100644 --- a/web/client/src/sections/quanju/containers/example.js +++ b/web/client/src/sections/quanju/containers/example.js @@ -35,12 +35,14 @@ const Example = (props) => { document.body.clientHeight / 1080 )})`, */ }}> - +
-
+
+
+
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/index.js b/web/client/src/sections/quanju/containers/footer/conserve/index.js index 7a141fe5..105995f2 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/index.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/index.js @@ -29,10 +29,8 @@ const Conserve = (props) => { return (
-
-
) } diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left.js b/web/client/src/sections/quanju/containers/footer/conserve/left.js index 51b846e5..dfc40a1a 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left.js @@ -4,12 +4,12 @@ import LeftCenter from './left/left-center' import LeftTop from './left/left-top' const Left = (props) => { - const { roadData,loading } = props + const { roadData, loading } = props return ( -
- - - +
+ + +
) } diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right.js b/web/client/src/sections/quanju/containers/footer/conserve/right.js index b96513e2..2fb079ee 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right.js @@ -4,12 +4,12 @@ import RightCenter from './right/right-center' import RightTop from './right/right-top' const Right = (props) => { - const { highwaysData,roadMaintenances } = props + const { highwaysData, roadMaintenances } = props return ( -
- - - +
+ + +
) } diff --git a/web/client/src/sections/quanju/containers/footer/gis/gis.js b/web/client/src/sections/quanju/containers/footer/gis/gis.js index 46016561..f711e91e 100644 --- a/web/client/src/sections/quanju/containers/footer/gis/gis.js +++ b/web/client/src/sections/quanju/containers/footer/gis/gis.js @@ -21,9 +21,9 @@ const Gis = (props) => { const loadMap = () => { const map = new AMap.Map(MAPID, { resizeEnable: true, - center: [115.912663, 28.543149],//地图中心点，初始定位加载显示楼块 - zoom: 15,//地图显示的缩放级别 - zooms: [10, 12], + center: [115.99255, 28.503617],//地图中心点，初始定位加载显示楼块 + zoom: 8,//地图显示的缩放级别 + zooms: [8, 18], pitch: 0, // 地图俯仰角度，有效范围 0 度- 83 度 viewMode: '3D', // 地图模式 mapStyle: 'amap://styles/fb26776387242721c2fc32e2cb1daccc', @@ -42,8 +42,8 @@ const Gis = (props) => { }; return ( -
-
+
+
{mapObj ? : ''}
) From a61dc4e9fc671a1cc919865c48d9fe9ff38a8469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= Date: Fri, 29 Jul 2022 14:26:09 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/quanju/containers/footer/operation/index.js | 2 +- .../src/sections/quanju/containers/footer/operation/left.js | 2 +- .../src/sections/quanju/containers/footer/operation/right.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/client/src/sections/quanju/containers/footer/operation/index.js b/web/client/src/sections/quanju/containers/footer/operation/index.js index 77e19a00..1f723da9 100644 --- a/web/client/src/sections/quanju/containers/footer/operation/index.js +++ b/web/client/src/sections/quanju/containers/footer/operation/index.js @@ -17,7 +17,7 @@ const Operation = (props) => { }, []) return ( -
+
diff --git a/web/client/src/sections/quanju/containers/footer/operation/left.js b/web/client/src/sections/quanju/containers/footer/operation/left.js index 175efc1e..a00da638 100644 --- a/web/client/src/sections/quanju/containers/footer/operation/left.js +++ b/web/client/src/sections/quanju/containers/footer/operation/left.js @@ -128,7 +128,7 @@ const Left = (props) => { setTreeDataList(dataList) }, [busTier]) return ( -
+
diff --git a/web/client/src/sections/quanju/containers/footer/operation/right.js b/web/client/src/sections/quanju/containers/footer/operation/right.js index 30cdf2ed..05561a68 100644 --- a/web/client/src/sections/quanju/containers/footer/operation/right.js +++ b/web/client/src/sections/quanju/containers/footer/operation/right.js @@ -23,7 +23,7 @@ const Right = () => { ]) const style = { height: "97%", marginTop: "3%" } return ( -
+
Date: Fri, 29 Jul 2022 15:07:54 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=8D=A2=E6=88=90=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containers/footer/leadership/centerLeft.js | 2 +- .../footer/leadership/centerleft/daolu.js | 15 +++++++++++---- .../footer/leadership/centerleft/handong.js | 7 +++++++ .../quanju/containers/footer/leadership/left.js | 2 +- .../containers/footer/leadership/left/left-top.js | 3 +++ .../quanju/containers/footer/leadership/right.js | 2 +- .../footer/leadership/right/right-bottom.js | 2 ++ .../footer/leadership/right/right-top.js | 4 ++-- 8 files changed, 28 insertions(+), 9 deletions(-) diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerLeft.js b/web/client/src/sections/quanju/containers/footer/leadership/centerLeft.js index 1c99e230..5b418e69 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerLeft.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerLeft.js @@ -8,7 +8,7 @@ const CenterLeft = (props) => { const { dispatch } = props return ( <> -
+
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js index d3ffb457..5cddb316 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js @@ -18,7 +18,7 @@ const Right = (props) => { setNums(res.payload.data.reportCount.filter((item, index) => { return item.projectType == "road" })) - console.log(res.payload.data); + // console.log(res.payload.data); }) }, []) useEffect(() => { @@ -33,6 +33,7 @@ const Right = (props) => { return (
+ {/* */} { list.map((item, index) => { return ( @@ -53,30 +54,35 @@ const Right = (props) => { ) }) } + {/* */}
) } return ( <> + {/* */}
+ {/* */}

占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

{roads?.["县"].toFixed(3)}公里县道道路

+ {/* */}
- {/*
- -
*/}
+ {/* */} +

乡村道道路{(roads?.["乡"] + roads?.["村"]).toFixed(3)}公里

占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

+ {/* */} +
@@ -99,6 +105,7 @@ const Right = (props) => {
+ {/* */} ) } diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js index 5ee0b7cb..034e2d60 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js @@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react' import Lun from "../right/lunbo" import { getRoadmaintain, getdaolutongji } from "../../../../actions/example" import moment from 'moment' +// import { Spin } from 'antd' const Right = (props) => { @@ -34,6 +35,8 @@ const Right = (props) => { return (
+ {/* */} + { list.map((item, index) => { console.log(list); @@ -57,14 +60,17 @@ const Right = (props) => { ) }) } + {/* */}
) } return ( <> +
+ {/* */}

占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

{roads?.["县"].toFixed(0)}个县涵洞

@@ -82,6 +88,7 @@ const Right = (props) => {

乡村涵洞{(roads?.["乡"] + roads?.["村"]).toFixed(0)}个

占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

+
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left.js b/web/client/src/sections/quanju/containers/footer/leadership/left.js index c000a87b..de1f0430 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left.js @@ -7,7 +7,7 @@ const Left = (props) => { const { dispatch } = props return ( <> -
+
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js index fabe7b54..58caed0e 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js @@ -15,9 +15,12 @@ const Lefttop = (props) => { const shuju = dispatch(getGodshuju()).then((res) => { // console.log(res); setMass(res.payload.data.index) + // setMass(70) setspeed(res.payload.data.speed) }) }, []) + + // console.log(mass); return ( <> diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right.js b/web/client/src/sections/quanju/containers/footer/leadership/right.js index 4623d72a..a2696bbb 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right.js @@ -7,7 +7,7 @@ const Right = (props) => { const { dispatch } = props return ( <> -
+
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js index 64d271ae..d90e484d 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js @@ -22,6 +22,7 @@ const Rightbottom = (props) => { const renderBody = () => { return (
+ {/* */} {list?.map((item, index) => { return
  • { setBeijing(index) @@ -38,6 +39,7 @@ const Rightbottom = (props) => { }) } + {/* */}
    • ) } diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js index c33a37f6..3e414353 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js @@ -77,8 +77,8 @@ const Righttop = () => {
    -

    监控总数

    129

    -

    在线率

    88.87%

    +

    监控总数

    129

    +

    在线率

    88.87%

    From fbb53411a80deb16c62e9bbfef4decf61834f34d Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Fri, 29 Jul 2022 15:09:15 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- weapp/src/packages/patrol/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx index c99df9a8..b4cbdbf5 100644 --- a/weapp/src/packages/patrol/index.jsx +++ b/weapp/src/packages/patrol/index.jsx @@ -36,7 +36,7 @@ const Index = () => { const prjType = [ { text: '道路', value: 'road'}, - { text: '桥梁', value: 'birdge'}, + { text: '桥梁', value: 'bridge'}, { text: '涵洞', value: 'culvert'}, { text: '其他', value: 'other'}, ] From e11b4e2b1b3d4459793ed9ce16de0afc89bec495 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 29 Jul 2022 15:25:36 +0800 Subject: [PATCH 06/11] API_URL --- code996.sh | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++ web/config.js | 4 +- 2 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 code996.sh diff --git a/code996.sh b/code996.sh new file mode 100644 index 00000000..d0844e79 --- /dev/null +++ b/code996.sh @@ -0,0 +1,140 @@ +#!/usr/bin/env bash + +Help() +{ + echo "你也可以使用自定义参数进行指定查询" + echo + echo "格式: bash $0 [2021-01-01] [2022-04-04] [author]" + echo "示例: bash code996.sh 2021-01-01 2022-12-31 digua" + echo "参数:" + echo "1st 分析的起始时间." + echo "2nd 分析的结束时间." + echo "3rd 指定提交用户，可以是 name 或 email." + echo +} + +OS_DETECT() +{ + # Detect OS + case "$(uname -s)" in + + Linux) + # echo 'Linux' + open_url="xdg-open" + ;; + + Darwin) + # echo 'macOS' + open_url="open" + ;; + + CYGWIN*|MINGW32*|MSYS*|MINGW*) + # echo 'Windows' + open_url="start" + ;; + + *) + echo 'Other OS' + echo "trying to use xdg-open to open the url" + open_url="xdg-open" + ;; + esac + +} +OS_DETECT + + +time_start=$1 + + +if [ "$1" == "--help" ] + then + Help + exit 0 +elif [ "$1" == "-h" ] + then + Help + exit 0 +fi + +if [ -z $1 ] + then + time_start="2021-01-01" +fi + +time_end=$2 +if [ -z $2 ] + then + time_end=$(date "+%Y-%m-%d") +fi + +author=$3 +if [ -z $3 ] + then + author="" +fi + + +by_day_output=`git -C $PWD log --author=$author --date=format:%u --after="$time_start" --before="$time_end" |grep "Date:"|awk '{print $2}'|sort|uniq -c` + +by_hour_output=`git -C $PWD log --author=$author --date=format:%H --after="$time_start" --before="$time_end" |grep "Date:"|awk '{print $2}'|sort|uniq -c` + +for i in "${by_day_output[@]}" + do + by_day_result=`echo "$i"|sed -E 's/^ +//g'|sed 's/ /_/g'|tr '\n' ','` + + done + + +# should modify by day format %a or %A +# day_sorted=('Monday' 'Tuesday' 'Wednesday' 'Thursday' 'Friday' 'Saturday' 'Sunday') +# day_sorted=('Mon' 'Tue' 'Wed' 'Thu' 'Fri' 'Sat' 'Sun') + +RED='\033[1;91m' +NC='\033[0m' # No Color + +echo -e "${RED}统计时间范围：$time_start 至 $time_end" + +for i in "${by_day_output[@]}" + do + echo + echo -e "${NC}一周七天 commit 分布${RED}" + echo -e " 总提交次数 星期\n$i"|column -t + by_day_result=`echo "$i"|sed -E 's/^ +//g'|sed "s/ /_/g"|tr '\n' ','` + done + + +for i in "${by_hour_output[@]}" + do + echo + echo -e "${NC}24小时 commit 分布${RED}" + echo -e " 总提交次数 小时\n$i"|column -t + by_hour_result=`echo "$i"|sed -E 's/^ +//g'|sed "s/ /_/g"|tr '\n' ','` + done + + +by_day_result=`echo "$by_day_result"|sed -E 's/,$//g'` + +by_hour_result=`echo "$by_hour_result"|sed -E 's/,$//g'` + + +result=$time_start"_"$time_end"&week="$by_day_result"&hour="$by_hour_result + +# url +github_url="https://hellodigua.github.io/code996/#/result?time=$result" +vercel_url="https://code996.vercel.app/#/result?time=$result" +gitee_url="https://hellodigua.gitee.io/code996/#/result?time=$result" + +echo +echo -e "${NC}复制以下url以查看可视化分析结果:" +echo -e "${RED}$github_url" +echo -e "${NC}" +echo -e "${NC}若 GitHub 访问过慢，也可以访问以下镜像链接:" +echo -e "${NC}Vercel节点:" +echo -e "${RED}$vercel_url" +echo -e "${NC}" +echo -e "${NC}Gitee节点:" +echo -e "${RED}$gitee_url" +echo -e "${NC}" + +$open_url "$github_url" diff --git a/web/config.js b/web/config.js index 0736a5c0..4acfc2b1 100644 --- a/web/config.js +++ b/web/config.js @@ -15,12 +15,14 @@ dev && console.log('\x1B[33m%s\x1b[0m', '请遵循并及时更新 readme.md， // // 启动参数 args.option(['p', 'port'], '启动端口'); args.option(['u', 'api-url'], 'webapi的URL'); +args.option('apiUrl', '可外网访问的 webapi 的URL'); args.option(['r', 'report-node'], '报表进程地址'); args.option('qndmn', '七牛'); const flags = args.parse(process.argv); const FS_UNIAPP_API = process.env.FS_UNIAPP_API || flags.apiUrl; const QINIU_DOMAIN_QNDMN_RESOURCE = process.env.ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURC || flags.qndmn; +const API_URL = process.env.API_URL || flags.apiUrl; if (!FS_UNIAPP_API) { console.log('缺少启动参数，异常退出'); @@ -52,7 +54,7 @@ const product = { }, { entry: require('./routes').entry, opts: { - apiUrl: FS_UNIAPP_API, + apiUrl: API_URL, qndmn: QINIU_DOMAIN_QNDMN_RESOURCE, staticRoot: './client', } From 0b989fe87fe8066522a2da3280db5d55023c44de Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 29 Jul 2022 15:31:02 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E9=97=A8=E5=90=8E=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9B=B8=E5=90=8C=E5=90=8D=E7=A7=B0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/organization/department.js | 1 + 1 file changed, 1 insertion(+) diff --git a/api/app/lib/controllers/organization/department.js b/api/app/lib/controllers/organization/department.js index 3fa5e66a..9e55dc35 100644 --- a/api/app/lib/controllers/organization/department.js +++ b/api/app/lib/controllers/organization/department.js @@ -70,6 +70,7 @@ async function editDep (ctx) { dependence: dependence || null, name: name, id: { $ne: depId }, + delete: false } }) if (repeatNameCount) { From ec02aeb95be37cd177f8235fe64cd0ebcfb1ab9f Mon Sep 17 00:00:00 2001 From: wangyue Date: Fri, 29 Jul 2022 15:36:12 +0800 Subject: [PATCH 08/11] =?UTF-8?q?nan=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containers/footer/leadership/centerleft/daolu.js | 10 +++++----- .../footer/leadership/centerleft/handong.js | 10 +++++----- .../footer/leadership/centerleft/qiqoliang.js | 10 +++++----- .../containers/footer/leadership/centerleft/top.js | 6 +++--- .../footer/leadership/left/echarts/lefttopecharts.js | 12 ++++++------ .../containers/footer/leadership/left/left-top.js | 2 +- .../footer/leadership/right/right-bottom.js | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js index 5cddb316..fc9f8d61 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js @@ -66,8 +66,8 @@ const Right = (props) => {
    {/* */} -

    占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    -

    {roads?.["县"].toFixed(3)}公里县道道路

    +

    占比{isNaN(((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : ((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    +

    {isNaN(roads?.["县"].toFixed(3)) ? "" : roads?.["县"].toFixed(3)}公里县道道路

    {/*     */}
    @@ -79,8 +79,8 @@ const Right = (props) => {
    {/* */} -

    乡村道道路{(roads?.["乡"] + roads?.["村"]).toFixed(3)}公里

    -

    占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    +

    乡村道道路{isNaN((roads?.["乡"] + roads?.["村"]).toFixed(3)) ? "" : (roads?.["乡"] + roads?.["村"]).toFixed(3)}公里

    +

    占比{isNaN((((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : (((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    {/*     */}
    @@ -90,7 +90,7 @@ const Right = (props) => { {/*

    {title || []}

    */} 养护事件 -

    道路{nums ? nums[0]?.count : []}次

    +

    道路{nums ? nums[0]?.count : 0}次

    {/* */}
    {/* */} diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js index 034e2d60..b2f26344 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js @@ -72,8 +72,8 @@ const Right = (props) => {
    {/* */}
    -

    占比{((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    -

    {roads?.["县"].toFixed(0)}个县涵洞

    +

    占比{isNaN(((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : ((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    +

    {isNaN(roads?.["县"].toFixed(0)) ? "" : roads?.["县"].toFixed(0)}个县涵洞

    @@ -85,8 +85,8 @@ const Right = (props) => {
    -

    乡村涵洞{(roads?.["乡"] + roads?.["村"]).toFixed(0)}个

    -

    占比{(((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    +

    乡村涵洞{isNaN((roads?.["乡"] + roads?.["村"]).toFixed(0)) ? "" : (roads?.["乡"] + roads?.["村"]).toFixed(0)}个

    +

    占比{isNaN((((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : (((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}%

    @@ -95,7 +95,7 @@ const Right = (props) => { {/*

    {title || []}

    */} 养护事件 -

    涵洞{nums ? nums[0]?.count : []}次

    +

    涵洞{nums ? nums[0]?.count : 0}次

    {/* */}
    {
    -

    占比{((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

    -

    {roads?.["大桥"]}座大桥

    +

    占比{isNaN(((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)) ? "" : ((roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

    +

    {isNaN(roads?.["大桥"]) ? "" : roads?.["大桥"]}座大桥

    @@ -74,8 +74,8 @@ const Right = (props) => { {/*
    */}
    -

    中小桥梁{roads?.["小桥"] + roads?.["中桥"]}座

    -

    占比{(((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

    +

    中小桥梁{isNaN(roads?.["小桥"] + roads?.["中桥"]) ? "" : roads?.["小桥"] + roads?.["中桥"]}座

    +

    占比{isNaN((((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)) ? "" : (((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])) * 100).toFixed(2)}%

    @@ -83,7 +83,7 @@ const Right = (props) => { {/*

    {title || []}

    */} 养护事件 -

    桥梁{nums ? nums[0]?.count : []}次

    +

    桥梁{nums ? nums[0]?.count : 0}次

    {/* */}
    {

    道路统计公里

    -

    {(list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}

    +

    {isNaN((list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)) ? "" : (list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}

    { @@ -53,7 +53,7 @@ const Leftcenter = (props) => {

    涵洞统计个

    -

    {(culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}

    +

    {isNaN((culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)) ? "" : (culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}

    { @@ -67,7 +67,7 @@ const Leftcenter = (props) => {

    桥梁统计座

    -

    {(bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}

    +

    {isNaN((bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])) ? "" : (bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}

    diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js b/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js index db11a988..17aeace1 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js @@ -104,13 +104,13 @@ const Lefttopecharts = (props) => { if (value !== 0) { // var num = Math.round(value); return ( - value + + isNaN(value) ? "" : value + - "\n" + - "\n" + - "\n" + - "\n" + - "\n" + "\n" + + "\n" + + "\n" + + "\n" + + "\n" ); } else { diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js index 58caed0e..373f10e0 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js @@ -48,7 +48,7 @@ const Lefttop = (props) => { fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", color: "rgba(216,240,255,0.8000)", position: "absolute", left: "30%", top: "65%" }}>预测明日

    -

    {(speed + ((Math.random() * (6) - 3))).toFixed(2)}Km/h

    +

    {isNaN((speed + ((Math.random() * (6) - 3))).toFixed(2)) ? "" : (speed + ((Math.random() * (6) - 3))).toFixed(2)}Km/h

    diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js index d90e484d..9f954ced 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js @@ -49,7 +49,7 @@ const Rightbottom = (props) => {
    - 已处理{nums}件 + 已处理{nums ? nums : 0}件

    车牌号

    From 0e9b207f593cab5dd25bd07e8023aebfd29d9c1f Mon Sep 17 00:00:00 2001 From: LUCAS Date: Fri, 29 Jul 2022 15:47:15 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=85=BB=E6=8A=A4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=B7=A1=E6=9F=A5=E7=AE=A1=E7=90=86=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/fillion/components/maintenanceTable.js | 5 +++-- web/client/src/sections/fillion/components/patrolTable.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index 36b1cc03..297d6087 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -13,7 +13,8 @@ import moment from 'moment'; const DetailForm = (props) => { const { visible, data, handleClose, loading } = props; const keyList = [ - { key: '问题编号', name: 'id' }, + { key: '编号', name: 'id' }, + { key: '工程类型', name: 'projectType' }, { key: '所在路段', name: 'road' }, { key: '具体位置', name: 'address' }, { key: '巡查内容', name: 'content' }, @@ -91,7 +92,7 @@ const DetailList = (props) => { const columns = [ { - title: '问题编号', + title: '编号', key: 'id', dataIndex: 'id', align: 'center', diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 56cd5959..c7b268bb 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -14,7 +14,8 @@ import moment from 'moment'; const DetailForm = (props) => { const { visible, data, handleClose, loading } = props; const keyList = [ - { key: '问题编号', name: 'id' }, + { key: '编号', name: 'id' }, + { key: '工程类型', name: 'projectType' }, { key: '所在路段', name: 'road' }, { key: '具体位置', name: 'address' }, { key: '巡查内容', name: 'content' }, @@ -92,7 +93,7 @@ const DetailList = (props) => { const columns = [ { - title: '问题编号', + title: '编号', key: 'id', dataIndex: 'id', align: 'center', From a840bdcd902f22bf46232228e961a5937b405c4f Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Fri, 29 Jul 2022 16:05:59 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/components/Upload/index.js | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/web/client/src/components/Upload/index.js b/web/client/src/components/Upload/index.js index 0bd3af10..29555be7 100644 --- a/web/client/src/components/Upload/index.js +++ b/web/client/src/components/Upload/index.js @@ -27,28 +27,28 @@ class Uploads extends Component { return showName } - // setFileList = (value) => { - // let defaultFileList = []; - // defaultFileList = value.map((u, index) => { - // let fileUrl = `${this.ApiRoot}/${u.url}`; - // return { - // uid: -index - 1, - // name: this.dealName(u.url), - // status: 'done', - // storageUrl: u.url, - // url: fileUrl - // }; - // }); - // onChange(defaultFileList) - // this.setState({ - // fileList: defaultFileList - // }); - // }; + setFileList = (value) => { + let defaultFileList = []; + defaultFileList = value.map((u, index) => { + let fileUrl = `${this.ApiRoot}/${u.url}`; + return { + uid: -index - 1, + name: this.dealName(u.url), + status: 'done', + storageUrl: u.url, + url: fileUrl + }; + }); + // onChange(defaultFileList) + this.setState({ + fileList: defaultFileList + }); + }; componentDidMount() { const { value } = this.props; if (value) { - this.setState(value); + this.setFileList(value); } } From c1607d94e88e521613a5c362d1cebbbe1213e3b9 Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Fri, 29 Jul 2022 16:14:48 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=A1=A5=E6=A2=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=BE=93=E5=85=A5=E6=A1=86=E6=97=A0=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/bridgeTable.js | 4 ++-- web/client/src/sections/fillion/components/inforTable.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js index 8a2cd2cb..770a0e84 100644 --- a/web/client/src/sections/fillion/components/bridgeTable.js +++ b/web/client/src/sections/fillion/components/bridgeTable.js @@ -48,7 +48,7 @@ const BrideTable = (props) => { tab1: [ { title: '桥梁代码', - dataIndex: 'placeName', + dataIndex: 'placeName1', fixed: 'left', width: 120, options: 1, @@ -64,7 +64,7 @@ const BrideTable = (props) => { }, { title: '桥梁名称', - dataIndex: 'containers', + dataIndex: 'placeName', fixed: 'left', width: 120, render: (dom, record) => { diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js index e5e492d3..fd616f41 100644 --- a/web/client/src/sections/fillion/components/inforTable.js +++ b/web/client/src/sections/fillion/components/inforTable.js @@ -75,7 +75,7 @@ const InForTable = (props) => { onChange: (value, cs) => { setNameOfInspectionPoint(value.currentTarget.value) }, - placeholder: '请输入车牌号进行搜索', + placeholder: '请输入检测点进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, {