From 9f6e34d7de3264883699c29f98b14bab8d158e8e Mon Sep 17 00:00:00 2001 From: wx <645899409@qq.com> Date: Tue, 2 Dec 2025 09:04:44 +0800 Subject: [PATCH] =?UTF-8?q?update=201.AED=E5=B8=83=E7=82=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +++---- .env.test | 4 ++-- Dockerfile | 6 +++--- DockerfileXj | 21 ------------------- .../aed/location/locationList.data.ts | 12 ++++++++++- 5 files changed, 20 insertions(+), 31 deletions(-) delete mode 100644 DockerfileXj diff --git a/.env.development b/.env.development index 381bc29..41530a8 100644 --- a/.env.development +++ b/.env.development @@ -11,13 +11,13 @@ VITE_PUBLIC_PATH = / VITE_DROP_CONSOLE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=https://xjgateway.mcrm.vip:8888 -#VITE_GLOB_API_URL=http://192.168.1.20 +VITE_GLOB_API_URL=https://api-jkglpt.iosp.ydpt.tech +#VITE_GLOB_API_URL=http://192.168.1.33 #VITE_GLOB_API_URL=http://cqyt.test.yg.dt.io #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://xjgateway.mcrm.vip:8888 -#VITE_GLOB_DOMAIN_URL=http://192.168.1.20 +VITE_GLOB_DOMAIN_URL=https://api-jkglpt.iosp.ydpt.tech +#VITE_GLOB_DOMAIN_URL=http://192.168.1.33 #VITE_GLOB_DOMAIN_URL=http://cqyt.test.yg.dt.io # 接口前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/.env.test b/.env.test index 4dfb671..76fa331 100644 --- a/.env.test +++ b/.env.test @@ -16,10 +16,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=http://cqyt.test.yg.dt.io +VITE_GLOB_API_URL=http://api-xj.tri.dt.io #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://cqyt.test.yg.dt.io +VITE_GLOB_DOMAIN_URL=http://api-xj.tri.dt.io #食堂接口前缀 VITE_GLOB_ST_DOMAIN_URL=http://101.201.149.156:9002/gateway/zhst #西安、银川应急大屏 diff --git a/Dockerfile b/Dockerfile index 40c2d28..31b24d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ MAINTAINER jeecgos@163.com VOLUME /tmp ENV LANG en_US.UTF-8 -ENV VITE_GLOB_API_URL https://api.xjygjk.com -ENV VITE_GLOB_DOMAIN_URL https://api.xjygjk.com +ENV VITE_GLOB_API_URL http://api-xj.tri.dt.io +ENV VITE_GLOB_DOMAIN_URL http://api-xj.tri.dt.io RUN echo "server { \ #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \ @@ -28,6 +28,6 @@ COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh # 启动脚本 -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["bash","/entrypoint.sh"] EXPOSE 80 diff --git a/DockerfileXj b/DockerfileXj deleted file mode 100644 index 580a2f1..0000000 --- a/DockerfileXj +++ /dev/null @@ -1,21 +0,0 @@ -FROM nginx -MAINTAINER jeecgos@163.com -VOLUME /tmp -ENV LANG en_US.UTF-8 -RUN echo "server { \ - #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \ - location / { \ - root /var/www/html/; \ - index index.html index.htm; \ - if (!-e \$request_filename) { \ - rewrite ^(.*)\$ /index.html?s=\$1 last; \ - break; \ - } \ - } \ - access_log /var/log/nginx/access.log ; \ - } " > /etc/nginx/conf.d/default.conf \ - && mkdir -p /var/www \ - && mkdir -p /var/www/html - -ADD dist/ /var/www/html/ -EXPOSE 3100 diff --git a/src/views/emergency/aed/location/locationList.data.ts b/src/views/emergency/aed/location/locationList.data.ts index 9962e92..a82a4b6 100644 --- a/src/views/emergency/aed/location/locationList.data.ts +++ b/src/views/emergency/aed/location/locationList.data.ts @@ -25,6 +25,16 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'location', }, + { + title: '经度', + align: 'center', + dataIndex: 'longitude', + }, + { + title: '纬度', + align: 'center', + dataIndex: 'latitude', + }, // { // title: '设备自检', // align: 'center', @@ -161,7 +171,7 @@ export const formSchema: FormSchema[] = [ field: 'installAddress', component: 'Input', slot: 'installAddress', - required: true, + rules: [{ required: true, message: '请选择布点位置' }], }, { label: '经度',