From 021ff808595bc3d514e158df1cae156e0b894179 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 20 Jun 2023 22:54:10 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8820=E6=97=A5=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AF=84=E8=AF=BE=E8=B6=B3=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/tksf/kctkcstj/KcTkcstjList.vue   |  4 +-
 .../site/tingKeZuJi/components/viewForm.vue   |  2 +-
 src/views/site/tingKeZuJi/index.vue           |  2 +-
 src/views/site/tingKeZuJi/list.vue            | 18 +++++----
 src/views/site/tingKeZuJi/listPkzj.vue        | 38 +++++++++++++++----
 src/views/site/tingKeZuJi/more.vue            |  6 ++-
 src/views/site/tingKeZuJi/pkMore.vue          |  9 ++++-
 7 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/views/kc/tksf/kctkcstj/KcTkcstjList.vue b/src/views/kc/tksf/kctkcstj/KcTkcstjList.vue
index 36b42e6..9229c85 100644
--- a/src/views/kc/tksf/kctkcstj/KcTkcstjList.vue
+++ b/src/views/kc/tksf/kctkcstj/KcTkcstjList.vue
@@ -81,8 +81,8 @@
           {{ text }}
         </template>
         <template v-else>
-          {{ text }}
-          <!-- <a @click="openKetangView(record)">{{ text }}</a> -->
+          <!-- {{ text }} -->
+          <a @click="openKetangView(record)">{{ text }}</a>
         </template>
       </template>
       <!--省市区字段回显插槽-->
