From 0accf1162a65b455980e8fc56ebc2b2a363f68ed Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 19 Oct 2023 22:50:01 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B410=E6=9C=8819=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9B=B4=E6=92=AD=E9=97=B4=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=89=8B=E5=8A=A8=E6=8E=A8?=
 =?UTF-8?q?=E6=B5=81=E8=BF=94=E5=9B=9E=E5=80=BC=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=99=BA=E6=85=A7=E6=95=99=E5=AE=A4=E7=BB=B4=E6=8A=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=99=BA=E6=85=A7=E6=95=99=E5=AE=A4=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=99=BA?=
 =?UTF-8?q?=E6=85=A7=E6=95=99=E5=AE=A4=E6=92=AD=E6=94=BE=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/jiaoshi/KcJiaoshixinxibiaoList.vue     |  22 +--
 src/views/kc/jiaoshi/KcJiaoxuelouInfo.data.ts |  20 +-
 src/views/kc/jiaoshi/KcJiaoxuelouInfoList.vue |   7 +-
 .../kc/jiaoshi/KcJiaoxuelouInfoListModal.vue  |  75 ++++++++
 src/views/kc/jiaoshi/KcZhihuijiaoshi.data.ts  |  41 ++++-
 .../jiaoshi/KcZhihuijiaoshiAccessLog.data.ts  | 104 +++++++----
 .../jiaoshi/KcZhihuijiaoshiAccessLogList.vue  |  35 ++--
 src/views/kc/jiaoshi/KcZhihuijiaoshiList.vue  |  34 ++--
 .../jiaoshi/KcZhihuijiaoshiOperateLog.data.ts | 174 ++++++++++++------
 .../jiaoshi/KcZhihuijiaoshiOperateLogList.vue |  39 ++--
 .../components/KcZhihuijiaoshiForm.vue        |  55 +++++-
 src/views/kc/jiaoshi/index.vue                |  10 +-
 .../site/common/video/videojs/viewPage.vue    |  23 ++-
 13 files changed, 477 insertions(+), 162 deletions(-)
 create mode 100644 src/views/kc/jiaoshi/KcJiaoxuelouInfoListModal.vue

diff --git a/src/views/kc/jiaoshi/KcJiaoshixinxibiaoList.vue b/src/views/kc/jiaoshi/KcJiaoshixinxibiaoList.vue
index 47faa91..40e5ac0 100644
--- a/src/views/kc/jiaoshi/KcJiaoshixinxibiaoList.vue
+++ b/src/views/kc/jiaoshi/KcJiaoshixinxibiaoList.vue
@@ -12,8 +12,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <!-- <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -105,7 +105,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -113,7 +113,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -121,28 +121,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -154,7 +154,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -179,7 +179,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -189,7 +189,7 @@
     //刷新数据
     reload();
   }
-  
+
 
 
 
