修改bug

src/main.ts

@@ -16,7 +16,7 @@ import { setupStore } from '/@/store';
 import { setupGlobDirectives } from '/@/directives';
 import { setupI18n } from '/@/locales/setupI18n';
 import { registerGlobComp } from '/@/components/registerGlobComp';
-// import { registerThirdComp } from '/@/settings/registerThirdComp';
+import { registerThirdComp } from '/@/settings/registerThirdComp';
 import { useSso } from '/@/hooks/web/useSso';
 // 注册online模块lib
 import { registerPackages } from '/@/utils/monorepo/registerPackages';
@@ -61,10 +61,10 @@ async function bootstrap() {
   setupGlobDirectives(app);
 
   // 配置全局错误处理
-  // setupErrorHandle(app);
+  setupErrorHandle(app);
 
   // 注册第三方组件
-  // await registerThirdComp(app);
+  await registerThirdComp(app);
 
   // 当路由准备好时再执行挂载( https://next.router.vuejs.org/api/#isready)
   await router.isReady();

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

@@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
+  {
+    title: '学年学期',
+    align: "center",
+    dataIndex: 'xqxn'
+  },
   {
     title: '学院',
     align: "center",

src/views/kc/kcXqxnHistory/KcXqxnHistory.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '学期学年',
+    title: '学年学期',
     align: "center",
     dataIndex: 'title'
   },
@@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
   {
-    label: "学期学年",
+    label: "学年学期",
     field: 'title',
     component: 'Input',
     colProps: {span: 6},
@@ -52,7 +52,7 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '学期学年',
+    label: '学年学期',
     field: 'title',
     component: 'Input',
   },

src/views/kc/kcXqxnHistory/components/KcXqxnHistoryForm.vue

@@ -3,8 +3,8 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="学期学年" v-bind="validateInfos.title">
+          <a-form-item label="学年学期" v-bind="validateInfos.title">
-            <a-input v-model:value="formData.title" placeholder="请输入学期学年" :disabled="disabled"></a-input>
+            <a-input v-model:value="formData.title" placeholder="请输入学年学期" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">

src/views/kc/kcZzThpjb/KcZzThpjb.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '学期学年',
+    title: '学年学期',
     align: "center",
     dataIndex: 'xqxn'
   },

src/views/kc/kcZzXstkb/KcZzXstkb.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '学期学年',
+    title: '学年学期',
     align: "center",
     dataIndex: 'xqxn'
   },

src/views/kc/kcZzYbtkb/KcZzYbtkb.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '学期学年',
+    title: '学年学期',
     align: "center",
     dataIndex: 'xqxn'
   },

src/views/kc/pktj/pkmxb/pkmxb.data.ts