diff --git a/src/views/site/tingKeZuJi/components/viewForm.vue b/src/views/site/tingKeZuJi/components/viewForm.vue
index 3717452..d2092a7 100644
--- a/src/views/site/tingKeZuJi/components/viewForm.vue
+++ b/src/views/site/tingKeZuJi/components/viewForm.vue
@@ -74,7 +74,7 @@ function view(record){
 
   let params = { pageSize: -1, status: 0, column: 'ordernum', order: 'asc' }
   //回答记录
-  let queryData = defHttp.get({ url: Api.queryResData, params: { userid: record.userid, minkcid: record.ketangbiaoid, evaluationver: record.evaluationver} });
+  let queryData = defHttp.get({ url: Api.queryResData, params: { userid: (record.userid || record.upuserid), minkcid: record.ketangbiaoid, evaluationver: record.evaluationver} });
   //题目
   let queryQue = defHttp.get({ url: Api.que, params: { ...params, evaluationver: record.evaluationver } });
   //答案列表
diff --git a/src/views/site/tingKeZuJi/index.vue b/src/views/site/tingKeZuJi/index.vue
index 719aeea..9228567 100644
--- a/src/views/site/tingKeZuJi/index.vue
+++ b/src/views/site/tingKeZuJi/index.vue
@@ -24,7 +24,7 @@
           <a style="padding-right: 0.5rem;" @click="reloadPkzj()">刷新</a>
           <RouterLink to="/site/pingKeZuJiMore">查看更多</RouterLink>
         </template>
-        <listPkzjPage :queryParam="{ pageSize: 3 ,score:'1', ...pkzjParam }"/>
+        <listPkzjPage :queryParam="{ pageSize: 3 , ...pkzjParam }"/>
       </a-card>
     </a-col>
   </a-row>
diff --git a/src/views/site/tingKeZuJi/list.vue b/src/views/site/tingKeZuJi/list.vue
index f3e4bee..5b4ff2a 100644
--- a/src/views/site/tingKeZuJi/list.vue
+++ b/src/views/site/tingKeZuJi/list.vue
@@ -78,8 +78,9 @@ const fwdtModal = ref();
 const current = ref<number>(0);
 const total = ref<number>(2);
 const loadingList = ref<boolean>(false);
-  
+
 const APagination = Pagination;
+const emit = defineEmits(['changeParam']);
 
 const props = defineProps({
   queryParam: { type: Object, default: () => ({}) },
@@ -100,8 +101,10 @@ onMounted(() => {
 
 watch(
   () => props.queryParam,
-  (v) => {
-    init();
+  (v) => init(),
+  {
+    deep:true,
+    immediate:true,
   }
 );
 
@@ -131,7 +134,7 @@ function txpjFun(item){
     }else{
       tingKeZuJiAddModal.value.view(item)
     }
-    
+
   });
 
 }
@@ -146,15 +149,16 @@ function loadData(){
     total.value = res.total;
     current.value = res.current;
     list.value = res.records
-  loadingList.value = false
+    loadingList.value = false
     // props.queryParam.value = res.total;
   });
 }
 
 function handlePageChange(record){
   console.log(`🚀 ~ file: list.vue:150 ~ handlePageChange ~ record:`, record)
-  props.queryParam.pageNo=record
-  loadData();
+  // props.queryParam.pageNo=record
+  emit('changeParam',record);
+  // loadData();
 }
 
 
diff --git a/src/views/site/tingKeZuJi/listPkzj.vue b/src/views/site/tingKeZuJi/listPkzj.vue
index 007bceb..139e35b 100644
--- a/src/views/site/tingKeZuJi/listPkzj.vue
+++ b/src/views/site/tingKeZuJi/listPkzj.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">
+  <a-list item-layout="horizontal" :data-source="list" :loading="loadingList">
     <template #renderItem="{ item }">
       <a-list-item>
         <a-list-item-meta>
@@ -39,6 +39,7 @@
       </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"/>
@@ -46,6 +47,7 @@
 <script setup lang="ts">
 import { ref, onMounted, watch } from 'vue';
 import { TeamOutlined, FormOutlined } from '@ant-design/icons-vue';
+import { Pagination } from 'ant-design-vue';
 import { getUserId,getSysConfig } from '/@/views/site/utils/index';
 
 import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
@@ -53,15 +55,24 @@ import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
 import fwdtModalPage from '/@/views/site/tingKeZuJi/components/fwdtModal.vue';
 import { defHttp } from '/@/utils/http/axios';
 enum Api {
-  list = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId'
+  // list = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId'
+  list = '/qa/kcEvaluation/queryPkZuJiList'
 }
 
 const tingKeZuJiAddModal = ref();
 const viewModal = ref();
 const fwdtModal = ref();
 
+const current = ref<number>(0);
+const total = ref<number>(2);
+const loadingList = ref<boolean>(false);
+
+const APagination = Pagination;
+const emit = defineEmits(['changeParam']);
+
 const props = defineProps({
   queryParam: { type: Object, default: () => ({}) },
+  flagPage: { type:Boolean,default:false}
 });
 
 
@@ -78,19 +89,32 @@ onMounted(() => {
 
 watch(
   () => props.queryParam,
-  (v) => {
-    init();
+  (v) => init(),
+  {
+    deep:true,
+    immediate:true,
   }
 );
 
 
 function init() {
- console.log('init');
-  listApi({ userid: getUserId(),pj:'1', tingketime: getSysConfig().bxqkssj, ...props.queryParam }).then(res => {
-    list.value = res ?? [];
+  console.log('init');
+  loadingList.value = true
+  listApi({ upuserid: getUserId(),pj:'1', tingketime: getSysConfig().bxqkssj, ...props.queryParam }).then(res => {
+    list.value = res?.records ?? [];
+
+    total.value = res.total;
+    current.value = res.current;
+    list.value = res.records
+    loadingList.value = false
   });
 }
 
+function handlePageChange(record){
+  emit('changeParam',record);
+  // loadData();
+}
+
 function onSearch() {
   init();
 }
diff --git a/src/views/site/tingKeZuJi/more.vue b/src/views/site/tingKeZuJi/more.vue
index c864891..1cf7722 100644
--- a/src/views/site/tingKeZuJi/more.vue
+++ b/src/views/site/tingKeZuJi/more.vue
@@ -40,7 +40,7 @@
             <a-divider class="divider"/>
             <a-row>
               <a-col :span="24">
-                <listPage ref="listRef" :queryParam="queryParam" flagPage/>
+                <listPage ref="listRef" :queryParam="queryParam" flagPage @change-param="changeParam"/>
               </a-col>
             </a-row>
           </a-card>
@@ -73,6 +73,10 @@ const listRef = ref();
 function onSearch(){
   listRef.value.onSearch();
 }
+function changeParam(pageNo){
+  queryParam.value.pageNo = pageNo;
+  onSearch();
+}
 
 </script>
 <style lang="less" scoped>
diff --git a/src/views/site/tingKeZuJi/pkMore.vue b/src/views/site/tingKeZuJi/pkMore.vue
index bb3e700..0a4250d 100644
--- a/src/views/site/tingKeZuJi/pkMore.vue
+++ b/src/views/site/tingKeZuJi/pkMore.vue
@@ -40,7 +40,7 @@
             <a-divider class="divider"/>
             <a-row>
               <a-col :span="24">
-                <listPkzjPage ref="listRef" :queryParam="queryParam"/>
+                <listPkzjPage ref="listRef" :queryParam="queryParam" flagPage @change-param="changeParam"/>
               </a-col>
             </a-row>
           </a-card>
@@ -60,7 +60,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
 import { getSysConfig } from '/@/views/site/utils/index';
 import { dateFormat } from '/@/utils/common/compUtils';
 
-const queryParam = ref<any>({ startDate: getSysConfig().bxqkssj, endDate: '',score: '1', pj: '', pageSize: -1 });
+const queryParam = ref<any>({ startDate: getSysConfig().bxqkssj, endDate: '', pageSize: 10 });
 
 //进入就加载
 onMounted(() => {
@@ -74,6 +74,11 @@ function onSearch(){
   listRef.value.onSearch();
 }
 
+function changeParam(pageNo){
+  queryParam.value.pageNo = pageNo;
+  onSearch();
+}
+
 </script>
 <style lang="less" scoped>
 #siteMain {