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 }}
- {{ text }}
-
+
+ {{ text }}
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 @@
刷新
查看更多
-
+
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(0);
const total = ref(2);
const loadingList = ref(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 @@
-
+
@@ -39,6 +39,7 @@
+
@@ -46,6 +47,7 @@