diff --git a/config/nginx.conf b/config/nginx.conf index f41906342d421dc65a9f3b9aebe058bc42320fff..a0ae52224995c296fd5cc4bedcb4d8483ab7ff09 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -31,7 +31,7 @@ } location /monitor { - rewrite ^/devices/(.*)$ /$1 break; + rewrite ^/monitor/(.*)$ /$1 break; add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; add_header Access-Control-Allow-Headers 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization'; diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..8c428fea5197e8b554066bd3dff13e841b80fda7 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +gzt-smart-monitor: + # 镜像 + image: registry.hncy.info/hncy/gzt-smart-monitor:0.0.1 + # 端口映射 + ports: + - 9096:80 + container_name: gzt-smart-monitor + # 环境变量 + environment: + - SPRING_PROFILES_ACTIVE=prod + - PROXY_ONE_SERVICE= + - PROXY_TWO_SERVICE= + - SERVICE_NAME=gzt-smart-monitor + - CROSS_HEADER=true + - EXTERNAL_HOST=192.168.2.21 + - EXTERNAL_PORT=80 + - EUREKA_SERVER=192.168.2.21:7777 diff --git a/src/caseSituation.tsx b/src/caseSituation.tsx index 7153b6135f067997cb02371c47581d45b3fcaaf5..1ef00cb0f53a33887a91dd26934ea3fc9edae734 100644 --- a/src/caseSituation.tsx +++ b/src/caseSituation.tsx @@ -11,6 +11,7 @@ import { queryHighIncidenceProblem, queryHighTime, } from "./service"; + import { cloneDeep } from "lodash"; const option: any = { diff --git a/src/mainPage.tsx b/src/mainPage.tsx index dd103a80598a5e55c710dc800d41c94843b33965..370158b816ac0592bbac4405c8a3002f3a156933 100644 --- a/src/mainPage.tsx +++ b/src/mainPage.tsx @@ -39,7 +39,7 @@ const MainPage = () => { value: intelligentMonitoringData?.[2]?.data.worring ?? 0, }, ], - [intelligentMonitoringData] + [intelligentMonitoringData, publicToiletInfo] ); useEffect(() => {