@@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
+  {
+    title: '学年学期',
+    align: "center",
+    dataIndex: 'xqxn',
+  },
   {
     title: '工号',
     align: "center",

src/views/kc/szkc/KcKechengbiaoList.vue

@@ -39,8 +39,8 @@
 
     <vxe-toolbar>
       <template #buttons>
-        <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="handleAdd" preIcon="ant-design:plus-outlined"  > 新增</a-button>
-        <a-button type="primary" class="pl1r" @click="handleYichu" preIcon="ant-design:plus-outlined" v-if="!props.isNoSearch"> 移除</a-button>
+        <a-button type="primary" class="pl1r" @click="handleYichu" preIcon="ant-design:plus-outlined" > 移除</a-button>
       </template>
     </vxe-toolbar>
     <JVxeTable
@@ -138,6 +138,7 @@ import { JDictSelectTag,JInput } from '/@/components/Form';
     let { current, pageSize } = pagination;
     let param = {szkc:'1', column: 'createTime', order: 'desc', pageNo: current, pageSize, ...queryParam.value, ...filterInfo.value, ...props.searchParam }
     list(filterObj(param)).then(res => {
+      console.log(`🚀 ~ file: KcKechengbiaoList.vue:141 ~ list ~ res:`, res)
       dataSource.value = res?.records??[];
       pagination.total = res?.total??0;
       //如果是隐藏模式，则直接选中

src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLog.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '学期学年',
+    title: '学年学期',
     align: "center",
     dataIndex: 'xqxn'
   },

src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLogList.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
-            <a-form-item label="学期学年">
+            <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"/>
+              <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 :lg="8">

src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLog.data.ts

@@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
+  {
+    title: '学年学期',
+    align: "center",
+    dataIndex: 'xqxn'
+  },
   {
     title: '编号',
     align: "center",

src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLogList.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
-            <a-form-item label="学期学年">
+            <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"/>
+              <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 :lg="8">

src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts

@@ -6,7 +6,7 @@ import { log } from 'console';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '学期学年',
+    title: '学年学期',
     align: "center",
     dataIndex: 'xqxn'
   },
@@ -153,7 +153,7 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
   {
-    label: "学期学年",
+    label: "学年学期",
     field: 'xqxn',
     component: 'Input',
     colProps: {span: 6},

src/views/kc/xxhbtkxx/XxhbtkxxList.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
-            <a-form-item label="学期学年">
+            <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"/>
+              <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 :lg="8">

src/views/site/kxstkkt/zzsk.vue

@@ -93,14 +93,14 @@ function loadData(num?) {
     pageNo.value = 1
     listData.value = [];
   }
-  // queryParam.value.pageSize = '4'
+  queryParam.value.pageSize = '4'
-  // queryParam.value.pageNo = pageNo
+  queryParam.value.pageNo = pageNo
-  // queryParam.value.sfyzhjs = '1'
+  queryParam.value.sfyzhjs = '1'
-  // queryParam.value.hh = queryParam.value.jieci+","+queryParam.value.jieci.split("、").join(',')
+  queryParam.value.hh = queryParam.value.jieci+","+queryParam.value.jieci.split("、").join(',')
-  // queryParam.value.skrq = queryParam.value.ywTime
+  queryParam.value.skrq = queryParam.value.ywTime
-  // queryParam.value.userid = getUserId()
+  queryParam.value.userid = getUserId()
-  // queryParam.value.skxs = 1
+  queryParam.value.skxs = 1
-  // queryParam.value.type = 1
+  queryParam.value.type = 1
   queryParam.value.ywskxs = ''
   console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam)
 

src/views/site/studentJrkb/index copy.vue

@@ -83,7 +83,7 @@ onMounted(() => {
   let skrq = formatToDate(new Date());
   sjtime.value = skrq
   sjtitle.value = formatToWeekOne(new Date());
-  list({ skrq,userId:getUserId() }).then(res => {
+  list({ skrq,userid:getUserId() }).then(res => {
     console.log(`🚀 ~ file: index.vue:83 ~ list ~ res:`, res)
     listData.value = res?.records;
     console.log(`🚀 ~ file: index.vue:85 ~ list ~ listData.value:`, listData.value)

src/views/site/tingKeZuJi/more.vue

@@ -13,7 +13,7 @@
             </div>
             <a-row :gutter="[16,16]">
               <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
-                <j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学期学年" style="width: 100%;"/>
+                <j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学年学期" style="width: 100%;"/>
               </a-col>
               <!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
                 <a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" />

src/views/site/tingKeZuJi/pkMore.vue

@@ -13,7 +13,7 @@
             </div>
             <a-row :gutter="[16,16]">
               <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
-                <j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学期学年" style="width: 100%;"/>
+                <j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学年学期" style="width: 100%;"/>
               </a-col>
               <!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
                 <a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.upDate_begin" style="width: 100%" />

src/views/site/yuYueKeCheng/more.vue

@@ -18,7 +18,7 @@
           
           <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" >
             <a-form-item label="" style="padding: 10px;">
-                <j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学期学年" style="width: 100%;"/>
+                <j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学年学期" style="width: 100%;"/>
               </a-form-item>
               </a-col>
           <!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">