Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: add course measure"
+	git commit --no-verify -m "fix: add course teacher"
 
 checkPre:
 	git checkout pre

src/services/apis/ClassTimeStatisticsController.ts

@@ -56,4 +56,7 @@ export async function getClassTimeStatisticsRecordList(params:any,mode: ErrorMes
 export async function postClassTimeStatisticsRefreshStatistics(params:API.RefreshStatisticsDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/classtime/classTimeStatistics/refresh-statistics', data:params},{errorMessageMode:mode});}
+/** 课时统计教师详情列表 GET /classtime/classTimeStatistics/teacher-record-page */
+export async function getClassTimeStatisticsTeacherRecordPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.ClassTimeStatisticsPageVo>>
+        ({url: '/classtime/classTimeStatistics/teacher-record-page', params:params},{errorMessageMode:mode});}
             

src/services/typing.d.ts

@@ -8311,6 +8311,8 @@ startDate?: string;
 status?: number;
 /** 总金额 */
 totalAmount?: number;
+/** 总周次 */
+weeks?: number;
 /** 统计年份 */
 year?: number;
 }

src/views/course/measure/components/edit.vue

@@ -41,14 +41,7 @@
               >
                 修改
               </a-button>
-              <a-button
-                class="ml-2"
-                type="primary"
-                :disabled="state.overWorkloadNumberStatus === 1"
-                @click="handelStatus"
-              >
-                锁定
-              </a-button>
+              <a-button class="ml-2" type="primary" @click="handelStatus"> 锁定 </a-button>
             </div>
           </Descriptions.Item>
         </Descriptions>
