修改bug

src/views/kc/szkc/components/XzKechengbiaoList.vue

@@ -5,8 +5,8 @@
       <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="课程名称或教师名">
+            <a-form-item label="课程名称">
-              <a-input placeholder="请输入课程名称或教师名" v-model:value="queryParam.searchInput"></a-input>
+              <a-input placeholder="请输入课程名称" v-model:value="queryParam.searchInput"></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="8">

src/views/site/common/header.vue

@@ -56,7 +56,10 @@
     </div>
 
     <span class="topTitle" >
-      <RouterLink :to="{path:'/site/index'}" style="color:white;">{{ projectName }}</RouterLink>
+      <RouterLink :to="{path:'/site/index'}" style="color:white;">{{ projectName }} 
+        <span style="font-size: 16px;" v-if="getSysConfig().flag1">{{getSysConfig().flag1}}({{getSysConfig().bxqkssj}}至{{getSysConfig().bxqjssj}})</span>
+        <!-- <span style="font-size: 16px;margin-left: 20px;" >本学期听课要求：10次；已完成：8次</span> -->
+      </RouterLink>
       <RouterLink hidden target='_blank' :to="{path:'/site/liveView',query:{ url: 'rtsp://176.139.87.16/axis-media/media.amp' }}">直播测试页rtsp</RouterLink>
       <RouterLink hidden target='_blank' :to="{path:'/site/liveFlvView',query:{ url: 'rtsp://176.139.87.16/axis-media/media.amp' }}">直播测试页flv</RouterLink>
       <RouterLink hidden target='_blank' :to="{path:'/site/livem3u8View',query:{ url: 'https://zxkccx.webvpn.nenu.edu.cn:9553/live_hls/yfjxl101s_lbzj.m3u8' }}">直播测试页m3u8</RouterLink>

src/views/site/jrkclb/kclbList.vue

@@ -7,7 +7,7 @@
           <div>
             <div style="width: 100%;height: 20px;background-color: #1c84c6;"></div>
             <div style="width:100%;white-space:normal; word-break:break-all;overflow:hidden;padding: 10px;height: 70px;font-weight: 600;font-size: 16px;">
-              {{ item.kcmc }}
+              {{ item.kcmc }} <template v-if="item.szkc == '1'" title="思政课程">⭐</template>
             </div>
           </div>
           <a-divider style="margin: 0px;color: #eef1f2;" />
@@ -55,7 +55,9 @@
                 <div v-show="!isNow(item)">
                   <span v-if="props.type == 'zzsk'">
                     <!-- 正在上课的，就给个评价 -->
-                    <a-button type="primary" class="bcClass" @click="funpingjia(item)" >评价</a-button>
+                    <!-- <a-button type="primary" class="bcClass" @click="funpingjia(item)" >评价</a-button> -->
+                    <a-button type="primary" class="bcClass" @click="funpingjia(item)" v-if="pjDisabled" style="background-color: #dfdfdf;" disabled>评价</a-button>
+                    <a-button type="primary" class="bcClass" @click="funpingjia(item)" v-else >评价</a-button>
                   </span>
                   <span v-else>
                     <a-button type="primary" class="yyyClass" disabled v-if="item.sfyy==1 && item.isdeleted==0">已预约</a-button>
@@ -63,7 +65,8 @@
                   </span>
                 </div>
                 <div v-show="isNow(item)">
-                    <a-button type="primary" class="bcClass" @click="funpingjia(item)" >评价</a-button>
+                    <a-button type="primary" class="bcClass" @click="funpingjia(item)" v-if="pjDisabled" style="background-color: #dfdfdf;" disabled>评价</a-button>
+                    <a-button type="primary" class="bcClass" @click="funpingjia(item)" v-else >评价</a-button>
                 </div>
               <!-- <a-col :span="24"> -->
                 <!-- <a-button type="primary" class="bcClass" @click="handleBaocuo(item)">报错</a-button> -->
@@ -84,7 +87,7 @@ import { ref,watch,reactive,defineExpose, createVNode,h } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import KcErrorreportIndexModal from '/@/views/kc/kcErrorreport/components/KcErrorreportIndexModal.vue'
-import { getUserId, addTingKeLog } from '/@/views/site/utils/index';
+import { getUserId, addTingKeLog, getSysConfig } from '/@/views/site/utils/index';
 import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
 import { useRouter } from 'vue-router'
 import dayjs from 'dayjs';
@@ -103,6 +106,8 @@ const emit = defineEmits(['setTotal']);
 
 const { createMessage } = useMessage();
 const confirmLoading = ref<boolean>(false);
+const pjDisabled = ref<boolean>(false);
+  
 let listData = ref<any>([]);
 let listType = ref<any>(String);
 const list = (params) => defHttp.get({ url: '/ktgl/kcKetangbiao/getKclblist', params });
