From b4a042b04f33018313066bf85b215e4d097e15cd Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sat, 9 Mar 2024 13:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/kc/jiaoshi/index.vue | 180 ++++++++----------
src/views/kc/jiaoshi/indexLogDetail.vue | 123 ++++++++++--
.../kcTingkeBmd/checkuser/CheckUserTool.vue | 6 +-
.../components/KcTingkeBmdForm.vue | 11 +-
src/views/kc/ketang/KcKetangbiaoCheckList.vue | 6 +-
5 files changed, 210 insertions(+), 116 deletions(-)
diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue
index 5e09b64..b6326f0 100644
--- a/src/views/kc/jiaoshi/index.vue
+++ b/src/views/kc/jiaoshi/index.vue
@@ -368,8 +368,8 @@
批量打开直播
批量关闭直播
-
批量打开听课
-
批量关闭听课
+
批量打开前台展示
+
批量关闭前台展示
@@ -393,125 +393,111 @@
{{ index+1 }}
-
-
-
- {{ text }}
-
-
+
+ 教室信息
+
+
+
+ {{ text }}
+
+
+
+
+ {{ text == 0?'是':'尚未接入' }}
+
+
+
+
+ 是
+ 否
+
+
+
+
-
-
- {{ text == 0?'是':'尚未接入' }}
-
-
-
-
- {{ text == 0?'是':'否' }}
- -
-
-
-
-
-
-
-
-
-
+
+ 课堂信息
+
+
+ {{ record?.nowIsClass?'是':'否' }}
-
- -
+
+
+
+ {{ record?.nextIsClass?'是':'否' }}
-
-
-
-
- {{ record?.nowIsClass?'是':'否' }}
-
-
-
-
- {{ record?.nextIsClass?'是':'否' }}
-
-
-
-
- 是
- 否
-
-
-
+
+
+
-
-
-
+
+ 直播信息
+
+
- 预览 |
-
- 开启直播 |
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ 开启直播
+ 关闭直播
+
+
+
+
+
+ {{ text == 0?'是':'否' }}
+ -
+
+
+
+
+
+ 开启前台展示
+ 关闭前台展示
+
+
+
+
+
+
+
+
+
+ 预览
+
-
检测教室 |
标记为有效
- 标记为无效
+ 标记为无效 -->
-
- 预览 |
- 开启直播 |
+ 预览
+
-
检测教室 |
标记为有效 |
- 标记为无效 |
+ 标记为无效 | -->
diff --git a/src/views/kc/jiaoshi/indexLogDetail.vue b/src/views/kc/jiaoshi/indexLogDetail.vue
index 3d9a5d1..f8ab631 100644
--- a/src/views/kc/jiaoshi/indexLogDetail.vue
+++ b/src/views/kc/jiaoshi/indexLogDetail.vue
@@ -4,7 +4,7 @@
-
+
@@ -17,12 +17,16 @@
import { useListPage } from '/@/hooks/system/useListPage'
import { columns, searchFormSchema } from './KcZhihuijiaoshiStateLog.data';
import { list } from './KcZhihuijiaoshiStateLog.api';
+import { defHttp } from '/@/utils/http/axios';
+import videojs from "video.js";
+import { useMessage } from '/@/hooks/web/useMessage';
const queryParam:any = ref({});
const checkedKeys = ref>([]);
//注册model
const [registerModal, { openModal }] = useModal();
+const { createMessage, createInfoModal, createErrorModal,createConfirm } = useMessage();
//注册table数据
const { tableContext } = useListPage({
tableProps:{
@@ -30,7 +34,7 @@
api: list,
columns,
canResize:false,
- showActionColumn: false,
+ showActionColumn: true,
immediate: false,
formConfig: {
//labelWidth: 120,
@@ -47,8 +51,11 @@
return Object.assign(params, queryParam.value);
},
actionColumn: {
- width: 120,
- fixed:'right'
+ width: 180,
+ title: '操作',
+ dataIndex: 'action',
+ slots: { customRender: 'action' },
+ fixed: undefined,
},
},
})
@@ -71,23 +78,111 @@
* 操作栏
*/
function getTableAction(record){
- return [
+ if(record.forceState === 'green'){
+ return [
{
- label: '详情',
- onClick: handleDetail.bind(null, record),
+ label: '检测教室',
+ onClick: jcZhiHuiJiaoShi.bind(null, record),
+ },
+ {
+ label: '标记为无效',
+ onClick: changeFlag.bind(null, record,"red"),
}
]
+ }else{
+ return [
+ {
+ label: '检测教室',
+ onClick: jcZhiHuiJiaoShi.bind(null, record),
+ },
+ {
+ label: '标记为有效',
+ onClick: changeFlag.bind(null, record,"green"),
+ }
+ ]
+ }
+
}
- function getDropDownAction(record){
- return []
- }
+
+//检查智慧教室
+async function jcZhiHuiJiaoShi(record){
+ console.log(`🚀 ~ jcZhiHuiJiaoShi ~ record:`, record)
+ let jxlMap = {};
+ let getListAction:any = [];
+ let liveIsExist = (x) => {
+ return new Promise((resolve,reject) => {
+ videojs.xhr.get(x.pullUrl,(err, resp, body) => {
+ if(err){
+ reject(x);
+ x.isOnLine = false
+ }else{
+ resolve(x);
+ x.isOnLine = true
+ }
+ })
+ })
+ }
- async function open(param){
+ let child = [];
+
+ await defHttp.get({url: '/jiaoshi/kcZhihuijiaoshi/list',params:{jsbh:record.jsbh}}).then((res:any) => {
+ console.log(`🚀 ~ awaitdefHttp.get ~ res:`, res)
+ console.log(`🚀 ~ awaitdefHttp.get ~ res:`, res.records)
+ child = res.records;
+ })
+
+
+ Object.values(child).forEach(item => {
+ let x:any = item;
+ if(x.pullUrl){
+ getListAction.push(liveIsExist(x));
+ }
+ });
+ console.log(`🚀 ~ Object.values ~ getListAction:`, getListAction)
+ Promise.all(getListAction).then(resList => {
+ }).catch((e) => {
+ console.error(`🚀 ~ file: index.vue:1170 ~ Promise.all Error ~ ress:`, e);
+ }).finally((...d) => {
+ console.log("正常执行！",...d);
+ //弹出成功或失败
+ let isSuccess = true;
+ let msgList:any = [];
+ Object.values(child).forEach(item => {
+ let _item = item as any;
+ console.log(`🚀 ~ Object.values ~ _item:`, _item)
+ if(_item.isOnLine){
+ msgList.push(_item.xm + '：连接成功！');
+ }else{
+ msgList.push(_item.xm + '：连接失败！');
+ isSuccess = false;
+ }
+ });
+ if(msgList.length){
+ if(isSuccess){
+ createInfoModal({ title: '成功！', content: msgList.join(',') });
+ }else{
+ createErrorModal({ title: '失败！', content: msgList.join(',') });
+ }
+ }
+ });
+}
+
+ //标记是否有效
+ function changeFlag(record, flag){
+ record.forceState = flag;
+ defHttp.post({ url: '/jiaoshi/kcZhihuijiaoshiStateLog/updateByJsbh', params: {
+ jsbh: record.jsbh,
+ forceState: flag
+ }}).then(res => {
+ queryParam.value.jxlName = null;
+ loadData();
+ });
+ }
+
+ function open(param){
console.log(`🚀 ~ detaillogopen ~ param:`, param)
- // changeQueryParam(param);
- // reload();
- await nextTick(() => {
+ nextTick(() => {
queryParam.value = Object.assign({ }, param);
reload();
isShowPage.value = true;
diff --git a/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue b/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue
index d06bc2d..5f517df 100644
--- a/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue
+++ b/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue
@@ -109,7 +109,11 @@
* 新增事件
*/
function add() {
- console.log(11111);
+ selectedRowKeys.value = [];
+ rowSelection.value = [];
+ selectedRows.value = [];
+ queryParam.value = {xqxn:getSysConfig().flag1};
+ reload();
}
function submitForm() {
diff --git a/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue b/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue
index 12edc59..c5af825 100644
--- a/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue
+++ b/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue
@@ -69,6 +69,7 @@
import { Form } from 'ant-design-vue';
import KcKetangbiaoCheckListModal from '/@/views/kc/ketang/KcKetangbiaoCheckListModal.vue';
import CheckUserToolModal from '/@/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue';
+ import _ from 'lodash-es';
const useForm = Form.useForm;
export default defineComponent({
@@ -141,10 +142,14 @@
}
function ketangSuccess(par){
- console.log(`🚀 ~ file: KcZzYbtkbForm.vue:232 ~ handleSuccess ~ par:`, par)
var list = par;
- console.log(`🚀 ~ ketangSuccess ~ list:`, list)
- kcTingkeBmdKcxxTable.dataSource = [...list]
+ console.log(`🚀 ~ ketangSuccess ~ par`, par);
+ var oldList2 = kcTingkeBmdKcxxTable.dataSource;
+ for(var i=0;i x.kcmc+x.skjs+x.skdd+x.hh+x.xnxq+x.skrq);
+ kcTingkeBmdKcxxTable.dataSource = [...list2]
}
function userSuccess(par){
diff --git a/src/views/kc/ketang/KcKetangbiaoCheckList.vue b/src/views/kc/ketang/KcKetangbiaoCheckList.vue
index b534349..dad9987 100644
--- a/src/views/kc/ketang/KcKetangbiaoCheckList.vue
+++ b/src/views/kc/ketang/KcKetangbiaoCheckList.vue
@@ -152,7 +152,11 @@
* 新增事件
*/
function add() {
- console.log(11111);
+ selectedRowKeys.value = [];
+ rowSelection.value = [];
+ selectedRows.value = [];
+ queryParam.value = {searchByNowXqxn:true};
+ reload();
}
function submitForm() {