From 33e6864358336ab1a3ecd4f1146c3161007c016b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 28 Jul 2023 06:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts | 11 +++++++++++
 src/views/kc/xxhbtkxx/XxhbtkxxList.vue |  8 +++++++-
 src/views/site/pjjgPage/index.vue      |  2 +-
 src/views/site/pjjgPage/list.vue       | 24 +++++++++++++++++++++++-
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts b/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts
index 47a689c..dd090b2 100644
--- a/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts
+++ b/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts
@@ -5,6 +5,11 @@ import { render } from '/@/utils/common/renderUtils';
 import { log } from 'console';
 //列表数据
 export const columns: BasicColumn[] = [
+  {
+    title: '学期学年',
+    align: "center",
+    dataIndex: 'xqxn'
+  },
   {
     title: '姓名',
     align: "center",
@@ -147,6 +152,12 @@ export const columns: BasicColumn[] = [
 
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+  {
+    label: "学期学年",
+    field: 'xqxn',
+    component: 'Input',
+    colProps: {span: 6},
+  },
   {
     label: "姓名",
     field: 'xm',
diff --git a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
index 24a4168..67ef68e 100644
--- a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
+++ b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
@@ -4,11 +4,17 @@
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="学期学年">
+              <j-dict-select-tag placeholder="请选择学期学年" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="8">
             <a-form-item label="姓名">
               <j-input placeholder="请输入姓名" v-model:value="queryParam.xm"></j-input>
             </a-form-item>
           </a-col>
+          
           <a-col :lg="8">
             <a-form-item label="创建人">
               <j-input placeholder="请输入创建人" v-model:value="queryParam.cjr"></j-input>
@@ -221,7 +227,7 @@
         fixed: 'right',
       },
       beforeFetch: (params) => {
-        params.column = '',params.order = '';//新生成的默认不带排序
+        params.column = 'skrq',params.order = 'desc';//新生成的默认不带排序
         return Object.assign(params, queryParam.value);
       },
     },
diff --git a/src/views/site/pjjgPage/index.vue b/src/views/site/pjjgPage/index.vue
index 0a5e995..8448de9 100644
--- a/src/views/site/pjjgPage/index.vue
+++ b/src/views/site/pjjgPage/index.vue
@@ -3,7 +3,7 @@
     <a-col :xs="{ span: 24 }" :sm="{ span: 24 }" :lg="{ span: 24 }" style="padding: 0 2px 0 0;">
       <a-card style="min-height: 222px;">
         <template #title>
-          <span style="font-size: 24px;font-weight: bold;">评课结果</span>
+          <span style="font-size: 24px;font-weight: bold;">评价结果</span>
         </template>
         <template #extra>
           <!-- <RouterLink target='_blank' to="/site/tingKeZuJiMore">查看更多</RouterLink> -->
diff --git a/src/views/site/pjjgPage/list.vue b/src/views/site/pjjgPage/list.vue
index 385537c..d1a4bb6 100644
--- a/src/views/site/pjjgPage/list.vue
+++ b/src/views/site/pjjgPage/list.vue
@@ -3,6 +3,9 @@
   <!-- <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" :grid="{ column: }"> -->
     <template #renderItem="{ item }">
       <a-list-item>
+          <div class="itemDate">
+            {{ item.skrq }} {{ formatTime(item.hhks) }}-{{ formatTime(item.hhjs) }}
+          </div>
           <div style="border: 2px #eef1f2 solid;">
           <div>
             <div style="width: 100%;height: 20px;background-color: #1c84c6;"></div>
@@ -166,7 +169,15 @@ function handlePageChange(record){
   emit('changeParam',record);
   // loadData();
 }
-
+/**
+ * 转换时间由【0012】转成【00:12】
+ * @param time 四个字符，时分，无分隔
+ */
+ function formatTime(time: string) {
+  if(!time) return '';
+  let t_i_m_e = time.split('');
+  return [t_i_m_e[0],t_i_m_e[1],':',t_i_m_e[2],t_i_m_e[3]].join('');
+}
 function onSearch() {
   init();
 }
@@ -214,4 +225,15 @@ defineExpose({
   background-color: #1c84c6;font-weight: 600;border-radius: 5px;line-height: 23px;
 }
 
+.itemDate {
+  border-radius: 25px;
+  background: #cccccc8c;
+  width: 90%;
+  margin-bottom: 0.5rem;
+  text-align: center;
+  margin: 0 auto .5rem;
+  padding: 0.5rem;
+  font-weight: 700;
+  font-size: 16px;
+}
 </style>
\ No newline at end of file