diff --git a/src/views/kc/jiaoshi/KcJiaoxuelouInfo.data.ts b/src/views/kc/jiaoshi/KcJiaoxuelouInfo.data.ts
index a3540e8..6397a1a 100644
--- a/src/views/kc/jiaoshi/KcJiaoxuelouInfo.data.ts
+++ b/src/views/kc/jiaoshi/KcJiaoxuelouInfo.data.ts
@@ -4,11 +4,11 @@ import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
-   {
-    title: '删除状态',
-    align:"center",
-    dataIndex: 'delFlag'
-   },
+  //  {
+  //   title: '删除状态',
+  //   align:"center",
+  //   dataIndex: 'delFlag'
+  //  },
    {
     title: '教学楼名称',
     align:"center",
@@ -20,11 +20,11 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
-    label: '删除状态',
-    field: 'delFlag',
-    component: 'InputNumber',
-  },
+  // {
+  //   label: '删除状态',
+  //   field: 'delFlag',
+  //   component: 'InputNumber',
+  // },
   {
     label: '教学楼名称',
     field: 'jxlhName',
diff --git a/src/views/kc/jiaoshi/KcJiaoxuelouInfoList.vue b/src/views/kc/jiaoshi/KcJiaoxuelouInfoList.vue
index 8cc3847..a42e65a 100644
--- a/src/views/kc/jiaoshi/KcJiaoxuelouInfoList.vue
+++ b/src/views/kc/jiaoshi/KcJiaoxuelouInfoList.vue
@@ -5,8 +5,8 @@
      <!--插槽:table标题-->
       <template #tableTitle>
           <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <!-- <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -31,7 +31,8 @@
       </template>
       <!--省市区字段回显插槽-->
       <template #pcaSlot="{text}">
-         {{ getAreaTextByCode(text) }}
+         <!-- {{ getAreaTextByCode(text) }} -->
+         {{ text }}
       </template>
       <template #fileSlot="{text}">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
diff --git a/src/views/kc/jiaoshi/KcJiaoxuelouInfoListModal.vue b/src/views/kc/jiaoshi/KcJiaoxuelouInfoListModal.vue
new file mode 100644
index 0000000..2e173e2
--- /dev/null
+++ b/src/views/kc/jiaoshi/KcJiaoxuelouInfoListModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <KcJiaoxuelouInfoList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></KcJiaoxuelouInfoList>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import KcJiaoxuelouInfoList from './KcJiaoxuelouInfoList.vue'
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshi.data.ts b/src/views/kc/jiaoshi/KcZhihuijiaoshi.data.ts
index c6b2fa9..1140619 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshi.data.ts
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshi.data.ts
@@ -15,7 +15,27 @@ export const columns: BasicColumn[] = [
     dataIndex: 'xm'
   },
   {
-    title: '新ip',
+    title: '教学楼ID',
+    align: "center",
+    dataIndex: 'jxlId'
+  },
+  {
+    title: '教学楼名称',
+    align: "center",
+    dataIndex: 'jxlName'
+  },
+  {
+    title: '教室编号',
+    align: "center",
+    dataIndex: 'jsbh'
+  },
+  {
+    title: '教室名称',
+    align: "center",
+    dataIndex: 'jsmc'
+  },
+  {
+    title: 'ip',
     align: "center",
     dataIndex: 'ip'
   },
@@ -29,11 +49,30 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'mima'
   },
+  {
+    title: '推流地址（rtmp）',
+    align: "center",
+    dataIndex: 'pushUrl'
+  },
+  {
+    title: '播放地址（http）',
+    align: "center",
+    dataIndex: 'pullUrl'
+  },
   {
     title: '备注',
     align: "center",
     dataIndex: 'bz'
   },
+  {
+    title: '是否有效',//0-有效 1-无效
+    align: "center",
+    dataIndex: 'sfyx',
+    customRender: ({ text }) => {
+      let map = ['有效','无效']
+      return map[text]
+    },
+  },
 ];
 
 //查询数据
diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts b/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts
index f58185e..9c272f6 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLog.data.ts
@@ -5,15 +5,19 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
    {
-    title: '日志类型（1播放成功，2播放失败）',
+    title: '日志类型',
     align:"center",
-    dataIndex: 'logType'
-   },
-   {
-    title: '教学楼编号',
-    align:"center",
-    dataIndex: 'jxlId'
+    dataIndex: 'logType',
+    customRender: ({ text }) => {
+      let map = ['','自动执行', '手动操作']
+      return map[text]
+    },
    },
+  //  {
+  //   title: '教学楼编号',
+  //   align:"center",
+  //   dataIndex: 'jxlId'
+  //  },
    {
     title: '教学楼名称',
     align:"center",
@@ -42,55 +46,91 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
-	{
-      label: "日志类型（1播放成功，2播放失败）",
+  {
+      label: "日志类型",
       field: 'logType',
-      component: 'Input',
+      component: 'Select',
       colProps: {span: 6},
- 	},
-	{
+      // colProps: {
+      //   span: 8,
+      // },
+      componentProps: {
+        options: [
+          {
+            label: '播放成功',
+            value: 1,
+            key: 1,
+          },
+          {
+            label: '播放失败',
+            value: 2,
+            key: 2,
+          },
+        ],
+      },
+  },
+  {
       label: "教学楼编号",
       field: 'jxlId',
       component: 'Input',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "教学楼名称",
       field: 'jxlName',
       component: 'Input',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "教室编号",
       field: 'jsbh',
       component: 'Input',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "教室名称",
       field: 'jsmc',
       component: 'Input',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "课堂ID",
       field: 'ketangbiaoId',
       component: 'Input',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "课堂名称",
       field: 'ketangbiaoName',
       component: 'Input',
       colProps: {span: 6},
- 	},
+   },
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '日志类型（1播放成功，2播放失败）',
+    label: '日志类型',
     field: 'logType',
-    component: 'InputNumber',
+    // component: 'InputNumber',
+    component: 'Select',
+    // colProps: {span: 6},
+    // colProps: {
+    //   span: 8,
+    // },
+    componentProps: {
+      options: [
+        {
+          label: '播放成功',
+          value: 1,
+          key: 1,
+        },
+        {
+          label: '播放失败',
+          value: 2,
+          key: 2,
+        },
+      ],
+    },
   },
   {
     label: '教学楼编号',
@@ -122,13 +162,13 @@ export const formSchema: FormSchema[] = [
     field: 'ketangbiaoName',
     component: 'Input',
   },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
 ];
 
 
diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLogList.vue b/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLogList.vue
index bfc247d..6008bb3 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLogList.vue
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiAccessLogList.vue
@@ -4,7 +4,7 @@
    <BasicTable @register="registerTable" :rowSelection="rowSelection">
      <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
           <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
           <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -19,7 +19,7 @@
               <a-button>批量操作
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
-        </a-dropdown>
+        </a-dropdown> -->
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -31,7 +31,8 @@
       </template>
       <!--省市区字段回显插槽-->
       <template #pcaSlot="{text}">
-         {{ getAreaTextByCode(text) }}
+         <!-- {{ getAreaTextByCode(text) }} -->
+         {{ text }}
       </template>
       <template #fileSlot="{text}">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -141,9 +142,13 @@
       */
   function getTableAction(record){
        return [
+        //  {
+        //    label: '编辑',
+        //    onClick: handleEdit.bind(null, record),
+        //  }
          {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
+          label: '详情',
+           onClick: handleDetail.bind(null, record),
          }
        ]
    }
@@ -152,16 +157,16 @@
         */
   function getDropDownAction(record){
        return [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-           }
-         }
+        //  {
+        //    label: '详情',
+        //    onClick: handleDetail.bind(null, record),
+        //  }, {
+        //    label: '删除',
+        //    popConfirm: {
+        //      title: '是否确认删除',
+        //      confirm: handleDelete.bind(null, record),
+        //    }
+        //  }
        ]
    }
 
diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiList.vue b/src/views/kc/jiaoshi/KcZhihuijiaoshiList.vue
index e466507..06863b1 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiList.vue
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiList.vue
@@ -12,8 +12,9 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" @click="handleJxlPage" preIcon="ant-design:plus-outlined"> 教学楼维护</a-button>
+        <!-- <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -47,6 +48,7 @@
     </BasicTable>
     <!-- 表单区域 -->
     <KcZhihuijiaoshiModal ref="registerModal" @success="handleSuccess"></KcZhihuijiaoshiModal>
+    <KcJiaoxuelouInfoListModal ref="KcJiaoxuelouInfoListModalRef"></KcJiaoxuelouInfoListModal>
   </div>
 </template>
 
@@ -58,10 +60,12 @@
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZhihuijiaoshi.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import KcZhihuijiaoshiModal from './components/KcZhihuijiaoshiModal.vue'
+  import KcJiaoxuelouInfoListModal from './KcJiaoxuelouInfoListModal.vue'
 
   const queryParam = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
+  const KcJiaoxuelouInfoListModalRef = ref();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
@@ -105,7 +109,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -113,7 +117,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -121,28 +125,36 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
+  /**
+   * 打开教学楼维护页面
+   */
+  function handleJxlPage(record: Recordable) {
+    KcJiaoxuelouInfoListModalRef.value.disableSubmit = true;
+    KcJiaoxuelouInfoListModalRef.value.edit(record);
+  }
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -154,7 +166,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -179,7 +191,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -189,7 +201,7 @@
     //刷新数据
     reload();
   }
-  
+
 
 
 
diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts b/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts
index a15ae37..c94e6cb 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLog.data.ts
@@ -5,15 +5,19 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
    {
-    title: '日志类型（1自动执行日志，2手动操作操作日志）',
+    title: '日志类型',
     align:"center",
-    dataIndex: 'logType'
-   },
-   {
-    title: '教学楼编号',
-    align:"center",
-    dataIndex: 'jxlId'
+    dataIndex: 'logType',
+    customRender: ({ text }) => {
+      let map = ['','自动执行', '手动操作']
+      return map[text]
+    },
    },
