From 83ebf6799eb00b18efb677f7984403838f9e0c64 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Thu, 26 Dec 2024 10:53:39 +0800 Subject: [PATCH] bugfix --- .env.development | 4 ++-- src/assets/styles/public.scss | 8 ++++++++ src/views/components/eventAudit.vue | 9 +++++++-- src/views/components/urgencyAudit.vue | 2 +- src/views/index.vue | 2 +- src/views/warningManage/warningAudit/groupEvent.vue | 7 ++++--- src/views/warningManage/warningAudit/similarity.vue | 6 +++++- 7 files changed, 28 insertions(+), 10 deletions(-) diff --git a/.env.development b/.env.development index eb68518..c04f33f 100644 --- a/.env.development +++ b/.env.development @@ -6,8 +6,8 @@ ENV = 'development' # 若依管理系统/开发环境 # VUE_APP_BASE_API = '/dev-api' -# VUE_APP_BASE_API = 'http://192.168.0.110:9102/api' -VUE_APP_BASE_API = 'http://39.101.188.84:9102/api' +VUE_APP_BASE_API = 'http://192.168.0.112:9102/api' +# VUE_APP_BASE_API = 'http://39.101.188.84:9102/api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 28978e6..a3858b7 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -513,6 +513,14 @@ text-overflow: ellipsis; /* 省略号 */ } } + .anjianmiaoshuTwo { + display: -webkit-box; /* 必需的，使用弹性盒模型 */ + width: 20ch; + -webkit-box-orient: vertical; /* 必需的，设置弹性盒方向为垂直 */ + -webkit-line-clamp: 1; /* 显示的行数 */ + overflow: hidden; /* 隐藏超出范围的内容 */ + text-overflow: ellipsis; /* 省略号 */ + } .sign { color: #D9001B; } diff --git a/src/views/components/eventAudit.vue b/src/views/components/eventAudit.vue index 0ddffba..bd3d70d 100644 --- a/src/views/components/eventAudit.vue +++ b/src/views/components/eventAudit.vue @@ -76,7 +76,12 @@ /> - + + @@ -230,7 +235,7 @@ export default { }, // 上报驾驶舱/退回重训练 reported(id){ - this.$confirm(`确定要${id == 1 ? '重新上报驾驶仓' : id == 2 ? '退回重训练' : id == 3 ? '审核通过':''}吗?`, "警告", { + this.$confirm(`确定要${id == 1 ? '重新上报驾驶舱' : id == 2 ? '退回重训练' : id == 3 ? '审核通过':''}吗?`, "警告", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/components/urgencyAudit.vue b/src/views/components/urgencyAudit.vue index d6677d3..c551d74 100644 --- a/src/views/components/urgencyAudit.vue +++ b/src/views/components/urgencyAudit.vue @@ -396,7 +396,7 @@ export default { reported(id){ // console.log(this.multipleSelection); // console.log(this.audioInfo.innerEventId); - this.$confirm(`确定要${id == 1 ? '重新上报驾驶仓' : id == 2 ? '退回重训练' : id == 3 ? '审核通过':''}吗?`, "警告", { + this.$confirm(`确定要${id == 1 ? '重新上报驾驶舱' : id == 2 ? '退回重训练' : id == 3 ? '审核通过':''}吗?`, "警告", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", diff --git a/src/views/index.vue b/src/views/index.vue index fe85fea..c345b04 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -3,7 +3,7 @@
- 算法运行监测 + 运行监测 算法运行：正常，数据获取：正常，数据推送：上一次时间 {{ tableData[0].runningTime }} 算法运行：异常，数据获取：异常，数据推送：上一次时间 {{ debugTime.firstWarnTimeDate }}
diff --git a/src/views/warningManage/warningAudit/groupEvent.vue b/src/views/warningManage/warningAudit/groupEvent.vue index 39874b0..e9171af 100644 --- a/src/views/warningManage/warningAudit/groupEvent.vue +++ b/src/views/warningManage/warningAudit/groupEvent.vue @@ -54,9 +54,10 @@ - - - + + + +