From 1dacaff29e26ab2d893f69a9859f4b600c7d0a2f Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Wed, 28 Feb 2024 08:29:30 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B42=E6=9C=8828=E6=97=A5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jiaoshi/KcZhihuijiaoshiStateLog.data.ts | 6 +- src/views/kc/jiaoshi/index.vue | 139 +++++++++++++++++- src/views/kc/jiaoshi/indexLogDetail.vue | 114 ++++++++++++++ 3 files changed, 254 insertions(+), 5 deletions(-) create mode 100644 src/views/kc/jiaoshi/indexLogDetail.vue diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiStateLog.data.ts b/src/views/kc/jiaoshi/KcZhihuijiaoshiStateLog.data.ts index 47cd2ee..78bb719 100644 --- a/src/views/kc/jiaoshi/KcZhihuijiaoshiStateLog.data.ts +++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiStateLog.data.ts @@ -56,7 +56,11 @@ export const columns: BasicColumn[] = [ title: '状态指示', align: "center", dataIndex: 'type', - + }, + { + title: '状态指示(标记)', + align: "center", + dataIndex: 'forceState', }, ]; diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue index 90cdf49..46bc0e9 100644 --- a/src/views/kc/jiaoshi/index.vue +++ b/src/views/kc/jiaoshi/index.vue @@ -46,9 +46,9 @@ -
+
未检测
-
{{ statusLogList.filter(x => x.type != 'green' ).length || 0 }}
+
{{ statusLogList.filter(x => x.forceState == 'red' || x.type != 'green' ).length || 0 }}
设备异常 @@ -123,11 +123,11 @@ {{ item.child.filter(x => x.zbgn == '0').length || 0 }} {{ item.child.filter(x => x.sfyx == 0).length || 0 }} 未检测 - {{ statusLogList.filter(x => x.jxlName == item.jxlName && x.type != 'green' ).length }} + {{ statusLogList.filter(x => x.jxlName == item.jxlName && ( x.forceState == 'red' || x.type != 'green') ).length }} 总数 可直播 开放听课 - +
设备异常
{{ statusLogList.find(x => x.jxlName == item.jxlName)?.createTime }}
@@ -483,6 +483,11 @@ 关闭直播 | 开放听课 关闭听课 + + 检测教室 | + 标记为有效 | + 标记为无效 | + @@ -501,6 +510,7 @@ + + + \ No newline at end of file