修改bug

src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue

@@ -17,13 +17,18 @@
           </a-col>
           <a-col :lg="8">
             <a-form-item label="教学楼名称">
-              <a-input placeholder="请输入教学楼名称" v-model:value="queryParam.jxlName"></a-input>
+              <a-select placeholder="请选择教学楼" v-model:value="queryParam.jxlName">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`逸夫教学楼`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`净月综合教学楼`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`惟真楼`">惟真楼</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <!--<template v-if="toggleSearchStatus">-->
             <a-col :lg="8">
               <a-form-item label="教室名称">
-                <a-input placeholder="请输入教室名称" v-model:value="queryParam.jsmc"></a-input>
+                <j-input placeholder="请输入教室名称" v-model:value="queryParam.jsmc"></j-input>
               </a-form-item>
             </a-col>
           <!--</template>-->
@@ -95,6 +100,7 @@
   import { columns } from './KcZhihuijiaoshiMonitorLog.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZhihuijiaoshiMonitorLog.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
+  import { JInput } from '/@/components/Form';
   import KcZhihuijiaoshiMonitorLogModal from './components/KcZhihuijiaoshiMonitorLogModal.vue'
   import KcZhihuijiaoshiMonitorStaticLogModal from './staticlist/KcZhihuijiaoshiMonitorStaticLogModal.vue'
 

src/views/kc/ktgl/KcKechengbiao.data.ts

