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

# Conflicts:
#	src/views/site/utils/index.ts

src/api/sys/user.ts

@@ -8,6 +8,7 @@ import { setAuthCache } from '/@/utils/auth';
 import { TOKEN_KEY } from '/@/enums/cacheEnum';
 import { router } from '/@/router';
 import { PageEnum } from '/@/enums/pageEnum';
+import { SysConfigInfo } from '/#/store';
 
 const { createErrorModal } = useMessage();
 enum Api {
@@ -15,6 +16,7 @@ enum Api {
   phoneLogin = '/sys/phoneLogin',
   Logout = '/sys/logout',
   GetUserInfo = '/sys/user/getUserInfo',
+  GetSysConfigInfo = '/kcSysConfig/kcSysConfig/queryById',
   // 获取系统权限
   // 1、查询用户拥有的按钮/表单访问权限
   // 2、所有权限
@@ -91,6 +93,24 @@ export function getUserInfo() {
   });
 }
 
+/**
+ * @description:
+ */
+export function getSysConfigInfo() {
+  return defHttp.get<SysConfigInfo>({ url: Api.GetSysConfigInfo, params: { id: '1' } }, { }).catch((e) => {
+    // update-begin--author:zyf---date:20220425---for:【VUEN-76】捕获接口超时异常,跳转到登录界面
+    if (e && (e.message.includes('timeout') || e.message.includes('401'))) {
+      //接口不通时跳转到登录界面
+      const userStore = useUserStoreWithOut();
+      userStore.setToken('');
+      setAuthCache(TOKEN_KEY, null);
+      router.push(PageEnum.BASE_LOGIN);
+    }
+    // update-end--author:zyf---date:20220425---for:【VUEN-76】捕获接口超时异常,跳转到登录界面
+  });
+}
+
+
 export function getPermCode() {
   return defHttp.get({ url: Api.GetPermCode });
 }

src/enums/cacheEnum.ts

@@ -32,6 +32,9 @@ export const TENANT_ID = 'TENANT_ID';
 // login info key
 export const LOGIN_INFO_KEY = 'LOGIN__INFO__';
 
+// login info key
+export const SYS_CONFIG_INFO_KEY = 'SYS__CONFIG__INFO__';
+
 // 聊天UID key
 export const JEECG_CHAT_UID = 'JEECG_CHAT_UID';
 

src/router/guard/permissionGuard.ts

@@ -117,6 +117,7 @@ export function createPermissionGuard(router: Router) {
     if (userStore.getLastUpdateTime === 0) {
       try {
         await userStore.getUserInfoAction();
+        await userStore.getSysConfigInfoAction();
       } catch (err) {
         console.info(err);
         next();

src/store/modules/user.ts

@@ -1,13 +1,13 @@
-import type { UserInfo, LoginInfo } from '/#/store';
+import type { UserInfo, LoginInfo, SysConfigInfo } from '/#/store';
 import type { ErrorMessageMode } from '/#/axios';
 import { defineStore } from 'pinia';
 import { store } from '/@/store';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { PageEnum } from '/@/enums/pageEnum';
-import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, LOGIN_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID } from '/@/enums/cacheEnum';
+import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, LOGIN_INFO_KEY, SYS_CONFIG_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID } from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache, removeAuthCache } from '/@/utils/auth';
 import { GetUserInfoModel, LoginParams, ThirdLoginParams } from '/@/api/sys/model/userModel';