+  //  {
+  //   title: '教学楼编号',
+  //   align:"center",
+  //   dataIndex: 'jxlId'
+  //  },
    {
     title: '教学楼名称',
     align:"center",
@@ -30,12 +34,17 @@ export const columns: BasicColumn[] = [
     dataIndex: 'jsmc'
    },
    {
-    title: '操作类型(1开启，0关闭)',
+    title: '操作类型',
     align:"center",
-    dataIndex: 'operateType'
+    dataIndex: 'operateType',
+    customRender: ({ text }) => {
+      let map = ['','开启', '关闭']
+      return map[text]
+    },
+
    },
    {
-    title: '操作结果',
+    title: '操作地址',
     align:"center",
     dataIndex: 'operateUrl'
    },
@@ -47,61 +56,106 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
-	{
-      label: "日志类型（1自动执行日志，2手动操作操作日志）",
-      field: 'logType',
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-	{
+  {
+    label: "日志类型",
+    field: 'logType',
+    component: 'Select',
+    colProps: {span: 6},
+    componentProps: {
+      options: [
+        {
+          label: '自动执行',
+          value: 1,
+          key: 1,
+        },
+        {
+          label: '手动操作',
+          value: 2,
+          key: 2,
+        },
+      ],
+    },
+  },
+  {
       label: "教学楼编号",
       field: 'jxlId',
-      component: 'Input',
+      component: 'JInput',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "教学楼名称",
-      field: 'jxlName',
+      field: 'JInput',
       component: 'Input',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "教室编号",
       field: 'jsbh',
-      component: 'Input',
+      component: 'JInput',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "教室名称",
       field: 'jsmc',
-      component: 'Input',
+      component: 'JInput',
       colProps: {span: 6},
- 	},
-	{
-      label: "操作类型(1开启，0关闭)",
+   },
+  {
+      label: "操作类型",
       field: 'operateType',
-      component: 'Input',
+      component: 'Select',
       colProps: {span: 6},
- 	},
-	{
-      label: "操作结果",
+      componentProps: {
+        options: [
+          {
+            label: '开启',
+            value: '1',
+            key: '1',
+          },
+          {
+            label: '关闭',
+            value: '2',
+            key: '2',
+          },
+        ],
+      },
+  },
+  {
+      label: "操作地址",
       field: 'operateUrl',
-      component: 'Input',
+      component: 'JInput',
       colProps: {span: 6},
- 	},
-	{
+   },
+  {
       label: "操作结果",
       field: 'operateResult',
-      component: 'Input',
+      component: 'JInput',
       colProps: {span: 6},
- 	},
+   },
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '日志类型（1自动执行日志，2手动操作操作日志）',
+    label: '日志类型',
     field: 'logType',
-    component: 'InputNumber',
+    component: 'Select',
+    // colProps: {
+    //   span: 8,
+    // },
+    componentProps: {
+      options: [
+        {
+          label: '自动执行',
+          value: 1,
+          key: 1,
+        },
+        {
+          label: '手动操作',
+          value: 2,
+          key: 2,
+        },
+      ],
+    },
   },
   {
     label: '教学楼编号',
@@ -124,12 +178,26 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '操作类型(1开启，0关闭)',
+    label: '操作类型',
     field: 'operateType',
-    component: 'Input',
-  },
+    component: 'Select',
+    componentProps: {
+      options: [
+        {
+          label: '开启',
+          value: '1',
+          key: '1',
+        },
+        {
+          label: '关闭',
+          value: '2',
+          key: '2',
+        },
+      ],
+    },
+},
   {
-    label: '操作结果',
+    label: '操作地址',
     field: 'operateUrl',
     component: 'InputTextArea',
   },
@@ -138,17 +206,15 @@ export const formSchema: FormSchema[] = [
     field: 'operateResult',
     component: 'InputTextArea',
   },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
 ];
 
-
-
 /**
 * 流程表单调用这个方法获取formSchema
 * @param param
diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLogList.vue b/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLogList.vue
index f9f5300..cc9e767 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLogList.vue
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiOperateLogList.vue
@@ -4,10 +4,10 @@
    <BasicTable @register="registerTable" :rowSelection="rowSelection">
      <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
           <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="selectedRowKeys.length > 0">
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+          <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
                   <a-menu-item key="1" @click="batchHandleDelete">
@@ -19,7 +19,7 @@
               <a-button>批量操作
                 <Icon icon="mdi:chevron-down"></Icon>
               </a-button>
-        </a-dropdown>
+        </a-dropdown> -->
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -31,7 +31,8 @@
       </template>
       <!--省市区字段回显插槽-->
       <template #pcaSlot="{text}">
-         {{ getAreaTextByCode(text) }}
+         <!-- {{ getAreaTextByCode(text) }} -->
+         {{ text }}
       </template>
       <template #fileSlot="{text}">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -141,9 +142,13 @@
       */
   function getTableAction(record){
        return [
+        //  {
+        //    label: '编辑',
+        //    onClick: handleEdit.bind(null, record),
+        //  },
          {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
          }
        ]
    }
