From 03ee2c265def63c903df7bc5ad876f663fd4b486 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 12 Dec 2023 20:57:49 +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/kcZzThpjb/KcZzThpjbList.vue      |  6 +-
 src/views/kc/kcZzXstkb/KcZzXstkbList.vue      |  6 +-
 src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue      |  2 +-
 .../kc/kcZzYbtkb/components/KcZzYbtkbForm.vue | 64 ++++++++++---------
 src/views/site/jrkclb/kclbRkb.vue             |  2 +-
 src/views/site/jrkclb/kclbXyjk.vue            |  2 +-
 src/views/site/jrkclb/kclbZzsk.vue            |  2 +-
 7 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/views/kc/kcZzThpjb/KcZzThpjbList.vue b/src/views/kc/kcZzThpjb/KcZzThpjbList.vue
index b139c95..3039c23 100644
--- a/src/views/kc/kcZzThpjb/KcZzThpjbList.vue
+++ b/src/views/kc/kcZzThpjb/KcZzThpjbList.vue
@@ -72,8 +72,8 @@
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-        <a-dropdown v-if="selectedRowKeys.length > 0">
+        <!-- <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
               <a-menu-item key="1" @click="batchHandleDelete">
@@ -85,7 +85,7 @@
           <a-button>批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
-        </a-dropdown>
+        </a-dropdown> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
diff --git a/src/views/kc/kcZzXstkb/KcZzXstkbList.vue b/src/views/kc/kcZzXstkb/KcZzXstkbList.vue
index 25c1406..ce14fad 100644
--- a/src/views/kc/kcZzXstkb/KcZzXstkbList.vue
+++ b/src/views/kc/kcZzXstkb/KcZzXstkbList.vue
@@ -72,8 +72,8 @@
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-        <a-dropdown v-if="selectedRowKeys.length > 0">
+        <!-- <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
               <a-menu-item key="1" @click="batchHandleDelete">
@@ -85,7 +85,7 @@
           <a-button>批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
-        </a-dropdown>
+        </a-dropdown> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
diff --git a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue
index 1846d70..283fcd5 100644
--- a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue
+++ b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue
@@ -51,7 +51,7 @@
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <!-- <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
diff --git a/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue b/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue
index b3fecc3..312634a 100644
--- a/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue
+++ b/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue
@@ -2,34 +2,6 @@
   <a-spin :spinning="confirmLoading">
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" :model="formData" :rules="validatorRules">
       <a-row>
-        <a-col :span="24">
-          <a-button type="primary" @click="handleJyktsj">匹配课堂数据</a-button>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="课程名称" v-bind="validateInfos.kcmc">
-            <a-input v-model:value="formData.kcmc" placeholder="请输入课程名称" disabled="true"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="课程编号" v-bind="validateInfos.kcbh">
-            <a-input v-model:value="formData.kcbh" placeholder="校验课堂数据后自动带值"  disabled="true"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="授课教师" v-bind="validateInfos.skjs">
-            <a-input v-model:value="formData.skjs" placeholder="请输入授课教师" disabled="true"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="授课时间" v-bind="validateInfos.skrq">
-		        <a-date-picker placeholder="请选择授课时间" v-model:value="formData.skrq" value-format="YYYY-MM-DD"  style="width: 100%" disabled="true"/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="16">
-          <a-form-item label="上课地点" v-bind="validateInfos.skdd" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
-            <a-input v-model:value="formData.skjs" placeholder="请输入上课地点" disabled="true"></a-input>
-          </a-form-item>
-        </a-col>
         <a-col :span="8">
           <a-form-item label="评课教师姓名" v-bind="validateInfos.tkjsxm">
             <a-input v-model:value="formData.tkjsxm" placeholder="请输入评课教师姓名" @change="handleHqjsbh" :disabled="disabled"></a-input>
@@ -40,11 +12,45 @@
             <a-input v-model:value="formData.tkjsbh" placeholder="请输入工号" disabled="true"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="8" style="height: 32px;">
           <a-form-item label="评课时间" v-bind="validateInfos.pksj">
 		        <a-date-picker placeholder="请选择评课时间"  v-model:value="formData.pksj" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
+        <a-col :span="4" style="height: 80px;line-height: 80px;text-align: center;">
+          <a-button type="primary" @click="handleJyktsj" style="font-size:20px;height: 50px;">匹配课堂数据</a-button>
+        </a-col>
+        <a-col :span="20">
+          <a-row>
+            <a-col :span="8">
+              <a-form-item label="课程名称" v-bind="validateInfos.kcmc">
+                <a-input v-model:value="formData.kcmc" placeholder="请输入课程名称" disabled="true"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="课程编号" v-bind="validateInfos.kcbh">
+                <a-input v-model:value="formData.kcbh" placeholder="校验课堂数据后自动带值"  disabled="true"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="授课教师" v-bind="validateInfos.skjs">
+                <a-input v-model:value="formData.skjs" placeholder="请输入授课教师" disabled="true"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item label="授课时间" v-bind="validateInfos.skrq">
+                <a-date-picker placeholder="请选择授课时间" v-model:value="formData.skrq" value-format="YYYY-MM-DD"  style="width: 100%" disabled="true"/>
+              </a-form-item>
+            </a-col>
+            <a-col :span="16">
+              <a-form-item label="上课地点" v-bind="validateInfos.skdd" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+                <a-input v-model:value="formData.skjs" placeholder="请输入上课地点" disabled="true"></a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-col>
+            
+        
         <a-col :span="24">
           <a-form-item label="授课有启发性，能给予学生思考、联想、创造的启迪" v-bind="validateInfos.ans1"  :labelCol="labelCol2" :wrapperCol="wrapperCol2">
             <j-dict-select-tag type='radio' v-model:value="formData.ans1" :dictCode="`kc_evaluationans,content,ordernum,queid = '25' order by ordernum asc`" placeholder="请选择授课有启发性，能给予学生思考、联想、创造的启迪" :disabled="disabled"/>
diff --git a/src/views/site/jrkclb/kclbRkb.vue b/src/views/site/jrkclb/kclbRkb.vue
index 146534c..b265296 100644
--- a/src/views/site/jrkclb/kclbRkb.vue
+++ b/src/views/site/jrkclb/kclbRkb.vue
@@ -24,7 +24,7 @@
       </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,true order by sort asc`" />
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 5 }">
diff --git a/src/views/site/jrkclb/kclbXyjk.vue b/src/views/site/jrkclb/kclbXyjk.vue
index ed64a0b..5a63679 100644
--- a/src/views/site/jrkclb/kclbXyjk.vue
+++ b/src/views/site/jrkclb/kclbXyjk.vue
@@ -11,7 +11,7 @@
       </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,true order by sort asc`" />
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
diff --git a/src/views/site/jrkclb/kclbZzsk.vue b/src/views/site/jrkclb/kclbZzsk.vue
index 7ebb441..ea68e3d 100644
--- a/src/views/site/jrkclb/kclbZzsk.vue
+++ b/src/views/site/jrkclb/kclbZzsk.vue
@@ -17,7 +17,7 @@
       </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,true order by sort asc`" />
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">