2023年8月12日 修复问题

src/hooks/system/useListPage.ts

@@ -79,12 +79,16 @@ export function useListPage(options: ListPageOptions) {
       //如果参数不为空，则整合到一起
       //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId
       if (params) {
-        Object.keys(params).map((k) => {
-          let temp = (params as object)[k];
-          if (temp) {
-            paramsForm[k] = unref(temp);
-          }
-        });
+        if(typeof params == 'function'){
+          paramsForm = { ...paramsForm, ...params()}
+        }else{
+          Object.keys(params).map((k) => {
+            let temp = (params as object)[k];
+            if (temp) {
+              paramsForm[k] = unref(temp);
+            }
+          });
+        }
       }
       //update-end-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId
       if (selectedRowKeys.value && selectedRowKeys.value.length > 0) {

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

@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'zt'
   },
   {
-    title: '每学期应听课次数',
+    title: '本学期应听课次数',
     align: "center",
     dataIndex: 'ytkcs'
   },
@@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'yskcs'
   // },
   {
-    title: '每学期听课次数',
+    title: '本学期已听课次数',
     align: "center",
     dataIndex: 'tkxttj'
   },

src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue

@@ -136,6 +136,7 @@
     exportConfig: {
       name: "人员信息",
       url: getExportUrl,
+      params: () => Object.assign({},queryParam.value)
     },
 	importConfig: {
 	  url: getImportUrl,
@@ -290,8 +291,6 @@
   }
 
 
-
-
 </script>
 
 <style lang="less" scoped>

src/views/kc/pktj/pktjb/pktjb.vue

@@ -32,6 +32,7 @@
                 valueFormat="YYYY-MM-DD"
                 :placeholder="'请选择开始时间'"
                 v-model:value="queryParam.startTime"
+                style="width:100%;"
               ></a-date-picker>
             </a-form-item>
           </a-col>
@@ -42,6 +43,7 @@
                 valueFormat="YYYY-MM-DD"
                 :placeholder="'请选择结束时间'"
                 v-model:value="queryParam.endTime"
+                style="width:100%;"
               ></a-date-picker>
             </a-form-item>
           </a-col>

src/views/kc/statistics/evaluationList/beiPengJiaIndex.vue

@@ -211,7 +211,8 @@ watch(() => xqDictTag.value?.dictOptions,(d) => {
 
 function loadData(pageNo?){
   loading.value = true;
-  let params = { pageNo: 0, pageSize: 10, findByBeiTkkdwmc: true, findGh: getUserId() };
+  queryParam.value = {...queryParam.value, findByBeiTkkdwmc: !roleList.value.filter(x => x.roleCode == 'admin' ).length, findGh: getUserId() }
+  let params = { pageNo: 0, pageSize: 10 };
   params.pageNo = ipagination.value.current;
   params.pageSize = ipagination.value.pageSize;
   if(pageNo === 1){

src/views/kc/statistics/evaluationList/index.vue

@@ -213,7 +213,8 @@ watch(() => xqDictTag.value?.dictOptions,(d) => {
 
 function loadData(pageNo?){
   loading.value = true;
-  let params = { pageNo: 0, pageSize: 10, findByPkdwmc: !roleList.value.filter(x => x.roleCode == 'admin' ).length, findGh: getUserId() };
+  queryParam.value = {...queryParam.value, findByPkdwmc: !roleList.value.filter(x => x.roleCode == 'admin' ).length, findGh: getUserId() }
+  let params = { pageNo: 0, pageSize: 10 };
   params.pageNo = ipagination.value.current;
   params.pageSize = ipagination.value.pageSize;
   if(pageNo === 1){

src/views/site/tingKeZuJi/list.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"> -->
-  <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" style="height: 105px;">
+  <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" style="min-height: 105px;">
     <template #renderItem="{ item }">
       <a-list-item>
         <a-list-item-meta>

src/views/site/tingKeZuJi/listPkzj.vue

@@ -1,45 +1,50 @@
 <template>
   <!-- <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3, xxxl: 2 }"> -->
-  <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" style="height: 105px;" >
-    <template #renderItem="{ item }">
-      <a-list-item>
-        <a-list-item-meta>
-          <template #title>
-            <div class="wenZiJiaCu fs1d1r">
-              评价了&nbsp;{{ item.kkdw }}&nbsp;{{item.skjs}}&nbsp;主讲的&nbsp;《{{ item.kcmc }}》
-            </div>
-          </template>
-          <template #description>
-            <!-- -{{ item }}- -->
-            <div class="wenZiJiaCu">
-              <span v-if="item.score" class="hand" style="color: #337ab7;" @click="viewModal.view(item)">已评分：{{ item.score }}分</span>
+  <div>
+    <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" style="min-height: 105px;" >
+      <template #renderItem="{ item }">
+        <a-list-item>
+          <a-list-item-meta>
+            <template #title>
+              <div class="wenZiJiaCu fs1d1r">
+                评价了&nbsp;{{ item.kkdw }}&nbsp;{{item.skjs}}&nbsp;主讲的&nbsp;《{{ item.kcmc }}》
+              </div>
+            </template>
+            <template #description>
+              <!-- -{{ item }}- -->
+              <div class="wenZiJiaCu">
+                <span v-if="item.score" class="hand" style="color: #337ab7;" @click="viewModal.view(item)">已评分：{{ item.score }}分</span>
+
+                <span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">【</span>
+                <span v-if="item.source=='0'" class="hand" style="padding-left: .5rem;color: #337ab7;">课程中心</span>
+                <span v-else-if="item.source=='1'" class="hand" style="padding-left: .5rem;color: #337ab7;">老系统</span>
+                <span v-else-if="item.source=='2'" class="hand" style="padding-left: .5rem;color: #337ab7;">政务大厅</span>
+                <span v-else-if="item.source=='3'" class="hand" style="padding-left: .5rem;color: #337ab7;">纸质评价</span>
+                <span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">--</span>
+                <span v-if="item.evaluationver=='1'" class="hand" style="padding-left: .5rem;color: #337ab7;">原始数据</span>
+                <span v-else-if="item.evaluationver=='2'" class="hand" style="padding-left: .5rem;color: #337ab7;">线上听课</span>
+                <span v-else-if="item.evaluationver=='3'" class="hand" style="padding-left: .5rem;color: #337ab7;">听课记录</span>
+                <span v-else-if="item.evaluationver=='4'" class="hand" style="padding-left: .5rem;color: #337ab7;">同行专家</span>
+                <span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">】</span>
+              </div>
+            </template>
+            <template #avatar>
+              <div class="wenZiJuZhong dateAndTime">
+                <!-- <TeamOutlined/> -->
+                <i class="fas fa-users" />
+                <div>{{ item.shijian }}</div>
+                <div style="color: #1ab394;">{{ item.tkrq }}</div>
+              </div>
+            </template>
+          </a-list-item-meta>
+        </a-list-item>
+      </template>
+    </a-list>
+  </div>
+  <div>
+    <a-pagination v-model="current" :total="total" show-less-items @change="handlePageChange" v-if="props.flagPage" style="text-align: right;" :hideOnSinglePage="true"/>
+  </div>
 
-              <span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">【</span>
-              <span v-if="item.source=='0'" class="hand" style="padding-left: .5rem;color: #337ab7;">课程中心</span>
-              <span v-else-if="item.source=='1'" class="hand" style="padding-left: .5rem;color: #337ab7;">老系统</span>
-              <span v-else-if="item.source=='2'" class="hand" style="padding-left: .5rem;color: #337ab7;">政务大厅</span>
-              <span v-else-if="item.source=='3'" class="hand" style="padding-left: .5rem;color: #337ab7;">纸质评价</span>
-              <span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">--</span>
-              <span v-if="item.evaluationver=='1'" class="hand" style="padding-left: .5rem;color: #337ab7;">原始数据</span>
-              <span v-else-if="item.evaluationver=='2'" class="hand" style="padding-left: .5rem;color: #337ab7;">线上听课</span>
-              <span v-else-if="item.evaluationver=='3'" class="hand" style="padding-left: .5rem;color: #337ab7;">听课记录</span>
-              <span v-else-if="item.evaluationver=='4'" class="hand" style="padding-left: .5rem;color: #337ab7;">同行专家</span>
-              <span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">】</span>
-            </div>
-          </template>
-          <template #avatar>
-            <div class="wenZiJuZhong dateAndTime">
-              <!-- <TeamOutlined/> -->
-              <i class="fas fa-users" />
-              <div>{{ item.shijian }}</div>
-              <div style="color: #1ab394;">{{ item.tkrq }}</div>
-            </div>
-          </template>
-        </a-list-item-meta>
-      </a-list-item>
-    </template>
-  </a-list>
-  <a-pagination v-model="current" :total="total" show-less-items @change="handlePageChange" v-if="props.flagPage" style="text-align: right;" :hideOnSinglePage="true"/>
   <addModalPage ref="tingKeZuJiAddModal"/>
   <viewModalPage ref="viewModal"/>
   <fwdtModalPage ref="fwdtModal"/>

vite.config.ts

@@ -65,6 +65,13 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       target: 'es2015',
       cssTarget: 'chrome80',
       outDir: OUTPUT_DIR,
+      //多页面入口，减少等待
+      // rollupOptions: {
+      //   input: {
+      //     '/': resolve(__dirname, '/site.html'),
+      //     admin: resolve(__dirname, '/index.html')
+      //   },
+      // },
       terserOptions: {
         compress: {
           keep_infinity: true,