@@ -152,16 +157,16 @@
         */
   function getDropDownAction(record){
        return [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-           }
-         }
+        //  {
+        //    label: '详情',
+        //    onClick: handleDetail.bind(null, record),
+        //  }, {
+        //    label: '删除',
+        //    popConfirm: {
+        //      title: '是否确认删除',
+        //      confirm: handleDelete.bind(null, record),
+        //    }
+        //  }
        ]
    }
 
diff --git a/src/views/kc/jiaoshi/components/KcZhihuijiaoshiForm.vue b/src/views/kc/jiaoshi/components/KcZhihuijiaoshiForm.vue
index 1894d86..3d4e6a0 100644
--- a/src/views/kc/jiaoshi/components/KcZhihuijiaoshiForm.vue
+++ b/src/views/kc/jiaoshi/components/KcZhihuijiaoshiForm.vue
@@ -2,19 +2,36 @@
   <a-spin :spinning="confirmLoading">
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
+        <a-col :span="24">
+          <a-form-item label="厂商名称" v-bind="validateInfos.changshang">
+            <a-input v-model:value="formData.changshang" placeholder="请输入厂商名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item label="校区" v-bind="validateInfos.xq">
             <a-input v-model:value="formData.xq" placeholder="请输入校区" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item label="教学楼" v-bind="validateInfos.jxlId">
+            <!-- <a-input v-model:value="formData.jxlId" placeholder="请选择教学楼" :disabled="disabled"></a-input>jxlName -->
+            <JDictSelectTag type="select" v-model:value="formData.jxlId" dictCode="kc_jiaoxuelou_info,jxlh_name,id" placeholder="请选择教学楼" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="教室名称" v-bind="validateInfos.jsbh">
+            <!-- <a-input v-model:value="formData.jsbh" placeholder="请选择教室名称" :disabled="disabled"></a-input>jsmc -->
+            <JDictSelectTag type="select" v-model:value="formData.jsbh" dictCode="xxhbjsjbxx,jsmc,jsh" placeholder="请选择教室名称" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item label="项目" v-bind="validateInfos.xm">
             <a-input v-model:value="formData.xm" placeholder="请输入项目" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="新ip" v-bind="validateInfos.ip">
-            <a-input v-model:value="formData.ip" placeholder="请输入新ip" :disabled="disabled"></a-input>
+          <a-form-item label="ip" v-bind="validateInfos.ip">
+            <a-input v-model:value="formData.ip" placeholder="请输入ip" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
@@ -27,9 +44,28 @@
             <a-input v-model:value="formData.mima" placeholder="请输入密码" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item label="推流地址（rtmp）" v-bind="validateInfos.pushUrl">
+            <a-input v-model:value="formData.pushUrl" placeholder="请输入推流地址（rtmp）" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="播放地址（http）" v-bind="validateInfos.pullUrl">
+            <a-input v-model:value="formData.pullUrl" placeholder="请输入播放地址（http）" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="是否有效" v-bind="validateInfos.sfyx">
+            <!-- <a-input v-model:value="formData.sfyx" placeholder="请选择是否有效" :disabled="disabled"></a-input> -->
+            <a-select v-model:value="formData.sfyx" style="width: 100%" :disabled="disabled">
+              <a-select-option value="0">有效</a-select-option>
+              <a-select-option value="1">无效</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item label="备注" v-bind="validateInfos.bz">
-            <a-input v-model:value="formData.bz" placeholder="请输入备注" :disabled="disabled"></a-input>
+            <a-textarea v-model:value="formData.bz" :rows="4" placeholder="请输入备注" :maxlength="255" :disabled="disabled"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -44,7 +80,8 @@
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../KcZhihuijiaoshi.api';
   import { Form } from 'ant-design-vue';