-import { doLogout, getUserInfo, loginApi, phoneLoginApi, thirdLogin } from '/@/api/sys/user';
+import { doLogout, getUserInfo, getSysConfigInfo, loginApi, phoneLoginApi, thirdLogin } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
@@ -27,6 +27,7 @@ interface UserState {
   lastUpdateTime: number;
   tenantid?: string | number;
   loginInfo?: Nullable<LoginInfo>;
+  sysConfigInfo?: Nullable<SysConfigInfo>;
 }
 
 export const useUserStore = defineStore({
@@ -48,6 +49,8 @@ export const useUserStore = defineStore({
     tenantid: '',
     //登录返回信息
     loginInfo: null,
+    //系统配置信息
+    sysConfigInfo: null,
   }),
   getters: {
     getUserInfo(): UserInfo {
@@ -56,6 +59,9 @@ export const useUserStore = defineStore({
     getLoginInfo(): LoginInfo {
       return this.loginInfo || getAuthCache<LoginInfo>(LOGIN_INFO_KEY) || {};
     },
+    getSysConfigInfo(): SysConfigInfo {
+      return this.sysConfigInfo || getAuthCache<SysConfigInfo>(SYS_CONFIG_INFO_KEY) || {};
+    },
     getToken(): string {
       return this.token || getAuthCache<string>(TOKEN_KEY);
     },
@@ -93,6 +99,10 @@ export const useUserStore = defineStore({
       this.loginInfo = info;
       setAuthCache(LOGIN_INFO_KEY, info);
     },
+    setSysConfigInfo(info: SysConfigInfo | null) {
+      this.sysConfigInfo = info;
+      setAuthCache(SYS_CONFIG_INFO_KEY, info);
+    },
     setAllDictItems(dictItems) {
       this.dictItems = dictItems;
       setAuthCache(DB_DICT_DATA_KEY, dictItems);
@@ -106,6 +116,7 @@ export const useUserStore = defineStore({
     },
     resetState() {
       this.userInfo = null;
+      this.sysConfigInfo = null;
       this.dictItems = [];
       this.token = '';
       this.roleList = [];
@@ -152,6 +163,7 @@ export const useUserStore = defineStore({
       if (!this.getToken) return null;
       //获取用户信息
       const userInfo = await this.getUserInfoAction();
+      await this.getSysConfigInfoAction();
       const sessionTimeout = this.sessionTimeout;
       if (sessionTimeout) {
         this.setSessionTimeout(false);
@@ -201,7 +213,7 @@ export const useUserStore = defineStore({
       if (!this.getToken) {
         return null;
       }
-      const { userInfo, sysAllDictItems } = await getUserInfo();
+      const { userInfo, sysAllDictItems } = <GetUserInfoModel> await getUserInfo();
       if (userInfo) {
         const { roles = [] } = userInfo;
         if (isArray(roles)) {
@@ -223,6 +235,16 @@ export const useUserStore = defineStore({
       }
       return userInfo;
     },
+    async getSysConfigInfoAction(): Promise<SysConfigInfo | null> {
+      const sysConfigInfo = <SysConfigInfo | null> await getSysConfigInfo();
+      if(sysConfigInfo){
+        await this.setSysConfigInfo(sysConfigInfo);
+      } else {
+        await this.setSysConfigInfo(<SysConfigInfo>{});
+      }
+      return sysConfigInfo;
+    },
+
     /**
      * 退出登录
      */

src/utils/cache/memory.ts

@@ -1,4 +1,4 @@
-import { TOKEN_KEY, ROLES_KEY, USER_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, PROJ_CFG_KEY } from '/@/enums/cacheEnum';
+import { TOKEN_KEY, ROLES_KEY, USER_INFO_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, SYS_CONFIG_INFO_KEY, PROJ_CFG_KEY } from '/@/enums/cacheEnum';
 import { omit } from 'lodash-es';
 
 export interface Cache<V = any> {
@@ -103,7 +103,7 @@ export class Memory<T = any, V = any> {
     });
     //update-begin---author:liusq  Date:20220108  for：不删除登录用户的租户id，其他缓存信息都清除----
     this.cache = {
-      ...omit(this.cache, [TOKEN_KEY, USER_INFO_KEY, ROLES_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, PROJ_CFG_KEY]),
+      ...omit(this.cache, [TOKEN_KEY, USER_INFO_KEY, ROLES_KEY, DB_DICT_DATA_KEY, TENANT_ID, LOGIN_INFO_KEY, SYS_CONFIG_INFO_KEY, PROJ_CFG_KEY]),
     };
     //update-end---author:liusq  Date:20220108  for：不删除登录用户的租户id，其他缓存信息都清除----
   }

src/utils/cache/persistent.ts

@@ -1,4 +1,4 @@
-import type { LockInfo, UserInfo, LoginInfo } from '/#/store';
+import type { LockInfo, UserInfo, LoginInfo, SysConfigInfo } from '/#/store';
 import type { ProjectConfig } from '/#/config';
 import type { RouteLocationNormalized } from 'vue-router';
 
@@ -16,6 +16,7 @@ import {
   DB_DICT_DATA_KEY,
   TENANT_ID,
   LOGIN_INFO_KEY,
+  SYS_CONFIG_INFO_KEY,
 } from '/@/enums/cacheEnum';
 import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting';
 import { toRaw } from 'vue';
@@ -31,6 +32,7 @@ interface BasicStore {
   [DB_DICT_DATA_KEY]: string;
   [TENANT_ID]: string;
   [LOGIN_INFO_KEY]: LoginInfo;
+  [SYS_CONFIG_INFO_KEY]: SysConfigInfo;
 }
 
 type LocalStore = BasicStore;

src/views/kc/kcErrorreport/JscjErrorList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--引用表格-->
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <template #tableTitle>
         <div></div>
       </template>
@@ -9,6 +9,8 @@
         <TableAction :actions="getTableAction(record)"/>
       </template>
     </BasicTable>
+    <!-- 子页面 -->
+    <KcKechengbiaoListPage v-if="selectedRows[0]" :searchParam="{ id:selectedRows[0]?.kechengbiaoid , xnxq:'' }" isNoSearch/>
   </div>
 </template>
 
@@ -21,6 +23,7 @@
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue';
 
+  import KcKechengbiaoListPage from '/@/views/kc/ktgl/KcKechengbiaoList.vue';
 
   const queryParam = ref<any>({});
   //注册table数据
@@ -32,6 +35,13 @@
       canResize:false,
       useSearchForm: false,
       immediate: false,
+      clickToRowSelect: true,
+      rowSelection: {
+        type: 'radio'
+      },
+      pagination: {
+        pageSize: 5
+      },
       actionColumn: {
         width: 120,
         fixed: 'right',
@@ -42,7 +52,7 @@
       },
     },
   });
-  const [registerTable, { reload}, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload}, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -67,7 +77,7 @@
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -79,7 +89,7 @@
       },
     ];
   }
-  
+
   function handleEdit(record: Recordable) {
     Modal.confirm({
         icon: createVNode({}),
@@ -114,7 +124,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -124,7 +134,7 @@
     //刷新数据
     reload();
   }
-  
+
 
   defineExpose({
     zbLoadData

src/views/kc/kcErrorreport/KcErrorreportList.vue

@@ -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();
   }
-  
+
 
 
 

src/views/kc/kcErrorreport/KcxxErrorList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--引用表格-->
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <template #tableTitle>
         <div></div>
       </template>
@@ -9,6 +9,8 @@
         <TableAction :actions="getTableAction(record)"/>
       </template>
     </BasicTable>
+    <!-- 子页面 -->
+    <KcKechengbiaoListPage v-if="selectedRows[0]" :searchParam="{ id:selectedRows[0]?.kechengbiaoid , xnxq:'' }" isNoSearch/>
   </div>
 </template>
 
@@ -21,6 +23,7 @@
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue';
 
+  import KcKechengbiaoListPage from '/@/views/kc/ktgl/KcKechengbiaoList.vue';
 
   const queryParam = ref<any>({});
   //注册table数据
@@ -32,6 +35,13 @@
       canResize:false,
       useSearchForm: false,
       immediate: false,
+      clickToRowSelect: true,
+      rowSelection: {
+        type: 'radio'
+      },
+      pagination: {
+        pageSize: 5
+      },
       actionColumn: {
         width: 120,
         fixed: 'right',
@@ -42,7 +52,7 @@
       },
     },
   });
-  const [registerTable, { reload}, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload}, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -67,7 +77,7 @@
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -79,7 +89,7 @@
       },
     ];
   }
-  
+
   function handleEdit(record: Recordable) {
     Modal.confirm({
         icon: createVNode({}),
@@ -114,7 +124,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -124,7 +134,7 @@
     //刷新数据
     reload();
   }
-  
+
 
   defineExpose({
     zbLoadData

src/views/kc/kcErrorreport/ZbptErrorList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--引用表格-->
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <template #tableTitle>
         <div></div>
       </template>
@@ -9,6 +9,8 @@
         <TableAction :actions="getTableAction(record)"/>
       </template>
     </BasicTable>
+    <!-- 子页面 -->
+    <KcKechengbiaoListPage v-if="selectedRows[0]" :searchParam="{ id:selectedRows[0]?.kechengbiaoid , xnxq:'' }" isNoSearch/>
   </div>
 </template>
 
@@ -21,6 +23,8 @@
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue';
 
+  import KcKechengbiaoListPage from '/@/views/kc/ktgl/KcKechengbiaoList.vue';
+
 
   const queryParam = ref<any>({});
   //注册table数据
@@ -32,6 +36,13 @@
       canResize:false,
       immediate: false,
       useSearchForm: false,
+      clickToRowSelect: true,
+      rowSelection: {
+        type: 'radio'
+      },
+      pagination: {
+        pageSize: 5
+      },
       actionColumn: {
         width: 120,
         fixed: 'right',
@@ -42,7 +53,7 @@
       },
     },
   });
-  const [registerTable, { reload}, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -67,7 +78,7 @@
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -79,7 +90,7 @@
       },
     ];
   }
-  
+
   function handleEdit(record: Recordable) {
     Modal.confirm({
         icon: createVNode({}),
@@ -114,7 +125,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -124,7 +135,7 @@
     //刷新数据
     reload();
   }
-  
+
 
   defineExpose({
     zbLoadData

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

@@ -1,128 +1,220 @@
 import {BasicColumn} from '/@/components/Table';
 import {FormSchema} from '/@/components/Table';
 import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
+// import { render } from '/@/utils/common/renderUtils';
+import { JVxeColumn, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
 //列表数据
-export const columns: BasicColumn[] = [
+
+export const columns = <JVxeColumn[]>([
   {
-    title: 'id',
+    title: '课程编号',
-    align: "center",
+    align: "left",
-    width: '0',
-    dataIndex: 'id',
-    // ifShow: false,
-  },
-  {
-    title: '课程号',
-    align: "center",
     width: '300px',
-    dataIndex: 'kcbh'
+    key: 'kcbh',
   },
   {
     title: '课程名称',
-    align: "center",
+    align: "left",
-    dataIndex: 'kcmc'
+    key: 'kcmc'
   },
   {
     title: '授课教师',
-    align: "center",
+    align: "left",
-    dataIndex: 'skjs'
+    key: 'skjs'
   },
   {
     title: '学科人数',
-    align: "center",
+    align: "left",
     width: '80px',
-    dataIndex: 'xkrs'
+    key: 'xkrs'
   },
   {
     title: '开课单位',
-    align: "center",
+    align: "left",
     width: '100px',
-    dataIndex: 'kkdw_dictText'
+    key: 'kkdw_dictText'
   },
   {
     title: '课程性质',
-    align: "center",
+    align: "left",
     width: '105px',
-    dataIndex: 'kcxz_dictText'
+    key: 'kcxz_dictText'
   },
   {
     title: '上课地点',
-    align: "center",
+    align: "left",
     width: '100px',
-    dataIndex: 'skdd'
+    key: 'skdd'
   },
   {
     title: '上课周次',
-    align: "center",
+    align: "left",
     width: '100px',
-    dataIndex: 'jkzc_dictText'
+    key: 'jkzc_dictText'
   },
   {
     title: '节次',
-    align: "center",
+    align: "left",
     width: '70px',
-    dataIndex: 'hh_dictText'
+    key: 'hh_dictText'
   },
   {
     title: '星期',
-    align: "center",
+    align: "left",
     width: '70px',
-    dataIndex: 'week_dictText'
+    key: 'week_dictText'
   },
   {
     title: '学分',
-    align: "center",
+    align: "left",
     width: '50px',
-    dataIndex: 'xf'
+    key: 'xf'
   },
+
   {
     title: '是否出镜',
-    align: "center",
+    key: 'sfcj',
-    dataIndex: 'sfcj',
+    type: JVxeTypes.selectSearch,
-    edit: true,
+    width: 100,
-    editComponent: 'Select',
+    options: [
-    // editComponentProps: {
+      { label: '是', value: 0, },
-    // //   //选中
+      { label: '否', value: 1, },
-    //   checkedChildren: "是-",
+    ],
-    //   // checkedValue: 0,
-    // //   //未选中
-    //   unCheckedChildren:'否-',
-    //   // unCheckedValue: 1,
-    //   // onClick: (checked: boolean | string | number, event: Event) => {
-    //   //   event.stopPropagation();
-    //   //   console.log('选择后回调',checked,event);
-
-    //   // }
-    // },
-    // editValueMap: (value) => value == '0'?'是':'否',
-    // editValueMap: (value) => value?'0':'1',
-    // format: (text) => ,C
-    editComponentProps: {
-      options: [
-        { label: '是', value: 0, },
-        { label: '否', value: 1, },
-      ],
-    },
-    // customRender: (r) => r.text == 0?'是':'否'
   },
-
-
   {
     title: '上课形式',
-    align: "center",
+    key: 'skxs',
-    dataIndex: 'skxs',
+    type: JVxeTypes.selectSearch,
-    edit: true,
+    width: 100,
-    editComponent: 'Select',
+    options: [
-    editComponentProps: {
+      { label: '线上', value: 0, },
-      options: [
+      { label: '线下', value: 1, },
-        { label: '线上', value: 0, },
+      { label: '线上线下混合', value: 2, },
-        { label: '线下', value: 1, },
+    ],
-        { label: '线上线下混合', value: 2, },
-      ],
-    },
-    // customRender: (r) => r.text == 0?'线上':r.text == 1?'线下':'线上线下混合'
   },
-];
+]);
+
+
+// export const columns: BasicColumn[] = [
+//   {
+//     title: 'id',
+//     align: "center",
+//     width: '0',
+//     dataIndex: 'id',
+//     // ifShow: false,
+//   },
+//   {
+//     title: '课程号',
+//     align: "center",
+//     width: '300px',
+//     dataIndex: 'kcbh'
+//   },
+//   {
+//     title: '课程名称',
+//     align: "center",
+//     dataIndex: 'kcmc'
+//   },
+//   {
+//     title: '授课教师',
+//     align: "center",
+//     dataIndex: 'skjs'
+//   },
+//   {
+//     title: '学科人数',
+//     align: "center",
+//     width: '80px',
+//     dataIndex: 'xkrs'
+//   },
+//   {
+//     title: '开课单位',
+//     align: "center",
+//     width: '100px',
+//     dataIndex: 'kkdw_dictText'
+//   },
+//   {
+//     title: '课程性质',
+//     align: "center",
+//     width: '105px',
+//     dataIndex: 'kcxz_dictText'
+//   },
+//   {
+//     title: '上课地点',
+//     align: "center",
+//     width: '100px',
+//     dataIndex: 'skdd'
+//   },
+//   {
+//     title: '上课周次',
+//     align: "center",
+//     width: '100px',
+//     dataIndex: 'jkzc_dictText'
+//   },
+//   {
+//     title: '节次',
+//     align: "center",
+//     width: '70px',
+//     dataIndex: 'hh_dictText'
+//   },
+//   {
+//     title: '星期',
+//     align: "center",
+//     width: '70px',
+//     dataIndex: 'week_dictText'
+//   },
+//   {
+//     title: '学分',
+//     align: "center",
+//     width: '50px',
+//     dataIndex: 'xf'
+//   },
+//   {
+//     title: '是否出镜',
+//     align: "center",
+//     dataIndex: 'sfcj',
+//     edit: true,
+//     editComponent: 'Select',
+//     // editComponentProps: {
+//     // //   //选中
+//     //   checkedChildren: "是-",
+//     //   // checkedValue: 0,
+//     // //   //未选中
+//     //   unCheckedChildren:'否-',
+//     //   // unCheckedValue: 1,
+//     //   // onClick: (checked: boolean | string | number, event: Event) => {
+//     //   //   event.stopPropagation();
+//     //   //   console.log('选择后回调',checked,event);
+
+//     //   // }
+//     // },
+//     // editValueMap: (value) => value == '0'?'是':'否',
+//     // editValueMap: (value) => value?'0':'1',
+//     // format: (text) => ,C
+//     editComponentProps: {
+//       options: [
+//         { label: '是', value: 0, },
+//         { label: '否', value: 1, },
+//       ],
+//     },
+//     // customRender: (r) => r.text == 0?'是':'否'
+//   },
+
+
+//   {
+//     title: '上课形式',
+//     align: "center",
+//     dataIndex: 'skxs',
+//     edit: true,
+//     editComponent: 'Select',
+//     editComponentProps: {
+//       options: [
+//         { label: '线上', value: 0, },
+//         { label: '线下', value: 1, },
+//         { label: '线上线下混合', value: 2, },
+//       ],
+//     },
+//     // customRender: (r) => r.text == 0?'线上':r.text == 1?'线下':'线上线下混合'
+//   },
+// ];
 
 //查询数据
 export const searchFormSchema: FormSchema[] = [

src/views/kc/ktgl/KcKechengbiaoList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--查询区域-->
-    <div class="jeecg-basic-table-form-container">
+    <div class="jeecg-basic-table-form-container" v-if="!props.isNoSearch">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
@@ -56,12 +56,9 @@
 
     <vxe-toolbar>
       <template #buttons>
-        <a-button type="primary" class="pl1r" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" class="pl1r" @click="handleAdd" preIcon="ant-design:plus-outlined" v-if="!props.isNoSearch"> 新增</a-button>
         <a-button type="primary" class="pl1r" @click="handleEdit" preIcon="ant-design:plus-outlined"> 修改</a-button>
         <a-button type="danger"  class="pl1r" @click="batchHandleDelete" preIcon="ant-design:delete-outlined">删除</a-button>
-        <!-- <vxe-button @click="insertEvent">新增</vxe-button>
-        <vxe-button @click="$refs.xTable.removeCheckboxRow()">删除选中</vxe-button>
-        <vxe-button @click="saveEvent">保存</vxe-button> -->
       </template>
     </vxe-toolbar>
     <JVxeTable
@@ -77,208 +74,47 @@
       :columns="columns"
       :pagination="pagination"
       style="margin-top: 8px"
-      @pageChange="handlePageChange"
+      @page-change="handlePageChange"
-      @valueChange="valueChange"
+      @value-change="valueChange"
-      @selectRowChange="selectRowChange"
+      @select-row-change="selectRowChange"
     >
-    <!-- @save="save"
-      @added="added"
-      @removed="removed"
-      @inserted="inserted"
-      @dragged="dragged" -->
-      <template #toolbarSuffix>
-        <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button type="primary" @click="handleEdit" preIcon="ant-design:plus-outlined"> 修改</a-button>
-        <a-button type="danger" @click="batchHandleDelete" preIcon="ant-design:delete-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>
-              <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>
     </JVxeTable>
-    <!--引用表格-->
 
     <!-- 表单区域 -->
     <KcKechengbiaoModal ref="registerModal" @success="handleSuccess"></KcKechengbiaoModal>
-    <!-- -{{ selectedRows }}- -->
+    <!--引用表格-->
     <KcKetangbiaoList v-show="selectedRows[0]" :currentRowKey="selectedRows[0]"/>
   </div>
 </template>
 
 <script lang="ts" name="ktgl-kcKechengbiao" setup>
-  import { ref, reactive, onMounted } from 'vue';
+  import { ref, reactive, onMounted, watch } from 'vue';
   // import { BasicTable, useTable, TableAction } from '/@/components/Table';
   // import { useListPage } from '/@/ho   oks/system/useListPage';
+  import { propTypes } from '/@/utils/propTypes';
   import { useMessage } from '/@/hooks/web/useMessage';
-  // import { columns } from './KcKechengbiao.data';
+  import { columns } from './KcKechengbiao.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, saveOrUpdate } from './KcKechengbiao.api';
+  import { list, batchDelete, saveOrUpdate } from './KcKechengbiao.api';
-  // import { downloadFile } from '/@/utils/common/renderUtils';
   import KcKechengbiaoModal from './components/KcKechengbiaoModal.vue'
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import KcKetangbiaoList from './KcKetangbiaoList.vue'
 
-  import { JVxeColumn, JVxeTableInstance, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
+  import { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
   import { filterObj } from '/@/utils/common/compUtils';
-  // import { random } from 'lodash-es';
+
-  // import { buildUUID } from '/@/utils/uuid';
+  //--------------------------------------变量区---------------------------------------------------------------------------
-  // import { uploadUrl } from '/@/api/common/api';
+
+  const props = defineProps({
+    searchParam: propTypes.object.def({}),
+    isNoSearch: propTypes.bool.def(false)
+  });
 
   const tableRef = ref<JVxeTableInstance>();
-  // const { createMessage } = useMessage();
   const loading = ref(false);
-  const columns = ref<JVxeColumn[]>([
-    // {
-    //   title: '下拉框_字典表搜索',
-    //   key: 'select_dict_search',
-    //   type: JVxeTypes.selectDictSearch,
-    //   width: 200,
-    //   async: true, // 异步搜索，默认为 true
-    //   // 字典表配置信息：数据库表名,显示字段名,存储字段名
-    //   dict: 'sys_user,realname,username',
-    //   tipsContent: '请输入查询条件',
-    // },
-    // {
-    //   title: '单选',
-    //   key: 'radio',
-    //   type: JVxeTypes.radio,
-    //   width: 130,
-    //   options: [
-    //     { text: '男', value: '1' },
-    //     { text: '女', value: '2' },
-    //   ],
-    //   // 允许清除选择（再点一次取消选择）
-    //   allowClear: false,
-    // },
 
-    {
+  const selectedRows = ref([]);
-      title: '课程编号',
+  const selectedRowKeys = ref([]);
-      align: "left",
-      width: '300px',
-      key: 'kcbh',
-    },
-    {
-      title: '课程名称',
-      align: "left",
-      key: 'kcmc'
-    },
-    {
-      title: '授课教师',
-      align: "left",
-      key: 'skjs'
-    },
-    {
-      title: '学科人数',
-      align: "left",
-      width: '80px',
-      key: 'xkrs'
-    },
-    {
-      title: '开课单位',
-      align: "left",
-      width: '100px',
-      key: 'kkdw_dictText'
-    },
-    {
-      title: '课程性质',
-      align: "left",
-      width: '105px',
-      key: 'kcxz_dictText'
-    },
-    {
-      title: '上课地点',
-      align: "left",
-      width: '100px',
-      key: 'skdd'
-    },
-    {
-      title: '上课周次',
-      align: "left",
-      width: '100px',
-      key: 'jkzc_dictText'
-    },
-    {
-      title: '节次',
-      align: "left",
-      width: '70px',
-      key: 'hh_dictText'
-    },
-    {
-      title: '星期',
-      align: "left",
-      width: '70px',
-      key: 'week_dictText'
-    },
-    {
-      title: '学分',
-      align: "left",
-      width: '50px',
-      key: 'xf'
-    },
 
-    {
-      title: '是否出镜',
-      key: 'sfcj',
-      type: JVxeTypes.selectSearch,
-      width: 100,
-      options: [
-        { label: '是', value: 0, },
-        { label: '否', value: 1, },
-      ],
-    },
-    {
-      title: '上课形式',
-      key: 'skxs',
-      type: JVxeTypes.selectSearch,
-      width: 100,
-      options: [
-        { label: '线上', value: 0, },
-        { label: '线下', value: 1, },
-        { label: '线上线下混合', value: 2, },
-      ],
-    },
-
-  // {
-  //   title: '是否出镜',
-  //   align: "center",
-  //   dataIndex: 'sfcj',
-  //   edit: true,
-  //   editComponent: 'Select',
-  //   editComponentProps: {
-  //     options: [
-  //       { label: '是', value: 0, },
-  //       { label: '否', value: 1, },
-  //     ],
-  //   },
-  // },
-
-
-  // {
-  //   title: '上课形式',
-  //   align: "center",
-  //   dataIndex: 'skxs',
-  //   edit: true,
-  //   editComponent: 'Select',
-  //   editComponentProps: {
-  //     options: [
-  //       { label: '线上', value: 0, },
-  //       { label: '线下', value: 1, },
-  //       { label: '线上线下混合', value: 2, },
-  //     ],
-  //   },
-  // },
-
-  ]);
   const dataSource = ref<any[]>([]);
   const pagination = reactive({
     current: 1,
@@ -287,243 +123,115 @@
     total: 0,
   });
 
-  // randomPage(pagination.current, pagination.pageSize, true);
+  const queryParam = ref<any>({ });
+  const filterInfo = ref<any>({ xnxq: '2022-2023-2' });
+  const registerModal = ref();
 
-  // 当分页参数变化时触发的事件
+  const labelCol = reactive({ xs: { span: 24 }, sm: { span: 7 }, });
-  // function handlePageChange(...e) {
+  const wrapperCol = reactive({ xs: { span: 24 }, sm: { span: 16 }, });
-  //   alert('????')
-  //   console.log('handlePageChange','?????????');
-  //   //{current, pageSize }
-  //   console.log('handlePageChange',e);
 
-    // 重新赋值
+  const { createMessage } = useMessage();
-    // pagination.current = current;
-    // pagination.pageSize = pageSize;
-    // 查询数据
-    // loadData(1);
-    // randomPage(event.current, event.pageSize, true);
-  // }
 
-  // function save() {
+  //--------------------------------------变量区END------------------------------------------------------------------------
-    // console.log('save',...data);
+  //--------------------------------------初始化---------------------------------------------------------------------------
-  // }
-  // function added(...data) {
-  //   console.log('added',...data);
-  // }
-  // function removed(...data) {
-  //   console.log('removed',...data);
-  // }
-  // function inserted(...data) {
-  //   console.log('inserted',...data);
-  // }
-  // function dragged(...data) {
-  //   console.log('dragged',...data);
-  // }
-  function selectRowChange({ selectedRowIds, selectedRows: rows, $table }) {
-
-    console.log(`🚀 --------------------------------------------------------------------🚀`);
-    console.log(`🚀 ~ file: KcKechengbiaoList.vue:323 ~ selectRowChange ~ rows:`, rows,selectedRows);
-    console.log(`🚀 --------------------------------------------------------------------🚀`);
-
-    if(rows && rows[0]){
-      selectedRows.value = Array<never>(rows[0])
-    }else{
-      selectedRows.value = [];
-    }
-    // console.log('selectRowChange',selectedRowIds,rows, tableRef);
-    // //action == selected
-
-    // if(rows && rows.length){
-    //   let id = rows[0]?.id
-    //   // let { row } = tableRef.value!.getIfRowById(id)
-    //   let row = dataSource.value.filter(x => x.id == id);
-
-    //   console.log(`🚀 ------------------------------------------------------------------🚀`);
-    //   console.log(`🚀 ~ file: KcKechengbiaoList.vue:330 ~ selectRowChange ~ row:`, row);
-    //   console.log(`🚀 ------------------------------------------------------------------🚀`);
-
-    //   $table.clearCheckboxRow().then(() => {
-    //     $table.setCheckboxRow(row,true);
-    //   })
-
-      // console.log(`🚀 ------------------------------------------------------------------🚀`);
-      // console.log(`🚀 ~ file: KcKechengbiaoList.vue:329 ~ selectRowChange ~ row:`, row);
-      // console.log(`🚀 ------------------------------------------------------------------🚀`);
-
-    // }
-    // tableRef.value!.toggleCheckboxRow(rows[0])
-
-    // if(selectedRowIds.length == 2){
-    //   selectedRowKeys.value = Array<never>(selectedRowIds[0]);
-    //   selectedRows.value = Array<never>(rows[0]);
-    // }else{
-    //   selectedRowKeys.value = selectedRowIds[0];
-    //   selectedRows.value = rows[0];
-    // }
 
 
-  }
-  function handlePageChange(event) {
-    console.log('pageChange',event);
-    // 重新赋值
-    pagination.current = event.current;
-    pagination.pageSize = event.pageSize;
-    //查询数据
-    loadData(null);
-  }
-  function valueChange({ value, col, row }) {
-    // console.log('valueChange',...data);
-    //异步改数据
-    // temp1.value
-    let key = col?.key
-    let id = row?.id
-    saveByCell({ value, key, id })
-  }
-
-  /** 获取值，忽略表单验证 */
-  function handleTableGet() {
-    const values = tableRef.value!.getTableData();
-    console.log('获取值:', { values });
-    createMessage.success('获取值成功，请看控制台输出');
-  }
-
-  /* 随机生成分页数据 */
-  // function randomPage(current, pageSize, $loading = false) {
-  //   if ($loading) {
-  //     loading.value = true;
-  //   }
-  //   let begin = Date.now();
-  //   let values: any[] = [];
-  //   for (let i = 0; i < pageSize; i++) {
-  //     let radio = random(0, 2);
-  //     values.push({
-  //       id: buildUUID(),
-  //       select_dict_search: ['admin', '', 'jeecg'][random(0, 2)],
-  //       progress: random(0, 100),
-  //       radio: radio ? radio.toString() : null,
-  //     });
-  //   }
-  //   dataSource.value = values;
-  //   let end = Date.now();
-  //   let diff = end - begin;
-  //   if ($loading && diff < pageSize) {
-  //     setTimeout(() => (loading.value = false), pageSize - diff);
-  //   }
-  // }
-
-
-  const selectedRows = ref([]);
-  const selectedRowKeys = ref([]);
-  // const reload = () => {}
   onMounted(() => {
     loadData(1);
   })
-  function reload() {
+
-    //自己写吧。。
+  watch(() => props.searchParam, async (newRow, oldRow) => {
-    loadData(1);
+    reload();
-  }
+  });
-  function loadData(pageNo:any | null | undefined){
+  //--------------------------------------初始化END---------------------------------------------------------------------------
+  //--------------------------------------与后台交互---------------------------------------------------------------------------
+  function loadData(pageNo?){
     loading.value = true;
     if(pageNo == 1){
       pagination.current = 1;
     }
     //参数
     let { current, pageSize } = pagination;
-    let param = { column: 'createTime', order: 'desc', pageNo: current, pageSize, ...queryParam.value, ...filterInfo.value }
+    let param = { column: 'createTime', order: 'desc', pageNo: current, pageSize, ...queryParam.value, ...filterInfo.value, ...props.searchParam }
-    // let param = Object.assign({ column: 'createTime', order: 'desc', current, pageSize },filterObj(queryParam.value));
+    list(filterObj(param)).then(res => {
-    list(param).then(res => {
+      dataSource.value = res?.records??[];
-      console.log(`🚀 -------------------------------------------------------🚀`);
+      pagination.total = res?.total??0;
-      console.log(`🚀 ~ file: KcKechengbiaoList.vue:323 ~ list ~ res:`, res);
+      //如果是隐藏模式，则直接选中
-      console.log(`🚀 -------------------------------------------------------🚀`);
+      if(props.isNoSearch){
-      dataSource.value = res?.records??[]
+        selectedRows.value = Array<never>(dataSource.value[0]);
-      pagination.total = res?.total??0
+        console.log('tableRef =>',tableRef);
+
+      }
+
     }).finally(() => {
       // 这里是无论成功或失败都会执行的方法，在这里关闭loading
       loading.value = false;
     });
   }
 
+  // 部分数据保存
+  function saveByCell({ value, key, id }) {
+    createMessage.loading({ content: `正在保存!`, key: '_save_fake_data', duration: 0, });
+    const params = { id, };
+    params[key] = value;
+    return new Promise((resolve) => {
+      saveOrUpdate(params ,true).then(res => {
+        if (res.success) {
+          createMessage.success({ content: `记录已保存`, key: '_save_fake_data', duration: 2, });
+          resolve(true);
+        } else {
+          createMessage.error({ content: `保存失败：${res.message}`, key: '_save_fake_data', duration: 2, });
+          resolve(false);
+        }
+      });
+    });
+  }
+  //--------------------------------------与后台交互---------------------------------------------------------------------------
+  //--------------------------------------表格功能事件---------------------------------------------------------------------------
+  function selectRowChange({ selectedRows: rows, $table }) {
+    if(rows && rows[0]){
+      selectedRows.value = Array<never>(rows[0])
+    }else{
+      selectedRows.value = [];
+    }
+  }
+  function handlePageChange(event) {
+    // 重新赋值,分页
+    pagination.current = event.current;
+    pagination.pageSize = event.pageSize;
+    //查询数据
+    loadData();
+  }
+  function valueChange({ value, col, row }) {
+    let key = col?.key
+    let id = row?.id
+    //异步改数据
+    saveByCell({ value, key, id })
+  }
+  //--------------------------------------表格功能事件---------------------------------------------------------------------------
+  //--------------------------------------按钮以及其他功能---------------------------------------------------------------------------
 
-  // async function loadData() {
+  /**
-  //   loading.value = true;
+   * 查询
-  //   // 调用查询数据接口
+   */
-  //   await defHttp
+   function searchQuery() {
-  //     .get({
+    reload();
-  //       // 请求地址
+  }
-  //       url: Api.getData,
-  //       // 封装查询条件
-  //       params: {
-  //         pageNo: pagination.current,
-  //         pageSize: pagination.pageSize,
-  //       },
-  //     })
-  //     .then((result) => {
-  //       // 后台查询回来的 total，数据总数量
-  //       pagination.total = result.total;
-  //       // 将查询的数据赋值给 dataSource
-  //       dataSource.value = result.records;
-  //       // 重置选择
-  //       selectedRows.value = [];
-  //     })
-  //     .finally(() => {
-  //       // 这里是无论成功或失败都会执行的方法，在这里关闭loading
-  //       loading.value = false;
-  //     });
-  // }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 
-  const queryParam = ref<any>({ });
+  //刷新列表数据
-  const filterInfo = ref<any>({ xnxq: '2022-2023-2' });
+  function reload() {
-  //kkdwid, week, hh, kcbh
+    loadData(1);
-  const toggleSearchStatus = ref<boolean>(false);
+  }
-  const registerModal = ref();
-
-  //注册table数据
-  // const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  //   tableProps: {
-  //     title: '课程管理-主表',
-  //     api: list,
-  //     columns,
-  //     canResize:false,
-  //     useSearchForm: false,
-  //     showIndexColumn: true,
-  //     showActionColumn: false,
-  //     clickToRowSelect: true,
-  //     rowSelection: {
-  //       type: 'radio'
-  //     },
-  //     pagination: {
-  //       pageSize: 5
-  //     },
-  //     actionColumn: {
-  //       width: 120,
-  //       fixed: 'right',
-  //     },
-  //     beforeFetch: (params) => {
-  //       params.column = '',params.order = '';//新生成的默认不带排序
-  //       return Object.assign(params, { ...queryParam.value, ...filterInfo.value});
-  //     },
-  //   },
-  //   exportConfig: {
-  //     name: "课程管理-主表",
-  //     url: getExportUrl,
-  //   },
-	// importConfig: {
-	//   url: getImportUrl,
-	//   success: handleSuccess
-	// },
-  // });
-  // const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
-  const labelCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 7 },
-  });
-  const wrapperCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 16 },
-  });
-
-  const { createMessage } = useMessage();
 
   /**
    * 新增事件
@@ -546,21 +254,6 @@
     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);
-  }
-
   /**
    * 批量删除事件
    */
@@ -580,141 +273,7 @@
     (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 handleEditEnd({ record, index, key, value }: Recordable) {
-    console.log(record, index, key, value);
-    return false;
-  }
-
-  // 模拟将指定数据保存
-  function saveByCell({ value, key, id }) {
-    createMessage.loading({
-      content: `正在保存!`,
-      key: '_save_fake_data',
-      duration: 0,
-    });
-    const params = {
-      id,
-    };
-    params[key] = value;
-    return new Promise((resolve) => {
-      saveOrUpdate(params ,true).then(res => {
-        if (res.success) {
-          createMessage.success({
-            content: `记录已保存`,
-            key: '_save_fake_data',
-            duration: 2,
-          });
-          resolve(true);
-        } else {
-          createMessage.error({
-            content: `保存失败：${res.message}`,
-            key: '_save_fake_data',
-            duration: 2,
-          });
-          resolve(false);
-        }
-      });
-    });
-  }
-
-  async function beforeEditSubmit({ record, index, key, value }) {
-    console.log('单元格数据正在准备提交', { record, index, key, value });
-    return await saveByCell({ id: record.id, key, value });
-  }
-
-  function handleEditCancel() {
-    console.log('cancel');
-  }
-
-
-  // function handleEditEnd({ record, index, key, value }: Recordable) {
-  //   console.log(record, index, key, value);
-  //   return false;
-  // }
-
-  // async function beforeEditSubmit({ record, index, key, value }) {
-  //   console.log('编辑后回调', record, index, key, value );
-  //   createMessage.loading({
-  //     content: `正在模拟保存${key}`,
-  //     key: '_save_fake_data',
-  //     duration: 0,
-  //   });
-  //   return await new Promise((resolve) => {
-  //     setTimeout(() => {
-  //       if (value === '') {
-  //         createMessage.error({
-  //           content: '保存失败：不能为空',
-  //           key: '_save_fake_data',
-  //           duration: 2,
-  //         });
-  //         resolve(false);
-  //       } else {
-  //         createMessage.success({
-  //           content: `记录的${key}已保存`,
-  //           key: '_save_fake_data',
-  //           duration: 2,
-  //         });
-  //         resolve(true);
-  //       }
-  //     }, 2000);
-  //   });
-  // }
-
-  // function handleEditCancel() {
-  //   console.log('cancel');
-  // }
-
-
-
-
 
 </script>
 

src/views/kc/ktgl/KcKetangbiaoList.vue

@@ -114,6 +114,7 @@
       canResize:false,
       useSearchForm: false,
       showActionColumn: false,
+      clickToRowSelect: true,
       rowSelection: {
         type: 'radio'
       },

src/views/site/utils/index.ts

@@ -1,14 +1,41 @@
 import { defHttp } from '/@/utils/http/axios';
+import { useUserStore } from '/@/store/modules/user';
+
+
+/**
+ * 项目名称
+ */
+export const projectName = import.meta.env.VITE_GLOB_APP_TITLE;
+
+/**
+ * 是否开启单点登录
+ */
+export const isOpenSSO = import.meta.env.VITE_GLOB_APP_OPEN_SSO;
 
 export const getUserId = () => {
-  return '2022010920';
+  if(isOpenSSO){
+    const { userInfo } = useUserStore();
+    //正常取用户
+    return userInfo?.username;
+  }else{
+    //固定某值
+    return '2016900057';
+  }
 }
 
+//S:学生 T:教师
 export const getUserSf = () => {
-  return 'S';
+  const { userInfo } = useUserStore();
+  if(userInfo?.userIdentity == 1){
+    return 'S';
+  }else if(userInfo?.userIdentity == 2){
+    return 'T';
+  }
 }
 
 
 // export const getSysConfig = () => defHttp.get({ url: '/kcSysConfig/kcSysConfig/queryById', params:{id:'1'} })
-export const getSysConfig = () => ({bxqkssj:'2023-02-19',bxqjssj:'2023-07-19'})
+export const getSysConfig = () => {
- 
+  const { sysConfigInfo } = useUserStore();
+  return sysConfigInfo;
+}

types/store.d.ts

@@ -57,3 +57,32 @@ export interface BeforeMiniState {
   menuMode?: MenuModeEnum;
   menuType?: MenuTypeEnum;
 }
+
+export interface SysConfigInfo {
+	/**主键*/
+  id?: string;
+	/**创建人*/
+  createBy: string;
+	/**创建日期*/
+  createTime?: string;
+	/**更新人*/
+  updateBy: string;
+	/**更新日期*/
+  updateTime?: string;
+	/**所属部门*/
+  sysOrgCode?: string;
+	/**本学期课程开始时间*/
+  bxqkssj?: string;
+	/**本学期课程结束时间*/
+  bxqjssj?: string;
+	/**预留字段1*/
+  flag1?: string;
+	/**预留字段2*/
+  flag2?: string;
+	/**预留字段3*/
+  flag3?: string;
+	/**预留字段4*/
+  flag4?: string;
+	/**预留字段5*/
+  flag5?: string;
+}