2023年8月15日 修复评价量表（x2）导出时数据量错误的问题，修复初始化查询多了一次导致数据对不上的问题

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

@@ -79,8 +79,8 @@
               <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 v-if="roleList.filter(x => x.roleCode == 'admin' ).length" type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()" style="margin-left: 8px">导出</a-button>
+                <a-button v-if="!roleList.filter(x => x.roleCode == 'admin' ).length" admin type="primary" preIcon="ant-design:export-outlined" @click="onExportXls2()" style="margin-left: 8px">导出</a-button>
-                <a-button v-else type="primary" preIcon="ant-design:export-outlined" @click="onExportXls2()" style="margin-left: 8px">导出</a-button>
+                <a-button v-else type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()" style="margin-left: 8px">导出</a-button>
                 <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'"/>
@@ -158,7 +158,7 @@ const queryParam:Ref<any> = ref({});
 const { createMessage } = useMessage();
 
 onMounted(() => {
-  loadData(1);
+  //loadData(1);
 });
 
 const roleList = computed(() => getUserInfo()?.roleList??[]);
@@ -200,9 +200,11 @@ const xqDictTag = ref();
 watch(() => xqDictTag.value?.dictOptions,(d) => {
   if(d){
     queryParam.value.xqxn = d[0]?.value
-    nextTick(() => {
+    if(queryParam.value.xqxn){
-      loadData(1);
+      nextTick(() => {
-    })
+        loadData(1);
+      })
+    }
   }
 },{
   deep:true,
@@ -262,7 +264,10 @@ function onExportXls() {
   let url = '/statistics/exportEvaluationXls';
   if (url) {
     let title = '评价量表统计';
-    return handleExportXls(title as string, url, queryParam.value);
+    let param = Object.assign({},queryParam.value);
+    delete param.findByPkdwmc;
+    delete param.findByBeiTkkdwmc;
+    return handleExportXls(title as string, url, param);
   } else {
     createMessage.warn('没有传递 export.url 参数');
     return Promise.reject();

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

@@ -79,8 +79,8 @@
               <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 v-if="roleList.filter(x => x.roleCode == 'admin' ).length" type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()" style="margin-left: 8px">导出</a-button>
+                <a-button v-if="!roleList.filter(x => x.roleCode == 'admin' ).length" admin type="primary" preIcon="ant-design:export-outlined" @click="onExportXls2()" style="margin-left: 8px">导出</a-button>
-                <a-button v-else type="primary" preIcon="ant-design:export-outlined" @click="onExportXls2()" style="margin-left: 8px">导出</a-button>
+                <a-button v-else type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()" style="margin-left: 8px">导出</a-button>
                 <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'"/>
@@ -160,7 +160,7 @@ const queryParam:Ref<any> = ref({});
 const { createMessage } = useMessage();
 
 onMounted(() => {
-  loadData(1);
+  //loadData(1);
 });
 
 const roleList = computed(() => getUserInfo()?.roleList??[]);
@@ -202,9 +202,11 @@ const xqDictTag = ref();
 watch(() => xqDictTag.value?.dictOptions,(d) => {
   if(d){
     queryParam.value.xqxn = d[0]?.value
-    nextTick(() => {
+    if(queryParam.value.xqxn){
-      loadData(1);
+      nextTick(() => {
-    })
+        loadData(1);
+      })
+    }
   }
 },{
   deep:true,
@@ -260,11 +262,14 @@ function openEve(record){
 const { handleExportXls } = useMethods();
 
 // 导出 excel
-function onExportXls() {
+function onExportXls() {//管理员
   let url = '/statistics/exportEvaluationXls';
   if (url) {
     let title = '评价量表统计';
-    return handleExportXls(title as string, url, queryParam.value);
+    let param = Object.assign({},queryParam.value);
+    delete param.findByPkdwmc;
+    delete param.findByBeiTkkdwmc;
+    return handleExportXls(title as string, url, param);
   } else {
     createMessage.warn('没有传递 export.url 参数');
     return Promise.reject();