From df3ece6fa27c79497965f6b9193146db0a9e3f04 Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 4 Aug 2023 20:13:01 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat:report=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/1.3.0/schema/6.update_report.sql | 4 ---- scripts/1.3.1/schema/4.update_report.sql | 11 +++++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 scripts/1.3.0/schema/6.update_report.sql diff --git a/scripts/1.3.0/schema/6.update_report.sql b/scripts/1.3.0/schema/6.update_report.sql deleted file mode 100644 index da99eb71..00000000 --- a/scripts/1.3.0/schema/6.update_report.sql +++ /dev/null @@ -1,4 +0,0 @@ -alter table report - add handle_opinions varchar(1024); - -comment on column report.handle_opinions is '处理意见'; \ No newline at end of file diff --git a/scripts/1.3.1/schema/4.update_report.sql b/scripts/1.3.1/schema/4.update_report.sql index eefe3537..51ab0ebc 100644 --- a/scripts/1.3.1/schema/4.update_report.sql +++ b/scripts/1.3.1/schema/4.update_report.sql @@ -1,6 +1,13 @@ ALTER TABLE "public"."report" - ADD COLUMN "handle_advice" varchar(1024); + ADD COLUMN "handle_advice" varchar(1024) + add handle_opinions varchar(1024); COMMENT ON COLUMN "public"."report"."handle_state" IS '待处理 / 已指派 / 已处理 / 不处理'; -COMMENT ON COLUMN "public"."report"."handle_advice" IS '管理员处理意见'; \ No newline at end of file +COMMENT ON COLUMN "public"."report"."handle_advice" IS '管理员处理意见'; + +comment on column report.handle_opinions is '处理意见'; + + + + From 3d10104cc7ade2dba5d645f32acb272941c7184e Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Fri, 4 Aug 2023 20:20:59 +0800 Subject: [PATCH 02/11] =?UTF-8?q?handleState=E9=BB=98=E8=AE=A4=E5=B7=B2?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/models/report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/app/lib/models/report.js b/api/app/lib/models/report.js index adb7d806..00a2c074 100644 --- a/api/app/lib/models/report.js +++ b/api/app/lib/models/report.js @@ -163,7 +163,7 @@ module.exports = dc => { handleState: { type: DataTypes.STRING, allowNull: true, - defaultValue: null, + defaultValue: '已处理', comment: null, primaryKey: false, field: "handle_state", From f3e924642250c1e47ec1ab27277bb5edcfd1c265 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Fri, 4 Aug 2023 20:27:48 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/uploads.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js index 920bf5c8..eb523956 100644 --- a/web/client/src/sections/fillion/components/uploads.js +++ b/web/client/src/sections/fillion/components/uploads.js @@ -56,12 +56,12 @@ class Uploads extends Component { componentWillReceiveProps (np) { const { dispatch, value: thisEditData, onChange } = this.props; const { value: nextEditData, clearFileList } = np; - + console.log(nextEditData,'哈哈哈哈') const setFileList = () => { let defaultFileList = []; defaultFileList = nextEditData.map((u, index) => { // let fileUrl = `${this.ApiRoot}/${u.storageUrl}`; - let fileUrl = `${u.storageUrl}`; + let fileUrl = `${u.url}`; return { uid: -index - 1, name: this.dealName(u.storageUrl), From f86ff509c6179fc2c0aece73af088d47202724b2 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Fri, 4 Aug 2023 20:28:28 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/uploads.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js index eb523956..a10cdb2f 100644 --- a/web/client/src/sections/fillion/components/uploads.js +++ b/web/client/src/sections/fillion/components/uploads.js @@ -75,7 +75,6 @@ class Uploads extends Component { fileList: defaultFileList }); }; - if (nextEditData && nextEditData.length) { if (!thisEditData || !this.state.fileList.length) { setFileList(); From 3a39e4e9e8229cd8ed658149f8ebb9425acaa8c9 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Fri, 4 Aug 2023 20:39:21 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/fillion/components/uploads.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js index a10cdb2f..90088077 100644 --- a/web/client/src/sections/fillion/components/uploads.js +++ b/web/client/src/sections/fillion/components/uploads.js @@ -57,6 +57,7 @@ class Uploads extends Component { const { dispatch, value: thisEditData, onChange } = this.props; const { value: nextEditData, clearFileList } = np; console.log(nextEditData,'哈哈哈哈') + const setFileList = () => { let defaultFileList = []; defaultFileList = nextEditData.map((u, index) => { From 4e6188a596da5f5d80fb4c3a0b6007febedddf8a Mon Sep 17 00:00:00 2001 From: wenlele Date: Fri, 4 Aug 2023 20:53:27 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=81=93=E8=B7=AF=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=B2=BB=E7=90=86=20=20=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quanju/containers/footer/guanli/index.js | 14 +- .../containers/footer/guanli/style.less | 547 +++++++++--------- .../footer/leadership/right/right-bottom.js | 163 +++--- 3 files changed, 382 insertions(+), 342 deletions(-) diff --git a/web/client/src/sections/quanju/containers/footer/guanli/index.js b/web/client/src/sections/quanju/containers/footer/guanli/index.js index 3e42faf5..44a348cf 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/index.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js @@ -64,7 +64,7 @@ const Guanli = (props) => { } - + console.log(1111, qndmn); useEffect(() => { requestleftDatas(); @@ -82,9 +82,11 @@ const Guanli = (props) => {
{picfile?.length > 0 ? - {picfile?.map(v => )} : { 处罚 处理日期
*/} - o
+
执法日期
执法成果
@@ -181,7 +183,7 @@ const Guanli = (props) => { ) } function mapStateToProps (state) { - const { auth, depMessage } = state; + const { auth, depMessage, global } = state; const pakData = (dep) => { return dep.map((d) => { return { diff --git a/web/client/src/sections/quanju/containers/footer/guanli/style.less b/web/client/src/sections/quanju/containers/footer/guanli/style.less index f1edaf71..7d612b9f 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/style.less +++ b/web/client/src/sections/quanju/containers/footer/guanli/style.less @@ -1,7 +1,7 @@ -@media screen and (max-width:1366px) { - html { - font-size: 12px; - } +@media screen and (max-width: 1366px) { + html { + font-size: 12px; + } } // .guanli{ @@ -13,291 +13,298 @@ // display: flex; // justify-content: space-between; .guanli-left { - width: 25%; - height: 100%; - position: absolute; - left: 0; - - .guanli-left-item { - box-sizing: border-box; - width: 85%; - position: relative; - // height: 30%; - height: 24vh; - margin: 0 auto 3%; + width: 25%; + height: 100%; + position: absolute; + left: 0; + + .guanli-left-item { + box-sizing: border-box; + width: 85%; + position: relative; + // height: 30%; + height: 24vh; + margin: 0 auto 3%; + display: flex; + align-items: center; + padding: 0 10%; + justify-content: space-between; + border: 2px solid rgba(28, 96, 254, 0.5); + + .guanli-left-item-left { + width: 45%; + height: 60%; + display: flex; + flex-direction: column; + align-items: center; + + span { + font-size: 1.25rem; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(216, 240, 255, 0.8); + } + + div { display: flex; - align-items: center; - padding: 0 10%; - justify-content: space-between; - border: 2px solid rgba(28, 96, 254, 0.5000); - - .guanli-left-item-left { - width: 45%; - height: 60%; - display: flex; - flex-direction: column; - align-items: center; - - span { - font-size: 1.25rem; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: rgba(216, 240, 255, 0.8000); - } - - div { - display: flex; - justify-content: center; - // align-items: ; - font-size: 2.125rem; - font-family: YouSheBiaoTiHei; - color: #FFFFFF; - height: 70%; - width: 100%; - background: url('/assets/images/quanju/guanlijiance_1.png') no-repeat; - background-size: 100% 80%; - background-position: center bottom; - - span { - font-size: 1rem; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - padding-top: 10%; - margin-left: 5px; - // height: 0; - color: rgba(216, 240, 255, 0.8000); - } - } - - // background-color: pink; - } - - .guanli-left-item-right { - width: 40%; - height: 50%; - position: relative; - - span { - position: absolute; - width: 8px; - height: 8px; - background-color: #fff; - top: 1.5%; - left: 50%; - z-index: 10; - border-radius: 4px; - display: block; - } - - // background-color: pink; - } - - // background-color: pink; - } -} - -.guanli-right { - width: 25%; - height: 100%; - position: absolute; - right: 0; - - .guanli-right-top { + justify-content: center; + // align-items: ; + font-size: 2.125rem; + font-family: YouSheBiaoTiHei; + color: #ffffff; + height: 70%; width: 100%; - // height: 5%; - display: flex; - justify-content: flex-end; - align-items: center; - padding-right: 10px; - - img { - width: 4%; - // height: 40%; - } + background: url("/assets/images/quanju/guanlijiance_1.png") no-repeat; + background-size: 100% 80%; + background-position: center bottom; span { - &:nth-child(2) { - font-size: 16px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: rgba(216, 240, 255, 0.8000); - margin: 0 10px 0 2px - } - - &:nth-child(3) { - font-size: 18px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - color: #FFFFFF; - margin-right: 10px; - } - - &:nth-child(4) { - font-size: 14px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: rgba(216, 240, 255, 0.8000); - } + font-size: 1rem; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + padding-top: 10%; + margin-left: 5px; + // height: 0; + color: rgba(216, 240, 255, 0.8); } + } - + // background-color: pink; } - .guanli-right-title { - width: 90%; - height: 5%; - margin: auto; - display: flex; - align-items: center; - justify-content: space-around; - background: rgba(21, 77, 160, 0.2000); - - span { - font-size: 12px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - color: #FFFFFF; - flex: 1; - text-align: center; - // &:nth-child(1){ - - // } - } + .guanli-left-item-right { + width: 40%; + height: 50%; + position: relative; + + span { + position: absolute; + width: 8px; + height: 8px; + background-color: #fff; + top: 1.5%; + left: 50%; + z-index: 10; + border-radius: 4px; + display: block; + } + + // background-color: pink; } - .guanli-right-item { - width: 90%; - // height: 4%; - height: 3vh; - margin: auto; - display: flex; - align-items: center; - justify-content: space-around; + // background-color: pink; + } +} - &:hover { - background: linear-gradient(270deg, rgba(0, 124, 230, 0) 0%, rgba(0, 70, 200, 0.8700) 100%); - } +.guanli-right { + width: 25%; + height: 100%; + position: absolute; + right: 0; + + .guanli-right-top { + width: 100%; + // height: 5%; + display: flex; + justify-content: flex-end; + align-items: center; + padding-right: 10px; + + img { + width: 4%; + // height: 40%; + } - // background: rgba(21,77,160,0.2000); - span { - font-size: 0.875rem; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: rgba(216, 240, 255, 0.8000); - line-height: 20px; - flex: 1; - text-align: center; - // &:nth-child(1){ + span { + &:nth-child(2) { + font-size: 16px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(216, 240, 255, 0.8); + margin: 0 10px 0 2px; + } + + &:nth-child(3) { + font-size: 18px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + margin-right: 10px; + } + + &:nth-child(4) { + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(216, 240, 255, 0.8); + } + } + } + + .guanli-right-title { + width: 90%; + height: 5%; + margin: auto; + display: flex; + align-items: center; + justify-content: space-around; + background: rgba(21, 77, 160, 0.2); + + span { + font-size: 12px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + flex: 1; + text-align: center; + // &:nth-child(1){ + + // } + } + } + + .guanli-right-item { + width: 90%; + // height: 4%; + height: 3vh; + margin: auto; + display: flex; + align-items: center; + justify-content: space-around; + + &:hover { + background: linear-gradient( + 270deg, + rgba(0, 124, 230, 0) 0%, + rgba(0, 70, 200, 0.87) 100% + ); + } - // } - } + // background: rgba(21,77,160,0.2000); + span { + font-size: 0.875rem; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: rgba(216, 240, 255, 0.8); + line-height: 20px; + flex: 1; + text-align: center; + // &:nth-child(1){ + + // } } + + } } .popover-content { - // background-color: red; - // .ant-popover-inner-content{ - // padding: 0!important; - // } - // .address { - // width: 80%; - // height: 80%; - // top: 10%; - // position: absolute; - // // background-color: pink; - - // .address1 { - // width: 194px; - // height: 20px; - // margin: 16px 0 24px 26px; - // span { - // &:nth-child(1) { - // margin-right: 20px; - // width: 42px; - // height: 20px; - // display: inline-block; - // overflow-wrap: break-word; - // color: rgba(216, 240, 255, 0.8); - // font-size: 14px; - // font-family: PingFangSC-Regular; - // white-space: nowrap; - // line-height: 20px; - // text-align: left; - // } - // &:nth-child(2) { - // width: 28px; - // height: 20px; - // display: inline-block; - // overflow-wrap: break-word; - // color: rgba(238, 244, 255, 1); - // font-size: 14px; - // font-family: PingFangSC-Medium; - // white-space: nowrap; - // line-height: 20px; - // text-align: left; - // } - // } - // } - - // .address2 { - // width: 194px; - // height: 20px; - // margin: 16px 0 24px 26px; - - // span { - // &:nth-child(1) { - // margin-right: 35px; - // width: 28px; - // height: 20px; - // display: inline-block; - // overflow-wrap: break-word; - // color: rgba(216, 240, 255, 0.8); - // font-size: 14px; - // font-family: PingFangSC-Regular; - // white-space: nowrap; - // line-height: 20px; - // text-align: right; - // } - // &:nth-child(2) { - // width: 126px; - // height: 20px; - // display: inline-block; - // overflow-wrap: break-word; - // color: rgba(255, 255, 255, 1); - // font-size: 14px; - // font-family: PingFangSC-Medium; - // white-space: nowrap; - // line-height: 20px; - // text-align: right; - // } - // } - // } - // } + // background-color: red; + // .ant-popover-inner-content{ + // padding: 0!important; + // } + // .address { + // width: 80%; + // height: 80%; + // top: 10%; + // position: absolute; + // // background-color: pink; + + // .address1 { + // width: 194px; + // height: 20px; + // margin: 16px 0 24px 26px; + // span { + // &:nth-child(1) { + // margin-right: 20px; + // width: 42px; + // height: 20px; + // display: inline-block; + // overflow-wrap: break-word; + // color: rgba(216, 240, 255, 0.8); + // font-size: 14px; + // font-family: PingFangSC-Regular; + // white-space: nowrap; + // line-height: 20px; + // text-align: left; + // } + // &:nth-child(2) { + // width: 28px; + // height: 20px; + // display: inline-block; + // overflow-wrap: break-word; + // color: rgba(238, 244, 255, 1); + // font-size: 14px; + // font-family: PingFangSC-Medium; + // white-space: nowrap; + // line-height: 20px; + // text-align: left; + // } + // } + // } + + // .address2 { + // width: 194px; + // height: 20px; + // margin: 16px 0 24px 26px; + + // span { + // &:nth-child(1) { + // margin-right: 35px; + // width: 28px; + // height: 20px; + // display: inline-block; + // overflow-wrap: break-word; + // color: rgba(216, 240, 255, 0.8); + // font-size: 14px; + // font-family: PingFangSC-Regular; + // white-space: nowrap; + // line-height: 20px; + // text-align: right; + // } + // &:nth-child(2) { + // width: 126px; + // height: 20px; + // display: inline-block; + // overflow-wrap: break-word; + // color: rgba(255, 255, 255, 1); + // font-size: 14px; + // font-family: PingFangSC-Medium; + // white-space: nowrap; + // line-height: 20px; + // text-align: right; + // } + // } + // } + // } + .picfileimg { + width: 200px !important; + height: 200px !important; + } } .popover { - .ant-tooltip-inner{ - min-width: 0 !important; - min-height: 0 !important; - background-color: rgba(0, 0, 0, 0) !important; - } -.ant-tooltip-arrow{ + .ant-tooltip-inner { + min-width: 0 !important; + min-height: 0 !important; + background-color: rgba(0, 0, 0, 0) !important; + } + .ant-tooltip-arrow { display: none; + } + // .ant-popover-arrow { + // .ant-popover-arrow-content { + // display: none; + // } + + // span { + // display: none; + // } + // } + + // .ant-popover-inner { + // .ant-popover-inner-content { + // padding: 0; + // } + // } + // .ant-popover-inner{padding:0 !important;} } - // .ant-popover-arrow { - // .ant-popover-arrow-content { - // display: none; - // } - - // span { - // display: none; - // } - // } - - // .ant-popover-inner { - // .ant-popover-inner-content { - // padding: 0; - // } - // } - // .ant-popover-inner{padding:0 !important;} -} \ No newline at end of file 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 a5c5af5c..6500d1dc 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 @@ -1,9 +1,15 @@ import React, { useState, useEffect } from 'react' import Module from '../../../public/module' -import { Spin } from 'antd' +import { Carousel, Tooltip,} from 'antd' import Lun from "./lunbo" +import moment from 'moment' import "./left.less" import { getZhichaolist } from "../../../../actions/example" +import { getRoadadministration } from '../../../../../fillion/actions/luzheng' +import NoData from '../../../public/noData'; +import AutoRollComponent from '../../build/AutoRollComponent' + + const Rightbottom = (props) => { const { dispatch } = props @@ -13,6 +19,8 @@ const Rightbottom = (props) => { const [rightDatas, setrightDatas] = useState([]) const [nums, setNums] = useState([]) const [num, setNum] = useState() + const [rightitemlist, setrightitemlist] = useState([]) + const requestRightDatas = async () => { const res = await dispatch(getZhichaolist()) var pattern = /[\u4e00-\u9fa5]*/; @@ -30,77 +38,100 @@ const Rightbottom = (props) => { setList(d) } useEffect(() => { - const zhichaolist = dispatch(getZhichaolist()).then((res) => { - setNums(res.payload?.data?.processed) + // const zhichaolist = dispatch(getZhichaolist()).then((res) => { + // setNums(res.payload?.data?.processed) - }) - requestRightDatas() + // }) + // requestRightDatas() + roadManagement() }, []) - console.log(list); - const renderBody = () => { - return ( -
- {/* */} - {list?.map((item, index) => { - return
  • { - setBeijing(index) - setNum(index) - // console.log(beijing); - }} onMouseLeave={() => { - setBeijing() - setNum() - }}> - {beijing == index ? : ""} -
    {item.licensePlate}
    -
    {item.overrunRate ? item.overrunRate + "%" : "--"}
    -
    {item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}
    -
    {item.processingTime ? item.processingTime : "--"}
    - { - num == index ?
    - -
    - -

    {item.overrunRate ? item.overrunRate + "%" : "--"}

    -

    超限

    -
    -
    -

    车牌号{item.licensePlate}

    -

    检测点{item.nameOfInspectionPoint ? item.nameOfInspectionPoint : "--"}

    -

    处罚{item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}

    -

    日期{item.processingTime ? item.processingTime : "--"}

    -
    -
    : "" + + const roadManagement = async () => { + await dispatch(getRoadadministration({})).then(res => { + if (res.success) { + setrightitemlist(res.payload.data?.rows || []) + } + }) + + + + } + + const renderContent = () => { + + return
    + {rightitemlist && rightitemlist.length !== 0 ? rightitemlist?.map(({ enforcementdate, enforcementreslt, roadname, picfile }, index) => { + if (index < 120) { + return
    + +
    + + {picfile?.length > 0 ? + {picfile?.map(v => )} + + : } -
    • - }) - } - {/*     */} -
    - ) - } + +
    +

    + 执法日期: + {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"} +

    +

    + 执法道路: + {roadname} +

    +

    + 执法成果: + {enforcementreslt}

    +
    +
    + + } + placement="leftTop" + overlayStyle={{ minWidth: 500, minHeight: 200, paddingTop: 10, margin: 0, backgroundImage: `url(../../../../../assets/images/leadership/beijinglan.png)` }} + overlayClassName='popover' + + > +
    +
    {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"}
    +
    {enforcementreslt}
    +
    + + + } + }) : ""} + + } return ( <> - - -
    - - 已处理{nums ? nums : 0}件 -
    -
    -

    车牌号

    -

    超限

    -

    处罚

    -

    处理日期

    -
    - {/* */} - - {/* */} + + +
    +
    执法日期
    +
    执法成果
    +
    + {rightitemlist && rightitemlist.length !== 0 ? : } +     ) From 6f96f60467580fcdb9f11f1e6cd438726b076b17 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Fri, 4 Aug 2023 20:54:38 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/auth/containers/login.js | 2 +- web/client/src/sections/quanju/containers/heand/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/client/src/sections/auth/containers/login.js b/web/client/src/sections/auth/containers/login.js index dd46d798..adb52159 100644 --- a/web/client/src/sections/auth/containers/login.js +++ b/web/client/src/sections/auth/containers/login.js @@ -31,7 +31,7 @@ const Login = props => { if (user && user.authorized) { hasAuth = allroutes?.filter((item) => { return user?.userResources.find((child) => { return child.resourceId === item.authCode }) }) if (user?.username === 'SuperAdmin') { - dispatch(push('/fillion/infor')) + dispatch(push('/fillion/luzheng')) } else if (hasAuth && hasAuth.length > 0) { const path = hasAuth[0].path diff --git a/web/client/src/sections/quanju/containers/heand/index.js b/web/client/src/sections/quanju/containers/heand/index.js index 2897b285..7748120e 100644 --- a/web/client/src/sections/quanju/containers/heand/index.js +++ b/web/client/src/sections/quanju/containers/heand/index.js @@ -17,7 +17,7 @@ const Header = (props) => { const allroutes = JSON.parse(sessionStorage.getItem('allRoutes')) || [] const hasAuth = allroutes?.filter((item) => { return user?.userResources.find((child) => { return child.resourceId === item.authCode }) }) if (user?.username === 'SuperAdmin') { - dispatch(push('/fillion/infor')) + dispatch(push('/fillion/luzheng')) } else if (hasAuth && hasAuth.length > 0) { const path = hasAuth[0].path From 9f427b629c1694ae4f4e6f81ba4827788d584b76 Mon Sep 17 00:00:00 2001 From: dengyinhuan Date: Fri, 4 Aug 2023 20:56:49 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/auth/containers/login.js | 1 + web/client/src/sections/quanju/containers/heand/index.js | 1 + 2 files changed, 2 insertions(+) diff --git a/web/client/src/sections/auth/containers/login.js b/web/client/src/sections/auth/containers/login.js index adb52159..e7eb603a 100644 --- a/web/client/src/sections/auth/containers/login.js +++ b/web/client/src/sections/auth/containers/login.js @@ -32,6 +32,7 @@ const Login = props => { hasAuth = allroutes?.filter((item) => { return user?.userResources.find((child) => { return child.resourceId === item.authCode }) }) if (user?.username === 'SuperAdmin') { dispatch(push('/fillion/luzheng')) + } else if (hasAuth && hasAuth.length > 0) { const path = hasAuth[0].path diff --git a/web/client/src/sections/quanju/containers/heand/index.js b/web/client/src/sections/quanju/containers/heand/index.js index 7748120e..bda0a41a 100644 --- a/web/client/src/sections/quanju/containers/heand/index.js +++ b/web/client/src/sections/quanju/containers/heand/index.js @@ -19,6 +19,7 @@ const Header = (props) => { if (user?.username === 'SuperAdmin') { dispatch(push('/fillion/luzheng')) } + else if (hasAuth && hasAuth.length > 0) { const path = hasAuth[0].path console.log('sasa', `${path}`) From cb6c2a1d944605748eef72551602355d8453fdb7 Mon Sep 17 00:00:00 2001 From: wenlele Date: Fri, 4 Aug 2023 21:05:05 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quanju/containers/footer/guanli/index.js | 9 +- .../footer/leadership/right/right-bottom.js | 94 +++++++++---------- 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/web/client/src/sections/quanju/containers/footer/guanli/index.js b/web/client/src/sections/quanju/containers/footer/guanli/index.js index 44a348cf..9265d77c 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/index.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js @@ -64,7 +64,6 @@ const Guanli = (props) => { } - console.log(1111, qndmn); useEffect(() => { requestleftDatas(); @@ -79,7 +78,7 @@ const Guanli = (props) => { if (index < 120) { return
    -
    +
    {picfile?.length > 0 ? {picfile?.map(v => { {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"}

    - 执法道路: {roadname}

    - 执法成果: @@ -170,7 +169,7 @@ const Guanli = (props) => { 处罚 处理日期

    */} -
    +
    执法日期
    执法成果
    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 6500d1dc..b0aba75d 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 @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react' import Module from '../../../public/module' -import { Carousel, Tooltip,} from 'antd' +import { Carousel, Tooltip, } from 'antd' import Lun from "./lunbo" import moment from 'moment' import "./left.less" @@ -12,41 +12,41 @@ import AutoRollComponent from '../../build/AutoRollComponent' const Rightbottom = (props) => { - const { dispatch } = props - const style = { height: "28%", marginTop: "4%" } - const [beijing, setBeijing] = useState() - const [list, setList] = useState([]) - const [rightDatas, setrightDatas] = useState([]) - const [nums, setNums] = useState([]) - const [num, setNum] = useState() + const { dispatch } = props + const style = { height: "28%", marginTop: "4%" } + const [beijing, setBeijing] = useState() + const [list, setList] = useState([]) + const [rightDatas, setrightDatas] = useState([]) + const [nums, setNums] = useState([]) + const [num, setNum] = useState() const [rightitemlist, setrightitemlist] = useState([]) - const requestRightDatas = async () => { - const res = await dispatch(getZhichaolist()) - var pattern = /[\u4e00-\u9fa5]*/; - let d = res.payload.data?.overSpeedList?.filter((item, index) => { - return /.*[\u4e00-\u9fa5_a-zA-Z]+.*$/.test(item.processingTime) == false - }) - console.log(res); - d.map((item, index) => { - if (parseInt(item.processingTime.match(/([^.]*)$/)[0]) < 10) { - return item.processingTime = `${(item.processingTime.match(/^([^.]*)(.[^.]*)/)[0])}.0${parseInt(item.processingTime.match(/([^.]*)$/)[0])}` - } - }) - d.sort((a, b) => b.processingTime.localeCompare(a.processingTime)) - // setrightDatas(res.payload.data) - setList(d) - } - useEffect(() => { + const requestRightDatas = async () => { + const res = await dispatch(getZhichaolist()) + var pattern = /[\u4e00-\u9fa5]*/; + let d = res.payload.data?.overSpeedList?.filter((item, index) => { + return /.*[\u4e00-\u9fa5_a-zA-Z]+.*$/.test(item.processingTime) == false + }) + console.log(res); + d.map((item, index) => { + if (parseInt(item.processingTime.match(/([^.]*)$/)[0]) < 10) { + return item.processingTime = `${(item.processingTime.match(/^([^.]*)(.[^.]*)/)[0])}.0${parseInt(item.processingTime.match(/([^.]*)$/)[0])}` + } + }) + d.sort((a, b) => b.processingTime.localeCompare(a.processingTime)) + // setrightDatas(res.payload.data) + setList(d) + } + useEffect(() => { // const zhichaolist = dispatch(getZhichaolist()).then((res) => { // setNums(res.payload?.data?.processed) // }) // requestRightDatas() roadManagement() - }, []) + }, []) - const roadManagement = async () => { + const roadManagement = async () => { await dispatch(getRoadadministration({})).then(res => { if (res.success) { setrightitemlist(res.payload.data?.rows || []) @@ -57,18 +57,18 @@ const Rightbottom = (props) => { } - const renderContent = () => { + const renderContent = () => { return
    {rightitemlist && rightitemlist.length !== 0 ? rightitemlist?.map(({ enforcementdate, enforcementreslt, roadname, picfile }, index) => { if (index < 120) { return
    -
    +
    {picfile?.length > 0 ? {picfile?.map(v => { {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"}

    - 执法道路: {roadname}

    - 执法成果: @@ -120,20 +120,20 @@ const Rightbottom = (props) => { }) : ""}

    } - return ( - <> - - -
    -
    执法日期
    -
    执法成果
    -
    - {rightitemlist && rightitemlist.length !== 0 ? : } - -     - - ) + return ( + <> + + +
    +
    执法日期
    +
    执法成果
    +
    + {rightitemlist && rightitemlist.length !== 0 ? : } + +     + + ) } export default Rightbottom \ No newline at end of file From 66d7c1424dd10f9204c4b14ace6ad5923a18a013 Mon Sep 17 00:00:00 2001 From: zhaobing Date: Fri, 4 Aug 2023 21:06:00 +0800 Subject: [PATCH 10/11] =?UTF-8?q?feat:=E7=BB=9F=E8=AE=A1=E5=87=BA=E9=94=99?= =?UTF-8?q?=EF=BC=8Ccount=E6=94=B9=E6=88=90sum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/data/vehicle.js | 4 ++-- .../fillion/containers/maintenanceSpotCheck.js | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/app/lib/controllers/data/vehicle.js b/api/app/lib/controllers/data/vehicle.js index 4ba183a5..e27834f7 100644 --- a/api/app/lib/controllers/data/vehicle.js +++ b/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 count(p.road_marking) 标线,count(p.roadside_ditch) 边沟, - count(p.guardrail) 护栏, count(p.roadside_trees) 行道树,count(p.wrong_lane) 错车道 + const sqlStr = `select sum(p.road_marking) 标线,sum(p.roadside_ditch) 边沟, + 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, diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js index 28d119a7..01390aec 100644 --- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js +++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js @@ -450,7 +450,7 @@ const MaintenanceSpotCheck = (props) => {
    @@ -468,19 +468,18 @@ const MaintenanceSpotCheck = (props) => { > - % - + */} -
    - -
    + +     From 7e5c9c80d8679edc299b6e978757f5ab869804dd Mon Sep 17 00:00:00 2001 From: liujiangyong Date: Fri, 4 Aug 2023 21:08:51 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix=20=E4=B8=8D=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8A=A5=E9=94=99?= 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 aad264a0..ab002782 100644 --- a/weapp/src/packages/patrol/index.jsx +++ b/weapp/src/packages/patrol/index.jsx @@ -871,7 +871,7 @@ const Index = () => { if (isSuperAdmin) { data = { handleState: isAppoint ? '已指派' : '不处理', - performerId: userList[appointUser].id, + performerId: userList[appointUser]?.id, handleAdvice, } } else {