From 8b26314bb0da3511bf9dd068a1cfd84dc615dcbe Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 23 Nov 2023 18:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E5=B1=95=E7=A4=BA=E5=8F=8A=E6=97=A5=E8=AF=BE=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=90=AC=E8=AF=BE=E6=8C=89=E9=92=AE=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KcKechengtixingdingyue.data.ts            |  8 +++---
 .../KcKechengtixingdingyueList.vue            | 25 ++++++++++++++++---
 .../components/KcSysConfigKkpz.vue            |  5 ++++
 src/views/site/jrkclb/kclbList.vue            | 10 +++++++-
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts
index ae86132..cf7a092 100644
--- a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts
+++ b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyue.data.ts
@@ -15,14 +15,14 @@ export const columns: BasicColumn[] = [
     dataIndex: 'username'
   },
   {
-    title: '课前提醒',
+    title: '课前提醒是否开启',
     align: "center",
-    dataIndex: 'kqtx'
+    dataIndex: 'kqtx_dictText'
   },
   {
-    title: '每日课程提醒',
+    title: '每日课程提醒是否开启',
     align: "center",
-    dataIndex: 'mrkctx'
+    dataIndex: 'mrkctx_dictText'
   },
 ];
 
diff --git a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
index 8f42f63..e2bb3a6 100644
--- a/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
+++ b/src/views/kc/kcKechengtixingdingyue/KcKechengtixingdingyueList.vue
@@ -4,14 +4,29 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
+          <a-col :span="8">
+            <a-form-item label="账号">
+              <j-input placeholder="账号" v-model:value="queryParam.userid"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="用户名">
+              <j-input placeholder="用户名" v-model:value="queryParam.username"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable" >
       <!--插槽: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">
@@ -26,11 +41,11 @@
           <a-button>批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
-        </a-dropdown>
+        </a-dropdown> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <!-- <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> -->
       </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{text}">
@@ -54,6 +69,7 @@
   import { ref, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
+  import {JInput } from '/@/components/Form';
   import { columns } from './KcKechengtixingdingyue.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcKechengtixingdingyue.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
@@ -70,6 +86,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      showActionColumn: false,
       actionColumn: {
         width: 120,
         fixed: 'right',
diff --git a/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue b/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue
index 0284f86..427cbb9 100644
--- a/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue
+++ b/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue
@@ -32,6 +32,11 @@
             <JDictSelectTag type="radio" v-model:value="formData.flag6" dictCode="yn" placeholder="请选择" />
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="是否开启日课表听课" v-bind="validateInfos.flag9">
+            <JDictSelectTag type="radio" v-model:value="formData.flag9" dictCode="yn" placeholder="请选择" />
+          </a-form-item>
+        </a-col>
         <a-col :span="12">
           <a-form-item label="线上课堂-说明文字" v-bind="validateInfos.xsktTitle">
             <a-input v-model:value="formData.xsktTitle" placeholder="请输入线上课堂-说明文字" ></a-input>
diff --git a/src/views/site/jrkclb/kclbList.vue b/src/views/site/jrkclb/kclbList.vue
index 4f423d5..905f536 100644
--- a/src/views/site/jrkclb/kclbList.vue
+++ b/src/views/site/jrkclb/kclbList.vue
@@ -37,7 +37,7 @@
                 </div>
               </a-col>
               <a-col :span="24" v-if="listType == 1 || listType == '1'">
-                <a-row style="text-align: center;">
+                <a-row style="text-align: center;" v-if="getSysConfig().flag9=='1'">
                   <a-col :span="12">
                     <a-button type="primary" :class="handleZhjs(item.sfyzhjs)" @click="toLivePage(item)" :disabled="item.sfyzhjs=='0' " v-if="item.sftkb!='1'" style="color: white;">听课</a-button>
                     <a-button type="primary" class="yyyClass" @click="toLivePage(item)" :disabled="true" v-else style="color: white;" :title="`停课事由：`+item.tksy">停课</a-button>
@@ -52,6 +52,14 @@
                     <a-button type="primary" class="bcClass" @click="handleBaocuo(item)">报错</a-button>
                   </a-col> -->
                 </a-row>
+                <a-row style="text-align: center;" v-else>
+                  <a-col :span="24" v-if="item.sftkb=='1'">
+                    <a-button type="primary" class="bcClass" @click="funpingjia(item)"  :disabled="true" style="color: white;" :title="`停课事由：`+item.tksy">评价</a-button>
+                  </a-col>
+                  <a-col :span="24" v-else>
+                    <a-button type="primary" class="bcClass" @click="funpingjia(item)" style="color: white;">评价</a-button>
+                  </a-col>
+                </a-row>
               </a-col>
               <!-- <a-col :span="24" style="text-align: center;"> -->
               <a-col :span="24" v-else style="text-align: center;">