diff --git a/web/client/assets/color.less b/web/client/assets/color.less index a522fd49..3a14a30f 100644 --- a/web/client/assets/color.less +++ b/web/client/assets/color.less @@ -174,7 +174,7 @@ button::-moz-focus-inner, [type='submit']::-moz-focus-inner {border-style: none;} fieldset {border: 0;} legend {color: inherit;} -mark {background-color: color(~`colorPalette("@{modal-footer-border-color-split}", 1)`);} +mark {background-color: #feffe6;} ::selection {color: #fff;background: @primary-color;} .anticon {color: inherit;} .ant-fade-enter, .ant-fade-appear {animation-fill-mode: both;} @@ -1149,25 +1149,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-mentions-dropdown-menu-item-active {background-color: @item-hover-bg;} .ant-menu-item-danger.ant-menu-item {color: #ff4d4f;} .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-item-danger.ant-menu-item-active {color: #ff4d4f;} -<<<<<<< Updated upstream -<<<<<<< Updated upstream - -.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);} +.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{slider-rail-background-color}", 1)`);} .ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;} .ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;} -.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);} -======= -.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);} -.ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;} -.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;} -.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);} ->>>>>>> Stashed changes -======= -.ant-menu-item-danger.ant-menu-item:active {background: #fff1f0;} -.ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;} -.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;} -.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: #fff1f0;} ->>>>>>> Stashed changes +.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{slider-rail-background-color}", 1)`);} .ant-menu-inline .ant-menu-item-danger.ant-menu-item::after {border-right-color: #ff4d4f;} .ant-menu-dark .ant-menu-item-danger.ant-menu-item, .ant-menu-dark .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-dark .ant-menu-item-danger.ant-menu-item > a {color: #ff4d4f;} .ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {color: #fff;background-color: #ff4d4f;} @@ -1737,78 +1722,31 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;} .ant-tag-checkable:active, .ant-tag-checkable-checked {color: #fff;} .ant-tag-checkable-checked {background-color: @primary-color;} .ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);} -<<<<<<< Updated upstream -<<<<<<< Updated upstream - -.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{component-background}", 1)`);border-color: #ffadd2;} - -======= ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -.ant-tag-pink {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;} - +.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{table-expand-icon-bg}", 1)`);border-color: #ffadd2;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{component-background}", 1)`);border-color: #ffadd2;} +.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{table-expand-icon-bg}", 1)`);border-color: #ffadd2;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -<<<<<<< Updated upstream -.ant-tag-red {color: #cf1322;background: #fff1f0;border-color: #ffa39e;} -<<<<<<< Updated upstream - -.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{success-color-deprecated-bg}", 1)`);border-color: #ffadd2;} -.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{success-color-deprecated-bg}", 1)`);border-color: #ffadd2;} -.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);border-color: #ffa39e;} - -======= -.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);border-color: #ffa39e;} ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes +.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{slider-rail-background-color}", 1)`);border-color: #ffa39e;} .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;} .ant-tag-volcano {color: #d4380d;background: #fff2e8;border-color: #ffbb96;} .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;} -.ant-tag-orange {color: #d46b08;background: color(~`colorPalette("@{alert-warning-border-color}", 1)`);border-color: #ffd591;} +.ant-tag-orange {color: #d46b08;background: #fff7e6;border-color: #ffd591;} .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;} -.ant-tag-yellow {color: #d4b106;background: color(~`colorPalette("@{modal-footer-border-color-split}", 1)`);border-color: #fffb8f;} +.ant-tag-yellow {color: #d4b106;background: #feffe6;border-color: #fffb8f;} .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;} .ant-tag-gold {color: #d48806;background: #fffbe6;border-color: #ffe58f;} .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;} .ant-tag-cyan {color: #08979c;background: #e6fffb;border-color: #87e8de;} .ant-tag-cyan-inverse {color: #fff;background: #13c2c2;border-color: #13c2c2;} -.ant-tag-lime {color: #7cb305;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #eaff8f;} +.ant-tag-lime {color: #7cb305;background: #fcffe6;border-color: #eaff8f;} .ant-tag-lime-inverse {color: #fff;background: #a0d911;border-color: #a0d911;} .ant-tag-green {color: #389e0d;background: #f6ffed;border-color: #b7eb8f;} .ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;} -<<<<<<< Updated upstream -<<<<<<< Updated upstream - .ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;} .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} -.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{btn-primary-bg}", 1)`);border-color: #adc6ff;} - - -.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: color(~`colorPalette("@{alert-info-border-color}", 5)`);} -.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} -.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{tree-bg}", 1)`);border-color: #adc6ff;} - +.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{cascader-menu-bg}", 1)`);border-color: #adc6ff;} .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} -.ant-tag-purple {color: #531dab;background: #f9f0ff;border-color: #d3adf7;} -======= -.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;} -.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} -.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{dropdown-menu-submenu-disabled-bg}", 3)`);border-color: #adc6ff;} -.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} -.ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{alert-error-bg-color}", 1)`);border-color: #d3adf7;} ->>>>>>> Stashed changes -======= -.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;} -.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} -.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{info-color-deprecated-bg}", 1)`);border-color: #adc6ff;} -.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} -.ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{background-color-light}", 1)`);border-color: #d3adf7;} ->>>>>>> Stashed changes +.ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{disabled-color-dark}", 4)`);border-color: #d3adf7;} .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;} .ant-tag-success {color: #52c41a;background: @success-color-deprecated-bg;border-color: @success-color-deprecated-border;} .ant-tag-processing {color: @primary-color;background: @info-color-deprecated-bg;border-color: @info-color-deprecated-border;} @@ -2046,16 +1984,6 @@ a.ant-typography.ant-typography-disabled:hover, .ant-typography a.ant-typography .ant-upload-list-picture .ant-upload-list-item-error, .ant-upload-list-picture-card .ant-upload-list-item-error {border-color: #ff4d4f;} .ant-upload-list-picture .ant-upload-list-item:hover .ant-upload-list-item-info, .ant-upload-list-picture-card .ant-upload-list-item:hover .ant-upload-list-item-info {background: transparent;} .ant-upload-list-picture .ant-upload-list-item-uploading, .ant-upload-list-picture-card .ant-upload-list-item-uploading {border-style: dashed;} -<<<<<<< Updated upstream -<<<<<<< Updated upstream - -.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;} - -.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;} - -======= -======= ->>>>>>> Stashed changes .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;} .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'] {fill: #ff4d4f;} .ant-upload-list-picture-card .ant-upload-list-item-info::before {background-color: rgba(0, 0, 0, 0.5);} 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 a8f74a9d..46016561 100644 --- a/web/client/src/sections/quanju/containers/footer/gis/gis.js +++ b/web/client/src/sections/quanju/containers/footer/gis/gis.js @@ -21,7 +21,7 @@ const Gis = (props) => { const loadMap = () => { const map = new AMap.Map(MAPID, { resizeEnable: true, - center: [115.912663,28.543149],//地图中心点，初始定位加载显示楼块 + center: [115.912663, 28.543149],//地图中心点，初始定位加载显示楼块 zoom: 15,//地图显示的缩放级别 zooms: [10, 12], pitch: 0, // 地图俯仰角度，有效范围 0 度- 83 度 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 38a4aeb0..486548bd 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 @@ -7,15 +7,17 @@ import request from 'superagent' const Lefttop = () => { const style = { height: "68%" } - useEffect(() => { - // return () => { - request('get', 'https://report.amap.com/ajax/districtRank.do?linksType=1&cityCode=360100') - // .set({ 'cookie': 'user_unique_id=a185bbc78215de5101823ec9f8455ff7; SESSION=781150e0-bd25-4431-b3ac-267bb49075fd; UM_distinctid=1823ec9ec89ce5-08fca33c64505f-76492e29-1fa400-1823ec9ec8a1447; CNZZDATA1256662931=1445129462-1658907884-https%253A%252F%252Freport.amap.com%252F%7C1658907884' }) - .then((success, failure) => { - console.log(success, failure); - }); - // }; - }, []) + // useEffect(() => { + // // return () => { + // request.get('https://report.amap.com/ajax/districtRank.do?linksType=1&cityCode=360100') + // // .set({ 'cookie': 'user_unique_id=a185bbc78215de5101823ec9f8455ff7; SESSION=781150e0-bd25-4431-b3ac-267bb49075fd; UM_distinctid=1823ec9ec89ce5-08fca33c64505f-76492e29-1fa400-1823ec9ec8a1447; CNZZDATA1256662931=1445129462-1658907884-https%253A%252F%252Freport.amap.com%252F%7C1658907884' }) + // .end((success, failure) => { + // console.log(success); + // }, err => { + // console.log(err) + // }); + // // }; + // }, []) 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 5ce2477f..bb83fb66 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,5 +1,6 @@ import React, { useState, useEffect } from 'react' import Module from '../../../public/module' +import { Spin } from 'antd' import Lun from "./lunbo" import "./left.less" import { getZhichaolist } from "../../../../actions/example" @@ -12,7 +13,8 @@ const Rightbottom = (props) => { const [nums, setNums] = useState([]) useEffect(() => { const zhichaolist = dispatch(getZhichaolist()).then((res) => { - setList(res.payload?.data?.overSpeedList) + setList(res.payload?.data?.overSpeedList.filter(item => /.*[\u4e00-\u9fa5_a-zA-Z]+.*$/.test(item.processingTime) == false + )) // console.log(res); setNums(res.payload?.data?.processed) }) @@ -41,6 +43,7 @@ const Rightbottom = (props) => { return ( <> +
已处理{nums}件 @@ -49,14 +52,16 @@ 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 d3bd3cd4..65a944cc 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 @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import Module from '../../../public/module' -import { Radio, Select } from 'antd'; +import { Radio, Select, Spin } from 'antd'; import Lunbo from "./lunbo" import Huadong from './hudong'; import "./left.less" @@ -72,6 +72,7 @@ const Righttop = () => { } return ( <> +

监控总数

129

@@ -108,6 +109,7 @@ const Righttop = () => { 离线详情
+ {/* */} { divHeight={"100%"} divId={"screen-slope"} /> + {/* */} + + ) } diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index 6a4e3a3e..9a97898a 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -2,7 +2,6 @@ import { ProxyRequest } from "@peace/utils"; export const GodTransRequest = new ProxyRequest("_godTrans"); - export const ApiTable = { login: 'login', logout: 'logout', @@ -45,24 +44,24 @@ export const ApiTable = { //运政管理 - getOperaTional: 'vehicle',putOperaTional: 'vehicle', - getSpecificVehicle: 'vehicle/specific',putSpecificVehicle: 'vehicle/specific',delSpecificVehicle: 'vehicle/{vehicleId}/specific', - getHouseholds: 'vehicle/business',putHouseholds: 'vehicle/business',delHouseholds: 'vehicle/business/{businessId}', + getOperaTional: 'vehicle', putOperaTional: 'vehicle', + getSpecificVehicle: 'vehicle/specific', putSpecificVehicle: 'vehicle/specific', delSpecificVehicle: 'vehicle/{vehicleId}/specific', + getHouseholds: 'vehicle/business', putHouseholds: 'vehicle/business', delHouseholds: 'vehicle/business/{businessId}', + getRoadway: 'road', + // 获取运政统计 + getYunZheng: "transportation/statistic", + //桥梁管理 + getBridge: 'bridge', + putBridge: 'bridge', + delBridge: 'bridge/{bridgeId}', + //工程数据 + getProject: 'project', + putProject: 'project', + delProject: 'project/{projectId}', + //道路数据 getRoadway: 'road', - // 获取运政统计 - getYunZheng: "transportation/statistic", - //桥梁管理 -getBridge:'bridge', -putBridge:'bridge', -delBridge:'bridge/{bridgeId}', - //工程数据 -getProject:'project', -putProject:'project', -delProject:'project/{projectId}', -//道路数据 -getRoadway: 'road', -putRoadway: 'road', -delRoadway:'road/{roadId}', + putRoadway: 'road', + delRoadway: 'road/{roadId}', //道路统计 getBgroadstatistics: "build/road_state", @@ -80,16 +79,16 @@ delRoadway:'road/{roadId}', getBusTier: '/operation/car_level', //获取路政列表 - getHighways: 'road_manage',putHighways: 'road_manage', + getHighways: 'road_manage', putHighways: 'road_manage', //获取道路养护统计及列表 getRoadMaintenance: 'conserve/statistic', //获取宣传数据 getpropagata: 'publicity', -//公交信息 -getCircuit:'bus/line',putCircuit:'bus/line',delCircuit:'bus/line/{lineId}', -getVehicle:'bus/car',putVehicle:'bus/car',delVehicle:'bus/car/{carId}', + //公交信息 + getCircuit: 'bus/line', putCircuit: 'bus/line', delCircuit: 'bus/line/{lineId}', + getVehicle: 'bus/car', putVehicle: 'bus/car', delVehicle: 'bus/car/{carId}', }; diff --git a/web/log/development.txt b/web/log/development.txt index 25844d79..6b46f15c 100644 --- a/web/log/development.txt +++ b/web/log/development.txt @@ -20970,3 +20970,4 @@ } 2022-07-27 11:00:11.991 - debug: [FS-LOGGER] Init. >>>>>>> Stashed changes +2022-07-27 17:24:17.967 - debug: [FS-LOGGER] Init.