update

1.AED布点管理，添加经纬度列

.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=https://api-jkglpt.iosp.ydpt.tech
-#VITE_GLOB_API_URL=http://192.168.1.20
+#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=https://api-jkglpt.iosp.ydpt.tech
-#VITE_GLOB_DOMAIN_URL=http://192.168.1.20
+#VITE_GLOB_DOMAIN_URL=http://192.168.1.33
 #VITE_GLOB_DOMAIN_URL=http://cqyt.test.yg.dt.io
 # 接口前缀
 VITE_GLOB_API_URL_PREFIX=

.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
 #西安、银川应急大屏

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_API_URL http://api-xj.tri.dt.io
-ENV VITE_GLOB_DOMAIN_URL https://api.xjygjk.com
+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

DockerfileXj

@@ -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

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: '经度',