Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_vue

src/views/kc/jiaoshi/KcJiaoshirongliang.data.ts

@@ -63,6 +63,30 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+  {
+    label: '教室名称',
+    field: 'jsmc',
+    component: 'JInput',
+    colProps: { span: 3 },
+   },
+   {
+    label: '所属单位',
+    field: 'ssdw',
+    component: 'JInput',
+    colProps: { span: 4},
+   },
+   {
+    label: '教室类型',
+    field: 'jslx',
+    component: 'JInput',
+    colProps: { span: 4 },
+   },
+   {
+    label: '建筑物名称',
+    field: 'jzwmc',
+    component: 'JInput',
+    colProps: { span: 4 },
+   },
 ];
 //表单数据
 export const formSchema: FormSchema[] = [

src/views/kc/jiaoshi/KcJiaoshirongliangList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+   <BasicTable @register="registerTable" >
      <!--插槽:table标题-->
       <template #tableTitle>
           <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
@@ -66,8 +66,8 @@
            formConfig: {
               //labelWidth: 120,
               schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
+              autoSubmitOnEnter: false,
+              showAdvancedButton: false,
               fieldMapToNumber: [
               ],
               fieldMapToTime: [

src/views/kc/kcEvaluationsStat/KcEvaluationsStat.data.ts

@@ -97,7 +97,7 @@ export const columns: BasicColumn[] = [
   {
     title: '思政课程',
     align: "center",
-    dataIndex: 'szkc_dictText'
+    dataIndex: 'col59'
   },
   {
     title: '评价日期',

src/views/site/common/video/videojs/viewPage.vue

@@ -15,13 +15,14 @@
                       <span class="" style="border-radius: 5px;">
                         {{ ktangInfo.kcmc || ' ' }}
                       </span>
-                      <span style="float: right;margin-left: 10px;background: #1c84c6;color: #fff;padding: 9px;border-radius: 5px;font-size: 12px;" @click="() => tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })">填写评价表</span>
-                      <div style="font-size: .5rem;">
+                      <span style="float: right;margin-left: 10px;background: #1c84c6;color: #fff;padding: 9px;border-radius: 5px;font-size: 16px;" @click="() => tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })">填写评价表</span>
+                      <div style="font-size: 12px;">
                         {{ ktangInfo.zc || ' ' }}&nbsp;&nbsp;{{ ktangInfo.skjs || ' ' }}&nbsp;&nbsp;学分：{{ ktangInfo.xf || ' ' }}&nbsp;&nbsp;选课人数：{{ ktangInfo.xkrs || ' ' }}&nbsp;&nbsp;课程性质：{{ ktangInfo.kcxz || ' ' }}&nbsp;&nbsp;开课单位：{{ ktangInfo.kkdw || ' ' }}
                       </div>
                     </template>
                     <div style="padding: 1rem;">
-                      <div >{{ mainVideoCardBoxTitle || '' }}</div>
+                      <div style="font-size: 16px;float: left;">{{ mainVideoCardBoxTitle || '' }}</div>
+                      <div style="float: right;"><template v-if="ktangInfo?.jiaoshirongliang?.jsrl">本教室容量：{{ktangInfo?.jiaoshirongliang?.jsrl}}座位</template></div>
                       <bVideo ref="mainVideo" videoId="mainVideo" :videoOption="{ autoplay: true }" @load-end="mainVideoLoadEnd"/>
                       <div style="width: 100%;margin-top:10px;">
                         <a-textarea style="width: calc(100% - 7rem);height:120px;float: left;" v-model:value="model.notes" placeholder="您可以填写听课笔记"></a-textarea>

src/views/site/common/video/videojs/viewPage2.vue

@@ -17,7 +17,7 @@
                           {{ ktangInfo.kcmc || ' ' }}
                         </span>
                         <!-- <span style="margin-left: 10px;background: #1c84c6;color: #fff;padding: 3px;border-radius: 5px;font-size: 12px;" @click="() => tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })">填写评价表</span> -->
-                        <div style="font-size: .5rem;">
+                        <div style="font-size: 12px;">
                           {{ ktangInfo.zc || ' ' }}&nbsp;&nbsp;{{ ktangInfo.skjs || ' ' }}&nbsp;&nbsp;学分：{{ ktangInfo.xf || ' ' }}&nbsp;&nbsp;选课人数：{{ ktangInfo.xkrs || ' ' }}&nbsp;&nbsp;课程性质：{{ ktangInfo.kcxz || ' ' }}&nbsp;&nbsp;开课单位：{{ ktangInfo.kkdw || ' ' }}
                         </div>
                       </span>
@@ -31,7 +31,7 @@
                       </span>
                     </template> -->
                     <div style="padding: 1rem;">
-                      <div >{{ mainVideoCardBoxTitle || '' }}</div>
+                      <div style="float: left;">{{ mainVideoCardBoxTitle || '' }}</div>
                       <div style="float: right;"><template v-if="ktangInfo?.jiaoshirongliang?.jsrl">本教室容量：{{ktangInfo?.jiaoshirongliang?.jsrl}}座位</template></div>
                       <bVideo ref="mainVideo" videoId="mainVideo" :videoOption="{ autoplay: true }" @load-end="mainVideoLoadEnd"/>
                       <!-- <div style="width: 100%;margin-top:10px;">

src/views/site/pjjgPage/list.vue

@@ -51,7 +51,7 @@
                     <a-button type="primary" class="bcClass" @click="openJspjPage(item)" >教师评价</a-button>
                   </a-col>
                   <a-col :span="12">
-                    <a-button type="primary" class="bcClass" @click="openXspjPage(item)" >学生评评价</a-button>
+                    <a-button type="primary" class="bcClass" @click="openXspjPage(item)" >学生评价</a-button>
                   </a-col>
                 </a-row>
               </a-col>