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