@@ -132,9 +137,23 @@ function rkbLoadData() {
     list(newRow).then(res => {
       listData.value = res.records;
       console.log(`🚀 ~ file: kclbList.vue:113 ~ list ~ listData.value:`, listData.value)
+
+      var bxqkssj = new Date(getSysConfig().bxqkssj);
+  var bxqjssj = new Date(getSysConfig().bxqjssj);
+  var nowDate = new Date();
+  console.log(`🚀 ~ file: kclbList.vue:143 ~ rkbLoadData ~ bxqkssj.getTime():`, bxqkssj.getTime())
+  console.log(`🚀 ~ file: kclbList.vue:144 ~ rkbLoadData ~ nowDate.getTime():`, nowDate.getTime())
+    console.log(`🚀 ~ file: kclbList.vue:145 ~ rkbLoadData ~ bxqjssj.getTime():`, bxqjssj.getTime())
+  if(bxqkssj.getTime()>nowDate.getTime()||bxqjssj.getTime()<nowDate.getTime()){
+    pjDisabled.value = true
+    console.log(`🚀 ~ file: kclbList.vue:148 ~ rkbLoadData ~ pjDisabled:`, pjDisabled)
+  }
+
       emit('setTotal', res.records.length);
     })
   }
+  
+  
 }
 //预约事件
 async function funYuyue(record){

src/views/site/tingKeZuJi/list.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" :loading="loadingList" style="max-height: 106px;">
+  <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" >
     <template #renderItem="{ item }">
       <a-list-item>
         <a-list-item-meta>

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" :loading="loadingList" style="max-height: 106px;">
+  <a-list item-layout="horizontal" :data-source="list" :loading="loadingList" >
     <template #renderItem="{ item }">
       <a-list-item>
         <a-list-item-meta>

src/views/site/tingKeZuJi/pkMore.vue

@@ -24,13 +24,13 @@
               <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
                 <j-dict-select-tag v-model:value="queryParam.hh" :dictCode="`kc_jieci_view,jieciname,jieci`" placeholder="请选择节次" style="width: 100%;"/>
               </a-col>
-              <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+              <!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
                 <a-select style="width: 100%;" v-model:value="queryParam.pj">
                   <a-select-option value="">全部</a-select-option>
                   <a-select-option value="0">未评价</a-select-option>
                   <a-select-option value="1">已评价</a-select-option>
                 </a-select>
-              </a-col>
+              </a-col> -->
               <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
                 <!-- <a-input placeholder="输入课程名或教师名……" v-model:value="queryParam.searchInput" style="width: 100%" /> -->
                 <a-input-search v-model:value="queryParam.searchInput" placeholder="输入课程名或教师名……" enter-button @search="onSearch"/>
@@ -39,7 +39,7 @@
             </a-row>
             <a-divider class="divider"/>
             <a-row>
-              <a-col :span="24">
+              <a-col :span="24" >
                 <listPkzjPage ref="listRef" :queryParam="queryParam" flagPage @change-param="changeParam"/>
               </a-col>
             </a-row>

src/views/site/tongJi/show/ykkttkrc.vue

@@ -1,5 +1,34 @@
 <template>
   <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    
+    <a-row style="margin-top:20px;">
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择结束时间'" style="width:100%;" v-model:value="queryParam.ywTime"></a-date-picker>
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <JDictSelectTag placeholder="请选择开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <JDictSelectTag placeholder="请选择节次" v-model:value="queryParam.hh" :dictCode="`kc_jieci_view,jieciname,jieci`" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <JDictSelectTag placeholder="请选择课程性质" v-model:value="queryParam.kcxz" dictCode="kcxz" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
+        <a-form-item label="" style="padding: 10px;">
+          <a-input-search placeholder="请输入课程或教师名称" v-model:value="queryParam.ywmc" enter-button="查询" @search="loadData"></a-input-search>
+        </a-form-item>
+      </a-col>
+    </a-row>
+    
     <a-table
       :dataSource="dataSource"
       size="default"
@@ -15,8 +44,9 @@
 import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
-
+const queryParam = ref<any>({});
   const ipagination:any = ref({
     current: 1,
     pageSize: 10,
@@ -43,31 +73,37 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
       title: '课程名称',
       align: 'center',
       dataIndex: 'kcmc',
-      width: 80,
     },
     {
       title: '上课教师',
       align: 'center',
       dataIndex: 'skjs',
-      width: 80,
     },
     {
       title: '节次',
       align: 'center',
       dataIndex: 'hh',
-      width: 80,
     },
     {
       title: '上课地点',
       align: 'center',
       dataIndex: 'skdd',
-      width: 80,
+    },
+    {
+      title: '课程性质',
+      align: 'center',
+      dataIndex: 'kcxz',
+    },
+    {
+      title: '上课日期',
+      align: 'center',
+      dataIndex: 'skrq',
     },
   ]);
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(900);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -85,7 +121,12 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function loadData(){
     let skrq = formatToDate(new Date());
     let { current:pageNo, pageSize } = ipagination.value;
-    defHttp.get({ url: '/ktgl/kcKetangbiao/ykkttkrcList', params: { skrq, pageNo, pageSize } }).then(res => {
+    let kkdw = queryParam.value.kkdw
+    let hh = queryParam.value.hh
+    let kcxz = queryParam.value.kcxz
+    let ywTime = queryParam.value.ywTime
+    let ywmc = queryParam.value.ywmc
+    defHttp.get({ url: '/ktgl/kcKetangbiao/ykkttkrcList', params: { skrq, pageNo, pageSize,kkdw,hh,kcxz,ywTime,ywmc } }).then(res => {
       dataSource.value = res.records;
       ipagination.value.total = res.total;
     })

src/views/site/tongJi/show/ykktzs.vue

@@ -1,5 +1,34 @@
 <template>
   <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    
+    <a-row style="margin-top:20px;">
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择结束时间'" style="width:100%;" v-model:value="queryParam.ywTime"></a-date-picker>
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <JDictSelectTag placeholder="请选择开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <JDictSelectTag placeholder="请选择节次" v-model:value="queryParam.hh" :dictCode="`kc_jieci_view,jieciname,jieci`" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <JDictSelectTag placeholder="请选择课程性质" v-model:value="queryParam.kcxz" dictCode="kcxz" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
+        <a-form-item label="" style="padding: 10px;">
+          <a-input-search placeholder="请输入课程或教师名称" v-model:value="queryParam.ywmc" enter-button="查询" @search="loadData"></a-input-search>
+        </a-form-item>
+      </a-col>
+    </a-row>
+    
     <a-table
       :dataSource="dataSource"
       size="default"
@@ -15,7 +44,8 @@
 import { ref, defineExpose } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { dateUtil, formatToDate } from '/@/utils/dateUtil';
-
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+const queryParam = ref<any>({});
 
   const ipagination:any = ref({
     current: 1,
@@ -43,31 +73,38 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
       title: '课程名称',
       align: 'center',
       dataIndex: 'kcmc',
-      width: 80,
     },
     {
       title: '上课教师',
       align: 'center',
       dataIndex: 'skjs',
-      width: 80,
     },
     {
       title: '节次',
       align: 'center',
       dataIndex: 'hh',
-      width: 80,
     },
     {
       title: '上课地点',
       align: 'center',
       dataIndex: 'skdd',
-      width: 80,
     },
+    {
+      title: '课程性质',
+      align: 'center',
+      dataIndex: 'kcxz',
+    },
+    {
+      title: '上课日期',
+      align: 'center',
+      dataIndex: 'skrq',
+    },
+    
   ]);
   const dataSource: any = ref([]);
 
   const title = ref<string>('');
-  const width = ref<number>(900);
+  const width = ref<string>('80%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   // const registerForm = ref();
@@ -85,8 +122,15 @@ import { dateUtil, formatToDate } from '/@/utils/dateUtil';
   function loadData(){
     let skrq = formatToDate(new Date());
     let { current:pageNo, pageSize } = ipagination.value;
-    defHttp.get({ url: '/ktgl/kcKetangbiao/ykktzsList', params: { skrq, pageNo, pageSize } }).then(res => {
+    let kkdw = queryParam.value.kkdw
+    let hh = queryParam.value.hh
+    let kcxz = queryParam.value.kcxz
+    let ywTime = queryParam.value.ywTime
+    let ywmc = queryParam.value.ywmc
+
+    defHttp.get({ url: '/ktgl/kcKetangbiao/ykktzsList', params: { skrq, pageNo, pageSize,kkdw,hh,kcxz,ywTime,ywmc } }).then(res => {
       dataSource.value = res.records;
+      console.log(`🚀 ~ file: ykktzs.vue:90 ~ defHttp.get ~ dataSource:`, dataSource)
       ipagination.value.total = res.total;
     })
   }

src/views/site/yuYueKeCheng/index.vue

@@ -5,6 +5,13 @@
       <span class="titleDownload"><a @click="downloadByUrl({url:'/downPath/tkpjb.docx',target: '_self',fileName:'线上教学听课评价表-新.docx'})">线上课堂评价表</a></span>
       <span class="titleDownload"><a @click="downloadByUrl({url:'/downPath/tkjlb.docx',target: '_self',fileName:'东北师范大学听课记录表.docx'})">听课记录表</a></span>
       <span class="titleDownload"><a @click="downloadByUrl({url:'/downPath/jxzlpjb.docx',target: '_self',fileName:'东北师范大学本科课堂教学质量评价表（同行专家用）'})">同行评价表</a></span>
+      <span class="titleDownload">
+        <a-tooltip placement="topLeft">
+        <template #title>
+          <span>登录教师课程可以预约，听课完成后可以对课程进行评价，评价有助于快速完成本学期的听课任务</span>
+        </template>
+        <span class="helpClass">?</span>
+      </a-tooltip></span>
     </template>
     <template #extra><RouterLink target='_blank' to="/site/yuyuekechengMore">查看更多</RouterLink></template>
     <a-row class="rowGutter" :gutter="[16,16]">
@@ -237,6 +244,16 @@ defineExpose({
   margin-left: 15px;
 }
 
+.helpClass{
+  font-size: 16px;
+    font-weight: 700;
+    /* background: #1c84c6; */
+    color: #1c84c6;
+    border-radius: 5px;
+    padding: 1px 8px;
+    border: 1px #1c84c6 solid;
+    cursor: pointer;
+}
 
 
 </style>