-  
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: ()=>{} },
@@ -55,12 +92,20 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
+    changshang: '',
+    jxlId: '',
+    jxlName: '',
+    jsbh: '',
+    jsmc: '',
     xq: '',
     xm: '',
     ip: '',
     user: '',
     mima: '',
+    pushUrl: '',
+    pullUrl: '',
     bz: '',
+    sfyx: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -83,7 +128,7 @@
     return props.formDisabled;
   });
 
-  
+
   /**
    * 新增
    */
diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue
index 58489cb..0420674 100644
--- a/src/views/kc/jiaoshi/index.vue
+++ b/src/views/kc/jiaoshi/index.vue
@@ -325,7 +325,15 @@ function changeLive(record, isEnable){
     let content = '';
     res.forEach(x => {
       content += x.jsmc + "-" + x.xm
-      content += "  " + x.resText + "<br/>"
+      let text = '';
+      if(x.resText){
+        if(x.resText.includes('ok')){
+          text = (isEnable?'开启':'关闭')+'直播-操作成功!'
+        }else{
+          text = (isEnable?'开启':'关闭')+'直播-操作失败:' + x.resText
+        }
+      }
+      content += "  " + text + "<br/>"
     });
     createInfoModal({ width:'50%', title: '结果',content })
   }).catch(e => {
diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue
index 60cfb0f..9c9bb9f 100644
--- a/src/views/site/common/video/videojs/viewPage.vue
+++ b/src/views/site/common/video/videojs/viewPage.vue
@@ -62,9 +62,12 @@
           <div v-else style="height: 100%;display: flex;justify-content: center;align-items: center;">
             <a-empty>
               <template #description>
-                <span>
+                <span v-if="!playStatus">
                   没有找到直播间
                 </span>
+                <span v-if="playStatus">
+                  直播间暂无内容
+                </span>
               </template>
               <!-- <a-button type="primary" @="">关闭</a-button> -->
             </a-empty>
@@ -73,7 +76,7 @@
       </a-layout>
     </div>
   </div>
-    <KcErrorreportIndexModal ref="kcErrorreportIndexModal"></KcErrorreportIndexModal>
+  <KcErrorreportIndexModal ref="kcErrorreportIndexModal"></KcErrorreportIndexModal>
   <addModalPage ref="tingKeZuJiAddModal"/>
   <a-modal title="查看听课笔记" width="800px" :visible="tkbjVisible" :okButtonProps="{ class: { 'jee-hidden': true } }" @cancel="() => tkbjVisible = false" cancelText="关闭">
     <div style="white-space:normal; word-break:break-all;overflow:hidden;">
@@ -96,6 +99,7 @@ import { nextTick } from 'vue';
 import { useRoute } from 'vue-router'
 import { getUserId } from '/@/views/site/utils/index';
 import KcErrorreportIndexModal from '/@/views/kc/kcErrorreport/components/KcErrorreportIndexZbModal.vue'
+import videojs from "video.js";
 
 const mainVideo = ref<any>();
 const bVideoRefs = ref<any>([]);
@@ -110,6 +114,7 @@ const tableData = ref<Recordable>([])
 const suibiList = ref<Recordable>([])
 const isError = ref(false);
 const tkbjVisible = ref(false);
+const playStatus = ref(false);
 
 const model = reactive<Record<string, any>>({ notes:'' });
 
@@ -148,6 +153,7 @@ onMounted(() => {
           changeLive(tableData.value[0]);
         }
         savePlayLogFn(tableData.value[0]);
+        calcPlayStatus(tableData.value[0]);
         tableData.value.forEach(x => x.isShow = false);//关闭
       })
     });
@@ -247,6 +253,19 @@ function savePlayLogFn(item){
   savePlayLog({ playUrl: item.pullUrl, jxlId: item.jxlId, jxlName: item.jxlName, jsbh: route.query.id, jsmc: item.jsmc, ketangbiaoId: route.query.ktId,ketangbiaoName: ktangInfo.value.kcmc })
 }
 
+//计算播放状态
+function calcPlayStatus(item){
+  videojs.xhr.get(item.pullUrl,(err, resp, body) => {
+    if(err){
+      playStatus.value = false;
+      isError.value = true;
+    }else{
+      playStatus.value = true;
+      isError.value = false;
+    }
+  })
+}
+
 function saveSuibi(){
   //addSuibi editSuibi
   // if(model.value.id){