@@ -24,7 +24,7 @@ export const columns = <JVxeColumn[]>([
     key: 'skjs'
   },
   {
-    title: '学科人数',
+    title: '选课人数',
     align: "left",
     width: '80px',
     key: 'xkrs'
@@ -121,7 +121,7 @@ export const columns = <JVxeColumn[]>([
 //     dataIndex: 'skjs'
 //   },
 //   {
-//     title: '学科人数',
+//     title: '选课人数',
 //     align: "center",
 //     width: '80px',
 //     dataIndex: 'xkrs'
@@ -304,12 +304,12 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '学科人数',
+    label: '选课人数',
     field: 'xkrs',
     component: 'Input',
     dynamicRules: ({model,schema}) => {
       return [
-              { required: true, message: '请输入学科人数!'},
+              { required: true, message: '请输入选课人数!'},
              ];
     },
   },

src/views/kc/ktgl/components/KcKechengbiaoForm.vue

@@ -165,7 +165,7 @@
     kcbh: [{ required: true, message: '请输入课程号!'}, { validator: kcbhDuplicatevalidate }],
     kcmc: [{ required: true, message: '请输入课程名称!'},],
     skjs: [{ required: true, message: '请输入授课教师!'},],
-    xkrs: [{ required: true, message: '请输入学科人数!'},],
+    xkrs: [{ required: true, message: '请输入选课人数!'},],
     kkdw: [{ required: true, message: '请输入开课单位!'},],
     kcxz: [{ required: true, message: '请输入课程性质!'},],
     jkzc: [{ required: true, message: '请输入上课周次!'},],

src/views/kc/szkc/KcKechengbiao.data.ts

@@ -23,7 +23,7 @@ export const columns = <JVxeColumn[]>([
     key: 'skjs'
   },
   {
-    title: '学科人数',
+    title: '选课人数',
     align: "left",
     width: '80px',
     key: 'xkrs'
@@ -106,7 +106,7 @@ export const columns = <JVxeColumn[]>([
 //     dataIndex: 'skjs'
 //   },
 //   {
-//     title: '学科人数',
+//     title: '选课人数',
 //     align: "center",
 //     width: '80px',
 //     dataIndex: 'xkrs'
@@ -289,12 +289,12 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '学科人数',
+    label: '选课人数',
     field: 'xkrs',
     component: 'Input',
     dynamicRules: ({model,schema}) => {
       return [
-              { required: true, message: '请输入学科人数!'},
+              { required: true, message: '请输入选课人数!'},
              ];
     },
   },

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

@@ -165,7 +165,7 @@
     kcbh: [{ required: true, message: '请输入课程号!'}, { validator: kcbhDuplicatevalidate }],
     kcmc: [{ required: true, message: '请输入课程名称!'},],
     skjs: [{ required: true, message: '请输入授课教师!'},],
-    xkrs: [{ required: true, message: '请输入学科人数!'},],
+    xkrs: [{ required: true, message: '请输入选课人数!'},],
     kkdw: [{ required: true, message: '请输入开课单位!'},],
     kcxz: [{ required: true, message: '请输入课程性质!'},],
     jkzc: [{ required: true, message: '请输入上课周次!'},],

src/views/kc/szkc/components/XzKechengbiao.data.ts

@@ -67,7 +67,7 @@ export const columns = <JVxeColumn[]>([
 //     dataIndex: 'skjs'
 //   },
 //   {
-//     title: '学科人数',
+//     title: '选课人数',
 //     align: "center",
 //     width: '80px',
 //     dataIndex: 'xkrs'
@@ -250,12 +250,12 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '学科人数',
+    label: '选课人数',
     field: 'xkrs',
     component: 'Input',
     dynamicRules: ({model,schema}) => {
       return [
-              { required: true, message: '请输入学科人数!'},
+              { required: true, message: '请输入选课人数!'},
              ];
     },
   },

src/views/site/kxstkkt/itemPage.vue

@@ -45,11 +45,11 @@
             </a-col> -->
           </a-row>
           <a-row style="text-align: center;" v-else>
-            <a-col :span="12" style="text-align: center;">
+            <!-- <a-col :span="12" style="text-align: center;">
               <a-button type="primary" class="yyyClass" @click="toLivePage(item)" disabled>听课</a-button>
-            </a-col>
+            </a-col> -->
-            <a-col :span="12" style="text-align: center;">
+            <a-col :span="24" style="text-align: center;">
-              <a-button type="primary" class="yyClass" @click="funpingjia(item)" disabled>评价</a-button>
+              <a-button type="primary" class="yyClass" @click="funpingjia(item)" >评价</a-button>
             </a-col>
           </a-row>
 

src/views/site/kxstkkt/rkb.vue

@@ -22,7 +22,12 @@
       </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.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
+          <a-select placeholder="请选择教学楼" v-model:value="queryParam.jzwh">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`0106`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`124101`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`0108`">惟真楼</a-select-option>
+              </a-select>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 5 }">
@@ -120,6 +125,7 @@ function loadData(num?) {
   queryParam.value.userid = getUserId()
   queryParam.value.skxs = 1
   queryParam.value.type = 1
+  queryParam.value.sftkb = 1
   console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam)
 
 

src/views/site/kxstkkt/xyjk.vue

@@ -7,7 +7,12 @@
       </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.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
+          <a-select placeholder="请选择教学楼" v-model:value="queryParam.jzwh">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`0106`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`124101`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`0108`">惟真楼</a-select-option>
+              </a-select>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@@ -106,6 +111,7 @@ function loadData(num?) {
   queryParam.value.userid = getUserId()
   queryParam.value.skxs = 1
   queryParam.value.type = 0
+  queryParam.value.sftkb = 1
   console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam)
 
   if(queryParam.value.hh!=","){

src/views/site/kxstkkt/zzsk.vue

@@ -7,7 +7,14 @@
       </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.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
+          <!-- <JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" /> -->
+          
+          <a-select placeholder="请选择教学楼" v-model:value="queryParam.jzwh">
+                <a-select-option :value="undefined">全部</a-select-option>
+                <a-select-option :value="`0106`">逸夫教学楼</a-select-option>
+                <a-select-option :value="`124101`">净月综合教学楼</a-select-option>
+                <a-select-option :value="`0108`">惟真楼</a-select-option>
+              </a-select>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@@ -101,6 +108,7 @@ function loadData(num?) {
   queryParam.value.userid = getUserId()
   queryParam.value.skxs = 1
   queryParam.value.type = 1
+  queryParam.value.sftkb = 1
   queryParam.value.ywskxs = ''
   console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam)
 

src/views/site/tongZhiGongGao/index.vue

@@ -1,7 +1,6 @@
 <template>
   <a-card class="rowGutter">
-    <br/>
+    <a-row :gutter="[16,16]">
-    <a-row :gutter="[16,16]" class="rowSpan">
       <a-col :span="12" v-for="(item,index) in list" :key="index">
         <a :href="item.nlink" target="_blank" class="itemLink">
           <span class="">
@@ -14,6 +13,14 @@
         </a>
       </a-col>
     </a-row>
+    <a-row style="font-size:16px;font-weight: 700;margin-top:10px;">
+      <a-col :span="3">调停课通知：</a-col>
+      <a-col :span="15">
+        <a-carousel autoplay easing="linear">
+          <div  v-for="(item,index) in tklist" :key="index" style="font-size:16px;font-weight: 700;">{{item.kcmc}}</div>
+        </a-carousel>
+      </a-col>
+    </a-row>
     <!-- <div style="color:red">[今日调课]</div> -->
   </a-card>
 </template>
@@ -27,6 +34,7 @@ import { formatToDate } from '/@/utils/dateUtil';
 // const { createConfirm } = useMessage();
 enum Api {
   list = '/kcNotice/kcNotice/list',
+  tkList = '/grab/imports/xxhbtkxx/getDayTklist',
 }
 
 /**
@@ -34,19 +42,26 @@ enum Api {
  * @param params
  */
 const listApi = (params) => defHttp.get({ url: Api.list, params });
+const listTkApi = (params) => defHttp.get({ url: Api.tkList, params });
 
 const list = ref<any>([]);
+const tklist = ref<any>([]);
 onMounted(() => {
   //ontop,修改时间，新增时间
   listApi({ pageSize: 6, nstatus: 1 }).then(res => {
     list.value = (res?.records) ?? [];
   });
+  //ontop,修改时间，新增时间
+  listTkApi({}).then(res => {
+    console.log(`🚀 ~ file: index.vue:56 ~ listTkApi ~ res:`, res)
+    tklist.value = res;
+  });
 });
 
 </script>
 <style lang="less" scoped>
 .rowSpan {
-  padding: 0 0 15px 0;
+  padding: 0 0 5px 0;
 }
 .spanWord {
   padding: 0 10px;