Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_vue

# Conflicts:
#	src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue

src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue

@@ -0,0 +1,283 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <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-dict-select-tag  placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <a-col  :span="8">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExport" style="margin-left: 8px">PDF导出</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px">Excel导出</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div>
+      <a-row>
+        <a-col :span="8" v-for="(item ,index) in listglyData" class="acolclass" :key="index">
+          <a-card :title="item.title" class="glyclass" headStyle="font-size:18px;font-weight:700;text-align:center;color:#d3822c;">
+            <a-row style="line-height:30px;font-size:18px;text-align:center;color:#fff">
+              <a-col :span="8">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.zrs}}</div>
+                <div>总人数</div>
+                </a>
+              </a-col>
+              <a-col :span="8">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.ywcrs}}</div>
+                <div>已完成人数</div>
+                </a>
+              </a-col>
+              <a-col :span="8">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.wwcrs}}</div>
+                <div>未完成人数</div>
+                </a>
+              </a-col>
+              <a-col :span="12">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.ypkcs}}</div>
+                <div>应评课次数</div>
+                </a>
+              </a-col>
+              <a-col :span="12">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.sjpkcs}}</div>
+                <div>已评课次数</div>
+                </a>
+              </a-col>
+            </a-row>
+          </a-card>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="8" v-for="(item ,index) in listxyData" class="acolclass" :key="index">
+          <a-card :title="item.title" class="xyglyclass" headStyle="font-size:18px;font-weight:700;text-align:center;color:#d3822c;" >
+            <a-row style="line-height:30px;font-size:18px;text-align:center;color:#fff">
+              <a-col :span="8">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.zrs}}</div>
+                <div>总人数</div>
+                </a>
+              </a-col>
+              <a-col :span="8">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.ywcrs}}</div>
+                <div>已完成人数</div>
+                </a>
+              </a-col>
+              <a-col :span="8">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.wwcrs}}</div>
+                <div>未完成人数</div>
+                </a>
+              </a-col>
+              <a-col :span="12">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.ypkcs}}</div>
+                <div>应评课次数</div>
+                </a>
+              </a-col>
+              <a-col :span="12">
+                <a style="color:#fff;" @click="handleEdit(item)">
+                <div>{{item.sjpkcs}}</div>
+                <div>已评课次数</div>
+                </a>
+              </a-col>
+              <a-col :span="24">
+                <div><a style="color:#fff;">各学院情况查看</a></div>
+              </a-col>
+            </a-row>
+          </a-card>
+        </a-col>
+      </a-row>
+    </div>
+    <StaticConModal ref="StaticCon"/> 
+
+  </div>
+</template>
+
+<script lang="ts" name="config-kcExportConfigTpkwcqkjzglx" setup>
+  import { ref, onMounted,reactive,computed } from 'vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { getSysConfig } from '/@/views/site/utils/index';
+  import { getUserInfo, getUserId } from '/@/views/site/utils/index';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcExportConfigTpkwcqkjzglx.api';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import StaticConModal from '/@/views/kc/config/StaticCon/StaticConModal.vue';
+
+  
+  const StaticCon = ref();
+  const queryParam = ref<any>({});
+
+    const roleList = computed(() => getUserInfo()?.roleList??[]);
+    let listglyData = ref<any>([]);
+    let listxyData = ref<any>([]);
+
+  const tjlist = (queryParam) => defHttp.get({ url: '/config/kcExportConfigTpkwcqkjzglx/getTjlist', params:queryParam });
+  //进入就加载
+  onMounted(() => {
+    queryParam.value.xqxn = getSysConfig().flag1
+    searchQuery()
+  });
+
+
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  function handleEdit(record) {
+    StaticCon.value.disableSubmit = true;
+    StaticCon.value.edit(record);
+  }
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    listglyData.value = [];
+    listxyData.value = [];
+    tjlist(queryParam.value).then(res=>{
+      console.log(`🚀 ~ file: KcExportConfigTpkwcqkjzglxListNew.vue:121 ~ tjlist ~ res:`, res)
+      for(var i=0;i<res.length;i++){
+        if(res[i].type == '0'){
+          listglyData.value.push(res[i]);
+        }else{
+          listxyData.value.push(res[i]);
+        }
+      }
+      
+    })
+  }
+
+  //注册table数据
+  const { onExportXls } = useListPage({
+    tableProps: {
+      title: 'kc_export_config_tpkwcqkjzglx',
+      api: list,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "人员信息",
+      url: getExportUrl,
+      params: () => {
+        let params:any = {};
+        return Object.assign(params,queryParam.value);
+      }
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+
+  /**
+   * 成功回调
+   */
+   function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  function onExport() {
+    onExportWord();
+  }
+
+  async function onExportWord(){
+    let dcType = 'pdf';
+    // let dcType = 'doc';
+
+    let fileName = dcType == 'pdf'?'教学听课情况表.pdf':'教学听课情况表.docx';
+    // let fileName = '教学听课情况表.docx';
+    let paramsForm = queryParam.value;
+
+    paramsForm = { ...paramsForm, findByDwmc: !roleList.value.filter(x => x.roleCode == 'admin' ).length, findGh: getUserId() }
+
+    let url = dcType == 'pdf'?'/config/kcExportConfigTpkwcqkjzglx/exportPdf':'/config/kcExportConfigTpkwcqkjzglx/exportWord'
+
+    const data = await defHttp.get({ url, params: paramsForm, responseType: 'blob' }, { isTransformResponse: false });
+    // const data = await defHttp.get({ url: '/config/kcExportConfigTpkwcqkjzglx/exportWord', params: paramsForm, responseType: 'blob' }, { isTransformResponse: false });
+    if (!data) {
+      createMessage.warning('文件下载失败');
+      return;
+    }
+
+    let blobOptions = dcType == 'pdf'?{ type: 'application/pdf' }:{ type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' };
+    // let blobOptions = { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' };
+
+    let navigator:any = window.navigator;
+    let msSaveBlob = navigator.msSaveBlob;
+
+    if (typeof msSaveBlob !== 'undefined') {
+      msSaveBlob(new Blob([data], blobOptions), fileName);
+    } else {
+      let url = window.URL.createObjectURL(new Blob([data], blobOptions));
+      let link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = url;
+      link.setAttribute('download', fileName);
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link); //下载完成移除元素
+      window.URL.revokeObjectURL(url); //释放掉blob对象
+    }
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  margin-top: 35px;
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+  .query-group-cust{
+    width: calc(50% - 15px);
+    min-width: 100px !important;
+  }
+  .query-group-split-cust{
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+}
+.acolclass{
+  padding: 5px 15px 5px 30px;
+}
+.glyclass{
+  width: 100%;
+    border-radius: 15px;
+    background: #1ab394;
+}
+.xyglyclass{
+  width: 100%;
+    border-radius: 15px;
+    background: #1c84c6;
+
+}
+</style>

src/views/kc/config/KcExportConfigTpkwcqkjzglxListOld.vue

@@ -0,0 +1,355 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <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-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" v-if="!!roleList.filter(x => x.roleCode == 'admin' ).length">
+            <a-form-item label="单位名称">
+              <!-- <j-dict-select-tag placeholder="请选择单位名称" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/> -->
+              <j-dict-select-tag placeholder="请选择单位名称" v-model:value="queryParam.dwmc" dictCode="kc_export_config_tpkwcqkjzglx,dwmc,dwmc,true group by dwmc"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="教师工号">
+              <!-- <j-dict-select-tag placeholder="请选择教师" v-model:value="queryParam.gh" dictCode="xxhbuser,xm,gh"/> -->
+              <j-input placeholder="请输入教师工号" v-model:value="queryParam.gh"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="教师姓名">
+              <!-- <j-dict-select-tag placeholder="请选择教师" v-model:value="queryParam.gh" dictCode="xxhbuser,xm,gh"/> -->
+              <j-input placeholder="请输入教师姓名" v-model:value="queryParam.xm"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="听课身份">
+              <j-dict-select-tag mode="multiple" placeholder="请选择听课身份" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExport" style="margin-left: 8px">PDF导出</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px">Excel导出</a-button>
+
+                <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>-->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <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="handleAddYq" preIcon="ant-design:plus-outlined"> 听课要求</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>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <!-- <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template> -->
+      <!--省市区字段回显插槽-->
+      <!--<template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>-->
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <KcExportConfigTpkwcqkjzglxModal ref="registerModal" @success="handleSuccess"></KcExportConfigTpkwcqkjzglxModal>
+    <KcTksfrzbModal ref="registerYqModal" @success="handleSuccess"></KcTksfrzbModal>
+
+
+  </div>
+</template>
+
+<script lang="ts" name="config-kcExportConfigTpkwcqkjzglx" setup>
+  import { ref, reactive, computed, watch, nextTick } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './KcExportConfigTpkwcqkjzglx.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcExportConfigTpkwcqkjzglx.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import KcExportConfigTpkwcqkjzglxModal from './components/KcExportConfigTpkwcqkjzglxModal.vue'
+  import KcTksfrzbModal from './components/KcTksfrzbModal.vue'
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { JInput } from '/@/components/Form';
+  import { getSysConfig } from '/@/views/site/utils/index';
+  import { getUserInfo, getUserId } from '/@/views/site/utils/index';
+
+  const roleList = computed(() => getUserInfo()?.roleList??[]);
+
+  const queryParam = ref<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const registerYqModal = ref();
+
+  const { createMessage } = useMessage();
+
+  const xqDictTag = ref();
+
+  watch(() => xqDictTag.value?.dictOptions,(d) => {
+    if(d){
+      queryParam.value.xqxn = d[0]?.value
+      if(queryParam.value.xqxn){
+        nextTick(() => {
+          reload();
+        })
+      }
+    }
+  },{
+    deep:true,
+    immediate:true,
+  });
+
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'kc_export_config_tpkwcqkjzglx',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      showActionColumn: false,
+      immediate: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        params.findByDwmc = !roleList.value.filter(x => x.roleCode == 'admin' ).length
+        params.findGh = getUserId()
+        //params.xqxn = getSysConfig().flag1;
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "人员信息",
+      url: getExportUrl,
+      params: () => {
+        let params:any = {};
+        params.findByDwmc = !roleList.value.filter(x => x.roleCode == 'admin' ).length
+        params.findGh = getUserId()
+        return Object.assign(params,queryParam.value);
+      }
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  function handleAddYq() {
+    registerYqModal.value.disableSubmit = false;
+    registerYqModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    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();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  function onExport() {
+    // if(!!roleList.value.filter(x => x.roleCode == 'admin' ).length && !queryParam.value.dwmc) {
+    //   createMessage.warn('请选择导出的单位');
+    //   return ;
+    // }
+    onExportWord();
+  }
+
+  async function onExportWord(){
+    let dcType = 'pdf';
+    // let dcType = 'doc';
+
+    let fileName = dcType == 'pdf'?'教学听课情况表.pdf':'教学听课情况表.docx';
+    // let fileName = '教学听课情况表.docx';
+    let paramsForm = queryParam.value;
+
+    paramsForm = { ...paramsForm, findByDwmc: !roleList.value.filter(x => x.roleCode == 'admin' ).length, findGh: getUserId() }
+
+    let url = dcType == 'pdf'?'/config/kcExportConfigTpkwcqkjzglx/exportPdf':'/config/kcExportConfigTpkwcqkjzglx/exportWord'
+
+    const data = await defHttp.get({ url, params: paramsForm, responseType: 'blob' }, { isTransformResponse: false });
+    // const data = await defHttp.get({ url: '/config/kcExportConfigTpkwcqkjzglx/exportWord', params: paramsForm, responseType: 'blob' }, { isTransformResponse: false });
+    if (!data) {
+      createMessage.warning('文件下载失败');
+      return;
+    }
+
+    let blobOptions = dcType == 'pdf'?{ type: 'application/pdf' }:{ type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' };
+    // let blobOptions = { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' };
+
+    let navigator:any = window.navigator;
+    let msSaveBlob = navigator.msSaveBlob;
+
+    if (typeof msSaveBlob !== 'undefined') {
+      msSaveBlob(new Blob([data], blobOptions), fileName);
+    } else {
+      let url = window.URL.createObjectURL(new Blob([data], blobOptions));
+      let link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = url;
+      link.setAttribute('download', fileName);
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link); //下载完成移除元素
+      window.URL.revokeObjectURL(url); //释放掉blob对象
+    }
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

src/views/kc/config/StaticCon/StaticCon.api.ts

@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/config/kcExportConfigTpkwcqkjzglx/queryTkyqPageList',
+  save='/config/kcExportConfigTpkwcqkjzglx/add',
+  edit='/config/kcExportConfigTpkwcqkjzglx/edit',
+  deleteOne = '/config/kcExportConfigTpkwcqkjzglx/delete',
+  deleteBatch = '/config/kcExportConfigTpkwcqkjzglx/deleteBatch',
+  importExcel = '/config/kcExportConfigTpkwcqkjzglx/importExcel',
+  exportXls = '/config/kcExportConfigTpkwcqkjzglx/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}

src/views/kc/config/StaticCon/StaticCon.data.ts

@@ -0,0 +1,81 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '学院名称',
+    align: "center",
+    dataIndex: 'xymc'
+  },
+  {
+    title: '姓名',
+    align: "center",
+    dataIndex: 'xm'
+  },
+  {
+    title: '听课身份',
+    align: "center",
+    dataIndex: 'tksf'
+  },
+  {
+    title: '本学期应听课次数',
+    align: "center",
+    dataIndex: 'ytkcs'
+  },
+  {
+    title: '本学期实际听课次数',
+    align: "center",
+    dataIndex: 'sjtkcs'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "教师",
+    field: 'gh',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "xxhbuser,xm,gh"
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "听课类型",
+    field: 'tklx',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "tpkwcqkjzglx"
+    },
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '教师',
+    field: 'gh',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "xxhbuser,xm,gh"
+    },
+  },
+  {
+    label: '听课类型',
+    field: 'tklx',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "tpkwcqkjzglx"
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];

src/views/kc/config/StaticCon/StaticCon.vue

@@ -0,0 +1,206 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <!--引用表格-->
+    <BasicTable @register="registerTable" >
+      <template #tableTitle>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction />
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    
+
+  </div>
+</template>
+
+<script lang="ts" name="config-KcTkypdata" setup>
+  import { ref, reactive, computed, watch, nextTick,defineExpose } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './StaticCon.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './StaticCon.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { JInput } from '/@/components/Form';
+  import { getSysConfig } from '/@/views/site/utils/index';
+  import { getUserInfo, getUserId } from '/@/views/site/utils/index';
+
+  const roleList = computed(() => getUserInfo()?.roleList??[]);
+
+  const queryParam = ref<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+
+  const { createMessage } = useMessage();
+
+  const xqDictTag = ref();
+
+  watch(() => xqDictTag.value?.dictOptions,(d) => {
+    if(d){
+      queryParam.value.xqxn = d[0]?.value
+      if(queryParam.value.xqxn){
+        nextTick(() => {
+          reload();
+        })
+      }
+    }
+  },{
+    deep:true,
+    immediate:true,
+  });
+
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'kc_export_config_tpkwcqkjzglx',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      showActionColumn: false,
+      immediate: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        params.findByDwmc = !roleList.value.filter(x => x.roleCode == 'admin' ).length
+        params.findGh = getUserId()
+        //params.xqxn = getSysConfig().flag1;
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "人员信息",
+      url: getExportUrl,
+      params: () => {
+        let params:any = {};
+        params.findByDwmc = !roleList.value.filter(x => x.roleCode == 'admin' ).length
+        params.findGh = getUserId()
+        return Object.assign(params,queryParam.value);
+      }
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  
+  const registerYqModal = ref();
+  function handleAdd() {
+    registerYqModal.value.disableSubmit = false;
+    registerYqModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+  console.log(`🚀 ~ file: StaticCon.vue:125 ~ handleEdit ~ record:`, record)
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    reload();
+  }
+
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) { 
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) { 
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  function init(record){
+    console.log(`🚀 ~ file: StaticCon.vue:177 ~ init ~ record:`, record)
+    reload();
+  }
+
+
+  defineExpose({
+    init,
+  });
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

src/views/kc/config/StaticCon/StaticConModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <StaticCon ref="registerTkypForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></StaticCon>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import StaticCon from './StaticCon.vue'
+  
+  const title = ref<string>('');
+  const width = ref<string>('80%');
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerTkypForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '钻取信息';
+    visible.value = true;
+    nextTick(() => {
+      registerTkypForm.value.init();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerTkypForm.value.init(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerTkypForm.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>

src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue

@@ -17,13 +17,18 @@
           </a-col>
           <a-col :lg="8">
             <a-form-item label="教学楼名称">
-              <a-input placeholder="请输入教学楼名称" v-model:value="queryParam.jxlName"></a-input>
+              <a-select placeholder="请选择教学楼" v-model:value="queryParam.jxlName">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`逸夫教学楼`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`净月综合教学楼`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`惟真楼`">惟真楼</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <!--<template v-if="toggleSearchStatus">-->
             <a-col :lg="8">
               <a-form-item label="教室名称">
-                <a-input placeholder="请输入教室名称" v-model:value="queryParam.jsmc"></a-input>
+                <j-input placeholder="请输入教室名称" v-model:value="queryParam.jsmc"></j-input>
               </a-form-item>
             </a-col>
           <!--</template>-->
@@ -98,6 +103,7 @@
   import { columns } from './KcZhihuijiaoshiMonitorLog.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZhihuijiaoshiMonitorLog.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
+import { JInput } from '/@/components/Form';
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import KcZhihuijiaoshiMonitorLogModal from './components/KcZhihuijiaoshiMonitorLogModal.vue'

src/views/kc/kcSysConfig/components/KcSysConfigMain.vue

@@ -10,8 +10,8 @@
       <a-row>
         <a-col :span="6">
           <a-form-item label="本学期名称" v-bind="validateInfos.flag1">
-            <!-- <a-input v-model:value="formData.flag1" placeholder="请输入本学期名称" ></a-input> -->
+            <a-input v-model:value="formData.flag1" placeholder="请输入本学期名称" ></a-input>
-            <JDictSelectTag type="list" v-model:value="formData.flag1" dictCode="xnxq" placeholder="请选择" :dropdownStyle="{zIndex:'99000'}" />
+            <!-- <JDictSelectTag type="list" v-model:value="formData.flag1" dictCode="xnxq" placeholder="请选择" :dropdownStyle="{zIndex:'99000'}" /> -->
           </a-form-item>
         </a-col>
         <a-col :span="6">

src/views/kc/ktgl/KcKechengbiao.data.ts

@@ -24,7 +24,7 @@ export const columns = <JVxeColumn[]>([
     key: 'skjs'
   },
   {
-    title: '学科人数',
+    title: '选课人数',
     align: "left",
     width: '80px',
     key: 'xkrs'
@@ -121,7 +121,7 @@ export const columns = <JVxeColumn[]>([
 //     dataIndex: 'skjs'
 //   },
 //   {
-//     title: '学科人数',
+//     title: '选课人数',
 //     align: "center",
 //     width: '80px',
 //     dataIndex: 'xkrs'
@@ -304,12 +304,12 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '学科人数',
+    label: '选课人数',
     field: 'xkrs',
     component: 'Input',
     dynamicRules: ({model,schema}) => {
       return [
-              { required: true, message: '请输入学科人数!'},
+              { required: true, message: '请输入选课人数!'},
              ];
     },
   },

src/views/kc/ktgl/components/KcKechengbiaoForm.vue

@@ -165,7 +165,7 @@
     kcbh: [{ required: true, message: '请输入课程号!'}, { validator: kcbhDuplicatevalidate }],
     kcmc: [{ required: true, message: '请输入课程名称!'},],
     skjs: [{ required: true, message: '请输入授课教师!'},],
-    xkrs: [{ required: true, message: '请输入学科人数!'},],
+    xkrs: [{ required: true, message: '请输入选课人数!'},],
     kkdw: [{ required: true, message: '请输入开课单位!'},],
     kcxz: [{ required: true, message: '请输入课程性质!'},],
     jkzc: [{ required: true, message: '请输入上课周次!'},],

src/views/kc/szkc/KcKechengbiao.data.ts

@@ -23,7 +23,7 @@ export const columns = <JVxeColumn[]>([
     key: 'skjs'
   },
   {
-    title: '学科人数',
+    title: '选课人数',
     align: "left",
     width: '80px',
     key: 'xkrs'
@@ -106,7 +106,7 @@ export const columns = <JVxeColumn[]>([
 //     dataIndex: 'skjs'
 //   },
 //   {
-//     title: '学科人数',
+//     title: '选课人数',
 //     align: "center",
 //     width: '80px',
 //     dataIndex: 'xkrs'
@@ -289,12 +289,12 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '学科人数',
+    label: '选课人数',
     field: 'xkrs',
     component: 'Input',
     dynamicRules: ({model,schema}) => {
       return [
-              { required: true, message: '请输入学科人数!'},
+              { required: true, message: '请输入选课人数!'},
              ];
     },
   },

src/views/kc/szkc/components/KcKechengbiaoForm.vue

@@ -165,7 +165,7 @@
     kcbh: [{ required: true, message: '请输入课程号!'}, { validator: kcbhDuplicatevalidate }],
     kcmc: [{ required: true, message: '请输入课程名称!'},],
     skjs: [{ required: true, message: '请输入授课教师!'},],
-    xkrs: [{ required: true, message: '请输入学科人数!'},],
+    xkrs: [{ required: true, message: '请输入选课人数!'},],
     kkdw: [{ required: true, message: '请输入开课单位!'},],
     kcxz: [{ required: true, message: '请输入课程性质!'},],
     jkzc: [{ required: true, message: '请输入上课周次!'},],

src/views/kc/szkc/components/XzKechengbiao.data.ts

@@ -67,7 +67,7 @@ export const columns = <JVxeColumn[]>([
 //     dataIndex: 'skjs'
 //   },
 //   {
-//     title: '学科人数',
+//     title: '选课人数',
 //     align: "center",
 //     width: '80px',
 //     dataIndex: 'xkrs'
@@ -250,12 +250,12 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '学科人数',
+    label: '选课人数',
     field: 'xkrs',
     component: 'Input',
     dynamicRules: ({model,schema}) => {
       return [
-              { required: true, message: '请输入学科人数!'},
+              { required: true, message: '请输入选课人数!'},
              ];
     },
   },

src/views/site/kxstkkt/itemPage.vue

@@ -45,11 +45,11 @@
             </a-col> -->
           </a-row>
           <a-row style="text-align: center;" v-else>
-            <a-col :span="12" style="text-align: center;">
+            <!-- <a-col :span="12" style="text-align: center;">
               <a-button type="primary" class="yyyClass" @click="toLivePage(item)" disabled>听课</a-button>
-            </a-col>
+            </a-col> -->
-            <a-col :span="12" style="text-align: center;">
+            <a-col :span="24" style="text-align: center;">
-              <a-button type="primary" class="yyClass" @click="funpingjia(item)" disabled>评价</a-button>
+              <a-button type="primary" class="yyClass" @click="funpingjia(item)" >评价</a-button>
             </a-col>
           </a-row>
 

src/views/site/kxstkkt/rkb.vue

@@ -22,7 +22,12 @@
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
         <a-form-item label="" style="padding: 10px;">
-          <JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
+          <a-select placeholder="请选择教学楼" v-model:value="queryParam.jzwh">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`0106`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`0295`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`0108`">惟真楼</a-select-option>
+              </a-select>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 5 }">
@@ -120,6 +125,7 @@ function loadData(num?) {
   queryParam.value.userid = getUserId()
   queryParam.value.skxs = 1
   queryParam.value.type = 1
+  queryParam.value.sftkb = 1
   console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam)
 
 

src/views/site/kxstkkt/xyjk.vue

@@ -7,7 +7,12 @@
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
         <a-form-item label="" style="padding: 10px;">
-          <JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
+          <a-select placeholder="请选择教学楼" v-model:value="queryParam.jzwh">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`0106`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`0295`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`0108`">惟真楼</a-select-option>
+              </a-select>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@@ -106,6 +111,7 @@ function loadData(num?) {
   queryParam.value.userid = getUserId()
   queryParam.value.skxs = 1
   queryParam.value.type = 0
+  queryParam.value.sftkb = 1
   console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam)
 
   if(queryParam.value.hh!=","){

src/views/site/kxstkkt/zzsk.vue

@@ -7,7 +7,14 @@
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
         <a-form-item label="" style="padding: 10px;">
-          <JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
+          <!-- <JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" /> -->
+          
+          <a-select placeholder="请选择教学楼" v-model:value="queryParam.jzwh">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`0106`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`0295`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`0108`">惟真楼</a-select-option>
+              </a-select>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@@ -101,6 +108,7 @@ function loadData(num?) {
   queryParam.value.userid = getUserId()
   queryParam.value.skxs = 1
   queryParam.value.type = 1
+  queryParam.value.sftkb = 1
   queryParam.value.ywskxs = ''
   console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam)
 

src/views/site/tongZhiGongGao/index.vue

@@ -1,7 +1,6 @@
 <template>
   <a-card class="rowGutter">
-    <br/>
+    <a-row :gutter="[16,16]">
-    <a-row :gutter="[16,16]" class="rowSpan">
       <a-col :span="12" v-for="(item,index) in list" :key="index">
         <a :href="item.nlink" target="_blank" class="itemLink">
           <span class="">
@@ -14,6 +13,14 @@
         </a>
       </a-col>
     </a-row>
+    <a-row style="font-size:16px;font-weight: 700;margin-top:10px;">
+      <a-col :span="3">调停课通知：</a-col>
+      <a-col :span="15">
+        <a-carousel autoplay easing="linear">
+          <div  v-for="(item,index) in tklist" :key="index" style="font-size:16px;font-weight: 700;">{{item.kcmc}}</div>
+        </a-carousel>
+      </a-col>
+    </a-row>
     <!-- <div style="color:red">[今日调课]</div> -->
   </a-card>
 </template>
@@ -27,6 +34,7 @@ import { formatToDate } from '/@/utils/dateUtil';
 // const { createConfirm } = useMessage();
 enum Api {
   list = '/kcNotice/kcNotice/list',
+  tkList = '/grab/imports/xxhbtkxx/getDayTklist',
 }
 
 /**
@@ -34,19 +42,26 @@ enum Api {
  * @param params
  */
 const listApi = (params) => defHttp.get({ url: Api.list, params });
+const listTkApi = (params) => defHttp.get({ url: Api.tkList, params });
 
 const list = ref<any>([]);
+const tklist = ref<any>([]);
 onMounted(() => {
   //ontop,修改时间，新增时间
   listApi({ pageSize: 6, nstatus: 1 }).then(res => {
     list.value = (res?.records) ?? [];
   });
+  //ontop,修改时间，新增时间
+  listTkApi({}).then(res => {
+    console.log(`🚀 ~ file: index.vue:56 ~ listTkApi ~ res:`, res)
+    tklist.value = res;
+  });
 });
 
 </script>
 <style lang="less" scoped>
 .rowSpan {
-  padding: 0 0 15px 0;
+  padding: 0 0 5px 0;
 }
 .spanWord {
   padding: 0 10px;