From ea48d196261bd3f94dd908e4bde6d35d906bc128 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 18 Apr 2024 18:40:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9ai=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- .env.production | 4 +-- src/config/config.ts | 4 +-- .../aIEarlyWarning/bottomRight.vue | 32 ++++++++++++------- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.env.development b/.env.development index 6f6b1cf..2c43043 100644 --- a/.env.development +++ b/.env.development @@ -21,9 +21,9 @@ NODE_ENV = 'development' # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -# VITE_API_URL = 'http://47.93.215.234:9809' +VITE_API_URL = 'http://47.93.215.234:9809' # 苏立信 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/.env.production b/.env.production index c920908..d830490 100644 --- a/.env.production +++ b/.env.production @@ -21,9 +21,9 @@ NODE_ENV = "production" # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -# VITE_API_URL = 'http://47.93.215.234:9809' +VITE_API_URL = 'http://47.93.215.234:9809' # 苏立信 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 打包 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' diff --git a/src/config/config.ts b/src/config/config.ts index 2420a90..0ac3406 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -25,8 +25,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 // export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "as"; //鞍山项目 -// export const COMPANY: string = "agjt"; //鞍钢集团 -export const COMPANY: string = "slx"; //苏立信项目 +export const COMPANY: string = "agjt"; //鞍钢集团 +// export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue index 5b77889..9fc367a 100644 --- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue +++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue @@ -3,27 +3,34 @@
-
序号
-
抓拍照片
-
设备名称
-
告警类型
-
告警时间
-
操作
+
序号
+
抓拍照片
+
设备名称
+
不安全行为类型
+
告警类型
+
告警时间
+
操作
-
{{ index + 1 }}
-
+
{{ index + 1 }}
+
-
{{ item.hardwareName }}
-
{{ item.alarmType ? getWarnName(item.alarmType) : "" }}
-
{{ item.createTime }}
-
查看详情
+
{{ item.hardwareName }}
+
+ 未穿安全工作服 + 未戴安全帽 + 烟火报警 + 未穿戴安全带 +
+
{{ item.alarmType ? getWarnName(item.alarmType) : "" }}
+
{{ item.createTime }}
+
查看详情
@@ -68,6 +75,7 @@ import Card from "@/components/card.vue"; import { ref, onMounted, computed , onBeforeUnmount} from "vue"; import { getAlarmList, getAlarmTypeOption } from "@/api/modules/aIEarlyWarn"; import { GlobalStore } from "@/stores"; +import { COMPANY } from "@/config/config"; import mitts from "@/utils/bus"; //兄弟组件传值 // import { aiAlarmTypeEnum } from "@/enums/project/aiAlarmTypeEnum";