@@ -190,8 +183,11 @@
   const handelStatus = async () => {
     try {
       setModalProps({ loading: true, confirmLoading: true });
-      await postClassTimeStatisticsOverWorkloadNumberStatus({ id: unref(modelRef).id, status: 1 });
-      state.overWorkloadNumberStatus = 1;
+      await postClassTimeStatisticsOverWorkloadNumberStatus({
+        id: unref(modelRef).id,
+        status: state.overWorkloadNumberStatus !== 1 ? 1 : 0,
+      });
+      state.overWorkloadNumberStatus = state.overWorkloadNumberStatus !== 1 ? 1 : 0;
       createMessage.success('锁定成功');
     } catch {
       createMessage.error('锁定失败');

src/views/course/measure/data.config.ts

@@ -141,7 +141,8 @@ export const formDetailSchema: BasicColumn[] = [
     title: '总平均课时',
     dataIndex: 'classTime4',
     align: 'left',
-    width: 100,
+    width: 120,
+    sorter: true,
     customRender: ({ text }) => {
       return text === 0 ? '' : text;
     },

src/views/course/teacher/components/detail.vue

@@ -0,0 +1,227 @@
+<template>
+  <BasicModal
+    @ok="handleSubmit"
+    :destroyOnClose="true"
+    :maskClosable="false"
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="getTitle"
+    :width="1002"
+    showFooter
+    :defaultFullscreen="true"
+    :show-cancel-btn="false"
+  >
+    <div class="h-full">
+      <BasicTable @register="registerTable">
+        <template #toolbar>
+          <div class="flex-1 flex items-center">
+            <!-- <div class="flex flex-1 items-center justify-center text-lg font-bold">
+              <Space>
+                <div>{{ modelRef?.userName }}</div>
+                <div>{{ modelRef?.name }}</div>
+                <div>{{ modelRef?.employTypeCn }}</div>
+              </Space>
+            </div> -->
+            <div class="flex items-center">
+              <Space>
+                <a-button type="primary" @click="handleExport">导出</a-button>
+                <div class="flex items-center">
+                  <div
+                    style="width: 10px; height: 10px; border-radius: 50%; background-color: #facd91"
+                  ></div>
+                  <div class="ml-2">调课</div>
+                </div>
+                <div class="flex items-center">
+                  <div
+                    style="width: 10px; height: 10px; border-radius: 50%; background-color: #ec808d"
+                  ></div>
+                  <div class="ml-2">顶课</div>
+                </div>
+              </Space>
+            </div>
+          </div>
+        </template>
+        <template #allClassTime="{ text }">
+          <div>{{ text }}</div>
+        </template>
+      </BasicTable>
+    </div>
+  </BasicModal>
+</template>
+<script setup lang="ts">
+  import { ref, computed, unref, h } from 'vue';
+  import { Space } from 'ant-design-vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { useTable, BasicTable, BasicColumn } from '/@/components/Table';
+  import {
+    postClassTimeStatisticsRecordDetailExportQuery,
+    getClassTimeStatisticsRecordDetailInfo,
+  } from '/@/services/apis/ClassTimeStatisticsController';
+  import { formatToDate } from '/@/utils/dateUtil';
+  import { downloadByData } from '/@/utils/file/download';
+
+  const isUpdate = ref(true);
+  const modelRef = ref<Recordable>({});
+  const emit = defineEmits(['success', 'register']);
+
+  const [registerTable, { setTableData, setColumns, redoHeight }] = useTable({
+    title: '课时统计表',
+    rowKey: 'id',
+    columns: [
+      {
+        title: '课程名称',
+        dataIndex: 'userName',
+        align: 'left',
+        width: 80,
+      },
+    ],
+    useSearchForm: false,
+    showTableSetting: true,
+    bordered: true,
+    immediate: false,
+    canResize: true,
+    pagination: false,
+    showIndexColumn: false,
+    resizeHeightOffset: 80,
+  });
+
+  const [registerModal, { closeModal, setModalProps }] = useModalInner(async (data) => {
+    setModalProps({ confirmLoading: true });
+    isUpdate.value = false;
+
+    modelRef.value = { ...data.baseData };
+
+    await loadData();
+  });
+
+  const loadData = async () => {
+    setModalProps({ confirmLoading: true, loading: true });
+    const resData = await getClassTimeStatisticsRecordDetailInfo({ id: unref(modelRef).id });
+
+    const columns: BasicColumn[] = [
+      {
+        title: '节次',
+        dataIndex: 'timeName',
+        align: 'left',
+        width: 120,
+      },
+    ];
+    const dataList: Recordable[] = [];
+    try {
+      if (resData) {
+        const { rowTitle, columnTitle, data, allClassTime } = resData;
+
+        const totalRow: Recordable = { timeName: '合计课时' };
+
+        rowTitle.forEach((item, index) => {
+          columns.push({
+            title: item.scheduleDate,
+            dataIndex: `day${index}`,
+            width: 120,
+            customRender: formatDay,
+          });
+        });
+
+        columnTitle.forEach((col) => {
+          let row: Recordable = {
+            timeName: col.type,
+          };
+
+          rowTitle.forEach((item, index) => {
+            const filter = data.filter(
+              (f) =>
+                formatToDate(f.scheduleDate, 'MM.DD') === `${item.scheduleDate}` &&
+                f.type === col.type,
+            );
+
+            const colName = `day${index}`;
+
+            totalRow[colName] = {
+              courseName: item.content === 0 || item.content === '0.0' ? '' : item.content,
+            };
+
+            row[colName] = {};
+            row['total'] = col.content === 0 || col.content === '0.0' ? '' : col.content;
+
+            if (filter.length > 0) {
+              const filterItem = filter[0];
+              if (filterItem.content) {
+                const contents = filterItem.content.split(',');
+                const courseName = contents[0];
+                let className = '';
+                if (contents.length > 1) {
+                  className = contents[1];
+                }
+
+                row[colName]['courseName'] = courseName === '0.0' ? '' : courseName;
+                row[colName]['className'] = className;
+
+                if (filterItem.adjustType === 'course_exchange') {
+                  row[colName]['color'] = '#facd91';
+                }
+                if (filterItem.adjustType === 'course_substitute') {
+                  row[colName]['color'] = '#ec808d';
+                }
+              }
+            }
+          });
+
+          dataList.push(row);
+        });
+
+        totalRow['total'] = allClassTime;
+        dataList.push(totalRow);
+
+        // console.log('dataList', dataList);
+      }
+
+      columns.push({
+        title: '合计（课时）',
+        dataIndex: 'total',
+        width: 90,
+      });
+
+      setColumns(columns);
+      setTableData(dataList);
+
+      setTimeout(() => {
+        redoHeight();
+      }, 500);
+    } finally {
+      setModalProps({ confirmLoading: false, loading: false });
+    }
+  };
+
+  const formatDay = ({ text }) => {
+    let style = {};
+    if (text && text.color) {
+      style['backgroundColor'] = text.color;
+      style['color'] = '#fff';
+    }
+    return h('div', { style: style }, [
+      h('div', null, text?.courseName || ''),
+      h('div', null, text?.className || ''),
+    ]);
+  };
+
+  const getTitle = computed(() => (!unref(isUpdate) ? '课时明细' : '课时明细'));
+  const handleSubmit = async () => {
+    try {
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  };
+
+  const handleExport = async () => {
+    setModalProps({ loading: true, confirmLoading: true });
+    downloadByData(
+      (await postClassTimeStatisticsRecordDetailExportQuery({ id: unref(modelRef).id })).data,
+      `课时明细统计表${formatToDate(new Date())}.xlsx`,
+    );
+    setModalProps({ loading: false, confirmLoading: false });
+  };
+</script>
+
+<style scoped lang="less"></style>

src/views/course/teacher/index.vue

@@ -25,13 +25,13 @@
   import { tableColumns, searchFormSchema } from '../statistics/data.config';
 
   import { useModal } from '/@/components/Modal';
-  import { getClassTimeStatisticsPage } from '/@/services/apis/ClassTimeStatisticsController';
+  import { getClassTimeStatisticsTeacherRecordPage } from '/@/services/apis/ClassTimeStatisticsController';
   import { formatToDate } from '/@/utils/dateUtil';
-  import FormEdit from '../statistics/components/edit.vue';
+  import FormEdit from './components/detail.vue';
   const [registerModal, { openModal }] = useModal();
 
   const [registerTable, { reload }] = useTable({
-    api: getClassTimeStatisticsPage,
+    api: getClassTimeStatisticsTeacherRecordPage,
     title: '课时统计记录',
     rowKey: 'id',
     columns: tableColumns,
@@ -63,7 +63,7 @@
 
   const handleView = (record: any) => {
     openModal(true, {
-      isUpdate: true,
+      isUpdate: false,
       baseData: { ...record },
     });
   };