From 5ada2c82f399e84f930f5a9ddc322218c998aac2 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 8 Aug 2023 13:42:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?2023=E5=B9=B48=E6=9C=888=E6=97=A5=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/site/tingKeZuJi/list.vue | 2 +-
src/views/site/tingKeZuJi/listPkzj.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/site/tingKeZuJi/list.vue b/src/views/site/tingKeZuJi/list.vue
index c0f21ac..bb0bf30 100644
--- a/src/views/site/tingKeZuJi/list.vue
+++ b/src/views/site/tingKeZuJi/list.vue
@@ -145,7 +145,7 @@ function init() {
function loadData(){
loadingList.value = true
console.log(`🚀 ~ file: list.vue:139 ~ listApi ~ props.queryParam:`, props.queryParam)
- listApi({ userid: getUserId(), ...props.queryParam }).then(res => {
+ listApi({ userid: getUserId(),startTime: getSysConfig().bxqkssj ,endTime: getSysConfig().bxqjssj , ...props.queryParam }).then(res => {
total.value = res.total;
current.value = res.current;
list.value = res.records
diff --git a/src/views/site/tingKeZuJi/listPkzj.vue b/src/views/site/tingKeZuJi/listPkzj.vue
index f5ff2fd..a73f5c9 100644
--- a/src/views/site/tingKeZuJi/listPkzj.vue
+++ b/src/views/site/tingKeZuJi/listPkzj.vue
@@ -100,7 +100,7 @@ watch(
function init() {
console.log('init');
loadingList.value = true
- listApi({ upuserid: getUserId(),pj:'1', tingketime: getSysConfig().bxqkssj, ...props.queryParam }).then(res => {
+ listApi({ upuserid: getUserId(),pj:'1', upDate_begin: getSysConfig().bxqkssj, upDate_end: getSysConfig().bxqjssj, ...props.queryParam }).then(res => {
list.value = res?.records ?? [];
total.value = res.total;
From 3d8e721da09a4ce0efb49d3adfb607b376b64aa0 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 9 Aug 2023 00:40:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?2023=E5=B9=B48=E6=9C=889=E6=97=A5=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../kc/config/KcExportConfigTpkwcqkjzglx.data.ts | 4 ++--
.../kc/config/KcExportConfigTpkwcqkjzglxList.vue | 4 ++--
.../kc/config/KcExportConfigTpkwcqkjzglxPzList.vue | 8 ++++----
src/views/kc/pktj/pkmxb/pkmxb.vue | 10 +++++-----
src/views/kc/statistics/evaluationList/index.vue | 11 ++++++-----
src/views/site/tingKeZuJi/pkMore.vue | 8 ++++----
6 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts
index 10d7a1d..0c34914 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts
@@ -20,12 +20,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'xm'
},
{
- title: '听课类型',
+ title: '听课身份',
align: "center",
dataIndex: 'tklx_dictText'
},
{
- title: '身份',
+ title: '听课类型',
align: "center",
dataIndex: 'sf'
},
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
index 6e1bb7a..74fbdbd 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
@@ -23,8 +23,8 @@
-
-
+
+
diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
index 4018abe..39cd8ce 100644
--- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
+++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
@@ -23,14 +23,14 @@
-
-
+
+
-
+
-
+
diff --git a/src/views/kc/pktj/pkmxb/pkmxb.vue b/src/views/kc/pktj/pkmxb/pkmxb.vue
index 2b13a60..c87ad62 100644
--- a/src/views/kc/pktj/pkmxb/pkmxb.vue
+++ b/src/views/kc/pktj/pkmxb/pkmxb.vue
@@ -70,10 +70,10 @@
- 门户添加
+ 课程中心
老系统
- 政务大厅
- 后台导入
+ 服务大厅
+ 纸质评价
@@ -178,7 +178,7 @@ const roleListApi = (params) => defHttp.get({ url: Api.roleList, params });
function openDcwjxx(record){
-
+
roleListApi({ userid: getUserId()}).then(res => {
let list = res ?? [];
let sfjx = 0;
@@ -197,7 +197,7 @@ const roleListApi = (params) => defHttp.get({ url: Api.roleList, params });
}
});
-
+
}
diff --git a/src/views/kc/statistics/evaluationList/index.vue b/src/views/kc/statistics/evaluationList/index.vue
index ba7c9ef..f9ab8bd 100644
--- a/src/views/kc/statistics/evaluationList/index.vue
+++ b/src/views/kc/statistics/evaluationList/index.vue
@@ -41,15 +41,16 @@
-
+
+
-
-
+
-
+
diff --git a/src/views/site/tingKeZuJi/pkMore.vue b/src/views/site/tingKeZuJi/pkMore.vue
index 9c9a7e3..56d9029 100644
--- a/src/views/site/tingKeZuJi/pkMore.vue
+++ b/src/views/site/tingKeZuJi/pkMore.vue
@@ -13,10 +13,10 @@
-
+
-
+
@@ -60,12 +60,12 @@ 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({ startDate: getSysConfig().bxqkssj, endDate: '', pageSize: 10 });
+const queryParam = ref({ upDate_begin: getSysConfig().bxqkssj, upDate_end: '', pageSize: 10 });
//进入就加载
onMounted(() => {
const format = 'yyyy-MM-dd';
- queryParam.value.endDate = dateFormat(new Date(), format)
+ queryParam.value.upDate_end = dateFormat(new Date(), format)
onSearch()
});
const listRef = ref();