Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx

1、区分当前学期与历史学期界面功能
2、调整页面适配手机样式

README.md

@@ -379,3 +379,7 @@ Online表单&Online报表&代码生成
 
 
 
+
+## 判断是否小尺寸屏幕
+import { useScreenSize } from '/src/utils/screenSize/useScreenSize'
+const { isSmallScreen } = useScreenSize();

src/components/Modal/src/hooks/useModal.ts

@@ -60,22 +60,29 @@ export function useModal(): UseModalReturnType {
       getInstance()?.redoModalHeight?.();
     },
 
-    openModal: <T = any>(visible = true, data?: T, openOnSet = true): void => {
+    openModal: <T = any>(visible = true, data?: T, openOnSet = true, options?: { onOpen?: () => void; onClose?: () => void }): void => {
       getInstance()?.setModalProps({
         visible: visible,
       });
-
+    
       if (!data) return;
+    
       const id = unref(uid);
       if (openOnSet) {
         dataTransfer[id] = null;
         dataTransfer[id] = toRaw(data);
+        options?.onOpen?.(); // 打开时调用 onOpen 回调
         return;
       }
+    
       const equal = isEqual(toRaw(dataTransfer[id]), toRaw(data));
       if (!equal) {
         dataTransfer[id] = toRaw(data);
       }
+    
+      if (!visible && options?.onClose) {
+        options.onClose(); // 关闭时调用 onClose 回调
+      }
     },
 
     closeModal: () => {

src/components/Tinymce/src/Editor.vue

@@ -1,4 +1,4 @@
-<template>
+<template> 
   <div :class="prefixCls" :style="{ width: containerWidth }">
     <ImgUpload
       :fullscreen="fullscreen"
@@ -111,6 +111,7 @@
     props: tinymceProps,
     emits: ['change', 'update:modelValue', 'inited', 'init-error'],
     setup(props, { emit, attrs }) {
+      const showImageUpload = ref(false);
       const editorRef = ref<Nullable<Editor>>(null);
       const fullscreen = ref(false);
       const tinymceId = ref<string>(buildShortUUID('tiny-vue'));
@@ -145,7 +146,7 @@
         return {
           selector: `#${unref(tinymceId)}`,
           height,
-          toolbar,
+          toolbar: [...toolbar, 'customImageUpload'],
           menubar: menubar,
           plugins,
           // external_plugins: {
@@ -185,6 +186,15 @@
           ...options,
           setup: (editor: Editor) => {
             editorRef.value = editor;
+
+            editor.ui.registry.addButton('customImageUpload', {
+              text: 'Insert Image',
+              onAction: () => {
+                // 触发 ImgUpload 组件的方法，比如打开文件选择器
+                showImageUpload.value = true;
+              }
+            });
+
             editor.on('init', (e) => initSetup(e));
           },
         };

src/router/routes/modules/site/site.ts

@@ -270,7 +270,15 @@ const site: AppRouteModule = {
         title: '答题结果',
       },
     },
-    
+    {
+      path: 'WjxCywjV2Dtjghis',
+      name: 'WjxCywjV2Dtjghis',
+      component: () => import('/@/views/kc/wjxCswj/WjxCywjV2Dtjghis.vue'),
+      meta: {
+        // affix: true,
+        title: '答题结果',
+      },
+    },
   ],
 };
 

src/router/routes/modules/zyHistory/zyHistory.ts

@@ -1,69 +0,0 @@
-import type { AppRouteModule } from '/@/router/types';
-
-// import { LAYOUT } from '/@/router/constant';
-import { t } from '/@/hooks/web/useI18n';
-
-const zuoyehistory: AppRouteModule = {
-  path: '/history',
-  name: 'history',
-  component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMain.vue'),
-  redirect: '/history/hismain',
-  meta: {
-    isAddStaticPath: true,//是否静态引入（不用配置menu表）
-    orderNo: 106,
-    title: '历史作业',
-  },
-  children: [
-    {
-      path: 'hismain',
-      name: 'zuoyeHistoryMain',
-      meta: {
-        title: '课程简介',
-      },
-      component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryDetail.vue'),
-    },
-    {
-      path: 'hisTzgg',
-      name: 'hisTzgg',
-      component: () => import('/@/views/zy/zyGonggao/StudentGonggaoList.vue'),
-      meta: {
-        title: '通知公告',
-      },
-    },
-    {
-      path: 'hisKczy',
-      name: 'hisKczy',
-      component: () => import('/@/views/zy/zyInfo/ZyInfoHisMainList.vue'),
-      meta: {
-        title: '课程作业',
-      },
-    },
-    {
-      path: 'hisdksbl',
-      name: 'hisdksbl',
-      component: () => import('/@/views/kc/detection/zyZhjsList.vue'),
-      meta: {
-        title: 'AI识别出勤率',
-      },
-    },
-    {
-      path: 'hisKccy',
-      name: 'hisKccy',
-      component: () => import('/@/views/kc/wjxCswj/WjxCswjHisMainList.vue'),
-      meta: {
-        title: '课程测验',
-      },
-    },
-    {
-      path: 'hisWjdc',
-      name: 'hisWjdc',
-      component: () => import('/@/views/kc/wjxDcwj/WjxDcwjHisMainList.vue'),
-      meta: {
-        title: '问卷调查',
-      },
-    },
-
-  ]
-}
-
-export default zuoyehistory;

src/router/routes/modules/zyhis/zyhis.ts

@@ -0,0 +1,76 @@
+import type { AppRouteModule } from '/@/router/types';
+
+// import { LAYOUT } from '/@/router/constant';
+import { t } from '/@/hooks/web/useI18n';
+
+const zyhis: AppRouteModule = {
+  path: '/zyhis',
+  name: 'zyhis',
+  component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue'),
+  redirect: '/zyhis/main',
+  meta: {
+    isAddStaticPath: true,//是否静态引入（不用配置menu表）
+    orderNo: 104,
+    title: '作业',
+  },
+  children: [
+    {
+      path: 'tuGonggaohis',
+      name: 'tuGonggaohis',
+      component: () => import('/@/views/zy/zyGonggao/ZyGonggaoHistoryList.vue'),
+      meta: {
+        title: '公告',
+      },
+    },
+    {
+      path: 'dqkcDetailhis',
+      name: 'dqkcDetailhis',
+      component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetailhis.vue'),
+      meta: {
+        title: '课程工作台',
+      },
+    },
+    {
+      path: 'dqkcDqzyhis',
+      name: 'dqkcDqzyhis',
+      component: () => import('/@/views/zy/zyInfo/ZyInfoV2Listhis.vue'),
+      meta: {
+        title: '当前作业',
+      },
+    },
+    {
+      path: 'dqkcQmzyhis',
+      name: 'dqkcQmzyhis',
+      component: () => import('/@/views/zy/zyInfo/ZyInfoQimoV2Listhis.vue'),
+      meta: {
+        title: '期末考试',
+      },
+    },
+    {
+      path: 'ceshiWenjuanhis',
+      name: 'ceshiWenjuanhis',
+      component: () => import('/@/views/kc/wjxCswj/WjxCywjV2Listhis.vue'),
+      meta: {
+        title: '测试问卷',
+      },
+    },
+    {
+      path: 'dqkcKczyhis',
+      name: 'dqkcKczyhis',
+      component: () => import('/@/views/zy/zyZyxx/ZyZyxxListhis.vue'),
+      meta: {
+        title: '教学大纲',
+      },
+    },
+    {
+      path: 'dqkcKhclhis',
+      name: 'dqkcKhclhis',
+      component: () => import('/@/views/zy/zyInfo/ZyInfoKhclListhis.vue'),
+      meta: {
+        title: '考核材料',
+      },
+    },
+  ]
+}
+
+export default zyhis;

src/utils/screenSize/useScreenSize.ts

@@ -0,0 +1,33 @@
+import { computed, onMounted, onUnmounted } from 'vue';
+
+interface UseScreenSizeReturn {
+  isSmallScreen: import('vue').ComputedRef<boolean>;
+}
+
+export function useScreenSize(): UseScreenSizeReturn {
+  // 计算是否为小屏设备
+  const isSmallScreen = computed<boolean>(() => window.innerWidth < 600); // 根据需要调整断点
+
+  // 更新 isSmallScreen 的函数（这里不需要单独的更新函数，因为计算属性会自动响应变化）
+
+  // 当组件挂载时添加事件监听器以响应窗口大小的变化
+  onMounted(() => {
+    const updateIsSmallScreen = () => {
+      // 强制重新计算计算属性，确保响应式更新
+      isSmallScreen.value;
+    };
+
+    window.addEventListener('resize', updateIsSmallScreen);
+    updateIsSmallScreen(); // 初始化调用一次
+  });
+
+  // 当组件卸载时移除事件监听器
+  onUnmounted(() => {
+    window.removeEventListener('resize', () => {
+    });
+  });
+
+  return {
+    isSmallScreen,
+  };
+}

src/views/kc/wjxCswj/WjxCywjV2Dtjg.vue

@@ -1,5 +1,5 @@
 <template>
-  ><div id="siteMain">
+  <div id="siteMain">
     <div id="maxSite">
       <a-layout>
         <!-- 页头 -->
@@ -62,7 +62,7 @@
                           >题目分值：<span class="answer-word"> {{ item.wjScore }}</span> 分</span
                         >
                       </template>
-                      <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                      <a-radio-group v-if="!isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
                         <div style="width: 100%" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
                           <a-radio :value="tmxx.itemIndex + ``" style="width: 100%; margin-bottom: 5px">
                             <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000"></span>
@@ -71,6 +71,23 @@
                           </a-radio>
                         </div>
                       </a-radio-group>
+                      <a-radio-group v-if="isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <div v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2" class="radio-item">
+                          <!-- Radio 按钮和标题 -->
+                          <div style="display: flex; align-items: center;">
+                            <a-radio :value="tmxx.itemIndex + ''">
+                              <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000;"></span>
+                            </a-radio>
+                          </div>
+                          <!-- 正确答案和选择人数 -->
+                          <div style="display: flex; justify-content: space-between; margin-top: 5px;padding-left:20px;height: 25px;">
+                            <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; font-size: 12px;">(正确答案)</span>
+                            <span class="tjfx-xzrs" >选择人数：{{ tmxx.num }}人</span>
+                          </div>
+                          <!-- 分隔线，仅在不是最后一个选项时显示 -->
+                          <hr v-if="index2 !== item.wjxWjxxTmxxList.length - 1" class="divider-line"/>
+                        </div>
+                      </a-radio-group>
                     </a-card>
                   </div>
                   <!-- 多选题 -->
@@ -82,7 +99,28 @@
                           >题目分值： <span class="answer-word">{{ item.wjScore }}</span> 分</span
                         >
                       </template>
-                      <a-checkbox-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                      <a-checkbox-group v-if="isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <a-row>
+                          <a-col :span="24" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
+                            <!-- Checkbox and Title -->
+                            <div style="display: flex; flex-direction: column;">
+                              <a-checkbox :value="tmxx.itemIndex" style="flex: 1 0 auto; width: 100%; margin-bottom: 5px;">
+                                <div style="width: 100%; font-size: 16px; color: #000; word-break: break-all; white-space: normal;">
+                                  <span v-html="tmxx.itemTitle"></span>
+                                </div>
+                              </a-checkbox>
+
+                              <!-- Correct Answer and Selection Count -->
+                              <div style="display: flex; align-items: center; height: 50px;"
+                                :style="{ 'border-bottom': index2 !== item.wjxWjxxTmxxList.length - 1 ? '1px solid #ccc' : 'none' }">
+                                <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; flex: 1; font-size: 12px;">(正确答案)</span>
+                                <span class="tjfx-xzrs" style="text-align: right; padding-right: 10px; flex: 1;">选择人数：{{ tmxx.num }}人</span>
+                              </div>
+                            </div>
+                          </a-col>
+                        </a-row>
+                      </a-checkbox-group>
+                      <a-checkbox-group v-if="!isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
                         <a-row>
                           <a-col :span="24" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
                             <a-checkbox :value="tmxx.itemIndex" style="width: 100%; margin-bottom: 5px">
@@ -96,7 +134,39 @@
                     </a-card>
                   </div>
                   <!-- 填空题 -->
-                  <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5">
+                  <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && isSmallScreen">
+                    <a-card>
+                      <!-- 确保正确答案、正确人数、错误人数各占一行 -->
+                        <div style="text-align: left;">
+                          <!-- 正确答案独占一行 -->
+                          <div v-if="item.wjAnswer" style="color: #9e9e9e; margin-bottom: 4px;">
+                            (正确答案: {{ item.wjAnswer }})
+                          </div>
+                          <!-- 正确人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            正确人数：{{ item.num }}人
+                          </div>
+                          <!-- 错误人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            错误人数：{{ item.num2 }}人
+                          </div>
+                        </div>
+                      <!-- 题目类型和分值独占一行 -->
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <div style="display: flex;justify-content: space-between;align-items: center;">
+                          <!-- 确保填空题独占一行 -->
+                          <div>
+                            <span class="question-type">填空题</span>
+                          </div>
+                          <!-- 确保题目分值独占一行 -->
+                          <div>
+                            <span style="margin-left: 10px;">题目分值：<span class="answer-word">{{ item.wjScore }}</span> 分</span>
+                          </div>
+                        </div>
+                      </template>
+                    </a-card>
+                  </div>
+                  <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && !isSmallScreen">
                     <a-card>
                       <template #title>
                         <span v-if="item.wjAnswer" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.wjAnswer }})</span>
@@ -116,13 +186,14 @@
                     <!-- <span style="text-align: left;width: 50%;font-weight: bold;font-size: 18px;padding: 20px;">填空题</span> -->
                     <!-- <span class="tjfx-zql">正确率：15%</span> -->
                     <a-card>
-                      <template #title>
+                      <template #title v-if="!isSmallScreen">
                         <j-upload v-model:value="item.picPath" fileType="image" :max-count="1" disabled :buttonVisible="false"></j-upload>
                         <!-- <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" /> -->
                         <!-- <span v-if="item.wjAnswer" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.wjAnswer }})</span>
                       <span class="tjfx-xzrs1" style="color: #9e9e9e">正确人数：{{ item.num }}人</span>
                       <span class="tjfx-xzrs1" style="color: #9e9e9e">错误人数：{{ item.num2 }}人</span> -->
                       </template>
+                      <j-upload v-if="isSmallScreen" v-model:value="item.picPath" fileType="image" :max-count="1" disabled :buttonVisible="false"></j-upload>
                       <template #extra v-if="zyInfo.atype == 6">
                         <span class="question-type" style="margin-left: 40px">文件题</span>
                         <span style="margin-left: 40px"
@@ -148,11 +219,11 @@
                   <!-- 单选题 -->
                   <div style="width: 98%; margin: 0 auto">
                     <a-row :span="24">
-                      <a-col :span="12">
-                        <pie :chartData="getPieData(item)" :option="pieOption" height="300px" style="width: 500px" />
+                      <a-col :span="24" :lg="{span:12}">
+                        <pie :chartData="getPieData(item)" :option="pieOption" :height="isSmallScreen?'20vh':'300px'" class="char-class" />
                       </a-col>
-                      <a-col :span="12">
-                        <BarMulti :chartData="getBarData(item)" :option="multiBarOption" height="300px" style="width: 500px"></BarMulti>
+                      <a-col :span="24" :lg="{span:12}">
+                        <BarMulti :chartData="getBarData(item)" :option="multiBarOption" :height="isSmallScreen?'30vh':'300px'" class="char-class"></BarMulti>
                       </a-col>
                     </a-row>
                   </div>
@@ -178,7 +249,7 @@
 </template>
 
 <script lang="ts" name="zyInfo-zyInfo" setup>
-import { ref, reactive, onMounted, unref, onBeforeUnmount } from 'vue';
+import { ref, reactive, onMounted, unref, onBeforeUnmount, onUnmounted, watchEffect  } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useRouter } from 'vue-router';
@@ -275,6 +346,22 @@ onMounted(() => {
 function clear() {
   intervalId && window.clearInterval(intervalId);
 }
+
+const isSmallScreen = ref(false);
+
+const checkScreenSize = () => {
+  isSmallScreen.value = window.innerWidth <= 768; // 根据需要调整断点
+};
+
+// 立即执行一次以设置初始值，并在组件卸载前监听窗口大小变化
+watchEffect(() => {
+  checkScreenSize();
+  const resizeObserver = () => checkScreenSize();
+  window.addEventListener('resize', resizeObserver);
+  onUnmounted(() => {
+    window.removeEventListener('resize', resizeObserver);
+  });
+});
 </script>
 
 <style lang="less" scoped>
@@ -491,6 +578,18 @@ function clear() {
   position: absolute;
   right: 15px;
 }
+@media (max-width: 768px) { /* 根据需要调整这个宽度 */
+  .tjfx-xzrs {
+    font-size: 12px;
+  }
+}
+
+.divider-line {
+  border: none;
+  height: 1px;
+  background-color: #e0e0e0; /* 淡灰色 */
+  margin: 10px 0; /* 上下间距 */
+}
 .tjfx-xzrs1 {
   margin-left: 30px;
   font-size: 12px;
@@ -548,4 +647,16 @@ function clear() {
     }
   }
 }
+
+@media (max-width: 768px) {
+.char-class{
+  width:70vw;
+}
+}
+  @media (min-width: 769px) {
+  .char-class{
+    width:300px;
+  }
+  }
+
 </style>

src/views/kc/wjxCswj/WjxCywjV2Dtjghis.vue

@@ -0,0 +1,664 @@
+<template>
+  <div id="siteMain">
+    <div id="maxSite">
+      <a-layout>
+        <!-- 页头 -->
+        <headerPage />
+        <!-- 主体部分 -->
+        <a-layout-content style="background-color: white; margin-top: 10px">
+          <a-row>
+            <a-col :span="24" style="text-align: center">
+              <span class="title">{{ zyInfo.title }}</span>
+            </a-col>
+            <a-col :span="24" style="text-align: right">
+              <span style="color: #999">开始时间：</span><span style="color: #666">{{ dayjs(zyInfo.startTime).format('MM.DD HH:mm') }}</span> ~
+              <span style="color: #999">结束时间：</span
+              ><span style="color: #666; margin-right: 20px">{{ dayjs(zyInfo.endTime).format('MM.DD HH:mm') }}</span>
+            </a-col>
+            <a-col :span="24" style="margin-top: 10px">
+              <div style="display: flex">
+                <div class="tjfx-line diva" @click="handleDjjgs(zyInfo, '')"
+                  ><span class="tjfx-colt">{{ zyInfo.xkrs }}</span
+                  ><span class="tjfx-colw"> 总人数</span></div
+                >
+                <div class="tjfx-line diva" @click="handleDjjgs(zyInfo, '1')"
+                  ><span class="tjfx-colt">{{ zyInfo.ywcrs }}</span
+                  ><span class="tjfx-colw"> 已完成人数</span></div
+                >
+                <div class="tjfx-line diva" @click="handleDjjgs(zyInfo, '0')"
+                  ><span class="tjfx-colt">{{ zyInfo.wwcrs }}</span
+                  ><span class="tjfx-colw"> 未完成人数</span></div
+                >
+              </div>
+            </a-col>
+            <a-col :span="24" style="margin-top: 10px; text-align: right">
+              <a-switch style="margin-right: 20px" checkedChildren="统计" unCheckedChildren="图表" v-model:checked="twoShowType" />
+            </a-col>
+            <a-col :span="23.5" style="margin: 10px 20px" v-if="twoShowType">
+              <a-collapse accordion expandIconPosition="right">
+                <a-collapse-panel :key="index" v-for="(item, index) in zyInfo.tmlbList">
+                  <template #header>
+                    <a-row :span="24" style="width: 90%">
+                      <a-col :span="24" class="title2"><div v-html="item.wjTitle"></div></a-col>
+                      <a-col :span="8" style="color: #909399; display: flex; flex-direction: column; text-align: left; font-size: 12px"
+                        ><span style="font-weight: bold; font-size: 20px; margin-left: 5px">{{ item.yzd }}</span
+                        >已作答人数</a-col
+                      >
+                      <a-col :span="8" style="color: #1ab394; display: flex; flex-direction: column; text-align: left; font-size: 12px"
+                        ><span style="font-weight: bold; font-size: 20px; margin-left: 5px">{{ item.ddrs }}</span
+                        >{{ item.wjType == '8' ? '已批阅人数' : '答对人数' }}</a-col
+                      >
+                      <a-col :span="8" style="color: #f56c6c; display: flex; flex-direction: column; text-align: left; font-size: 12px"
+                        ><span style="font-weight: bold; font-size: 20px; margin-left: 5px">{{ item.dcrs }}</span
+                        >{{ item.wjType != '8' ? '答错人数' : '未批阅人数' }}</a-col
+                      >
+                    </a-row>
+                  </template>
+                  <div style="width: 98%; margin: 0 auto" v-if="item.wjType == 3">
+                    <a-card>
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <span class="question-type" style="margin-left: 40px">单选题</span>
+                        <span style="margin-left: 40px"
+                          >题目分值：<span class="answer-word"> {{ item.wjScore }}</span> 分</span
+                        >
+                      </template>
+                      <a-radio-group v-if="!isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <div style="width: 100%" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
+                          <a-radio :value="tmxx.itemIndex + ``" style="width: 100%; margin-bottom: 5px">
+                            <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000"></span>
+                            <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案)</span>
+                            <span class="tjfx-xzrs">选择人数：{{ tmxx.num }}人</span>
+                          </a-radio>
+                        </div>
+                      </a-radio-group>
+                      <a-radio-group v-if="isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <div v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2" class="radio-item">
+                          <!-- Radio 按钮和标题 -->
+                          <div style="display: flex; align-items: center;">
+                            <a-radio :value="tmxx.itemIndex + ''">
+                              <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000;"></span>
+                            </a-radio>
+                          </div>
+                          <!-- 正确答案和选择人数 -->
+                          <div style="display: flex; justify-content: space-between; margin-top: 5px;padding-left:20px;height: 25px;">
+                            <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; font-size: 12px;">(正确答案)</span>
+                            <span class="tjfx-xzrs" >选择人数：{{ tmxx.num }}人</span>
+                          </div>
+                          <!-- 分隔线，仅在不是最后一个选项时显示 -->
+                          <hr v-if="index2 !== item.wjxWjxxTmxxList.length - 1" class="divider-line"/>
+                        </div>
+                      </a-radio-group>
+                    </a-card>
+                  </div>
+                  <!-- 多选题 -->
+                  <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 4">
+                    <a-card>
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <span class="question-type" style="margin-left: 40px">多选题</span>
+                        <span style="margin-left: 40px"
+                          >题目分值： <span class="answer-word">{{ item.wjScore }}</span> 分</span
+                        >
+                      </template>
+                      <a-checkbox-group v-if="isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <a-row>
+                          <a-col :span="24" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
+                            <!-- Checkbox and Title -->
+                            <div style="display: flex; flex-direction: column;">
+                              <a-checkbox :value="tmxx.itemIndex" style="flex: 1 0 auto; width: 100%; margin-bottom: 5px;">
+                                <div style="width: 100%; font-size: 16px; color: #000; word-break: break-all; white-space: normal;">
+                                  <span v-html="tmxx.itemTitle"></span>
+                                </div>
+                              </a-checkbox>
+
+                              <!-- Correct Answer and Selection Count -->
+                              <div style="display: flex; align-items: center; height: 50px;"
+                                :style="{ 'border-bottom': index2 !== item.wjxWjxxTmxxList.length - 1 ? '1px solid #ccc' : 'none' }">
+                                <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; flex: 1; font-size: 12px;">(正确答案)</span>
+                                <span class="tjfx-xzrs" style="text-align: right; padding-right: 10px; flex: 1;">选择人数：{{ tmxx.num }}人</span>
+                              </div>
+                            </div>
+                          </a-col>
+                        </a-row>
+                      </a-checkbox-group>
+                      <a-checkbox-group v-if="!isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <a-row>
+                          <a-col :span="24" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
+                            <a-checkbox :value="tmxx.itemIndex" style="width: 100%; margin-bottom: 5px">
+                              <span v-html="tmxx.itemTitle" style="width: 80%; font-size: 16px; color: #000"></span>
+                              <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案)</span>
+                              <span class="tjfx-xzrs">选择人数：{{ tmxx.num }}人</span>
+                            </a-checkbox>
+                          </a-col>
+                        </a-row>
+                      </a-checkbox-group>
+                    </a-card>
+                  </div>
+                  <!-- 填空题 -->
+                  <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && isSmallScreen">
+                    <a-card>
+                      <!-- 确保正确答案、正确人数、错误人数各占一行 -->
+                        <div style="text-align: left;">
+                          <!-- 正确答案独占一行 -->
+                          <div v-if="item.wjAnswer" style="color: #9e9e9e; margin-bottom: 4px;">
+                            (正确答案: {{ item.wjAnswer }})
+                          </div>
+                          <!-- 正确人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            正确人数：{{ item.num }}人
+                          </div>
+                          <!-- 错误人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            错误人数：{{ item.num2 }}人
+                          </div>
+                        </div>
+                      <!-- 题目类型和分值独占一行 -->
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <div style="display: flex;justify-content: space-between;align-items: center;">
+                          <!-- 确保填空题独占一行 -->
+                          <div>
+                            <span class="question-type">填空题</span>
+                          </div>
+                          <!-- 确保题目分值独占一行 -->
+                          <div>
+                            <span style="margin-left: 10px;">题目分值：<span class="answer-word">{{ item.wjScore }}</span> 分</span>
+                          </div>
+                        </div>
+                      </template>
+                    </a-card>
+                  </div>
+                  <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && !isSmallScreen">
+                    <a-card>
+                      <template #title>
+                        <span v-if="item.wjAnswer" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.wjAnswer }})</span>
+                        <span class="tjfx-xzrs1" style="color: #9e9e9e">正确人数：{{ item.num }}人</span>
+                        <span class="tjfx-xzrs1" style="color: #9e9e9e">错误人数：{{ item.num2 }}人</span>
+                      </template>
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <span class="question-type" style="margin-left: 40px">填空题</span>
+                        <span style="margin-left: 40px"
+                          >题目分值：<span class="answer-word"> {{ item.wjScore }}</span> 分</span
+                        >
+                      </template>
+                    </a-card>
+                  </div>
+                  <!-- 文件题 -->
+                  <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 8">
+                    <!-- <span style="text-align: left;width: 50%;font-weight: bold;font-size: 18px;padding: 20px;">填空题</span> -->
+                    <!-- <span class="tjfx-zql">正确率：15%</span> -->
+                    <a-card>
+                      <template #title v-if="!isSmallScreen">
+                        <j-upload v-model:value="item.picPath" fileType="image" :max-count="1" disabled :buttonVisible="false"></j-upload>
+                        <!-- <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" /> -->
+                        <!-- <span v-if="item.wjAnswer" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.wjAnswer }})</span>
+                      <span class="tjfx-xzrs1" style="color: #9e9e9e">正确人数：{{ item.num }}人</span>
+                      <span class="tjfx-xzrs1" style="color: #9e9e9e">错误人数：{{ item.num2 }}人</span> -->
+                      </template>
+                      <j-upload v-if="isSmallScreen" v-model:value="item.picPath" fileType="image" :max-count="1" disabled :buttonVisible="false"></j-upload>
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <span class="question-type" style="margin-left: 40px">文件题</span>
+                        <span style="margin-left: 40px"
+                          >题目分值：<span class="answer-word"> {{ item.wjScore }}</span> 分</span
+                        >
+                      </template>
+                    </a-card>
+                  </div>
+                  <div v-else> 无对应类型 </div>
+                </a-collapse-panel>
+              </a-collapse>
+            </a-col>
+
+            <!-- 图表 -->
+            <a-col :span="23.5" style="margin: 10px 20px" v-if="!twoShowType">
+              <a-collapse accordion expandIconPosition="right">
+                <a-collapse-panel :key="index" v-for="(item, index) in zyInfo.tmlbList">
+                  <template #header>
+                    <a-row :span="24" style="width: 100%">
+                      <a-col :span="24" class="title2"><div v-html="item.wjTitle"></div></a-col>
+                    </a-row>
+                  </template>
+                  <!-- 单选题 -->
+                  <div style="width: 98%; margin: 0 auto">
+                    <a-row :span="24">
+                      <a-col :span="24" :lg="{span:12}">
+                        <pie :chartData="getPieData(item)" :option="pieOption" :height="isSmallScreen?'20vh':'300px'" class="char-class" />
+                      </a-col>
+                      <a-col :span="24" :lg="{span:12}">
+                        <BarMulti :chartData="getBarData(item)" :option="multiBarOption" :height="isSmallScreen?'30vh':'300px'" class="char-class"></BarMulti>
+                      </a-col>
+                    </a-row>
+                  </div>
+                  <!-- 多选题 -->
+                  <!-- <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 4">
+                </div> -->
+                  <!-- 填空题 -->
+                  <!-- <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5">
+                </div> -->
+                  <!-- <div v-else> 无对应类型 </div> -->
+                </a-collapse-panel>
+              </a-collapse>
+            </a-col>
+            <a-col style="height: 40px"> </a-col>
+          </a-row>
+        </a-layout-content>
+        <!-- 页尾 -->
+        <footerPage style="margin-top: 10px" />
+      </a-layout>
+    </div>
+    <WjxWjxxTmlbDjjgsModalhis ref="WjxWjxxTmlbDjjgsModalPage"></WjxWjxxTmlbDjjgsModalhis>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfo-zyInfo" setup>
+import { ref, reactive, onMounted, unref, onBeforeUnmount , onUnmounted, watchEffect} from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { useRouter } from 'vue-router';
+import dayjs, { Dayjs } from 'dayjs';
+import { Form } from 'ant-design-vue';
+import { getValueType } from '/@/utils';
+import headerPage from '/@/views/site/common/header.vue';
+import footerPage from '/@/views/site/common/footer.vue';
+import Pie from '/@/components/chart/Pie.vue';
+import BarMulti from '/@/components/chart/BarMulti.vue';
+
+import WjxWjxxTmlbDjjgsModalhis from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModalhis.vue';
+import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, type, teano, cyid } = query; //获取传递参数
+const { createConfirm, createMessage } = useMessage();
+const zyInfo = ref<any>({});
+const WjxWjxxTmlbDjjgsModalPage = ref();
+
+const twoShowType = ref<boolean>(true);
+let intervalId: ReturnType<typeof setInterval> | null;
+const aaaaa = ref<number>(0);
+
+const multiBarOption = {
+  title: { text: '答题情况统计', left: 'center' },
+};
+
+const pieOption = {
+  title: { text: '正确率统计', left: 'center' },
+};
+
+function getPieData(item) {
+  console.log('👩', item);
+  if(item.wjType == 8){
+    const pieData = [
+      { value: parseInt(item.ddrs), name: '已批阅人数' },
+      { value: parseInt(item.dcrs), name: '未批阅人数' },
+    ];
+    return pieData;
+  }else{
+    const pieData = [
+      { value: parseInt(item.ddrs), name: '答对人数' },
+      { value: parseInt(item.dcrs), name: '答错人数' },
+    ];
+    return pieData;
+  }
+  
+}
+
+function getBarData(item) {
+  if(item.wjType == 8){
+    const barMultiData = [
+      { value: parseInt(item.yzd), name: '作答人数' },
+      { value: parseInt(item.ddrs), name: '已批阅人数' },
+      { value: parseInt(item.dcrs), name: '未批阅人数' },
+    ];
+    return barMultiData;
+  }else{
+    const barMultiData = [
+      { value: parseInt(item.yzd), name: '作答人数' },
+      { value: parseInt(item.ddrs), name: '答对人数' },
+      { value: parseInt(item.dcrs), name: '答错人数' },
+    ];
+    return barMultiData;
+  }
+}
+function reloadZy() {
+  defHttp.get({ url: '/wjxWjxx/wjxWjxx/queryCyjgById', params: { id: cyid } }).then((res) => {
+    zyInfo.value = res;
+  });
+}
+/**
+ * 学生答卷列表
+ */
+function handleDjjgs(record: Recordable, flag) {
+  WjxWjxxTmlbDjjgsModalPage.value.disableSubmit = true;
+  WjxWjxxTmlbDjjgsModalPage.value.edit(record, flag);
+}
+
+onMounted(() => {
+  reloadZy();
+  intervalId = setInterval(() => {
+    // 执行要重复执行的逻辑
+    reloadZy();
+    if (zyInfo.value.xkrs == zyInfo.value.ywcrs) {
+      clear();
+    }
+  }, 15000);
+});
+
+function clear() {
+  intervalId && window.clearInterval(intervalId);
+}
+
+const isSmallScreen = ref(false);
+
+const checkScreenSize = () => {
+  isSmallScreen.value = window.innerWidth <= 768; // 根据需要调整断点
+};
+
+// 立即执行一次以设置初始值，并在组件卸载前监听窗口大小变化
+watchEffect(() => {
+  checkScreenSize();
+  const resizeObserver = () => checkScreenSize();
+  window.addEventListener('resize', resizeObserver);
+  onUnmounted(() => {
+    window.removeEventListener('resize', resizeObserver);
+  });
+});
+
+</script>
+
+<style lang="less" scoped>
+.title {
+  line-height: 100px;
+  font-size: 18px;
+}
+.title2 {
+  font-size: 18px;
+  font-weight: bold;
+  color: #333;
+}
+.ant-divider-horizontal {
+  display: flex;
+  clear: both;
+  width: 100%;
+  min-width: 100%;
+  margin: 3px 0 5px;
+}
+.tishi {
+  width: 100%;
+  font-size: 12px;
+  color: #fd8f02;
+  margin-top: -4px;
+  background: #fffbf2;
+  text-align: center;
+  padding: 6px 0;
+}
+.cardClass {
+  min-height: 200px;
+}
+.sznrClass {
+  line-height: 40px;
+  text-align: center;
+}
+.ant-card {
+  box-sizing: border-box;
+  margin: 2px 0;
+  padding: 0;
+  color: rgb(0 0 0);
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  font-feature-settings: tnum;
+  position: relative;
+  border-radius: 5px;
+  border: 1px solid #dadada;
+  background: #fff;
+}
+.ant-card-head {
+  min-height: 48px;
+  margin-bottom: -1px;
+  padding: 0 24px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 500;
+  font-size: 16px;
+  background: transparent;
+  border-bottom: 1px solid #dadada;
+  border-radius: 2px 2px 0 0;
+}
+.ellipsis {
+  overflow: hidden; /* 确保超出容器的内容被裁剪 */
+  white-space: nowrap; /* 确保文本在一行内显示 */
+  text-overflow: ellipsis; /* 超出部分显示省略号 */
+}
+.ellip-title {
+  display: flex;
+  justify-content: space-between;
+}
+.elli-title {
+  font-size: 16px;
+  font-weight: bold;
+}
+.ellip-word {
+  font-size: 14px;
+  color: #666666;
+}
+.zuanqu:hover {
+  cursor: pointer;
+  color: #18a689;
+}
+.data-suggest {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+  width: 25%;
+  margin-right: 3px;
+  padding: 8px 3px;
+  border-radius: 5px;
+  background: #f7f7f7;
+  margin-top: 10px;
+}
+.data-suggest span:nth-child(1) {
+  font-size: 16px;
+  font-weight: bold;
+}
+.data-suggest span:nth-child(2) {
+  font-size: 12px;
+}
+.work-img {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 80px;
+  margin-bottom: 30px;
+}
+.work-img-img {
+  width: 180px;
+  height: 139px;
+}
+.buttonClass {
+  background: #1ab394;
+  font-weight: 600;
+  color: #fff;
+  border-radius: 3px;
+  border: none;
+}
+.mar-right20 {
+  margin-right: 14px;
+}
+.button-zhta {
+  color: #666666;
+  cursor: pointer;
+}
+.button-zhta:hover {
+  cursor: pointer;
+  color: #18a689;
+}
+
+.diva {
+  cursor: pointer;
+  color: #18a689;
+}
+.sear-distance {
+  padding: 0 10px;
+}
+.ant-form-item {
+  box-sizing: border-box;
+  margin: 10px 0;
+  padding: 0;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  font-feature-settings: tnum;
+  /* margin-bottom: 24px; */
+  vertical-align: top;
+}
+.bled-countenance {
+  color: #333333;
+}
+.bled-countenance2 {
+  color: #999999;
+  font-size: 12px;
+}
+.region {
+  margin: 5px 10px;
+  padding-bottom: 20px;
+  background: #fff;
+  border-radius: 5px;
+}
+.region-title {
+  font-size: 16px;
+  color: #029c88;
+  padding: 8px 20px;
+  border-left: 5px solid #029c88;
+  margin: 10px;
+  border-radius: 5px;
+  background: #fff;
+}
+.tjfx-col {
+  font-size: 12px;
+  padding: 8px 20px;
+  line-height: 25px;
+}
+.tjfx-col-title {
+  font-size: 16px;
+  padding: 8px 20px;
+  line-height: 25px;
+  font-weight: bold;
+}
+.tjfx-line {
+  width: 33%;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  background: #f7f7f7;
+  border-radius: 5px;
+  margin: 0 15px;
+  padding: 8px 0;
+}
+.tjfx-colt {
+  font-size: 22px;
+  font-weight: bold;
+  color: #1ab394;
+}
+.tjfx-colw {
+  font-size: 14px;
+  color: #666;
+}
+.tjfx-title {
+  width: 90%;
+  float: left;
+}
+.tjfx-type {
+  width: 10%;
+  float: left;
+}
+.tjfx-xzrs {
+  margin-left: 30px;
+  font-size: 12px;
+  position: absolute;
+  right: 15px;
+}
+
+@media (max-width: 768px) { /* 根据需要调整这个宽度 */
+  .tjfx-xzrs {
+    font-size: 12px;
+  }
+}
+
+.divider-line {
+  border: none;
+  height: 1px;
+  background-color: #e0e0e0; /* 淡灰色 */
+  margin: 10px 0; /* 上下间距 */
+}
+
+.tjfx-xzrs1 {
+  margin-left: 30px;
+  font-size: 12px;
+}
+.tjfx-zql {
+  text-align: right;
+  width: 50%;
+  font-size: 16px;
+  padding: 20px;
+}
+.question-type {
+  background: #eaf9f6;
+  color: #1ab394;
+  padding: 0 5px;
+  border-radius: 3px;
+  border: 1px solid #1ab394;
+}
+.answer-word {
+  color: #ff8710;
+  font-weight: bold;
+}
+
+#siteMain {
+  // font-size: ;
+  // height: 100%;
+  background: #f3f3f4;
+  #maxSite {
+    //最大宽度
+    max-width: 1170px;
+    //居中
+    margin: 0 auto;
+    .rowGutter {
+      margin-top: 1rem;
+      margin-bottom: 1rem;
+    }
+
+    .ant-layout-header {
+      color: #fff;
+      background: #1ab394;
+    }
+    .ant-layout-footer {
+      line-height: 1.5;
+      background: #fff;
+    }
+    .ant-layout-sider {
+      color: #fff;
+      background: #3ba0e9;
+    }
+    .ant-layout-content {
+      color: #000;
+      background: #f3f3f4;
+    }
+    .dictBox :deep(.ant-select) {
+      width: 100%;
+    }
+  }
+}
+
+@media (max-width: 768px) {
+.char-class{
+  width:70vw;
+}
+}
+  @media (min-width: 769px) {
+  .char-class{
+    width:300px;
+  }
+  }
+</style>

src/views/kc/wjxCswj/WjxCywjV2List.vue

@@ -70,7 +70,7 @@
           <div style="text-align: center">
             <a-button type="primary" @click="handleBatchAdd"><Icon icon="ant-design:save-outlined" />保存</a-button>
             <a-divider type="vertical" />
-            <a-button type="primary" @click="reloadZy"><Icon icon="ant-design:export-outlined" style="margin-right: 10px" />返回</a-button>
+            <a-button type="primary" @click="reloadZy"><Icon icon="ant-design:arrow-left-outlined" style="margin-right: 10px" />返回</a-button>
           </div>
         </a-col>
       </a-row>
@@ -92,7 +92,7 @@
                 <a-col :span="24">
                   <div class="region">
                     <div class="region-title">基本信息</div>
-                    <a-col :span="24">
+                    <a-col :span="24" class="jbxx-cytm">
                       <a-form-item label="测验名称" v-bind="validateInfos.title">
                         <a-input v-model:value="zyInfo.title" placeholder="请输入测验题目" :disabled="editDisabled"></a-input>
                       </a-form-item>
@@ -106,7 +106,7 @@
                     <a-col :span="24" style="padding: 0 20px" v-if="dataKhnr.length > 0">
                       <a-table :columns="columnsKhnr" rowKey="id" :data-source="dataKhnr" :pagination="false" />
                     </a-col> -->
-                    <a-col :span="24">
+                    <a-col :span="24" class="jbxx-cykssj">
                       <a-form-item label="测验开始时间" v-bind="validateInfos.startTime">
                         <a-date-picker
                           placeholder="请选择测验开始时间"
@@ -128,13 +128,13 @@
                             <Icon
                               icon="ant-design:question-circle-outlined"
                               :size="20"
-                              style="float: right; margin-top: 5px; color: #029c88; margin-right: 19px"
+                              class="jbxx-cykssj-ico"
                             />
                           </a-popover>
                         </span>
                       </a-form-item>
                     </a-col>
-                    <a-col :span="24">
+                    <a-col :span="24" class="jbxx-cyjssj">
                       <a-form-item label="测验结束时间" v-bind="validateInfos.endTime">
                         <a-date-picker
                           placeholder="请选择测验结束时间"
@@ -147,7 +147,7 @@
                         />
                       </a-form-item>
                     </a-col>
-                    <a-col :span="24">
+                    <a-col :span="24" class="jbxx-ms">
                       <a-form-item label="描述" v-bind="validateInfos.content">
                         <j-editor v-model:value="zyInfo.content" v-if="zyyqShow" @blur="handleZyyqShow(0)" />
                         <div style="color: #777777" v-html="zyInfo.content" v-if="!zyyqShow"></div>
@@ -157,48 +157,30 @@
                   </div>
                 </a-col>
                 <a-col :span="24">
-                  <a-row style="min-height: 100px">
-                    <a-col :span="4" style="padding: 10px">
-                      <a-card title="可选题型" style="height: 370px; border: 1px solid #e8e8e8">
-                        <p
-                          ><a-button type="primary" @click="addTigan(3)" :disabled="editDisabled"
-                            >单选题</a-button
-                          ></p
-                        >
-                        <p
-                          ><a-button type="primary" @click="addTigan(4)" :disabled="editDisabled"
-                            >多选题</a-button
-                          ></p
-                        >
-                        <p
-                          ><a-button type="primary" @click="addTigan(5)" :disabled="editDisabled"
-                            >填空题</a-button
-                          ></p
-                        >
-                        <p
-                          ><a-button type="primary" @click="addTigan(8)" :disabled="editDisabled"
-                            >文件题</a-button
-                          ></p
-                        >
-                        <p
-                          ><a-button type="primary" @click="addTigan(502)" :disabled="editDisabled"
-                            >简答题</a-button
-                          ></p
-                        >
-                        <p
-                          ><a-button type="primary" @click="addTigan(305)" :disabled="editDisabled"
-                            >判断题</a-button
-                          ></p
-                        >
-                      </a-card>
-                      <a-card title="引用题库">
-                        <p><a-button type="primary" @click="handleYylx('0')" :disabled="editDisabled">我的题库</a-button></p>
-                        <p><a-button type="primary" @click="handleYylx('1')" :disabled="editDisabled">公有题库</a-button></p>
-                        <p><a-button type="primary" @click="importOpen = true" :disabled="editDisabled">导入试题</a-button></p>
-                      </a-card>
+                  <a-row :gutter="[16, 0]">
+                    <a-col :span="24" :lg="{ span: 4 }" style="padding: 10px;">
+                      <a-row>
+                        <a-col :span="12" :lg="{ span: 24 }">
+                          <a-card title="可选题型" style="height: 370px; border: 1px solid #e8e8e8;">
+                            <p><a-button type="primary" @click="addTigan(3)" :disabled="editDisabled">单选题</a-button></p>
+                            <p><a-button type="primary" @click="addTigan(4)" :disabled="editDisabled">多选题</a-button></p>
+                            <p><a-button type="primary" @click="addTigan(5)" :disabled="editDisabled">填空题</a-button></p>
+                            <p><a-button type="primary" @click="addTigan(8)" :disabled="editDisabled">文件题</a-button></p>
+                            <p><a-button type="primary" @click="addTigan(502)" :disabled="editDisabled">简答题</a-button></p>
+                            <p><a-button type="primary" @click="addTigan(305)" :disabled="editDisabled">判断题</a-button></p>
+                          </a-card>
+                        </a-col>
+                        <a-col :span="12" :lg="{ span: 24 }">
+                          <a-card title="引用题库">
+                            <p><a-button type="primary" @click="handleYylx('0')" :disabled="editDisabled">我的题库</a-button></p>
+                            <p><a-button type="primary" @click="handleYylx('1')" :disabled="editDisabled">公有题库</a-button></p>
+                            <p><a-button type="primary" @click="importOpen = true" :disabled="editDisabled">导入试题</a-button></p>
+                          </a-card>
+                        </a-col>
+                      </a-row>
                     </a-col>
-                    <a-col :span="20" style="overflow-y: scroll; min-height: 100px">
-                      <draggable @end="end" v-model="tiganData" item-key="id">
+                    <a-col :span="24" :lg="{ span: 20 }" style="overflow-y: scroll; min-height: 100px;">
+                      <draggable :handle="isSmallScreen ? '.drag-handle' : null" @end="end" v-model="tiganData" item-key="id">
                         <template #item="{ index, element: item }">
                           <div>
                             <!-- 单选题 -->
@@ -207,10 +189,10 @@
                                 <template #title>
                                   <div>
                                     <a-row>
-                                      <a-col :span="12">
-                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[单选题]</span></span>
+                                      <a-col :span="11">
+                                         <span>{{ index + 1 }}、<span style="color: #c2bfbf">[单选题]</span></span>
                                       </a-col>
-                                      <a-col :span="12" style="text-align: right;">
+                                      <a-col :span="13" style="text-align: right;">
                                         <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                           <a-select
                                             style="width: 120px"
@@ -229,6 +211,12 @@
                                             @click="handleDelTigan(item, index)"
                                             v-if="!editDisabled"
                                         /></a-tooltip>
+                                        <Icon
+                                          v-if="isSmallScreen && !editDisabled"
+                                          icon="pixelarticons:chevrons-vertical"
+                                          class="drag-handle"
+                                          style="cursor: move; font-size: 20px; margin-right: 10px;"
+                                        />
                                       </a-col>
                                     </a-row>
                                   </div>
@@ -238,7 +226,7 @@
                                     :style="{ width: '30rem' }"
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled" v-if="!editDisabled"/>
-                                    <div v-else v-html="item.wjTitle"></div>
+                                    <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                                   
                                     <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                           <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -284,10 +272,10 @@
 
                                   <div>
                                     <a-row>
-                                      <a-col :span="12">
+                                      <a-col :span="11">
                                         <span>{{ index + 1 }}、<span style="color: #c2bfbf">[多选题]</span></span>
                                       </a-col>
-                                      <a-col :span="12" style="text-align: right;">
+                                      <a-col :span="13" style="text-align: right;">
                                         <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                           <a-select
                                             style="width: 120px"
@@ -306,6 +294,12 @@
                                             @click="handleDelTigan(item, index)"
                                             v-if="!editDisabled"
                                         /></a-tooltip>
+                                        <Icon
+                                          v-if="isSmallScreen && !editDisabled"
+                                          icon="pixelarticons:chevrons-vertical"
+                                          class="drag-handle"
+                                          style="cursor: move; font-size: 20px; margin-right: 10px;"
+                                        />
                                       </a-col>
                                     </a-row>
                                   </div>
@@ -315,7 +309,7 @@
                                     :style="{ width: '30rem' }"
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled" v-if="!editDisabled"/>
-                                    <div v-else v-html="item.wjTitle"></div>
+                                    <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
 
                                     <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                           <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -362,10 +356,10 @@
                                 <template #title>
                                   <div>
                                     <a-row>
-                                      <a-col :span="12">
+                                      <a-col :span="11">
                                         <span>{{ index + 1 }}、<span style="color: #c2bfbf">[填空题]</span></span>
                                       </a-col>
-                                      <a-col :span="12" style="text-align: right;">
+                                      <a-col :span="13" style="text-align: right;">
                                         <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                           <a-select
                                             style="width: 120px"
@@ -385,6 +379,12 @@
                                             @click="handleDelTigan(item, index)"
                                             v-if="!editDisabled"
                                         /></a-tooltip>
+                                        <Icon
+                                          v-if="isSmallScreen && !editDisabled"
+                                          icon="pixelarticons:chevrons-vertical"
+                                          class="drag-handle"
+                                          style="cursor: move; font-size: 20px; margin-right: 10px;"
+                                        />
                                       </a-col>
                                     </a-row>
                                   </div>
@@ -394,7 +394,7 @@
                                     :style="{ width: '30rem' }"
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled" v-if="!editDisabled"/>
-                                    <div v-else v-html="item.wjTitle"></div>
+                                    <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                                     
                                     <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                           <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -420,18 +420,17 @@
                                 <template #title>
                                   <div>
                                     <a-row>
-                                      <a-col :span="12">
+                                      <a-col :span="11">
                                         <span>{{ index + 1 }}、<span style="color: #c2bfbf">[文件题]</span></span>
                                       </a-col>
-                                      <a-col :span="12" style="text-align: right;">
+                                      <a-col :span="13" style="text-align: right;">
                                         <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                           <a-select
                                             style="width: 120px"
                                             v-model:value="item.wjScore"
                                             placeholder="请选择分数"
                                             v-if="item.wjSfqh == '0'"
-                                            :disabled="editDisabled"
-                                          >
+                                            :disabled="editDisabled">
                                             
                                           <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
                                           </a-select>
@@ -443,6 +442,12 @@
                                             @click="handleDelTigan(item, index)"
                                             v-if="!editDisabled"
                                         /></a-tooltip>
+                                        <Icon
+                                          v-if="isSmallScreen && !editDisabled"
+                                          icon="pixelarticons:chevrons-vertical"
+                                          class="drag-handle"
+                                          style="cursor: move; font-size: 20px; margin-right: 10px;"
+                                        />
                                       </a-col>
                                     </a-row>
                                   </div>
@@ -452,7 +457,7 @@
                                     :style="{ width: '30rem' }"
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled" v-if="!editDisabled"/>
-                                    <div v-else v-html="item.wjTitle"></div>
+                                    <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                                     
                                     <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                           <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -466,10 +471,10 @@
                                 <template #title>
                                   <div>
                                     <a-row>
-                                      <a-col :span="12">
+                                      <a-col :span="11">
                                         <span>{{ index + 1 }}、<span style="color: #c2bfbf">[判断题]</span></span>
                                       </a-col>
-                                      <a-col :span="12" style="text-align: right;">
+                                      <a-col :span="13" style="text-align: right;">
                                         <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                           <a-select
                                             style="width: 120px"
@@ -488,6 +493,12 @@
                                             @click="handleDelTigan(item, index)"
                                             v-if="!editDisabled"
                                         /></a-tooltip>
+                                        <Icon
+                                          v-if="isSmallScreen && !editDisabled"
+                                          icon="pixelarticons:chevrons-vertical"
+                                          class="drag-handle"
+                                          style="cursor: move; font-size: 20px; margin-right: 10px;"
+                                        />
                                       </a-col>
                                     </a-row>
                                   </div>
@@ -497,7 +508,7 @@
                                     :style="{ width: '30rem' }"
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled" v-if="!editDisabled"/>
-                                    <div v-else v-html="item.wjTitle"></div>
+                                    <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                                   
                                     <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                           <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -542,10 +553,10 @@
                                 <template #title>
                                   <div>
                                     <a-row>
-                                      <a-col :span="12">
+                                      <a-col :span="11">
                                         <span>{{ index + 1 }}、<span style="color: #c2bfbf">[简答题]</span></span>
                                       </a-col>
-                                      <a-col :span="12" style="text-align: right;">
+                                      <a-col :span="13" style="text-align: right;">
                                         <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                           <a-select
                                             style="width: 120px"
@@ -564,6 +575,12 @@
                                             @click="handleDelTigan(item, index)"
                                             v-if="!editDisabled"
                                         /></a-tooltip>
+                                        <Icon
+                                          v-if="isSmallScreen && !editDisabled"
+                                          icon="pixelarticons:chevrons-vertical"
+                                          class="drag-handle"
+                                          style="cursor: move; font-size: 20px; margin-right: 10px;"
+                                        />
                                       </a-col>
                                     </a-row>
                                   </div>
@@ -573,7 +590,7 @@
                                     :style="{ width: '30rem' }"
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled" v-if="!editDisabled"/>
-                                    <div v-else v-html="item.wjTitle"></div>
+                                    <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                                     
                                     <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                           <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -612,7 +629,7 @@
               <span class="title">统计分析</span>
             </a-col>
             <a-col :span="4" style="text-align: right">
-              <a-button class="buttonClass" @click="reloadZy" style="margin-right: 10px"><Icon icon="ant-design:export-outlined" />返回</a-button>
+              <a-button class="buttonClass" @click="reloadZy" style="margin-right: 10px"><Icon icon="ant-design:arrow-left-outlined" />返回</a-button>
             </a-col>
           </a-row>
           <a-divider />
@@ -647,18 +664,18 @@
             <a-col :span="24" v-for="(item, index) in tiganData" :key="index">
               <div style="width: 100%">
                 <!-- 单选题 -->
-                <div style="width: 98%; margin: 0 auto" v-if="item.wjType == 3">
+                <div style="width: 98%; margin: 0 auto" v-if="item.wjType == 3 && item.wjSubtype == null">
                   <a-card>
-                    <template #title>
+                    <!-- <template #title> -->
                       <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word"></span>
-                    </template>
+                    <!-- </template> -->
                     <template #extra v-if="zyInfo.atype == 6">
                       <span class="question-type" style="margin-left: 40px">单选题</span>
                       <span style="margin-left: 40px"
                         >题目分值：<span class="answer-word"> {{ item.wjScore }}</span> 分</span
                       >
                     </template>
-                    <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                    <a-radio-group v-if="!isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
                       <div style="width: 100%" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
                         <a-radio :value="tmxx.itemIndex + ``" style="width: 100%; margin-bottom: 5px">
                           <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000"></span>
@@ -667,21 +684,59 @@
                         </a-radio>
                       </div>
                     </a-radio-group>
+                    <a-radio-group v-if="isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <div v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2" class="radio-item">
+                          <!-- Radio 按钮和标题 -->
+                          <div style="display: flex; align-items: center;">
+                            <a-radio :value="tmxx.itemIndex + ''">
+                              <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000;"></span>
+                            </a-radio>
+                          </div>
+                          <!-- 正确答案和选择人数 -->
+                          <div style="display: flex; justify-content: space-between; margin-top: 5px;padding-left:20px;height: 25px;">
+                            <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; font-size: 12px;">(正确答案)</span>
+                            <span class="tjfx-xzrs" >选择人数：{{ tmxx.num }}人</span>
+                          </div>
+                          <!-- 分隔线，仅在不是最后一个选项时显示 -->
+                          <hr v-if="index2 !== item.wjxWjxxTmxxList.length - 1" class="divider-line"/>
+                        </div>
+                      </a-radio-group>
                   </a-card>
                 </div>
                 <!-- 多选题 -->
                 <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 4">
                   <a-card>
-                    <template #title>
+                    <!-- <template #title> -->
                       <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
-                    </template>
+                    <!-- </template> -->
                     <template #extra v-if="zyInfo.atype == 6">
                       <span class="question-type" style="margin-left: 40px">多选题</span>
                       <span style="margin-left: 40px"
                         >题目分值： <span class="answer-word">{{ item.wjScore }}</span> 分</span
                       >
                     </template>
-                    <a-checkbox-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                    <a-checkbox-group v-if="isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <a-row>
+                          <a-col :span="24" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
+                            <!-- Checkbox and Title -->
+                            <div style="display: flex; flex-direction: column;">
+                              <a-checkbox :value="tmxx.itemIndex" style="flex: 1 0 auto; width: 100%; margin-bottom: 5px;">
+                                <div style="width: 100%; font-size: 16px; color: #000; word-break: break-all; white-space: normal;">
+                                  <span v-html="tmxx.itemTitle"></span>
+                                </div>
+                              </a-checkbox>
+
+                              <!-- Correct Answer and Selection Count -->
+                              <div style="display: flex; align-items: center; height: 50px;"
+                                :style="{ 'border-bottom': index2 !== item.wjxWjxxTmxxList.length - 1 ? '1px solid #ccc' : 'none' }">
+                                <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; flex: 1; font-size: 12px;">(正确答案)</span>
+                                <span class="tjfx-xzrs" style="text-align: right; padding-right: 10px; flex: 1;">选择人数：{{ tmxx.num }}人</span>
+                              </div>
+                            </div>
+                          </a-col>
+                        </a-row>
+                      </a-checkbox-group>
+                    <a-checkbox-group v-if="!isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
                       <a-row>
                         <a-col :span="24" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
                           <a-checkbox :value="tmxx.itemIndex" style="width: 100%; margin-bottom: 5px">
@@ -695,14 +750,47 @@
                   </a-card>
                 </div>
                 <!-- 填空题 -->
-                <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5">
+                <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && item.wjSubtype == null && isSmallScreen">
+                    <a-card>
+                      <!-- 确保正确答案、正确人数、错误人数各占一行 -->
+                          <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
+                        <div style="text-align: left;">
+                          <!-- 正确答案独占一行 -->
+                          <div v-if="item.wjAnswer" style="color: #9e9e9e; margin-bottom: 4px;">
+                            (正确答案: {{ item.wjAnswer }})
+                          </div>
+                          <!-- 正确人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            正确人数：{{ item.num }}人
+                          </div>
+                          <!-- 错误人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            错误人数：{{ item.num2 }}人
+                          </div>
+                        </div>
+                      <!-- 题目类型和分值独占一行 -->
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <div style="display: flex;justify-content: space-between;align-items: center;">
+                          <!-- 确保填空题独占一行 -->
+                          <div>
+                            <span class="question-type" style="margin-left: 40px">填空题</span>
+                          </div>
+                          <!-- 确保题目分值独占一行 -->
+                          <div>
+                            <span style="margin-left: 40px;">题目分值：<span class="answer-word">{{ item.wjScore }}</span> 分</span>
+                          </div>
+                        </div>
+                      </template>
+                    </a-card>
+                  </div>
+                <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && item.wjSubtype == null && !isSmallScreen">
                   <a-card>
-                    <template #title>
+                    <!-- <template #title> -->
                       <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
                       <span v-if="item.wjAnswer" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.wjAnswer }})</span>
                       <span class="tjfx-xzrs1" style="color: #9e9e9e">正确人数：{{ item.num }}人</span>
                       <span class="tjfx-xzrs1" style="color: #9e9e9e">错误人数：{{ item.num2 }}人</span>
-                    </template>
+                    <!-- </template> -->
                     <template #extra v-if="zyInfo.atype == 6">
                       <span class="question-type" style="margin-left: 40px">填空题</span>
                       <span style="margin-left: 40px"
@@ -714,9 +802,9 @@
                 <!-- 文件题 -->
                 <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 8">
                   <a-card>
-                    <template #title>
+                    <!-- <template #title> -->
                       <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
-                    </template>
+                    <!-- </template> -->
                     <template #extra v-if="zyInfo.atype == 6">
                       <span class="question-type" style="margin-left: 40px">文件题</span>
                       <span style="margin-left: 40px"
@@ -727,7 +815,97 @@
                     <j-upload v-model:value="item.picPath"  fileType="image" :max-count="1" disabled :buttonVisible="false"></j-upload>
                   </a-card>
                 </div>
-                <div v-else> 无对应类型 </div>
+                <!-- 解答题 -->
+                <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && item.wjSubtype == 5 && isSmallScreen">
+                    <a-card>
+                      <!-- 确保正确答案、正确人数、错误人数各占一行 -->
+                          <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
+                        <div style="text-align: left;">
+                          <!-- 正确答案独占一行 -->
+                          <div v-if="item.wjAnswer" style="color: #9e9e9e; margin-bottom: 4px;">
+                            (正确答案: {{ item.wjAnswer }})
+                          </div>
+                          <!-- 正确人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            正确人数：{{ item.num }}人
+                          </div>
+                          <!-- 错误人数独占一行 -->
+                          <div style="color: #9e9e9e; margin-bottom: 4px;">
+                            错误人数：{{ item.num2 }}人
+                          </div>
+                        </div>
+                      <!-- 题目类型和分值独占一行 -->
+                      <template #extra v-if="zyInfo.atype == 6">
+                        <div style="display: flex;justify-content: space-between;align-items: center;">
+                          <!-- 确保填空题独占一行 -->
+                          <div>
+                            <span class="question-type" style="margin-left: 40px">解答题</span>
+                          </div>
+                          <!-- 确保题目分值独占一行 -->
+                          <div>
+                            <span style="margin-left: 40px;">题目分值：<span class="answer-word">{{ item.wjScore }}</span> 分</span>
+                          </div>
+                        </div>
+                      </template>
+                    </a-card>
+                  </div>
+                <div style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 5 && item.wjSubtype == 5 && !isSmallScreen">
+                  <a-card>
+                    <!-- <template #title> -->
+                      <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
+                      <span v-if="item.wjAnswer" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.wjAnswer }})</span>
+                      <span class="tjfx-xzrs1" style="color: #9e9e9e">正确人数：{{ item.num }}人</span>
+                      <span class="tjfx-xzrs1" style="color: #9e9e9e">错误人数：{{ item.num2 }}人</span>
+                    <!-- </template> -->
+                    <template #extra v-if="zyInfo.atype == 6">
+                      <span class="question-type" style="margin-left: 40px">解答题</span>
+                      <span style="margin-left: 40px"
+                        >题目分值：<span class="answer-word"> {{ item.wjScore }}</span> 分</span
+                      >
+                    </template>
+                  </a-card>
+                </div>
+                <!-- 判断题 -->
+                <div style="width: 98%; margin: 0 auto" v-if="item.wjType == 3 && item.wjSubtype == 305">
+                  <a-card>
+                    <!-- <template #title> -->
+                      <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word"></span>
+                    <!-- </template> -->
+                    <template #extra v-if="zyInfo.atype == 6">
+                      <span class="question-type" style="margin-left: 40px">判断题</span>
+                      <span style="margin-left: 40px"
+                        >题目分值：<span class="answer-word"> {{ item.wjScore }}</span> 分</span
+                      >
+                    </template>
+                    <a-radio-group v-if="!isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                      <div style="width: 100%" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
+                        <a-radio :value="tmxx.itemIndex + ``" style="width: 100%; margin-bottom: 5px">
+                          <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000"></span>
+                          <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案)</span>
+                          <span class="tjfx-xzrs">选择人数：{{ tmxx.num }}人</span>
+                        </a-radio>
+                      </div>
+                    </a-radio-group>
+                    <a-radio-group v-if="isSmallScreen" v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                        <div v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2" class="radio-item">
+                          <!-- Radio 按钮和标题 -->
+                          <div style="display: flex; align-items: center;">
+                            <a-radio :value="tmxx.itemIndex + ''">
+                              <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000;"></span>
+                            </a-radio>
+                          </div>
+                          <!-- 正确答案和选择人数 -->
+                          <div style="display: flex; justify-content: space-between; margin-top: 5px;padding-left:20px;height: 25px;">
+                            <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; font-size: 12px;">(正确答案)</span>
+                            <span class="tjfx-xzrs" >选择人数：{{ tmxx.num }}人</span>
+                          </div>
+                          <!-- 分隔线，仅在不是最后一个选项时显示 -->
+                          <hr v-if="index2 !== item.wjxWjxxTmxxList.length - 1" class="divider-line"/>
+                        </div>
+                      </a-radio-group>
+                  </a-card>
+                </div>
+                <!-- <div v-else> 无对应类型 </div> -->
               </div>
             </a-col>
           </a-row>
@@ -739,9 +917,9 @@
       <a-row>
         <a-col :span="24"><span class="title">布置测验</span><a-divider /></a-col>
         <a-col :span="24" style="text-align: right; margin-top: 5px">
-          <a-button type="primary" @click="handleSzzycs(1)" style="margin-top: 10px;"><Icon icon="ant-design:edit-outlined" />修改课程测验次数</a-button>
+          <a-button type="primary" @click="handleSzzycs(1)" style="margin-top: 10px;"><Icon v-if="!isSmallScreen" icon="ant-design:edit-outlined" />修改课程测验次数</a-button>
           <a-divider type="vertical" />
-          <a-button type="primary" @click="handleAddOne" style="margin-top: 10px;"><Icon icon="ant-design:file-add-outlined" />新增测验</a-button>
+          <a-button type="primary" @click="handleAddOne" style="margin-top: 10px;"><Icon v-if="!isSmallScreen" icon="ant-design:file-add-outlined" />新增测验</a-button>
           <a-divider type="vertical" />
           <a-button type="primary" @click="handleTiku('6')" style="margin-left: 8px; margin-right: 18px;margin-top: 10px;">题库</a-button>
         </a-col>
@@ -854,7 +1032,7 @@
                             <template #overlay>
                               <a-menu>
                                 <a-menu-item>
-                                  <a href="javascript:;" disabled style="color: #9e9e9e">设置测验</a>
+                                  <a href="javascript:;" disabled  style="color: #9e9e9e">设置测验</a>
                                 </a-menu-item>
                                 <!-- <a-menu-item>
                                   <a href="javascript:;" disabled style="color: #9e9e9e">修改题目</a>
@@ -870,11 +1048,12 @@
                       <a-col :md="4" :xs="12">
                         <span style="margin-left: 10px">
                           <a-dropdown>
-                            <a class="ant-dropdown-link" @click.prevent
-                              ><Icon icon="ant-design:setting-outlined" @click="handleViewEwm(item)" /><span @click="handleViewEwm(item)"> 发送问卷</span>
+                            <a class="ant-dropdown-link" @click.prevent="handleViewEwm(item)" >
+                              <Icon icon="ant-design:setting-outlined" />
+                              <span> 发送问卷</span>
                             </a>
                             <template #overlay>
-                              <a-menu>
+                              <a-menu v-show="!ewmvisible">
                                 <a-menu-item>
                                   <a href="javascript:;" @click="handleViewEwm(item)">链接&二维码</a>
                                   <!-- <QrCode :value="qrCodeUrl" class="enter-x flex justify-center xl:justify-start" :width="280" /> -->
@@ -1087,7 +1266,7 @@
 </template>
 
 <script lang="ts" name="zyInfo-zyInfo" setup>
-import { ref, reactive, onMounted, unref } from 'vue';
+import { ref, reactive, onMounted, unref, onUnmounted, watchEffect  } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useRouter } from 'vue-router';
@@ -2295,16 +2474,66 @@ function openXkrs(record) {
   XxhbbksListModalPage.value.init(record);
 }
 
+const isSmallScreen = ref(false);
+
+const checkScreenSize = () => {
+  isSmallScreen.value = window.innerWidth <= 768; // 根据需要调整断点
+};
+
+// 立即执行一次以设置初始值，并在组件卸载前监听窗口大小变化
+watchEffect(() => {
+  checkScreenSize();
+  const resizeObserver = () => checkScreenSize();
+  window.addEventListener('resize', resizeObserver);
+  onUnmounted(() => {
+    window.removeEventListener('resize', resizeObserver);
+  });
+});
+
 onMounted(() => {
   reloadZy();
 });
 </script>
 
 <style lang="less" scoped>
-.title {
-  margin-left: 20px;
-  font-size: 18px;
+@media (max-width: 768px) {
+  .title {
+    margin-left: 5px;
+    font-size: 18px;
+  }
+  .jbxx-cytm{
+    padding:10px;
+  }
+  .jbxx-cykssj{
+    padding:10px;
+  }
+  .jbxx-cykssj-ico{
+    float: right;
+    margin-top: 5px; 
+    color: #029c88; 
+    margin-right: 0px
+  }
+  .jbxx-cyjssj{
+    padding:10px;
+  }
+  .jbxx-ms{
+    padding:10px;
+  }
 }
+
+@media (min-width: 769px) {
+  .title {
+    margin-left: 20px;
+    font-size: 18px;
+  }
+  .jbxx-cykssj-ico{
+    float: right;
+    margin-top: 5px; 
+    color: #029c88; 
+    margin-right: 19px
+  }
+}
+
 .title2 {
   font-size: 18px;
 }
@@ -2577,4 +2806,10 @@ onMounted(() => {
 //   width: 20rem !important;
 //     height: 100px;
 // }
+
+.rich-text-container {
+  white-space: pre-wrap; /* 强制换行 */
+  word-break: break-all; /* 长单词和 URL 地址换行 */
+  overflow-wrap: break-word; /* 在长单词内部换行 */
+}
 </style>

src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue

@@ -53,7 +53,7 @@
 </template>
 
 <script lang="ts" name="wjxWjxx-wjxWjxx" setup>
-import { ref, reactive, defineExpose, unref } from 'vue';
+import { ref, reactive, defineExpose, unref , computed, onMounted, onUnmounted} from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { defHttp } from '/@/utils/http/axios';
 import { useListPage } from '/@/hooks/system/useListPage';
@@ -69,6 +69,29 @@ const WjxWjxxTmlbDjjgModalPage = ref();
 const ZgtpfModalPage = ref();
 const sjxxInfo = ref<any>({});
 const loadingCeshi = ref<boolean>(false);
+
+// 定义一个响应式的宽度变量
+const actionColumnWidth = ref(220);
+
+// 计算是否为小屏设备
+const isSmallScreen = computed(() => window.innerWidth < 600); // 根据需要调整断点
+
+// 动态更新宽度的函数
+const updateWidth = () => {
+  actionColumnWidth.value = isSmallScreen.value ? 220 : 220;
+};
+
+// 当组件挂载时添加事件监听器
+onMounted(() => {
+  window.addEventListener('resize', updateWidth);
+  updateWidth(); // 初始化调用一次
+});
+
+// 当组件卸载时移除事件监听器
+onUnmounted(() => {
+  window.removeEventListener('resize', updateWidth);
+});
+
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
@@ -78,7 +101,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     actionColumn: {
-      width: 220,
+      width: actionColumnWidth,
       fixed: 'right',
     },
     beforeFetch: (params) => {

src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsListhis.vue

@@ -0,0 +1,199 @@
+<template>
+  <div >
+    <div class="jeecg-basic-table-form-container">
+      <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <!-- <a-col :span="24">
+            <a-button type="primary" @click="handleZgtpf">主观题评分</a-button>
+          </a-col> -->
+          <a-col :lg="6">
+            <a-form-item label="学生姓名">
+              <a-input placeholder="请输入学生姓名" v-model:value="queryParam.userName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="学生学号">
+              <a-input placeholder="请输入学生学号" v-model:value="queryParam.userId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="状态">
+              <a-select placeholder="请选择" v-model:value="queryParam.isFinished">
+                <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-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
+                <!-- <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <a-spin :spinning="loadingCeshi">
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+    </BasicTable>
+  </a-spin>
+    <!-- 表单区域 -->
+    <WjxWjxxTmlbDjjgModal ref="WjxWjxxTmlbDjjgModalPage" @success="reload"></WjxWjxxTmlbDjjgModal>
+    <ZgtpfModal ref="ZgtpfModalPage" @success="reload"></ZgtpfModal>
+  </div>
+</template>
+
+<script lang="ts" name="wjxWjxx-wjxWjxx" setup>
+import { ref, reactive, defineExpose, unref } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { defHttp } from '/@/utils/http/axios';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns } from './WjxWjxxTmlbDjjgs.data';
+import { list, getExportUrl } from './WjxWjxxTmlbDjjgs.api';
+import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue';
+import ZgtpfModal from '/@/views/kc/wjxWjxx/components/ZgtpfModal.vue';
+
+const queryParam = ref<any>({});
+const isFinished = ref<string>('');
+const toggleSearchStatus = ref<boolean>(false);
+const WjxWjxxTmlbDjjgModalPage = ref();
+const ZgtpfModalPage = ref();
+const sjxxInfo = ref<any>({});
+const loadingCeshi = ref<boolean>(false);
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 220,
+      fixed: 'right',
+    },
+    beforeFetch: (params) => {
+      (params.column = ''), (params.order = ''); //新生成的默认不带排序
+      return Object.assign(params, queryParam.value);
+    },
+  },
+  exportConfig: {
+    name: '学生测验信息',
+    url: getExportUrl,
+    params: () => {
+      return Object.assign({}, queryParam.value);
+    },
+  },
+});
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+  tableContext;
+const labelCol = reactive({
+  xs: { span: 24 },
+  sm: { span: 7 },
+});
+const wrapperCol = reactive({
+  xs: { span: 24 },
+  sm: { span: 16 },
+});
+
+/**
+ * 答卷详情
+ */
+function handlePeizhiDjjg(record: Recordable) {
+  WjxWjxxTmlbDjjgModalPage.value.disableSubmit = true;
+  WjxWjxxTmlbDjjgModalPage.value.edit(record.id, false);
+}
+
+function handleZgypf(record: Recordable) {
+  ZgtpfModalPage.value.disableSubmit = true;
+  ZgtpfModalPage.value.edit(record, false);
+}
+
+function handleZgtpf() {
+  console.log('👩‍🦰', sjxxInfo);
+  console.log('👩‍🦰', sjxxInfo.value.vid);
+  ZgtpfModalPage.value.disableSubmit = true;
+  ZgtpfModalPage.value.edit({vid:sjxxInfo.value.vid}, false);
+}
+
+function handleHqjg(record){
+  console.log(record);
+  // defHttp.post({url:'/wjxDjxx/updateDjjg',params:record}).then(res=>{
+  //   console.log('-->',res)
+  // })
+  loadingCeshi.value = true;
+  defHttp.post({url:'/wjxDjxx/getDjjg',params:record}).then(res=>{
+    console.log('-->',res)
+    loadingCeshi.value = false;
+    reload();
+  })
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  if (record.commitTime != null && record.commitTime != '') {
+    return [
+      {
+        label: '答卷结果',
+        onClick: handlePeizhiDjjg.bind(null, record),
+      },
+      {
+       label: '获取结果',
+       onClick: handleHqjg.bind(null, record),
+       ifShow: record.answerSeconds == 0,
+      },
+      // {
+      //   label: '主观题评分',
+      //   onClick: handleZgypf.bind(null, record),
+      //   ifShow: record.sfxysdpy == 1,
+      // },
+    ];
+  } else {
+    return [];
+  }
+}
+
+function init(record, flag) {
+  console.log('👨‍🦲', record);
+  sjxxInfo.value = record;
+  queryParam.value.id = record.id;
+  queryParam.value.rwbh = record.rwbh;
+  queryParam.value.isFinished = flag;
+  isFinished.value = flag;
+  reload();
+}
+
+defineExpose({
+  init,
+});
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+  .query-group-cust {
+    width: calc(50% - 15px);
+    min-width: 100px !important;
+  }
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center;
+  }
+}
+</style>

src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue

@@ -13,9 +13,12 @@
   import { ref, nextTick, defineExpose } from 'vue';
   import WjxWjxxTmlbDjjgsList from './WjxWjxxTmlbDjjgsList.vue'
   import WjxWjxxTmlbAllDjjgsList from './WjxWjxxTmlbAllDjjgsList.vue'
+  import { useScreenSize } from '/src/utils/screenSize/useScreenSize'
 
+  const { isSmallScreen } = useScreenSize();
+  console.log("🚀 ~ isSmallScreen:", isSmallScreen)
   const title = ref<string>('');
-  const width = ref<string>('65%');
+  const width = ref<string>(isSmallScreen?'90%':'65%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModalhis.vue

@@ -0,0 +1,80 @@
+<template>
+  <a-modal :title="title" :width="width" centered :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <div v-if="showDiv">
+      <WjxWjxxTmlbDjjgsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WjxWjxxTmlbDjjgsList>
+    </div>
+    <div v-else>
+      <WjxWjxxTmlbAllDjjgsListhis ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></WjxWjxxTmlbAllDjjgsListhis>
+    </div>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import WjxWjxxTmlbDjjgsList from './WjxWjxxTmlbDjjgsList.vue'
+  import WjxWjxxTmlbAllDjjgsListhis from './WjxWjxxTmlbAllDjjgsListhis.vue'
+  import { useScreenSize } from '/src/utils/screenSize/useScreenSize'
+
+  const { isSmallScreen } = useScreenSize();
+  const title = ref<string>('');
+  const width = ref<string>(isSmallScreen?'90%':'65%');
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const showDiv = ref<boolean>(true);
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record,flag) {
+    showDiv.value = true;
+    if(flag == '1'){
+      title.value = '已完成答卷学生列表';
+    }else if(flag == '0'){
+      title.value = '未完成答卷学生列表';
+    }else if(flag == ''){
+      showDiv.value = false;
+      title.value = '全部答卷学生列表';
+    }
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.init(record,flag);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>

src/views/kc/wjxWjxx/components/YycyxqForm.vue

@@ -35,7 +35,7 @@
                           <Icon
                             icon="ant-design:question-circle-outlined"
                             :size="20"
-                            style="float: right; margin-top: 5px; color: #029c88; margin-right: 19px"
+                            class="jbxx-cykssj-ico"
                           />
                         </a-popover>
                       </span>
@@ -68,7 +68,7 @@
               <a-col :span="24">
                 <a-row style="min-height: 100px">
                   <a-col :span="24" style="overflow-y: scroll; min-height: 100px">
-                    <draggable @end="end" v-model="tiganData" item-key="id">
+                    <draggable :handle="isSmallScreen?'.draggclass':false" @end="end" v-model="tiganData" item-key="id">
                       <template #item="{ index, element: item }">
                         <div>
                           <!-- 单选题 -->
@@ -125,7 +125,7 @@
                                   :disabled="editDisabled"
                                   v-if="!editDisabled"
                                 />
-                                <div v-else v-html="item.wjTitle"></div>
+                                <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                               </template>
                               <a-row v-if="isShow">
                                 <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -218,7 +218,7 @@
                                   :disabled="editDisabled"
                                   v-if="!editDisabled"
                                 />
-                                <div v-else v-html="item.wjTitle"></div>
+                                <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                               </template>
                               <a-row v-if="isShow">
                                 <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -313,7 +313,7 @@
                                   :disabled="editDisabled"
                                   v-if="!editDisabled"
                                 />
-                                <div v-else v-html="item.wjTitle"></div>
+                                <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                               </template>
                               <a-row v-if="isShow">
                                 <a-col :span="24">
@@ -387,7 +387,7 @@
                                   :disabled="editDisabled"
                                   v-if="!editDisabled"
                                 />
-                                <div v-else v-html="item.wjTitle"></div>
+                                <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                               </template>
                             </a-card>
                           </div>
@@ -419,7 +419,9 @@ import { useRouter } from 'vue-router';
 import dayjs, { Dayjs } from 'dayjs';
 import draggable from 'vuedraggable';
 import JEditor2 from '/@/components/Form/src/jeecg/components/JEditor2.vue';
+import { useScreenSize } from '/src/utils/screenSize/useScreenSize'
 
+const { isSmallScreen } = useScreenSize();
 //当前路由信息
 const { currentRoute } = useRouter();
 const { query } = unref(currentRoute);
@@ -616,6 +618,24 @@ defineExpose({
 </script>
 
 <style lang="less" scoped>
+@media (max-width: 768px) {
+  .jbxx-cykssj-ico{
+    float: right;
+    margin-top: 5px; 
+    color: #029c88; 
+    margin-right: 0px
+  }
+}
+
+@media (min-width: 769px) {
+  .jbxx-cykssj-ico{
+    float: right;
+    margin-top: 5px; 
+    color: #029c88; 
+    margin-right: 19px
+  }
+}
+
 .antd-modal-form {
   min-height: 500px !important;
   overflow-y: auto;
@@ -738,4 +758,10 @@ defineExpose({
   margin-left: 10px;
   font-size: 12px;
 }
+
+.rich-text-container {
+  white-space: pre-wrap; /* 强制换行 */
+  word-break: break-all; /* 长单词和 URL 地址换行 */
+  overflow-wrap: break-word; /* 在长单词内部换行 */
+}
 </style>

src/views/kc/wjxWjxxTmlb/TikuList.vue

@@ -55,30 +55,24 @@
       <template #action="{ record }">
         <TableAction :actions="getTableAction(record)" />
       </template>
-      
+
       <template #wjTitleaction="{ record }">
         <div v-html="record.wjTitle"></div>
       </template>
-      
+
       <!--字段回显插槽-->
       <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <template #fileSlot="{ text }">
         <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
+          @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
 
-    <a-modal
-      title="Excel导入指导"
-      :width="800"
-      :visible="importOpen"
-      :maskClosable="false"
-      :okButtonProps="{ class: { 'jee-hidden': true } }"
-      @cancel="importOpen = false"
-      cancelText="关闭"
-    >
+    <a-modal title="Excel导入指导" :width="800" :visible="importOpen" :maskClosable="false"
+      :okButtonProps="{ class: { 'jee-hidden': true } }" @cancel="importOpen = false" cancelText="关闭">
       <div style="padding: 20px; background-color: rgb(225, 243, 237); border-radius: 5px; margin: 20px">
         <p>Excel导入指导</p>
         <p>1.下载题目导入模板文件。</p>
@@ -86,32 +80,37 @@
         <p>3.在模板内录入信息后，上传文件导入题目。</p>
         <p>4.点击导入题目，选择已完成录入的文件，平台将会验证数据的正确性。</p>
         <p>5.若发现错误，会给予提示，重新修正后再次上传:若无错误，即将数据导入到平台中。</p>
-        <p
-          ><a @click="downloadByUrl({ url: '/downPath/stdrmb.xls', target: '_self', fileName: '试题导入模板.xls' })"
-            ><Icon icon="ant-design:download-outlined" :size="20" />导入模板下载</a
-          ></p
-        >
+        <p><a @click="downloadByUrl({ url: '/downPath/stdrmb.xls', target: '_self', fileName: '试题导入模板.xls' })">
+            <Icon icon="ant-design:download-outlined" :size="20" />导入模板下载
+          </a></p>
       </div>
       <div style="text-align: center; margin-top: 20px; margin-bottom: 20px">
         <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="importXls">导入试题</j-upload-button>
       </div>
     </a-modal>
 
-    <a-modal title="手动添加" :width="`80%`" :visible="addOpen" :maskClosable="false" @cancel="addOpen = false" cancelText="关闭" @ok="handleOk">
-      <div style="padding: 20px; margin: 20px">
-        <a-row style="min-height: 100px">
-          <a-col :span="4" style="padding: 10px">
+    <a-modal title="手动添加" :style="{ width: computedWidth }" :visible="addOpen" :maskClosable="false" @cancel="addOpen = false"
+      cancelText="关闭" @ok="handleOk">
+      <div class="sdtj-div">
+        <a-row :gutter="[16, 16]">
+          <a-col :xs="24" :lg="4" style="padding: 10px">
             <a-card title="可选题型" style="height: 360px; border: 1px solid #e8e8e8">
-              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(3)">单选题</a-button></p>
-              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(4)">多选题</a-button></p>
-              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(5)">填空题</a-button></p>
-              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(8)">文件题</a-button></p>
-              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(502)">简答题</a-button></p>
-              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(305)">判断题</a-button></p>
+              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(3)">单选题</a-button>
+              </p>
+              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(4)">多选题</a-button>
+              </p>
+              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(5)">填空题</a-button>
+              </p>
+              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(8)">文件题</a-button>
+              </p>
+              <p><a-button type="primary" preIcon="ant-design:check-square-outlined"
+                  @click="addTigan(502)">简答题</a-button></p>
+              <p><a-button type="primary" preIcon="ant-design:check-square-outlined"
+                  @click="addTigan(305)">判断题</a-button></p>
             </a-card>
           </a-col>
-          <a-col :span="20" style="overflow-y: scroll; min-height: 100px">
-            <draggable @end="end" v-model="tiganData" item-key="id">
+          <a-col :xs="24" :lg="20" style="overflow-y: scroll; min-height: 100px">
+            <draggable :handle="isSmallScreen ? '.drag-handle' : null" @end="end" v-model="tiganData" item-key="id">
               <template #item="{ index, element: item }">
                 <div>
                   <!-- 单选题 -->
@@ -120,71 +119,60 @@
                       <template #title>
                         <div>
                           <a-row>
-                            <a-col :span="12">
+                            <a-col :span="11">
                               <span>{{ index + 1 }}、<span style="color: #c2bfbf">[单选题]</span></span>
                             </a-col>
-                            <a-col :span="12" style="text-align: right;">
+                            <a-col :span="13" style="text-align: right;">
                               <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                                <a-select
-                                  style="width: 120px"
-                                  v-model:value="item.wjScore"
-                                  placeholder="请选择分数"
-                                  v-if="item.wjSfqh == '0'"
-                                  :disabled="editDisabled"
-                                >
-                                <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
+                                <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'" :disabled="editDisabled">
+                                  <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
                                 </a-select>
                               </a-tooltip>
-                              <a-tooltip placement="topRight" title="删除此题"
-                                ><Icon
-                                  icon="ant-design:delete-outlined"
-                                  style="cursor: pointer; font-size: 20px; margin: 10px"
-                                  @click="handleDelTigan(item, index)"
-                                  v-if="!editDisabled"
-                              /></a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题">
+                                <Icon icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 5px"
+                                  @click="handleDelTigan(item, index)" v-if="!editDisabled" />
+                              </a-tooltip>
+                              <Icon
+                                v-if="isSmallScreen && !editDisabled"
+                                icon="pixelarticons:chevrons-vertical"
+                                class="drag-handle"
+                                style="cursor: move; font-size: 20px; margin-right: 10px;"
+                              />
                             </a-col>
                           </a-row>
                         </div>
-                        <JEditor2 placeholder="请填写文件题题干"
-                          v-model:value="item.wjTitle"
-                          :bordered="false"
-                          :style="{ width: '30rem' }"
-                          :auto-size="{ minRows: 1, maxRows: 5 }"
-                          :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
-                        
-                          <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
-                                <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
-                          </div>
+                        <JEditor2  placeholder="请填写文件题题干" v-model:value="item.wjTitle" :bordered="false"
+                          :style="{ width: '30rem' }" :auto-size="{ minRows: 1, maxRows: 5 }" :disabled="editDisabled"
+                          v-if="!editDisabled" />
+                        <div v-else v-html="item.wjTitle"></div>
+
+                        <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
+                          <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库"
+                            :disabled="editDisabled" />
+                        </div>
                       </template>
                       <a-row v-if="isShow">
                         <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
                       </a-row>
-                      <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" :disabled="!isShow">
+                      <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default"
+                        :disabled="!isShow">
                         <div style="width: 100%" v-for="(tmxx, index) in item.wjxWjxxTmxxList" :key="index">
                           <a-radio :value="tmxx.itemIndex + ``" style="width: 100%">
-                            <a-input
-                              placeholder="请填写选项"
-                              v-model:value="tmxx.itemTitle"
-                              :style="{ width: '30rem' }"
-                              :bordered="false"
-                              :disabled="editDisabled"
-                            />
+                            <a-input placeholder="请填写选项" v-model:value="tmxx.itemTitle" :style="{ width: '30rem' }"
+                              :bordered="false" :disabled="editDisabled" />
                             <span style="color: #ecb646" v-if="item.itemSelected == tmxx.itemIndex">(正确答案)</span>
-                            <a-tooltip placement="topLeft" title="在下方添加新的选项"
-                              ><Icon
-                                icon="ant-design:plus-circle-outlined"
+                            <a-tooltip placement="topLeft" title="在下方添加新的选项">
+                              <Icon icon="ant-design:plus-circle-outlined"
                                 style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
-                                @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                                v-if="!editDisabled"
-                            /></a-tooltip>
-                            <a-tooltip placement="topLeft" title="删除选项"
-                              ><Icon
-                                icon="ant-design:minus-circle-outlined"
+                                @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)" v-if="!editDisabled" />
+                            </a-tooltip>
+                            <a-tooltip placement="topLeft" title="删除选项">
+                              <Icon icon="ant-design:minus-circle-outlined"
                                 style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
-                                @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                                v-if="!editDisabled"
-                            /></a-tooltip>
+                                @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)" v-if="!editDisabled" />
+                            </a-tooltip>
                           </a-radio>
                         </div>
                       </a-radio-group>
@@ -197,132 +185,113 @@
 
                         <div>
                           <a-row>
-                            <a-col :span="12">
+                            <a-col :span="11">
                               <span>{{ index + 1 }}、<span style="color: #c2bfbf">[多选题]</span></span>
                             </a-col>
-                            <a-col :span="12" style="text-align: right;">
+                            <a-col :span="13" style="text-align: right;">
                               <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                                <a-select
-                                  style="width: 120px"
-                                  v-model:value="item.wjScore"
-                                  placeholder="请选择分数"
-                                  v-if="item.wjSfqh == '0'"
-                                  :disabled="editDisabled"
-                                >
-                                <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
+                                <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'" :disabled="editDisabled">
+                                  <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
                                 </a-select>
                               </a-tooltip>
-                              <a-tooltip placement="topRight" title="删除此题"
-                                ><Icon
-                                  icon="ant-design:delete-outlined"
-                                  style="cursor: pointer; font-size: 20px; margin: 10px"
-                                  @click="handleDelTigan(item, index)"
-                                  v-if="!editDisabled"
-                              /></a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题">
+                                <Icon icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 5px"
+                                  @click="handleDelTigan(item, index)" v-if="!editDisabled" />
+                              </a-tooltip>
+                              <Icon
+                                v-if="isSmallScreen && !editDisabled"
+                                icon="pixelarticons:chevrons-vertical"
+                                class="drag-handle"
+                                style="cursor: move; font-size: 20px; margin-right: 10px;"
+                              />
                             </a-col>
                           </a-row>
                         </div>
-                        <JEditor2 placeholder="请填写多选题题干"
-                          v-model:value="item.wjTitle"
-                          :bordered="false"
-                          :style="{ width: '30rem' }"
-                          :auto-size="{ minRows: 1, maxRows: 5 }"
-                          :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
+                        <JEditor2 placeholder="请填写多选题题干" v-model:value="item.wjTitle" :bordered="false"
+                          :style="{ width: '30rem' }" :auto-size="{ minRows: 1, maxRows: 5 }" :disabled="editDisabled"
+                          v-if="!editDisabled" />
+                        <div v-else v-html="item.wjTitle"></div>
 
-                          <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
-                                <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
-                          </div>
+                        <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
+                          <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库"
+                            :disabled="editDisabled" />
+                        </div>
                       </template>
                       <a-row v-if="isShow">
                         <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
                       </a-row>
-                      <a-checkbox-group v-model:value="item.itemSelected" style="width: 100%" :disabled="!isShow" @change="handleChecked">
+                      <a-checkbox-group v-model:value="item.itemSelected" style="width: 100%" :disabled="!isShow"
+                        @change="handleChecked">
                         <a-row>
                           <a-col :span="24" v-for="(tmxx, index) in item.wjxWjxxTmxxList" :key="index">
                             <!-- -{{item.itemSelected}}-{{tmxx.itemIndex}} -->
-                            <a-checkbox :value="tmxx.itemIndex"
-                              ><a-input
-                                placeholder="请填写选项"
-                                v-model:value="tmxx.itemTitle"
-                                :bordered="false"
-                                :style="{ width: '30rem' }"
-                                :disabled="editDisabled"
-                            /></a-checkbox>
+                            <a-checkbox :value="tmxx.itemIndex"><a-input placeholder="请填写选项"
+                                v-model:value="tmxx.itemTitle" :bordered="false" :style="{ width: '30rem' }"
+                                :disabled="editDisabled" /></a-checkbox>
                             <span style="color: #ecb646" v-if="cheGrp(item.itemSelected, tmxx.itemIndex)">(正确答案)</span>
-                            <a-tooltip placement="topLeft" title="在下方添加新的选项"
-                              ><Icon
-                                icon="ant-design:plus-circle-outlined"
+                            <a-tooltip placement="topLeft" title="在下方添加新的选项">
+                              <Icon icon="ant-design:plus-circle-outlined"
                                 style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
-                                @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                                v-if="!editDisabled"
-                            /></a-tooltip>
-                            <a-tooltip placement="topLeft" title="删除选项"
-                              ><Icon
-                                icon="ant-design:minus-circle-outlined"
+                                @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)" v-if="!editDisabled" />
+                            </a-tooltip>
+                            <a-tooltip placement="topLeft" title="删除选项">
+                              <Icon icon="ant-design:minus-circle-outlined"
                                 style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
-                                @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                                v-if="!editDisabled"
-                            /></a-tooltip>
+                                @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)" v-if="!editDisabled" />
+                            </a-tooltip>
                           </a-col>
                         </a-row>
                       </a-checkbox-group>
                     </a-card>
                   </div>
                   <!-- 填空题 -->
-                  <div style="width: 100%" v-else-if="(item.wjType == 5 || item.wjType == '5') && item.wjSubtype == null">
+                  <div style="width: 100%"
+                    v-else-if="(item.wjType == 5 || item.wjType == '5') && item.wjSubtype == null">
                     <a-card>
                       <template #title>
                         <div>
                           <a-row>
-                            <a-col :span="12">
+                            <a-col :span="11">
                               <span>{{ index + 1 }}、<span style="color: #c2bfbf">[填空题]</span></span>
                             </a-col>
-                            <a-col :span="12" style="text-align: right;">
+                            <a-col :span="13" style="text-align: right;">
                               <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                                <a-select
-                                  style="width: 120px"
-                                  v-model:value="item.wjScore"
-                                  placeholder="请选择分数"
-                                  v-if="item.wjSfqh == '0'"
-                                  :disabled="editDisabled"
-                                >
-                                  
-                                <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
+                                <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'" :disabled="editDisabled">
+
+                                  <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
                                 </a-select>
                               </a-tooltip>
-                              <a-tooltip placement="topRight" title="删除此题"
-                                ><Icon
-                                  icon="ant-design:delete-outlined"
-                                  style="cursor: pointer; font-size: 20px; margin: 10px"
-                                  @click="handleDelTigan(item, index)"
-                                  v-if="!editDisabled"
-                              /></a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题">
+                                <Icon icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 5px"
+                                  @click="handleDelTigan(item, index)" v-if="!editDisabled" />
+                              </a-tooltip>
+                              <Icon
+                                v-if="isSmallScreen && !editDisabled"
+                                icon="pixelarticons:chevrons-vertical"
+                                class="drag-handle"
+                                style="cursor: move; font-size: 20px; margin-right: 10px;"
+                              />
                             </a-col>
                           </a-row>
                         </div>
-                        <JEditor2 placeholder="请填写填空题题干"
-                          v-model:value="item.wjTitle"
-                          :bordered="false"
-                          :style="{ width: '30rem' }"
-                          :auto-size="{ minRows: 1, maxRows: 5 }"
-                          :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
-                          
-                          <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
-                                <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
-                          </div>
+                        <JEditor2 placeholder="请填写填空题题干" v-model:value="item.wjTitle" :bordered="false"
+                          :style="{ width: '30rem' }" :auto-size="{ minRows: 1, maxRows: 5 }" :disabled="editDisabled"
+                          v-if="!editDisabled" />
+                        <div v-else v-html="item.wjTitle"></div>
+
+                        <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
+                          <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库"
+                            :disabled="editDisabled" />
+                        </div>
                       </template>
-                      <a-row >
+                      <a-row>
                         <a-col :span="24">
-                          <a-textarea
-                            placeholder="请填写答案"
-                            v-model:value="item.wjAnswer"
-                            :bordered="false"
-                            style="width: 100%"
-                            :auto-size="{ minRows: 1, maxRows: 5 }"
-                            :disabled="editDisabled"
-                          />
+                          <a-textarea placeholder="请填写答案" v-model:value="item.wjAnswer" :bordered="false"
+                            style="width: 100%" :auto-size="{ minRows: 1, maxRows: 5 }" :disabled="editDisabled" />
                         </a-col>
                       </a-row>
                     </a-card>
@@ -333,164 +302,149 @@
                       <template #title>
                         <div>
                           <a-row>
-                            <a-col :span="12">
+                            <a-col :span="11">
                               <span>{{ index + 1 }}、<span style="color: #c2bfbf">[文件题]</span></span>
                             </a-col>
-                            <a-col :span="12" style="text-align: right;">
+                            <a-col :span="13" style="text-align: right;">
                               <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                                <a-select
-                                  style="width: 120px"
-                                  v-model:value="item.wjScore"
-                                  placeholder="请选择分数"
-                                  v-if="item.wjSfqh == '0'"
-                                  :disabled="editDisabled"
-                                >
-                                  
-                                <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
+                                <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'" :disabled="editDisabled">
+
+                                  <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
                                 </a-select>
                               </a-tooltip>
-                              <a-tooltip placement="topRight" title="删除此题"
-                                ><Icon
-                                  icon="ant-design:delete-outlined"
-                                  style="cursor: pointer; font-size: 20px; margin: 10px"
-                                  @click="handleDelTigan(item, index)"
-                                  v-if="!editDisabled"
-                              /></a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题">
+                                <Icon icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 5px"
+                                  @click="handleDelTigan(item, index)" v-if="!editDisabled" />
+                              </a-tooltip>
+                              <Icon
+                                v-if="isSmallScreen && !editDisabled"
+                                icon="pixelarticons:chevrons-vertical"
+                                class="drag-handle"
+                                style="cursor: move; font-size: 20px; margin-right: 10px;"
+                              />
                             </a-col>
                           </a-row>
                         </div>
-                        <JEditor2 placeholder="请填写文件题题干"
-                          v-model:value="item.wjTitle"
-                          :bordered="false"
-                          :style="{ width: '30rem' }"
-                          :auto-size="{ minRows: 1, maxRows: 5 }"
-                          :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
-                          
-                          <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
-                                <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
-                          </div>
+                        <JEditor2 placeholder="请填写文件题题干" v-model:value="item.wjTitle" :bordered="false"
+                          :style="{ width: '30rem' }" :auto-size="{ minRows: 1, maxRows: 5 }" :disabled="editDisabled"
+                          v-if="!editDisabled" />
+                        <div v-else v-html="item.wjTitle"></div>
+
+                        <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
+                          <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库"
+                            :disabled="editDisabled" />
+                        </div>
                       </template>
                     </a-card>
                   </div>
                   <!-- 判断题 -->
-                  <div style="width: 100%" v-else-if="(item.wjType == 3 || item.wjType == '3') && (item.wjSubtype == 305 || item.wjSubtype == '305')">
+                  <div style="width: 100%"
+                    v-else-if="(item.wjType == 3 || item.wjType == '3') && (item.wjSubtype == 305 || item.wjSubtype == '305')">
                     <a-card>
                       <template #title>
                         <div>
                           <a-row>
-                            <a-col :span="12">
+                            <a-col :span="11">
                               <span>{{ index + 1 }}、<span style="color: #c2bfbf">[判断题]</span></span>
                             </a-col>
-                            <a-col :span="12" style="text-align: right;">
+                            <a-col :span="13" style="text-align: right;">
                               <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                                <a-select
-                                  style="width: 120px"
-                                  v-model:value="item.wjScore"
-                                  placeholder="请选择分数"
-                                  v-if="item.wjSfqh == '0'"
-                                  :disabled="editDisabled"
-                                >
-                                <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
+                                <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'" :disabled="editDisabled">
+                                  <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
                                 </a-select>
                               </a-tooltip>
-                              <a-tooltip placement="topRight" title="删除此题"
-                                ><Icon
-                                  icon="ant-design:delete-outlined"
-                                  style="cursor: pointer; font-size: 20px; margin: 10px"
-                                  @click="handleDelTigan(item, index)"
-                                  v-if="!editDisabled"
-                              /></a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题">
+                                <Icon icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 5px"
+                                  @click="handleDelTigan(item, index)" v-if="!editDisabled" />
+                              </a-tooltip>
+                              <Icon
+                                v-if="isSmallScreen && !editDisabled"
+                                icon="pixelarticons:chevrons-vertical"
+                                class="drag-handle"
+                                style="cursor: move; font-size: 20px; margin-right: 10px;"
+                              />
                             </a-col>
                           </a-row>
                         </div>
-                        <JEditor2 placeholder="请填写文件题题干"
-                          v-model:value="item.wjTitle"
-                          :bordered="false"
-                          :style="{ width: '30rem' }"
-                          :auto-size="{ minRows: 1, maxRows: 5 }"
-                          :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
-                        
-                          <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
-                                <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
-                          </div>
+                        <JEditor2 placeholder="请填写文件题题干" v-model:value="item.wjTitle" :bordered="false"
+                          :style="{ width: '30rem' }" :auto-size="{ minRows: 1, maxRows: 5 }" :disabled="editDisabled"
+                          v-if="!editDisabled" />
+                        <div v-else v-html="item.wjTitle"></div>
+
+                        <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
+                          <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库"
+                            :disabled="editDisabled" />
+                        </div>
                       </template>
                       <a-row v-if="isShow">
                         <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
                       </a-row>
-                      <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" :disabled="!isShow">
+                      <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default"
+                        :disabled="!isShow">
                         <div style="width: 100%" v-for="(tmxx, index) in item.wjxWjxxTmxxList" :key="index">
                           <a-radio :value="tmxx.itemIndex + ``" style="width: 100%">
-                            <a-input
-                              placeholder="请填写选项"
-                              v-model:value="tmxx.itemTitle"
-                              :style="{ width: '30rem' }"
-                              :bordered="false"
-                              :disabled="editDisabled"
-                            />
+                            <a-input placeholder="请填写选项" v-model:value="tmxx.itemTitle" :style="{ width: '30rem' }"
+                              :bordered="false" :disabled="editDisabled" />
                             <span style="color: #ecb646" v-if="item.itemSelected == tmxx.itemIndex">(正确答案)</span>
-                            <a-tooltip placement="topLeft" title="在下方添加新的选项"
-                              ><Icon
-                                icon="ant-design:plus-circle-outlined"
+                            <a-tooltip placement="topLeft" title="在下方添加新的选项">
+                              <Icon icon="ant-design:plus-circle-outlined"
                                 style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
-                                @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                                v-if="!editDisabled"
-                            /></a-tooltip>
-                            <a-tooltip placement="topLeft" title="删除选项"
-                              ><Icon
-                                icon="ant-design:minus-circle-outlined"
+                                @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)" v-if="!editDisabled" />
+                            </a-tooltip>
+                            <a-tooltip placement="topLeft" title="删除选项">
+                              <Icon icon="ant-design:minus-circle-outlined"
                                 style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
-                                @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                                v-if="!editDisabled"
-                            /></a-tooltip>
+                                @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)" v-if="!editDisabled" />
+                            </a-tooltip>
                           </a-radio>
                         </div>
                       </a-radio-group>
                     </a-card>
                   </div>
                   <!-- 简答题 -->
-                  <div style="width: 100%" v-else-if="(item.wjType == 5 || item.wjType == '5') && (item.wjSubtype == 5 || item.wjSubtype == '5')">
+                  <div style="width: 100%"
+                    v-else-if="(item.wjType == 5 || item.wjType == '5') && (item.wjSubtype == 5 || item.wjSubtype == '5')">
                     <a-card>
                       <template #title>
                         <div>
                           <a-row>
-                            <a-col :span="12">
+                            <a-col :span="11">
                               <span>{{ index + 1 }}、<span style="color: #c2bfbf">[简答题]</span></span>
                             </a-col>
-                            <a-col :span="12" style="text-align: right;">
+                            <a-col :span="13" style="text-align: right;">
                               <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                                <a-select
-                                  style="width: 120px"
-                                  v-model:value="item.wjScore"
-                                  placeholder="请选择分数"
-                                  v-if="item.wjSfqh == '0'"
-                                  :disabled="editDisabled"
-                                >
-                                <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
+                                <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'" :disabled="editDisabled">
+                                  <a-select-option :value="item" v-for="(item) in scoreData">{{item}}</a-select-option>
                                 </a-select>
                               </a-tooltip>
-                              <a-tooltip placement="topRight" title="删除此题"
-                                ><Icon
-                                  icon="ant-design:delete-outlined"
-                                  style="cursor: pointer; font-size: 20px; margin: 10px"
-                                  @click="handleDelTigan(item, index)"
-                                  v-if="!editDisabled"
-                              /></a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题">
+                                <Icon icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 5px"
+                                  @click="handleDelTigan(item, index)" v-if="!editDisabled" />
+                              </a-tooltip>
+                              <Icon
+                                v-if="isSmallScreen && !editDisabled"
+                                icon="pixelarticons:chevrons-vertical"
+                                class="drag-handle"
+                                style="cursor: move; font-size: 20px; margin-right: 10px;"
+                              />
                             </a-col>
                           </a-row>
                         </div>
-                        <JEditor2 placeholder="请填写简答题题干"
-                          v-model:value="item.wjTitle"
-                          :bordered="false"
-                          :style="{ width: '30rem' }"
-                          :auto-size="{ minRows: 1, maxRows: 5 }"
-                          :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
-                          
-                          <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
-                                <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
-                          </div>
+                        <JEditor2 placeholder="请填写简答题题干" v-model:value="item.wjTitle" :bordered="false"
+                          :style="{ width: '30rem' }" :auto-size="{ minRows: 1, maxRows: 5 }" :disabled="editDisabled"
+                          v-if="!editDisabled" />
+                        <div v-else v-html="item.wjTitle"></div>
+
+                        <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
+                          <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库"
+                            :disabled="editDisabled" />
+                        </div>
                       </template>
                     </a-card>
                   </div>
@@ -511,12 +465,12 @@
 
     <!-- 表单区域 -->
     <WjxWjxxTmlbModal @register="registerModal" @success="handleSuccess"></WjxWjxxTmlbModal>
-    
+
   </div>
 </template>
 
 <script lang="ts" name="wjxWjxxTmlb-siyou" setup>
-import { ref, reactive, watch, computed, unref, onMounted } from 'vue';
+import { ref, reactive, watch, computed, unref, onMounted, onUnmounted } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { useModal } from '/@/components/Modal';
@@ -540,6 +494,8 @@ const checkedKeys = ref<Array<string | number>>([]);
 const importOpen = ref<boolean>(false);
 const addOpen = ref<boolean>(false);
 const glob = useGlobSetting();
+// 定义一个响应式的宽度
+const width = ref('80%');
 
 const tiganData = ref<any>([]);
 const isShow = ref<boolean>(true);
@@ -861,11 +817,13 @@ function handleEdit(record: Recordable, wjSytype) {
 /**
  * 详情
  */
-function handleDetail(record: Recordable) {
+ function handleDetail(record: Recordable) {
+  // 添加自定义类名
   openModal(true, {
     record,
     isUpdate: true,
     showFooter: false,
+    className: 'custom-modal-detail', // 添加自定义类名
   });
 }
 /**
@@ -1000,7 +958,30 @@ function searchReset() {
   reload();
 }
 
+// 计算属性来决定实际使用的宽度
+const computedWidth = computed(() => {
+  return isSmallScreen.value ? '90%' : width.value;
+});
+
+// 响应式地检查是否是小屏幕
+const isSmallScreen = ref(false);
+
+// 更新 isSmallScreen 的函数
+const updateScreenWidth = () => {
+  isSmallScreen.value = window.innerWidth < 600; // 你可以调整这个断点
+};
+
+
+onUnmounted(() => {
+  window.removeEventListener('resize', updateScreenWidth);
+});
+
 onMounted(() => {
+  // 监听窗口大小变化
+  window.addEventListener('resize', updateScreenWidth);
+  // 初始化时也调用一次
+  updateScreenWidth();
+
   // wjLeixing.value = "1";
   // console.log(`🚀 ~ onMounted ~ wjLeixing:`, wjLeixing)
   // queryParam.value.wjLeixing = wjLeixing;
@@ -1010,6 +991,20 @@ onMounted(() => {
 });
 </script>
 <style lang="less" scoped>
+@media (max-width: 768px) {
+  .sdtj-div {
+    padding: 0;
+    margin: 0;
+  }
+}
+
+@media (min-width: 769px) {
+  .sdtj-div {
+    padding: 20px;
+    margin: 20px;
+  }
+}
+
 .jeecg-basic-table-form-container {
   .table-page-search-submitButtons {
     display: block;
@@ -1026,4 +1021,13 @@ onMounted(() => {
     text-align: center;
   }
 }
+  /deep/.ant-card-head-title {
+    padding:0px;
+  }
+
+.custom-modal-detail .ant-card-head-title {
+  white-space: normal !important; /* 覆盖原有的 white-space: nowrap */
+}
+
+
 </style>

src/views/kc/wjxWjxxTmlb/TikuListModal.vue

@@ -1,64 +1,89 @@
 <template>
-  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-modal :title="title" :style="{ width: computedWidth }" :visible="visible" @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
     <TikuListMain ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></TikuListMain>
   </a-modal>
 </template>
 
 <script lang="ts" setup>
-  import { ref, nextTick, defineExpose } from 'vue';
-  import TikuListMain from './TikuListMain.vue'
-  
-  const title = ref<string>('');
-  const width = ref<string>('80%');
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
+import { ref, nextTick, defineExpose, onMounted, onUnmounted, computed } from 'vue';
+import TikuListMain from './TikuListMain.vue'
 
-  
-  /**
-   * 编辑
-   * @param record
-   */
-  function init(record) {
-    title.value = '题库';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.init(record);
-    });
-  }
-  
-  /**
-   * 确定按钮点击事件
-   */
-  function handleOk() {
-    registerForm.value.submitForm();
-  }
+const title = ref<string>('');
+const width = ref<string>('80%');
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const emit = defineEmits(['register', 'success']);
 
-  /**
-   * form保存回调事件
-   */
-  function submitCallback() {
-    handleCancel();
-    emit('success');
-  }
 
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-  }
-
-  defineExpose({
-    init,
-    disableSubmit,
+/**
+ * 编辑
+ * @param record
+ */
+function init(record) {
+  title.value = '题库';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.init(record);
   });
+}
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback() {
+  handleCancel();
+  emit('success');
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+// 计算属性来决定实际使用的宽度
+const computedWidth = computed(() => {
+  return isSmallScreen.value ? '100%' : width.value;
+});
+
+// 响应式地检查是否是小屏幕
+const isSmallScreen = ref(false);
+
+// 更新 isSmallScreen 的函数
+const updateScreenWidth = () => {
+  isSmallScreen.value = window.innerWidth < 600; // 你可以调整这个断点
+};
+
+// 监听窗口大小变化
+onMounted(() => {
+  window.addEventListener('resize', updateScreenWidth);
+  // 初始化时也调用一次
+  updateScreenWidth();
+});
+
+onUnmounted(() => {
+  window.removeEventListener('resize', updateScreenWidth);
+});
+
+defineExpose({
+  init,
+  disableSubmit,
+});
 </script>
 
 <style>
-  /**隐藏样式-modal确定按钮 */
-  .jee-hidden {
-    display: none !important;
-  }
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
 </style>

src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue

@@ -1,7 +1,7 @@
 <template>
   <a-spin :spinning="loading">
     <a-form v-bind="formItemLayout">
-      <draggable @end="end" v-model="tiganData" item-key="id">
+      <draggable handle="'.dragclass'" @end="end" v-model="tiganData" item-key="id">
         <template #item="{ index, element: item }">
           <div>
             <!-- 单选题 -->
@@ -35,7 +35,7 @@
                           :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
                           :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
+                          <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                         
                           <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                 <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -105,7 +105,7 @@
                           :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
                           :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
+                          <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
 
                           <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                 <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -177,7 +177,7 @@
                           :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
                           :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
+                          <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                           
                           <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                 <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -228,7 +228,7 @@
                           :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
                           :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
+                          <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                           
                           <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                 <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -266,7 +266,7 @@
                           :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
                           :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
+                          <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                         
                           <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                 <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -335,7 +335,7 @@
                           :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
                           :disabled="editDisabled" v-if="!editDisabled"/>
-                          <div v-else v-html="item.wjTitle"></div>
+                          <div v-else class="rich-text-container" v-html="item.wjTitle"></div>
                           
                           <div style="text-align: right;color: #c2bfbf" v-if="isShow">是否加入题库：
                                 <j-dict-select-tag type='radio' v-model:value="item.sftjtk" dictCode="yn" placeholder="是否加入题库" :disabled="editDisabled"/>
@@ -364,6 +364,9 @@ import { Form } from 'ant-design-vue';
 import JEditor2 from '/@/components/Form/src/jeecg/components/JEditor2.vue';
 import draggable from 'vuedraggable';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { useScreenSize } from '/src/utils/screenSize/useScreenSize'
+
+const { isSmallScreen } = useScreenSize();
 const useForm = Form.useForm;
 
 export default defineComponent({
@@ -599,4 +602,12 @@ const scoreData = [
     };
   },
 });
-</script>
+</script>
+
+<style scoped>
+.rich-text-container {
+  white-space: pre-wrap; /* 强制换行 */
+  word-break: break-all; /* 长单词和 URL 地址换行 */
+  overflow-wrap: break-word; /* 在长单词内部换行 */
+}
+</style>

src/views/kc/xxhbbks/XxhbbksListModal.vue

@@ -21,6 +21,8 @@
    * @param record
    */
   function init(record) {
+    console.log("🚀 ~ 999init ~ record:", record)
+    
     title.value = '详情' ;
     visible.value = true;
     nextTick(() => {

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue

@@ -4,7 +4,9 @@
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" :key="index" v-for="(item, index) in allList">
         <div class=" ketangback ketangCard ketangCardcol">
           <div class="rjkcTopDiv">
-            <div style="text-align: left"><Icon icon="ant-design:read-outlined" /><span>{{ item.sksj }}</span></div>
+            <div style="text-align: left">
+              <Icon icon="ant-design:read-outlined" /><span>{{ item.sksj }}</span>
+            </div>
           </div>
           <div class="rjkcBodyDiv">
             <div class="kcmcDiv">
@@ -15,23 +17,23 @@
                 :numberStyle="{ backgroundColor: '#f00', width: '10px', height: '10px' }"
                 :title="'您有' + item.dbtxType + '条提醒信息'"
               > -->
-                <span style="font-size: 20px">{{ item.kcmc }}</span>
+              <span style="font-size: 20px">{{ item.kcmc }}</span>
               <!-- </a-badge> -->
             </div>
             <div class="skddDiv">{{ item.skdd }}</div>
             <!-- <div class="skddDiv">教课周次：{{ item.jkzc }}</div> -->
             <div class="xkrsDiv skdd-Left-section">
-                <div style="width:70%; display: flex; justify-content: flex-start; ">
-                  <div class="skdd-line">
-                    <div class="xkrs-color">{{ item.xf }}</div>
-                    <div class="skddDiv">学分</div>
-                  </div>
-                  <div class="skdd-line" style="cursor: pointer;">
-                      <div class="xkrs-color">{{ item.xkrs }}</div>
-                      <div class="skddDiv" @click="openXkrs(item)">选课人数</div>
-                  </div>
+              <div style="width:70%; display: flex; justify-content: flex-start; ">
+                <div class="skdd-line">
+                  <div class="xkrs-color">{{ item.xf }}</div>
+                  <div class="skddDiv">学分</div>
                 </div>
-                <a-button class="buttonClass" @click="openKechengDetail(item)">进入课程</a-button>
+                <div class="skdd-line" style="cursor: pointer;"  @click="openXkrs(item)">
+                  <div class="xkrs-color">{{ item.xkrs }}</div>
+                  <div class="skddDiv">选课人数</div>
+                </div>
+              </div>
+              <a-button class="buttonClass" @click="openKechengDetail(item)">进入课程</a-button>
             </div>
           </div>
         </div>
@@ -46,13 +48,13 @@ import { ref, onMounted } from 'vue';
 
 import { getUserSf, getSysConfig } from '/@/views/site/utils/index';
 import { defHttp } from '/@/utils/http/axios';
-  import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
+import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
 
 import { router } from '/@/router';
 import { useRouter } from 'vue-router';
 
 const allList = ref<any>([]);
-  const XxhbbksListModalPage = ref();
+const XxhbbksListModalPage = ref();
 
 const weebMap = {
   '1': '星期一',
@@ -67,18 +69,18 @@ function toWeek(week) {
   return weebMap[week];
 }
 
-  //获取选课人数
-  function openXkrs(record){
-    console.log(`🚀 ~ openXkrs ~ record:`, record)
-    XxhbbksListModalPage.value.disableSubmit = true;
-    XxhbbksListModalPage.value.init(record);
-  }
+//获取选课人数
+function openXkrs(record) {
+  console.log(`🚀 ~ openXkrs ~ record:`, record)
+  XxhbbksListModalPage.value.disableSubmit = true;
+  XxhbbksListModalPage.value.init(record);
+}
 //进入就加载
 onMounted(() => {
   loadData();
   setInterval(() => {
     loadData()
-  }, 60*1000);
+  }, 60 * 1000);
 });
 
 function loadData() {
@@ -99,17 +101,20 @@ function openKechengDetail(item) {
 .ketangCard {
   margin: 0.5rem;
 }
+
 .ketangCardcol {
   background-color: #f3f3f3;
   padding: 1px;
   box-shadow: 1px 1px 5px 1px #e1e1e1;
 }
+
 .rjkcTopDiv {
   padding: 0.5rem;
   color: #798394;
   font-size: 15px;
   text-align: right;
 }
+
 .nDayDiv {
   top: -14px;
   right: -14px;
@@ -121,26 +126,31 @@ function openKechengDetail(item) {
   border-radius: 0 0 0 5px;
   text-align: left;
 }
+
 .rjkcBodyDiv {
   margin-top: 1px;
   background: #fff;
-  padding:1rem;
+  padding: 1rem;
 }
+
 .kcmcDiv {
   font-size: 24px;
   font-weight: bold;
 }
+
 .skddDiv {
   color: #333333;
-  font-size:14px;
+  font-size: 14px;
   // font-weight: bold;
 }
+
 .xkrsDiv {
-  padding-top:1rem;
+  padding-top: 1rem;
   font-size: 18px;
   font-weight: bold;
   text-align: right;
 }
+
 .buttonClass {
   background: #1ab394;
   font-weight: 600;
@@ -152,46 +162,52 @@ function openKechengDetail(item) {
     background: #6cafda;
   }
 }
-.skdd-Left-section{
+
+.skdd-Left-section {
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
 }
-.ketangback{
+
+.ketangback {
   background: #f7f7f7;
   border-radius: 5px;
 }
-.skdd-line{
+
+.skdd-line {
   text-align: left;
-  width:30%;
+  width: 30%;
   margin-right: 10rpx;
 }
-.xkrs-color{
+
+.xkrs-color {
   color: #18a689;
 }
-.xkrs-color:hover{
+
+.xkrs-color:hover {
   color: #ff5a00;
 }
+
 .ant-btn {
-    line-height: 1.5715;
-    position: relative;
-    display: inline-block;
-    font-weight: 400;
-    white-space: nowrap;
-    text-align: center;
-    background-image: none;
-    box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
-    cursor: pointer;
-    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    user-select: none;
-    touch-action: manipulation;
-    height: 32px;
-    padding: 4px 15px;
-    font-size: 14px;
-    border-radius:5px;
-    border-color: #fff;
-    color: #fff;
+  line-height: 1.5715;
+  position: relative;
+  display: inline-block;
+  font-weight: 400;
+  white-space: nowrap;
+  text-align: center;
+  background-image: none;
+  box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
+  cursor: pointer;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  touch-action: manipulation;
+  height: 32px;
+  padding: 4px 15px;
+  font-size: 14px;
+  border-radius: 5px;
+  border-color: #fff;
+  color: #fff;
 }
 </style>

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue

@@ -122,7 +122,7 @@
     </div>
     <div v-if="!showYl">
       <div>
-        <a-button type="primary" @click="handleYulan(1)" preIcon="ant-design:plus-outlined" style="margin-left: 8px"> 返回</a-button>
+        <a-button type="primary" @click="handleYulan(1)" preIcon="ant-design:arrow-left-outlined" style="margin-left: 8px"> 返回</a-button>
         <studentZyxx/>
       </div>
     </div>

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetailhis.vue

@@ -0,0 +1,378 @@
+<template>
+  <div style="margin-top: 10px; background: #fff; height: calc(100vh - 225px); overflow: auto">
+    <div v-if="showYl">
+      <div style="width: 100%; text-align: right">
+        <a-button type="primary" style="margin-left: 10px" @click="handleYulan(0)">学生预览页面</a-button>
+      </div>
+      <a-card>
+        <div>
+          <a-row>
+            <a-col :lg="3" style="font-size: 18px; font-weight: bold">课程简介：</a-col>
+            <a-col :lg="15" >
+              <p v-html="jxdgInfo.kcjs"></p>
+              <!-- <j-editor v-model:value="jxdgInfo.kcjs" /> -->
+              <!-- <a-textarea style="width: 100%;min-height: 200px;" v-model:value="jxdgInfo.kcjs" @blur="handleEditKcjs(0)"></a-textarea> -->
+            </a-col>
+            <!-- <a-col :lg="15" v-show="!kcjsShow">
+              <div
+                style="width: 100%; min-height: 50px; margin-top: 10px; color: #cfcfcf; font-size: 13px"
+                v-if="!jxdgInfo.kcjs"
+                @click="handleEditKcjs(1)"
+                >暂无内容,点击进行编辑</div
+              >
+              <div style="width: 100%; min-height: 50px" v-else @click="handleEditKcjs(1)">
+                <div v-html="jxdgInfo.kcjs"></div>
+                <div style="color: #cfcfcf; font-size: 13px">说明：点击进行编辑</div>
+              </div>
+            </a-col> -->
+            <!-- <a-col :lg="6" style="text-align: right"
+              ><a-button type="primary" @click="addKcjsHandle(1)">提交</a-button
+              ><a-button type="primary" style="margin-left: 10px" @click="handleYinyong(jxdgInfo)">引用</a-button></a-col
+            > -->
+          </a-row>
+        </div>
+      </a-card>
+      <!-- <a-card>
+        <div>
+          <span style="float: left; line-height: 30px; font-size: 18px; font-weight: bold">教学大纲：</span>
+          <span style="width: 300px; float: left">
+            <span style="float: left"
+              ><j-upload
+                v-model:value="jxdgInfo.filePath"
+                maxCount="1"
+                accept=".doc,.docx,.pdf"
+                @change="jxdgChange"
+                :forceAcceptVerify="true"
+              ></j-upload
+            ></span>
+          </span>
+          <span style="float: right">
+            <a-button type="primary" style="margin-left: 10px" @click="downLoad(jxdgInfo.filePath)">下载</a-button>
+            <a-button type="danger" style="margin-left: 10px" @click="fileRemove(jxdgInfo, 1)">删除</a-button>
+            <a-button type="primary" style="margin-left: 10px" @click="openPdf(jxdgInfo)">预览大纲</a-button>
+          </span>
+        </div>
+      </a-card>
+      <a-card>
+        <div>
+          <span style="float: left; line-height: 30px; font-size: 18px; font-weight: bold">教学日历：</span>
+          <span style="width: 300px; float: left">
+            <span style="float: left"
+              ><j-upload
+                v-model:value="jxdgInfo.jxrlFilePath"
+                maxCount="1"
+                accept=".doc,.docx,.pdf"
+                @change="jxrlChange"
+                :forceAcceptVerify="true"
+              ></j-upload
+            ></span>
+          </span>
+          <span style="float: right">
+            <a-button type="primary" style="margin-left: 10px" @click="downLoad(jxdgInfo.jxrlFilePath)">下载</a-button>
+            <a-button type="danger" style="margin-left: 10px" @click="fileRemove(jxdgInfo, 2)">删除</a-button>
+            <a-button type="primary" style="margin-left: 10px" @click="openJxrlPdf(jxdgInfo)">预览日历</a-button>
+          </span>
+        </div>
+      </a-card>
+      <a-card>
+        <div style="line-height: 30px; font-size: 18px; font-weight: bold; width: 100%">
+          <span style="float: left">常见问题</span>
+          <span style="float: right"><a-button type="primary" @click="addCjwtHanle">新增</a-button></span>
+        </div>
+        <a-row style="margin-top: 50px; width: 100%; display: block">
+          <a-col :span="24" v-for="(item, index) in cjwtSource" :key="index">
+            <a-row>
+              <a-col :span="24">
+                <span style="float: left">{{ (current - 1) * pageSize + index + 1 }}.{{ item.question }}</span>
+                <span style="float: left; margin-left: 10px" v-if="item.sffb == '0'">
+                  <a title="修改" @click="handleEdit(item)"><Icon icon="ant-design:form-outlined" /></a>
+                  <a-divider type="vertical" style="height: 30px; background-color: #7cb305" />
+                  <a title="删除" @click="handleDelete(item)"><Icon icon="ant-design:delete-outlined" /></a>
+                </span>
+                <span style="float: right; " v-if="item.sffb == '0'">
+                  <a-button type="primary" @click="handleFabu(item, '1')">发布</a-button> 
+                </span>
+                <span style="float: left" v-if="item.sffb == '1'">
+                  <a @click="handleFabu(item, '0')" style="margin-left: 5px; padding: 0px 8px" title="撤回"
+                    ><Icon icon="ant-design:rollback-outlined"
+                  /></a>
+                </span>
+              </a-col>
+              <a-col :span="24"
+                ><span><Icon icon="ant-design:caret-right-outlined" />答：<div v-html="item.answer"></div> </span
+              ></a-col>
+              <a-col :span="24">
+                <a-divider />
+              </a-col>
+            </a-row>
+          </a-col>
+          <a-col :span="24" v-show="cjwtSource.length > 0">
+            <a-pagination v-model="current" :total="total" @change="handlePageChange" :pageSize="pageSize" style="text-align: right" />
+          </a-col>
+          <a-col :span="24" v-show="cjwtSource.length == 0">
+            <a-empty />
+          </a-col>
+        </a-row>
+      </a-card>
+      <a-card>
+        <div style="line-height: 30px; font-size: 18px; font-weight: bold; width: 100%">
+          <span style="float: left">往届学生评价</span>
+        </div>
+        <studentPjjgTeaList :queryParam="{ pageSize: 3, ...tkzjParam, kcbh: '' }" style="max-height: 106px" />
+      </a-card> -->
+    </div>
+    <div v-if="!showYl">
+      <div>
+        <a-button type="primary" @click="handleYulan(1)" preIcon="ant-design:arrow-left-outlined"  style="margin-left: 8px"> 返回</a-button>
+        <studentZyxx/>
+      </div>
+    </div>
+
+    <ZyCjwtModal ref="ZyCjwtModalPage" @success="handleCjwtOk" />
+    <ZyJxdgListModal ref="ZyJxdgListModalPage" @success="getKcjsJxdg" />
+    <studentZyxxModal ref="studentZyxxModalPage" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, unref } from 'vue';
+import { getUserSf, getSysConfig } from '/@/views/site/utils/index';
+import { defHttp } from '/@/utils/http/axios';
+import { useRouter } from 'vue-router';
+import { Icon } from '/@/components/Icon';
+import { Pagination, Empty } from 'ant-design-vue';
+import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+import { deleteOne } from '/@/views/zy/zyCjwt/ZyCjwt.api';
+import headerPage from '/@/views/site/common/header.vue';
+import footerPage from '/@/views/site/common/footer.vue';
+import studentPjjgTeaList from '/@/views/site/pjjgPage/studentPjjgTeaList.vue';
+import ZyCjwtModal from '/@/views/zy/zyCjwt/components/ZyCjwtModal.vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import ZyJxdgListModal from '/@/views/zy/zyJxdg/ZyJxdgListModal.vue';
+import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+import JeecgPdfView from '/@/views/demo/jeecg/JeecgPdfView.vue';
+import { useGlobSetting } from '/@/hooks/setting';
+import studentZyxxModal from '/@/views/site/studentWdkc/studentZyxxModal.vue';
+import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+import studentZyxx from '/@/views/site/studentWdkc/studentZyxx.vue';
+
+const globSetting = useGlobSetting();
+const baseApiUrl = globSetting.domainUrl;
+
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, teano } = query; //获取传递参数
+const APagination = Pagination;
+const current = ref<number>(1);
+const total = ref<number>(0);
+const pageNo = ref<number>(0);
+const pageSize = ref<number>(3);
+const tkzjParam = ref({ rwbh: rwbh });
+const ZyCjwtModalPage = ref();
+const ZyJxdgListModalPage = ref();
+const studentZyxxModalPage = ref();
+const cjwtSource = ref([]);
+let kcjsShow = ref<boolean>(false);
+const showYl = ref<boolean>(true);
+let router = useRouter();
+const { createMessage } = useMessage();
+const jxdgInfo = ref({
+  id: '',
+  filePath: null,
+  jxrlFilePath: null,
+  kcjs: '',
+  pdfPath: null,
+  jxrlPdfPath: null,
+});
+function handleEditKcjs(type) {
+  console.log(`🚀 ~ handleEditKcjs ~ type:`, type);
+  if (type == 1) {
+    kcjsShow.value = true;
+  } else {
+    kcjsShow.value = false;
+  }
+}
+
+//预览
+function handleYulan(type) {
+  if (type == 1) {
+    showYl.value = true;
+  } else if (type == 0) {
+    showYl.value = false;
+  }
+}
+
+//教学大纲提交附件
+function jxdgChange(record) {
+  console.log(`🚀 ~ jxdgChange ~ record:`, record);
+  var model = { id: jxdgInfo.value.id, filePath: record, rwbh, xqxn };
+  defHttp.post({ url: '/zyJxdg/zyJxdg/jxdgScfj', params: model }).then((res) => {
+    getKcjsJxdg();
+  });
+}
+
+function downLoad(file) {
+  if (file) {
+    let url = getFileAccessHttpUrl(file);
+    if (url) {
+      window.open(url);
+    }
+  } else {
+    createMessage.warning('暂无文件或文件上传中');
+  }
+}
+//删除附件
+function fileRemove(record, type) {
+  var model = { id: record.id, type: type };
+  console.log(`🚀 ~ fileRemove ~ model:`, model);
+  defHttp.post({ url: '/zyJxdg/zyJxdg/deleteJxdgJxrl', params: model }).then((res) => {
+    getKcjsJxdg();
+  });
+}
+function jxrlChange(record) {
+  console.log(`🚀 ~ jxdgChange ~ record:`, record);
+  var model = { id: jxdgInfo.value.id, jxrlFilePath: record, rwbh, xqxn };
+  defHttp.post({ url: '/zyJxdg/zyJxdg/jxrlScfj', params: model }).then((res) => {
+    getKcjsJxdg();
+  });
+}
+
+function handleZtyl(record) {
+  studentZyxxModalPage.value.disableSubmit = true;
+  studentZyxxModalPage.value.edit(record);
+}
+
+//引用功能
+function handleYinyong(record) {
+  ZyJxdgListModalPage.value.disableSubmit = true;
+  ZyJxdgListModalPage.value.init(record);
+}
+//常见问题新增
+function addCjwtHanle() {
+  var params = { rwbh: rwbh, xqxn: xqxn };
+  ZyCjwtModalPage.value.disableSubmit = false;
+  ZyCjwtModalPage.value.add(params);
+}
+/**
+ * 常见问题编辑事件
+ */
+function handleEdit(record: Recordable) {
+  ZyCjwtModalPage.value.disableSubmit = false;
+  ZyCjwtModalPage.value.edit(record);
+}
+/**
+ * 常见问题发布
+ */
+function handleFabu(record, type) {
+  var model = { id: record.id, sffb: type };
+  console.log(`🚀 ~ fileRemove ~ model:`, model);
+  defHttp.post({ url: '/zyCjwt/zyCjwt/edit', params: model }).then((res) => {
+    cjwtData();
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({ id: record.id }, handleCjwtOk2);
+}
+
+function openPdf(record) {
+  if (record.pdfPath) {
+    var url2 = getFileAccessHttpUrl(record.pdfPath);
+    let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+    window.open(url, '_blank');
+  } else {
+    createMessage.warning('暂无文件或文件上传中');
+  }
+}
+
+function openJxrlPdf(record) {
+  if (record.jxrlPdfPath) {
+    var url2 = getFileAccessHttpUrl(record.jxrlPdfPath);
+    let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+    window.open(url, '_blank');
+  } else {
+    createMessage.warning('暂无文件或文件上传中');
+  }
+}
+
+//常见问题回调刷新
+function handleCjwtOk() {
+  // console.log('--------cjwt ok -----------')
+  cjwtData();
+}
+
+//常见问题回调刷新
+function handleCjwtOk2() {
+  total.value = 1;
+  handlePageChange(1);
+}
+
+//常见问题新增翻页
+function handlePageChange(page: number) {
+  current.value = page;
+  cjwtData();
+}
+
+function cjwtData() {
+  defHttp
+    .get({
+      url: '/zyCjwt/zyCjwt/list',
+      params: { pageSize: 3, pageNo: current.value, rwbh: rwbh, xqxn: xqxn,  column: 'createTime', order: 'desc' },
+    })
+    .then((res) => {
+      // console.log(`🚀 ~ defHttp.get ~ res:`, res)
+      cjwtSource.value = res.records;
+      total.value = res.total;
+      pageNo.value = res.pages;
+      current.value = res.current;
+      // console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
+    });
+}
+//获取课程简介和教学大纲内容
+function getKcjsJxdg() {
+  console.log(`🚀 ~111111111111111:`);
+  defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh: rwbh, xqxn: xqxn, } }).then((res) => {
+    console.log(`🚀 ~2222222222222222:`, res);
+    if (res) {
+      jxdgInfo.value = res;
+    }
+  });
+}
+function addKcjsHandle(type) {
+  const isUpdate = true;
+  var model = jxdgInfo.value;
+  model.rwbh = rwbh;
+  model.xqxn = xqxn;
+  console.log(`🚀 ~ addKcjsHandle ~ model:`, model);
+  if (model.id) {
+    if (type == '1') {
+      model.filePath = '';
+    }
+    defHttp.post({ url: '/zyJxdg/zyJxdg/edit', params: model }).then((res) => {
+      console.log(`🚀 ~ defHttp.post 111~ res:`, res);
+      kcjsShow.value = false;
+      getKcjsJxdg();
+    });
+  } else {
+    if (type == '1') {
+      model.filePath = '';
+    }
+    defHttp.post({ url: '/zyJxdg/zyJxdg/add', params: model }).then((res) => {
+      console.log(`🚀 ~ defHttp.post 222~ res:`, res);
+      kcjsShow.value = false;
+      getKcjsJxdg();
+    });
+  }
+}
+//进入就加载
+onMounted(() => {
+  getKcjsJxdg();
+  cjwtData();
+});
+</script>
+<style lang="less" scoped>
+</style>

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcHistory.vue

@@ -1,55 +1,84 @@
 <template>
-  <a-card>
-    <a-row>
-      <a-col :span="24">
-        <a-row>
-          <a-col  :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" >
-            <a-form-item label="学年学期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag  placeholder="学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc" style="width:90%;"/>
-            </a-form-item>
-          </a-col>
-          <a-col  :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" >
-            <a-form-item label="课程名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-input placeholder="课程名称" v-model:value="queryParam.kcmc" style="width:90%;"/>
-            </a-form-item>
-          </a-col>
-          <a-col  :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" >
-            <a-button type="primary" preIcon="ant-design:search-outlined" @click="loadData">查询</a-button>
-          </a-col>
-          
-        </a-row>
-      </a-col>
-        <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" :key="index" v-for="(item, index) in allList" >
-          <div class="ketangCard ketangCardcol"  >
+  <div>
+    <a-card>
+      <a-row>
+        <a-col :span="24">
+          <a-row>
+            <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }">
+              <a-form-item label="学年学期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag placeholder="学年学期" v-model:value="queryParam.xqxn"
+                  dictCode="kc_xqxn_history,title,title,true order by start_time desc" style="width:90%;" />
+              </a-form-item>
+            </a-col>
+            <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }">
+              <a-form-item label="课程名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-input placeholder="课程名称" v-model:value="queryParam.kcmc" style="width:90%;" />
+              </a-form-item>
+            </a-col>
+            <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }">
+              <a-button type="primary" preIcon="ant-design:search-outlined" @click="loadData">查询</a-button>
+            </a-col>
+
+          </a-row>
+        </a-col>
+        <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" :key="index" v-for="(item, index) in allList">
+          <div class=" ketangback ketangCard ketangCardcol">
             <div class="rjkcTopDiv">
-              <div style="text-align: left;"><span>{{ item.sksj }}</span></div>
+              <div style="text-align: left">
+                <Icon icon="ant-design:read-outlined" /><span>{{ item.sksj }}</span>
+              </div>
             </div>
             <div class="rjkcBodyDiv">
-              <div class="kcmcDiv">{{ item.kcmc }}</div>
-              <div class="skddDiv" style="margin-top:20px;">{{ item.skdd }}</div>
-              <div class="xkrsDiv" style="margin-top:20px;">{{ item.xqxn }}</div>
-              <div class="xkrsDiv">{{ item.xkrs }}人选课&nbsp;&nbsp;&nbsp;<a-button class="buttonClass" @click="openKechengDetail(item)">进入课程</a-button></div>
+              <div class="kcmcDiv">
+                <!-- <a-badge  :offset="[10|0]" :count="item.dbtxType" :title="'您有'+item.dbtxType+'条提醒信息'"> -->
+                <!-- <a-badge
+                :dot="item.dbtxType > 0 ? true : false"
+                :offset="[5 | 0]"
+                :numberStyle="{ backgroundColor: '#f00', width: '10px', height: '10px' }"
+                :title="'您有' + item.dbtxType + '条提醒信息'"
+              > -->
+                <span style="font-size: 20px">{{ item.kcmc }}</span>
+                <!-- </a-badge> -->
+              </div>
+              <div class="skddDiv">{{ item.skdd }}</div>
+              <!-- <div class="skddDiv">教课周次：{{ item.jkzc }}</div> -->
+              <div class="xkrsDiv skdd-Left-section">
+                <div style="width:70%; display: flex; justify-content: flex-start; ">
+                  <div class="skdd-line">
+                    <div class="xkrs-color">{{ item.xf }}</div>
+                    <div class="skddDiv">学分</div>
+                  </div>
+                  <div class="skdd-line" style="cursor: pointer;" @click="openXkrs(item)">
+                    <div class="xkrs-color">{{ item.xkrs }}</div>
+                    <div class="skddDiv">选课人数</div>
+                  </div>
+                </div>
+                <a-button class="buttonClass" @click="openKechengDetail(item)">进入课程</a-button>
+              </div>
             </div>
           </div>
         </a-col>
       </a-row>
-  </a-card>
+    </a-card>
+    <XxhbbksListModal ref="XxhbbksListModalPage"></XxhbbksListModal>
+  </div>
 </template>
 
 <script lang="ts" setup>
-  import { ref, onMounted  } from 'vue';
+import { ref, onMounted } from 'vue';
 
-  import { getUserSf,getSysConfig } from '/@/views/site/utils/index';
-  import { defHttp } from '/@/utils/http/axios';
-  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import { JInput } from '/@/components/Form';
-
-  import { router } from '/@/router';
-  import { useRouter } from 'vue-router';
-  const queryParam = ref<any>({});
-  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
-  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+import { getUserSf, getSysConfig } from '/@/views/site/utils/index';
+import { defHttp } from '/@/utils/http/axios';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { JInput } from '/@/components/Form';
+import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
+import { router } from '/@/router';
+import { useRouter } from 'vue-router';
 
+const queryParam = ref<any>({});
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const XxhbbksListModalPage = ref()
 const allList = ref<any>([]);
 
 const weebMap = {
@@ -61,43 +90,54 @@ const weebMap = {
   '6': '星期六',
   '7': '星期日',
 }
-function toWeek(week){
+function toWeek(week) {
   return weebMap[week];
 }
-function loadData(){
-  
+function loadData() {
+
   queryParam.value.checkType = '1';
-    defHttp.get({ url: '/ktgl/kcKechengbiao/getKechengbiaolist',params:queryParam.value}).then((res) => {
-      console.log(res);
-      allList.value = res.records;
-    });
-}
-  //进入就加载
-  onMounted(() => {
-    loadData()
+  defHttp.get({ url: '/ktgl/kcKechengbiao/getKechengbiaolist', params: queryParam.value }).then((res) => {
+    console.log(res);
+    allList.value = res.records;
   });
- 
- function openKechengDetail(item){
- console.log(`🚀 ~ openKechengDetail ~ item:`, item)
-  window.open('/history/hismain?rwbh='+item.rwbh+'&xqxn='+getSysConfig().flag1+"&type=0","_blank");
- }
+}
+//进入就加载
+onMounted(() => {
+  loadData()
+});
+
+function openKechengDetail(item) {
+  console.log(`🚀 ~ openKechengDetail ~ item:`, item)
+  //未改版前跳转组件地址
+  // window.open('/history/hismain?rwbh='+item.rwbh+'&xqxn='+getSysConfig().flag1+"&type=0","_blank");
+  //改版后组件跳转地址
+  window.open('/zyhis/tuGonggaohis?rwbh=' + item.rwbh + '&xqxn=' + getSysConfig().flag1 + '&type=1' + '&teano=' + item.jgh, '_blank');
+}
+
+//获取选课人数
+function openXkrs(record) {
+  XxhbbksListModalPage.value.disableSubmit = true;
+  XxhbbksListModalPage.value.init(record);
+}
 </script>
 <style lang="less" scoped>
 .ketangCard {
-  margin: .5rem;
+  margin: 0.5rem;
 }
-.ketangCardcol{
+
+.ketangCardcol {
   background-color: #f3f3f3;
   padding: 1px;
+  box-shadow: 1px 1px 5px 1px #e1e1e1;
 }
+
 .rjkcTopDiv {
-  background: #fff;
-  padding: .9rem;
-  color: #1ab394;
-  font-size: 18px;
-  font-weight: bold;
-  text-align:right;
+  padding: 0.5rem;
+  color: #798394;
+  font-size: 15px;
+  text-align: right;
 }
+
 .nDayDiv {
   top: -14px;
   right: -14px;
@@ -107,37 +147,90 @@ function loadData(){
   font-weight: 200;
   padding: 2px 6px 2px 6px;
   border-radius: 0 0 0 5px;
-  text-align:left;
+  text-align: left;
 }
+
 .rjkcBodyDiv {
   margin-top: 1px;
   background: #fff;
-  padding: 1rem 2rem 2rem 2rem;
+  padding: 1rem;
 }
+
 .kcmcDiv {
   font-size: 24px;
   font-weight: bold;
 }
+
 .skddDiv {
-  color: #1c84c6;
-  font-size: 16px;
+  color: #333333;
+  font-size: 14px;
   // font-weight: bold;
 }
+
 .xkrsDiv {
-  padding-top: 2.5rem;
+  padding-top: 1rem;
   font-size: 18px;
   font-weight: bold;
   text-align: right;
 }
+
 .buttonClass {
-  background: #1c84c6;
+  background: #1ab394;
   font-weight: 600;
   color: #fff;
   border-radius: 5px;
-  line-height: 23px;
+  line-height: 22px;
 
   &[disabled] {
     background: #6cafda;
   }
 }
+
+.skdd-Left-section {
+  display: flex;
+  align-items: flex-end;
+  justify-content: space-between;
+}
+
+.ketangback {
+  background: #f7f7f7;
+  border-radius: 5px;
+}
+
+.skdd-line {
+  text-align: left;
+  width: 30%;
+  margin-right: 10rpx;
+}
+
+.xkrs-color {
+  color: #18a689;
+}
+
+.xkrs-color:hover {
+  color: #ff5a00;
+}
+
+.ant-btn {
+  line-height: 1.5715;
+  position: relative;
+  display: inline-block;
+  font-weight: 400;
+  white-space: nowrap;
+  text-align: center;
+  background-image: none;
+  box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
+  cursor: pointer;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  touch-action: manipulation;
+  height: 32px;
+  padding: 4px 15px;
+  font-size: 14px;
+  border-radius: 5px;
+  border-color: #fff;
+  color: #fff;
+}
 </style>

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue

@@ -2,96 +2,102 @@
   <div id="siteMain">
     <div id="maxSite">
       <a-layout style="height: calc(100vh - 30px)">
-        <headerPage/>
+        <headerPage />
         <a-row>
           <a-col :span="24">
             <a-row>
               <a-col :lg="24" :xs="18">
-                <div style="width:100%;background: #fff;font-size: 18px;font-weight: bold;margin-top:10px;padding: 10px;">
-                <a-row>
-                  <a-col :xs="0" :lg="24">
-                    <a-button type="primary" @click="toggleCollapsed">
-                      <MenuUnfoldOutlined v-if="collapsed" />
-                      <MenuUnfoldOutlined v-else />
-                    </a-button>
-                    <span class="ellipsis">
-                      课程名称1：{{kcxxInfo.kcmc}}
-                    </span>
-                  </a-col>
-                  <a-col :xs="24" :lg="0">
-                    <span class="ellipsis">
-                      课程名称1：{{kcxxInfo.kcmc}}
-                    </span>
-                  </a-col>
-                </a-row>  
-                
+                <div
+                  style="width:100%;background: #fff;font-size: 18px;font-weight: bold;margin-top:10px;padding: 10px;">
+                  <a-row>
+                    <a-col :xs="0" :lg="24">
+                      <a-button type="primary" @click="toggleCollapsed">
+                        <MenuUnfoldOutlined v-if="collapsed" />
+                        <MenuUnfoldOutlined v-else />
+                      </a-button>
+                      <span class="ellipsis">
+                        课程名称：{{ kcxxInfo.kcmc }}
+                      </span>
+                    </a-col>
+                    <a-col :xs="24" :lg="0">
+                      <span class="ellipsis">
+                        课程名称：{{ kcxxInfo.kcmc }}
+                      </span>
+                    </a-col>
+                  </a-row>
+
                 </div>
               </a-col>
               <a-col :lg="0" :xs="6">
-                  <dqxqkcMenu/>
+                <dqxqkcMenu v-if="!readOnly" ref="dqxqkcMenuTag" />
+                <dqxqkcMenuHis v-else ref="dqxqkcMenuTag" />
               </a-col>
             </a-row>
           </a-col>
           <a-col :lg="spanlg" :xs="0">
-            <dqxqkcMenu ref="dqxqkcMenuTag"/>
+            <dqxqkcMenu v-if="!readOnly" ref="dqxqkcMenuTag" />
+            <dqxqkcMenuHis v-else ref="dqxqkcMenuTag" />
           </a-col>
           <a-col :lg="spanlt" :xs="24">
-            <RouterView/>
+            <RouterView />
           </a-col>
         </a-row>
-        <footerPage/>
+        <footerPage />
       </a-layout>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { ref, onMounted, unref  } from 'vue';
+import { ref, onMounted, unref } from 'vue';
 
-  import { getUserSf,getSysConfig } from '/@/views/site/utils/index';
-  import { defHttp } from '/@/utils/http/axios';
-  import { useRouter } from 'vue-router';
+import { getUserSf, getSysConfig } from '/@/views/site/utils/index';
+import { defHttp } from '/@/utils/http/axios';
+import { useRouter } from 'vue-router';
 
 
-  import { MenuUnfoldOutlined } from '@ant-design/icons-vue';
-  import headerPage from '/@/views/site/common/header.vue';
-  import footerPage from '/@/views/site/common/footer.vue';
-  import dqxqkcMenu from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue';
-  import dqxqkc from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue';
+import { MenuUnfoldOutlined } from '@ant-design/icons-vue';
+import headerPage from '/@/views/site/common/header.vue';
+import footerPage from '/@/views/site/common/footer.vue';
+import dqxqkcMenu from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue';
+import dqxqkcMenuHis from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenuHistory.vue';
+import dqxqkc from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue';
 
-  const maxClassName = ref<any>({});
-  const dqxqkcMenuTag = ref();
-  const selectedKeys = ref<string[]>([]);
-  //当前路由信息
-  const { currentRoute } = useRouter();
-  const { query } = unref(currentRoute);
-  const { rwbh,xqxn } = query;//获取传递参数
-  let router = useRouter();
-  const kcxxInfo = ref<string>('');
-  const spanlg = ref<number>(5);
-  const spanlt = ref<number>(19);
-  const collapsed = ref<any>(false);
+const maxClassName = ref<any>({});
+const dqxqkcMenuTag = ref();
+const selectedKeys = ref<string[]>([]);
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query, matched } = unref(currentRoute);
+const readOnly = ref(false)
+if (matched[0].name == 'zyhis') readOnly.value = true
+const { rwbh, xqxn } = query;//获取传递参数
+let router = useRouter();
+const kcxxInfo = ref<string>('');
+const spanlg = ref<number>(5);
+const spanlt = ref<number>(19);
+const collapsed = ref<any>(false);
 
 
 function toggleCollapsed() {
   collapsed.value = !collapsed.value;
   dqxqkcMenuTag.value.toggleCollapsed();
-  if(collapsed.value){
+  if (collapsed.value) {
     spanlg.value = 1;
     spanlt.value = 23;
-  }else{
+  } else {
     spanlg.value = 5;
     spanlt.value = 19;
   }
 }
-  //进入就加载
-  onMounted(() => {
-    // console.log('rwbh:',rwbh);
-    defHttp.get({ url: '/ktgl/kcKechengbiao/getKcxxByRwbhXqxn', params: { rwbh: rwbh,xqxn:xqxn } }).then((res) => {
+//进入就加载
+onMounted(() => {
+  // console.log('rwbh:',rwbh);
+  defHttp.get({ url: '/ktgl/kcKechengbiao/getKcxxByRwbhXqxn', params: { rwbh: rwbh, xqxn: xqxn } }).then((res) => {
     // console.log(`🚀 ~ 1111 defHttp.get ~ res:`, res)
     kcxxInfo.value = res;
-    });
   });
+});
 
 </script>
 <style lang="less" scoped>
@@ -99,13 +105,15 @@ function toggleCollapsed() {
   // font-size: ;
   // height: 100%;
   background: #f3f3f4;
+
   #maxSite {
     //最大宽度
     max-width: 1070px;
     min-height: calc(100vh);
     //居中
     margin: 0 auto;
-    .rowGutter{
+
+    .rowGutter {
       margin-top: 1rem;
       margin-bottom: 1rem;
     }
@@ -114,15 +122,18 @@ function toggleCollapsed() {
       color: #fff;
       background: #1ab394;
     }
+
     .ant-layout-footer {
       line-height: 1.5;
       background: #FFF;
     }
+
     .ant-layout-sider {
       color: #fff;
       line-height: 120px;
       background: #3ba0e9;
     }
+
     .ant-layout-content {
       min-height: 120px;
       color: #000;
@@ -131,9 +142,13 @@ function toggleCollapsed() {
     }
   }
 }
+
 .ellipsis {
-  white-space: nowrap; /* 确保文本在一行内显示 */
-  overflow: hidden; /* 隐藏溢出的内容 */
-  text-overflow: ellipsis; /* 使用省略号表示溢出的文本 */
+  white-space: nowrap;
+  /* 确保文本在一行内显示 */
+  overflow: hidden;
+  /* 隐藏溢出的内容 */
+  text-overflow: ellipsis;
+  /* 使用省略号表示溢出的文本 */
 }
 </style>

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue

@@ -49,10 +49,30 @@
             <BlockOutlined />
             <span>课程资源</span>
           </a-menu-item>
-          <a-menu-item key="sub7" @click="getGzt('khcl')">
+          <!-- <a-menu-item key="sub7" @click="getGzt('khcl')">
             <BlockOutlined />
             <span>上传考核材料</span>
           </a-menu-item>
+          <a-menu-item key="sub8">
+            <BlockOutlined />
+              <span @click="gotoPageByName('jiaoXueDanYuanNeiRong')">教学单元</span>
+            </a-menu-item>
+            <a-menu-item key="sub9">
+              <BlockOutlined />
+              <span @click="getGzt('dcwj')">问卷调查</span>
+            </a-menu-item>
+            <a-menu-item key="sub10">
+              <BlockOutlined />
+              <span @click="getGzt('yiykzyk')">教学资源库</span>
+            </a-menu-item>
+            <a-menu-item key="sub11">
+              <BlockOutlined />
+              <span @click="getGzt('tlq')">讨论区</span>
+            </a-menu-item>
+            <a-menu-item key="sub12">
+              <BlockOutlined />
+              <span @click="getGzt('gongju')">AI识别出勤率</span>
+            </a-menu-item> -->
           <!-- <a-menu-item key="sub6">
             <template #icon>
               <BlockOutlined />
@@ -96,12 +116,6 @@
             <a-menu-item key="sub1" @click="getGzt('kcjs')">
               <span>课程简介</span>
             </a-menu-item>
-            <!-- <a-menu-item key="sub2">
-              <span @click="getGzt('jxdg')">教学大纲</span>
-            </a-menu-item> -->
-            <!-- <a-menu-item key="sub2">
-              <span @click="gotoPageByName('jiaoXueDanYuanNeiRong')">教学单元</span>
-            </a-menu-item> -->
             <a-menu-item key="sub3" @click="getGzt('dqzy')">
               <span>课程作业</span>
             </a-menu-item>
@@ -114,26 +128,19 @@
             <a-menu-item key="sub6" @click="getGzt('kczy')">
               <span>课程资源</span>
             </a-menu-item>
+            <!-- <a-menu-item key="sub7">
+              <span @click="getGzt('jxdg')">教学大纲</span>
+            </a-menu-item> -->
+            
             <!-- <a-menu-item key="sub7" @click="getGzt('khcl')">
               <span>上传考核材料</span>
             </a-menu-item> -->
-            <!-- <a-menu-item key="sub5">
-              <span @click="getGzt('gongju')">AI识别出勤率</span>
-            </a-menu-item> -->
-            <!-- <a-menu-item key="sub5">
-              <span @click="getGzt('dcwj')">问卷调查</span>
-            </a-menu-item> -->
+            <!--  -->
             <!-- <a-menu-item key="sub6">
               <span @click="getGzt('gongju')">AI识别出勤率</span>
             </a-menu-item>
             <a-menu-item key="sub7">
               <span @click="getGzt('zycd')">作业存档</span>
-            </a-menu-item>
-            <a-menu-item key="sub8">
-              <span @click="getGzt('yiykzyk')">教学资源库</span>
-            </a-menu-item>
-            <a-menu-item key="sub9">
-              <span @click="getGzt('tlq')">讨论区</span>
             </a-menu-item> -->
           </a-sub-menu>
         </a-menu>
@@ -165,6 +172,7 @@ const { rwbh, xqxn, type, teano } = query; //获取传递参数
 let router = useRouter();
 
 function getGzt(zytype) {
+  console.log(112233)
   var param = { rwbh, xqxn, type };
   // console.log(`🚀 ~ getGzt ~ type:`, zytype)
   var href = '/zy/dqkcDqzy';

src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenuHistory.vue

@@ -0,0 +1,265 @@
+<template>
+  <div id="siteMain">
+    <a-row>
+      <a-col :lg="24" :xs="0">
+        <a-menu
+          v-model:openKeys="openKeys"
+          v-model:selectedKeys="selectedKeys"
+          style="width: 98%; min-height: calc(100vh - 225px); margin: 10px 0"
+          mode="inline"
+          :inline-collapsed="collapsed"
+        >
+          <a-menu-item key="sub0" @click="getGzt('gonggao')">
+            <template #icon>
+              <PieChartOutlined />
+            </template>
+            <span >通知公告</span>
+          </a-menu-item>
+          <a-menu-item  key="sub1" @click="getGzt('kcjs')">
+            <template #icon>
+              <BarChartOutlined />
+            </template>
+            <span >课程简介</span>
+          </a-menu-item >
+          <!-- <a-menu-item  key="sub2">
+            <template #icon>
+              <SettingOutlined />
+            </template>
+            <span @click="getGzt('jxdg')">教学大纲</span>
+          </a-menu-item > -->
+          <a-menu-item key="sub3" @click="getGzt('dqzy')">
+            <template #icon>
+              <SnippetsOutlined />
+            </template>
+            <span>课程作业</span>
+          </a-menu-item>
+          <a-menu-item key="sub4" @click="getGzt('qmzy')">
+            <template #icon>
+              <AppstoreOutlined />
+            </template>
+            <span>期末考试</span>
+          </a-menu-item>
+          <a-menu-item key="sub5" @click="getGzt('kcjc')">
+            <template #icon>
+              <AppstoreAddOutlined />
+            </template>
+            <span>课堂测验</span>
+          </a-menu-item>
+          <a-menu-item key="sub6" @click="getGzt('kczy')">
+            <BlockOutlined />
+            <span>课程资源</span>
+          </a-menu-item>
+          <!-- <a-menu-item key="sub7" @click="getGzt('khcl')">
+            <BlockOutlined />
+            <span>上传考核材料</span>
+          </a-menu-item> -->
+          <!-- <a-menu-item key="sub6">
+            <template #icon>
+              <BlockOutlined />
+            </template>
+            <span @click="getGzt('gongju')">AI识别出勤率</span>
+          </a-menu-item> -->
+          <!-- <a-sub-menu key="sub3">
+            <template #icon>
+              <PieChartOutlined />
+            </template>
+            <template #title>教学工具</template>
+            <a-menu-item key="6" @click="getGzt('dcwj')">问卷调查</a-menu-item>
+            <a-menu-item key="7" @click="getGzt('gongju')">AI识别出勤率</a-menu-item>
+            <a-menu-item key="8" @click="getGzt('zycd')">作业存档</a-menu-item>
+          </a-sub-menu>
+          <a-menu-item key="sub4">
+            <template #icon>
+              <PieChartOutlined />
+            </template>
+            <span @click="getGzt('yiykzyk')">教学资源库</span>
+          </a-menu-item>
+          <a-menu-item key="sub6">
+            <template #icon>
+              <PieChartOutlined />
+            </template>
+            <span @click="getGzt('tlq')">讨论区</span>
+          </a-menu-item> -->
+        </a-menu>
+      </a-col>
+      <a-col :lg="0" :xs="24">
+        <a-menu v-model:openKeys="openKeys" v-model:selectedKeys="selectedKeys" style="width: 98%; margin: 10px 0" mode="horizontal">
+          <a-sub-menu key="min0">
+            <template #icon>
+              <!-- <SettingOutlined /> -->
+              <MenuUnfoldOutlined />
+            </template>
+            <!-- <template #title>功能菜单</template> -->
+            <a-menu-item key="sub0" @click="getGzt('gonggao')">
+              <span>通知公告</span>
+            </a-menu-item>
+            <a-menu-item key="sub1" @click="getGzt('kcjs')">
+              <span>课程简介</span>
+            </a-menu-item>
+            <!-- <a-menu-item key="sub2">
+              <span @click="getGzt('jxdg')">教学大纲</span>
+            </a-menu-item> -->
+            <!-- <a-menu-item key="sub2">
+              <span @click="gotoPageByName('jiaoXueDanYuanNeiRong')">教学单元</span>
+            </a-menu-item> -->
+            <a-menu-item key="sub3" @click="getGzt('dqzy')">
+              <span>课程作业</span>
+            </a-menu-item>
+            <a-menu-item key="sub4" @click="getGzt('qmzy')">
+              <span>期末考试</span>
+            </a-menu-item>
+            <a-menu-item key="sub5" @click="getGzt('kcjc')">
+              <span>课堂测验</span>
+            </a-menu-item>
+            <a-menu-item key="sub6" @click="getGzt('kczy')">
+              <span>课程资源</span>
+            </a-menu-item>
+            <!-- <a-menu-item key="sub7" @click="getGzt('khcl')">
+              <span>上传考核材料</span>
+            </a-menu-item> -->
+            <!-- <a-menu-item key="sub5">
+              <span @click="getGzt('gongju')">AI识别出勤率</span>
+            </a-menu-item> -->
+            <!-- <a-menu-item key="sub5">
+              <span @click="getGzt('dcwj')">问卷调查</span>
+            </a-menu-item> -->
+            <!-- <a-menu-item key="sub6">
+              <span @click="getGzt('gongju')">AI识别出勤率</span>
+            </a-menu-item>
+            <a-menu-item key="sub7">
+              <span @click="getGzt('zycd')">作业存档</span>
+            </a-menu-item>
+            <a-menu-item key="sub8">
+              <span @click="getGzt('yiykzyk')">教学资源库</span>
+            </a-menu-item>
+            <a-menu-item key="sub9">
+              <span @click="getGzt('tlq')">讨论区</span>
+            </a-menu-item> -->
+          </a-sub-menu>
+        </a-menu>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, unref,defineExpose } from 'vue';
+
+import { getUserSf, getSysConfig } from '/@/views/site/utils/index';
+import { defHttp } from '/@/utils/http/axios';
+import { useRouter } from 'vue-router';
+import { MailOutlined, AppstoreOutlined, SettingOutlined, MenuUnfoldOutlined,PieChartOutlined,BarChartOutlined,SnippetsOutlined,AppstoreAddOutlined,BlockOutlined } from '@ant-design/icons-vue';
+
+import headerPage from '/@/views/site/common/header.vue';
+import footerPage from '/@/views/site/common/footer.vue';
+import dqxqkc from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue';
+
+const maxClassName = ref<any>({});
+const selectedKeys = ref<string[]>(['sub0']);
+const openKeys = ref<string[]>(['sub0']);
+const collapsed = ref<any>(false);
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, type, teano } = query; //获取传递参数
+let router = useRouter();
+
+function getGzt(zytype) {
+  console.log(332211)
+  var param = { rwbh, xqxn, type };
+  // console.log(`🚀 ~ getGzt ~ type:`, zytype)
+  var href = '/zy/dqkcDqzy';
+  if (zytype == 'dqzy') {
+    href = '/zyhis/dqkcDqzyhis';
+  } else if (zytype == 'dcwj') {
+    href = '/zy/dcwjWenjuan';
+  } else if (zytype == 'lszy') {
+    href = '/zy/dqkcLszy';
+  } else if (zytype == 'gonggao') {
+    href = '/zyhis/tuGonggaohis';
+  } else if (zytype == 'kcjs') {
+    href = '/zyhis/dqkcDetailhis';
+  } else if (zytype == 'kcjc') {
+    href = '/zyhis/ceshiWenjuanhis';
+  } else if (zytype == 'gongju') {
+    href = '/zy/dqkcGongju';
+  } else if (zytype == 'yiykzyk') {
+    href = '/zy/yiykzyk';
+  } else if (zytype == 'jxzyk') {
+    href = '/zy/dqkcJxzyk';
+  } else if (zytype == 'tlq') {
+    href = '/zy/dqkcTlq';
+  } else if (zytype == 'zycd') {
+    href = '/zy/dqkcCdxx';
+  } else if (zytype == 'qmzy') {
+    href = '/zyhis/dqkcQmzyhis';
+  }else if (zytype == 'jxdg') {
+    href = '/zy/dqkcJxdg';
+  }else if (zytype == 'kczy') {
+    href = '/zyhis/dqkcKczyhis';
+  }else if (zytype == 'khcl') {
+    href = '/zyhis/dqkcKhclhis';
+  }
+
+  router.push({ path: href, query: { rwbh, xqxn, type, teano } });
+}
+
+function toggleCollapsed() {
+  collapsed.value = !collapsed.value;
+  openKeys.value = collapsed.value ? [] : selectedKeys.value;
+}
+
+function gotoPageByName(name) {
+  router.push({ name, query: { rwbh, xqxn, type, teano } });
+}
+
+//进入就加载
+onMounted(() => {
+  // console.log('rwbh:',rwbh);
+});
+
+defineExpose({
+  toggleCollapsed
+  });
+</script>
+<style lang="less" scoped>
+#siteMain {
+  // font-size: ;
+  // height: 100%;
+  background: #f3f3f4;
+  #maxSite {
+    //最大宽度
+    max-width: 1070px;
+    min-height: 730px;
+    //居中
+    margin: 0 auto;
+    .rowGutter {
+      margin-top: 1rem;
+      margin-bottom: 1rem;
+    }
+
+    .ant-layout-header {
+      color: #fff;
+      background: #1ab394;
+    }
+    .ant-layout-footer {
+      line-height: 1.5;
+      background: #fff;
+    }
+    .ant-layout-sider {
+      color: #fff;
+      line-height: 120px;
+      background: #3ba0e9;
+    }
+    .ant-layout-content {
+      min-height: 120px;
+      color: #000;
+      line-height: 120px;
+      background: #f3f3f4;
+    }
+  }
+}
+.ant-menu-overflow {
+  flex-direction: row-reverse;
+}
+</style>

src/views/zy/zyGonggao/ZyGonggaoHistoryList.vue

@@ -0,0 +1,300 @@
+<template>
+  <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin-top:10px;">
+    <div v-if="showYl">
+      <!--查询区域-->
+      <div class="jeecg-basic-table-form-container" style="border-bottom: 2px solid #f0f0f0;">
+        <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" style="padding: 20px 10px 0px 10px;">
+          <a-row :gutter="24">
+            <a-col :lg="8">
+              <a-form-item label="标题">
+                <j-input placeholder="请输入标题" v-model:value="queryParam.title"></j-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+                <a-col :lg="6">
+                  <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                  <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" style="margin-left: 8px"> 新增</a-button> -->
+                  <a-button type="primary" @click="handleZtyl(0)" preIcon="ant-design:menu-unfold-outlined" style="margin-left: 8px"> 预览学生页面</a-button>
+                </a-col>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <a-row>
+        <a-col :span="24" v-for="(item, index) in tableData" :key="index" style="padding:10px;overflow:hidden;border-bottom: 1px solid #f0f0f0;">
+          <div>
+            <a-row style="padding:10px;line-height: 30px;">
+              <a-col :span="20">
+                <span style="font-size: 16px;color: #515151 ;font-weight: bold; ">{{item.title}}</span>
+                <span v-if="item.ggStatus==0" style="margin-left:15px;"><a-tag color="blue">草稿</a-tag></span>
+                <span v-if="item.ggStatus==2" style="margin-left:15px;">
+                  <span style="color:#9d9d9d;font-size:12px;">已撤回，学生端页面看不到这条通知</span></span>
+                <span style="margin-left:15px;">
+                  <!-- <a @click="handleEdit(item)" style="margin-left:5px;padding: 0px 8px;" v-if="item.ggStatus==0||item.ggStatus==2" title="编辑"><Icon icon="ant-design:form-outlined"/></a> -->
+                  <!-- <a-divider type="vertical" style="height: 30px; background-color: #7cb305"  v-if="item.ggStatus==0||item.ggStatus==2"/> -->
+                  <!-- <a @click="handleDelete(item)" style="margin-left:5px;padding: 0px 8px;" v-if="item.ggStatus==0||item.ggStatus==2" title="删除"><Icon icon="ant-design:delete-outlined" /></a> -->
+                  <!-- <a @click="handleCh(item)" style="margin-left:5px;padding: 0px 8px;" v-if="item.ggStatus==1" title="撤回"><Icon icon="ant-design:rollback-outlined" /></a> -->
+                </span>
+              </a-col>
+              <!-- <a-col :span="4" v-if="item.ggStatus==0||item.ggStatus==2">
+                <div  style="text-align: right;color:#9e9e9e;">
+                  <a-button type="primary"  @click="handleFabu(item)">发布</a-button>
+                </div>
+              </a-col>
+              <a-col :span="4" v-if="item.ggStatus==1">
+                <div  style="text-align: right;color:#9e9e9e;">
+                  <a-button type="primary"  @click="handleCh(item)">撤回</a-button>
+                </div>
+              </a-col> -->
+            </a-row>
+            <a-row style="padding:10px;">
+              <a-col :span="24">
+                <div style="color: #515151" v-html="item.content"></div>
+              </a-col>
+            </a-row>
+            <a-row style="padding:10px;">
+              <a-col :span="24">
+                <div style="text-align: right;color:#9e9e9e;font-weight: bold;">{{item.createTime}}</div>
+              </a-col>
+            </a-row>
+          </div>
+        </a-col>
+        <a-col :span="24" style="padding:10px;">
+          <div v-show="tableData.length>0">
+            <a-pagination v-model="current" :total="total" @change="handlePageChange" :pageSize="pageSize" style="text-align: right;"/>
+          </div>
+          <div v-show="tableData.length==0">
+            <a-empty/>
+          </div>
+        </a-col>
+      </a-row>
+    </div>
+    <div v-if="!showYl">
+      <div>
+        <a-button type="primary" @click="handleZtyl(1)" preIcon="ant-design:arrow-left-outlined" style="margin-left: 8px"> 返回</a-button>
+      </div>
+      <TeacherYulanList />
+    </div>
+
+
+    <ZyGonggaoModal ref="registerModal" @success="handleSuccess"></ZyGonggaoModal>
+    <ZyGonggaoYlModal ref="registerYlModal" @success="handleSuccess"></ZyGonggaoYlModal>
+<!--    <ZyGonggaoHistoryModal ref="registerHistoryModal" @success="handleSuccess"></ZyGonggaoHistoryModal>-->
+  </div>
+</template>
+
+<script lang="ts" name="zyGonggao-zyGonggao" setup>
+  import {ref, reactive, unref, onMounted} from 'vue';
+  import { Input, Popover, Pagination, Empty } from 'ant-design-vue';
+  import { deleteOne } from './ZyGonggao.api';
+  import ZyGonggaoModal from './components/ZyGonggaoModal.vue';
+  import ZyGonggaoYlModal from './components/ZyGonggaoYlModal.vue';
+  import TeacherYulanList from '/@/views/zy/zyGonggao/TeacherYulanList.vue';
+  // import ZyGonggaoHistoryModal from './components/ZyGonggaoHistoryModal.vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from "/@/hooks/web/useMessage";
+  import { JInput } from '/@/components/Form';
+  import { useRouter } from 'vue-router';
+  import {useUserStore} from "/@/store/modules/user";
+
+  const APagination = Pagination;
+  const { createConfirm } = useMessage();
+  const { currentRoute } = useRouter();
+  const { query } = unref(currentRoute);
+  const { rwbh,xqxn } = query;//获取传递参数
+  const userStore = useUserStore();
+  const userName = userStore.getUserInfo.username;
+  const queryParam = ref<any>({rwbh,  xqxn});
+  const registerModal = ref();
+  const registerYlModal = ref();
+  // const registerHistoryModal = ref();
+  const current = ref<number>(0);
+  const total = ref<number>(0);
+  const pageNo = ref<number>(0);
+  const pageSize = ref<number>(5);
+  const tableData = ref<any>([]);
+  const showYl = ref<boolean>(true);
+
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  function handleZtyl(type){
+    if(type==1){
+      showYl.value = true;
+    }else if(type==0){
+      showYl.value = false;
+    }
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    if(record.ggStatus == 1){
+      registerYlModal.value.disableSubmit = true;
+    }else{
+      registerYlModal.value.disableSubmit = false;
+    }
+    registerYlModal.value.edit(record);
+  }
+
+  /**
+   * 历史通知
+   */
+  // function handleHistory(record: Recordable) {
+  //   registerHistoryModal.value.disableSubmit = true;
+  //   registerHistoryModal.value.edit(record);
+  // }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除此通知？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, handleSuccess2);
+      }
+    });
+  }
+
+  function handleFabu(record){
+    createConfirm({
+      iconType: 'warning',
+      title: '确认发布',
+      content: '是否发布此通知？',
+      okText: '发布',
+      cancelText: '取消',
+      onOk: () => {
+        var params = {id:record.id,ggStatus:"1",flag:"1",fbTime:new Date()}
+        defHttp.post({url: '/zyGonggao/zyGonggao/edit', params: params}).then(() => {
+          handleSuccess();
+        });
+      }
+    });
+  }
+
+  function handleCh(record){
+    createConfirm({
+      iconType: 'warning',
+      title: '撤回',
+      content: '是否撤回此通知？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        var params = {id:record.id,ggStatus:"2",flag:"0",fbTime:new Date()}
+        defHttp.post({url: '/zyGonggao/zyGonggao/edit', params: params}).then(() => {
+          handleSuccess();
+        });
+      }
+    });
+  }
+
+  /**
+   * 成功回调,用于删除
+   */
+  function handleSuccess2() {
+    total.value = 1;
+    handlePageChange(1);
+  }
+
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    total.value = 1;
+    handlePageChange(1);
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {"createBy":userName};
+    queryParam.value.rwbh = rwbh;
+    queryParam.value.xqxn = xqxn;
+    total.value = 1;
+    handlePageChange(1);
+  }
+
+  function handlePageChange(record){
+    current.value = record;
+    reload();
+  }
+
+  function reload(){
+    queryParam.value.pageNo = current.value;
+    queryParam.value.pageSize = pageSize.value;
+    queryParam.value.rwbh = rwbh;
+    queryParam.value.xqxn = xqxn;
+    queryParam.value.column="createTime";
+    queryParam.value.order="desc";
+    defHttp.get({ url: '/zyGonggao/zyGonggao/list', params: queryParam.value }).then(res => {
+      total.value = res.total;
+      pageNo.value = res.pages;
+      current.value = res.current;
+      tableData.value = res.records;
+    });
+  }
+
+  onMounted(() => {
+    searchQuery();
+  });
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    width:99%;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

src/views/zy/zyInfo/ZyInfoKhclListhis.vue

@@ -0,0 +1,230 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <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="学年学期">
+              <j-dict-select-tag ref="xqDictTag" placeholder="请选择学年学期" v-model:value="queryParam.xqxn" dictCode="kc_xqxn_history,title,title,true order by start_time desc"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleKhcl" style="margin-left: 8px">上传考核材料</a-button> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <!--<template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>-->
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ZyInfoModal ref="registerModal" @success="handleSuccess"></ZyInfoModal>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfo-zyInfo" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columnsKhcl } from './ZyInfo.data';
+  import { listKhcl, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ZyInfo.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ZyInfoModal from './components/ZyInfoModal.vue'
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+import { defHttp } from '/@/utils/http/axios';
+
+  const queryParam = ref<any>({zyStatus:'1,2'});
+  const toggleSearchStatus = ref<boolean>(false);
+  const { createConfirm, createMessage } = useMessage();
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'zy_info',
+      api: listKhcl,
+      columns:columnsKhcl,
+      canResize:false,
+      useSearchForm: false,
+      showActionColumn: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "zy_info",
+      url: getExportUrl,
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+   
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+   
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+  //上传考核材料
+  function batchHandleKhcl() {
+  if (selectedRowKeys.value.length == 0) {
+    createMessage.warn('请勾选要上传的作业数据！');
+    return;
+  }
+  console.log("🚀 ~ batchHandleKhcl ~ selectedRowKeys.value:", selectedRowKeys.value)
+  // batchZyinfoKhcl({ ids: selectedRowKeys.value }, reload);
+  // defHttp.post({url:'/zyInfoStudent/zyInfoStudent/uploadSckhcl',params:{id:selectedRowKeys.value.join(',')}}).then(res=>{})
+  defHttp.post({url:'/zyInfoStudent/zyInfoStudent/uploadSckhcl',data:{id:selectedRowKeys.value.join(',')}}).then(res=>{
+    reload();
+  })
+  createMessage.success("系统上传中，请等待")
+}
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

src/views/zy/zyInfo/ZyInfoQimoV2List.vue

@@ -69,7 +69,7 @@
           <div style="text-align: center">
             <a-button class="buttonClass" @click="handleBatchAdd"><Icon icon="ant-design:save-outlined" />保存</a-button>
             <a-divider type="vertical" />
-            <a-button class="buttonClass" @click="reloadZy"><Icon icon="ant-design:export-outlined" />返回</a-button>
+            <a-button class="buttonClass" @click="reloadZy"><Icon icon="ant-design:arrow-left-outlined" />返回</a-button>
           </div>
         </a-col>
       </a-row>
@@ -165,7 +165,7 @@
                           label="是否允许学生查看"
                           :labelCol="labelCol2"
                           :wrapperCol="wrapperCol2"
-                          style="margin-top: -1px; margin-left: -17px"
+                          class="pjbz-sfyxxsck"
                         >
                           <j-dict-select-tag
                             type="radio"
@@ -210,7 +210,7 @@
                           label="互评结果使用"
                           :labelCol="labelCol3"
                           :wrapperCol="wrapperCol3"
-                          style="margin-top: 20px; margin-left: -30px"
+                           class="sshp-hpjgsy"
                         >
                           <a-radio-group v-model:value="zyInfo.sfzzcj" style="width: 100%" size="default" :disabled="editDisabled">
                             <a-radio :value="'1'" style="width: 100%; margin-bottom: 5px">互评成绩为最终成绩</a-radio>
@@ -221,7 +221,7 @@
                           label="是否允许学生看到互评成绩"
                           :labelCol="labelCol4"
                           :wrapperCol="wrapperCol4"
-                          style="margin-top: 20px; margin-left: -10px"
+                          class="sshp-sfyxxskdhpcj"
                         >
                           <a-radio-group v-model:value="zyInfo.xssfck">
                             <a-radio :value="'1'" style="margin-top: 5px">是(匿名)</a-radio>
@@ -277,7 +277,7 @@
                       label="检测通过率"
                       :labelCol="labelCol3"
                       :wrapperCol="wrapperCol3"
-                      style="margin: -1px; margin-left: -10px"
+                      class="ccsz-jctgl"
                       v-if="zyInfo.sfcc == '1'"
                     >
                       <a-input-number
@@ -295,7 +295,7 @@
                       label="比对库设置"
                       :labelCol="labelCol3"
                       :wrapperCol="wrapperCol3"
-                      style="margin-left: -10px"
+                      class="ccsz-bdksz"
                       v-if="zyInfo.sfcc == '1'"
                     >
                       <div style="padding: 5px 0">维普</div>
@@ -336,7 +336,7 @@
       <a-row>
         <a-col :span="24"
           ><span class="title">批阅考试</span> - <span class="title2">考试详情页</span>
-          <a-button type="primary" preIcon="ant-design:export-outlined" @click="reloadZy" style="float: right; margin-right: 8px"> 返回</a-button>
+          <a-button type="primary" preIcon="ant-design:arrow-left-outlined" @click="reloadZy" style="float: right; margin-right: 8px"> 返回</a-button>
           <a-popover title="温馨提示">
             <template #content>
               <p>1、非高峰期预计30分钟内返回检测结果，高峰期预计时间会更长，请您耐心等待！</p>
@@ -375,13 +375,28 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col :span="24">
+                <!-- <a-col :span="24">
                   <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQueryZyxq">查询</a-button>
                   <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
                   <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
-                  <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleFabu" style="margin-left: 8px">发布成绩</a-button>
+                  <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleFabu" style="margin-left: 8px">发布成绩</a-button> -->
                   <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleKhcl" style="margin-left: 8px">上传考核材料</a-button> -->
-                  <span class="tishi" style="margin-left: 20px; padding: 10px">温馨提示：考试完成后，请及时发布评分</span>
+                  <!-- <span class="tishi" style="margin-left: 20px; padding: 10px">温馨提示：考试完成后，请及时发布评分</span>
+                </a-col> -->
+              </a-row>
+              <a-row :gutter="[16, 16]">
+                <a-col :span="24" :lg="{ span: 16 }">
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:search-outlined'"
+                    @click="searchQueryZyxq">查询</a-button>
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:reload-outlined'"
+                    @click="searchReset" style="margin-left: 8px">重置</a-button>
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:export-outlined'"
+                    @click="onExportXls" style="margin-left: 8px">导出</a-button>
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:export-outlined'"
+                    @click="batchHandleFabu" style="margin-left: 8px">发布成绩</a-button>
+                </a-col>
+                <a-col :span="24" :lg="{ span: 8 }">
+                  <span class="tishi" style="padding: 10px">温馨提示：考试完成后，请及时发布评分</span>
                 </a-col>
               </a-row>
             </a-form>
@@ -434,7 +449,7 @@
         <a-col :span="24"
           ><span class="title">批阅考试</span> - <span class="title2">考试详情页</span> - <span class="title2">查重相似度详情</span>
           <a-button type="primary" @click="handleShowType(3)" style="float: right; margin-right: 8px"
-            ><Icon icon="ant-design:export-outlined" />返回</a-button
+            ><Icon icon="ant-design:arrow-left-outlined" />返回</a-button
           >
           <a-divider
         /></a-col>
@@ -511,13 +526,13 @@
                     ><span>{{ item.ypynum }}人</span><span>已评阅</span></div
                   >
                 </div>
-                <div class="flex">
+                <div>
                   <div style="width: 100%; display: flex; margin-top: 20px">
-                    <div class="ellip-word"
+                    <div class="ellip-word flex"
                       ><span class="ellip-word2">作业发布时间：</span
                       >{{ item.startTime ? dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div
                     >
-                    <div class="ellip-word"><span class="ellip-word2">作业截止时间：</span>{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
+                    <div class="ellip-word  flex"><span class="ellip-word2">作业截止时间：</span>{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
                   </div>
                   <div style="text-align: right; margin-top: 20px; margin-bottom: -10px; width: 100%">
                     <!-- <a @click="handleWxtx(item)" class="home-status"><Icon icon="ant-design:wechat-outlined" />微信提醒</a>
@@ -587,7 +602,7 @@
 </template>
 
 <script lang="ts" name="zyInfo-zyInfo" setup>
-import { ref, reactive, onMounted, unref } from 'vue';
+import { ref, reactive, onMounted, unref , onUnmounted, watchEffect } from 'vue';
 import { list, deleteOne } from './ZyInfo.api';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
@@ -1741,6 +1756,22 @@ function handlePageChange(record) {
   reloadZy();
 }
 
+const isSmallScreen = ref(false);
+
+const checkScreenSize = () => {
+  isSmallScreen.value = window.innerWidth <= 768; // 根据需要调整断点
+};
+
+// 立即执行一次以设置初始值，并在组件卸载前监听窗口大小变化
+watchEffect(() => {
+  checkScreenSize();
+  const resizeObserver = () => checkScreenSize();
+  window.addEventListener('resize', resizeObserver);
+  onUnmounted(() => {
+    window.removeEventListener('resize', resizeObserver);
+  });
+});
+
 onMounted(() => {
   searchQuery();
 });
@@ -1909,6 +1940,16 @@ onMounted(() => {
   color: #999999;
   font-size: 12px;
 }
+@media (max-width: 768px) {
+.region {
+  margin: 6px 12px;
+  padding: 10px;
+  background: #fff;
+  border-radius: 5px;
+  border: 1px solid #e6e6e6;
+}
+}
+@media (min-width: 769px) {
 .region {
   margin: 6px 12px;
   padding-bottom: 20px;
@@ -1916,6 +1957,30 @@ onMounted(() => {
   border-radius: 5px;
   border: 1px solid #e6e6e6;
 }
+.ccsz-bdksz{
+    margin-left: -10px;
+  }
+
+  .ccsz-jctgl{
+    margin-top: -1px;
+    margin-left: -10px;
+  }
+
+  .sshp-sfyxxskdhpcj{
+    margin-top: 20px;
+    margin-left: -10px;
+  }
+
+  .sshp-hpjgsy {
+    margin-left: -30px;
+  }
+
+  .pjbz-sfyxxsck {
+    margin-top: -1px;
+    margin-left: -17px;
+  }
+}
+
 .region:hover {
   margin: 6px 12px;
   padding-bottom: 20px;

src/views/zy/zyInfo/ZyInfoV2List.vue

@@ -20,28 +20,22 @@
         <a-col :span="24"><span class="title">课程作业次数设置</span><a-divider /></a-col>
         <a-col :span="24" style="margin-top: 10px; height: 50px">
           <a-row style="text-align: center">
-            <a-col :span="8"
-              ><span>课程作业占比:</span><span>{{ kczyzb }}%;</span></a-col
-            >
-            <a-col :span="8"
-              ><span>期末考试占比:</span><span>{{ qmkszb }}%;</span></a-col
-            >
-            <a-col :span="8"
-              ><span>课堂测验占比:</span><span>{{ ktcyzb }}%;</span></a-col
-            >
+            <a-col :span="8"><span>课程作业占比:</span><span>{{ kczyzb }}%;</span></a-col>
+            <a-col :span="8"><span>期末考试占比:</span><span>{{ qmkszb }}%;</span></a-col>
+            <a-col :span="8"><span>课堂测验占比:</span><span>{{ ktcyzb }}%;</span></a-col>
           </a-row>
         </a-col>
         <a-col :span="24" style="padding: 0 0 0 30px">
           <a-row>
             <a-col :span="18" style="margin-top: 5px">
               <span style="color: #777777">学生修完本课程需要完成的作业次数：</span>
-              <a-input-number style="width: 30%" v-model:value="zycs" @change="handleZycs" :max="100" :disabled="zycsDisabled" /><span
-                style="margin-left: 5px"
-                >次</span
-              >
+              <a-input-number style="width: 30%" v-model:value="zycs" @change="handleZycs" :max="100"
+                :disabled="zycsDisabled" /><span style="margin-left: 5px">次</span>
             </a-col>
             <a-col :span="6" style="text-align: right; padding: 5px 0 0 0">
-              <a-button type="primary" @click="handleAddZycs" class="mar-right20"><Icon icon="ant-design:file-add-outlined" />新增作业</a-button>
+              <a-button type="primary" @click="handleAddZycs" class="mar-right20">
+                <Icon icon="ant-design:file-add-outlined" />新增作业
+              </a-button>
             </a-col>
           </a-row>
         </a-col>
@@ -50,7 +44,8 @@
             <template #bodyCell="{ column, record }">
               <template v-if="column.key === 'score'">
                 <span>
-                  <a-input-number v-model:value="record.score" :min="0" :max="100"> <template #addonAfter> % </template></a-input-number>
+                  <a-input-number v-model:value="record.score" :min="0" :max="100"> <template #addonAfter> %
+                    </template></a-input-number>
                 </span>
               </template>
               <template v-else-if="column.key === 'lstitle'">
@@ -66,9 +61,13 @@
         </a-col>
         <a-col :span="24" style="margin-top: 30px; font-size: 18px">
           <div style="text-align: center">
-            <a-button class="buttonClass" @click="handleBatchAdd"><Icon icon="ant-design:save-outlined" />保存</a-button>
+            <a-button class="buttonClass" @click="handleBatchAdd">
+              <Icon icon="ant-design:save-outlined" />保存
+            </a-button>
             <a-divider type="vertical" />
-            <a-button class="buttonClass" @click="reloadZy"><Icon icon="ant-design:export-outlined" />返回</a-button>
+            <a-button class="buttonClass" @click="reloadZy">
+              <Icon icon="ant-design:arrow-left-outlined" />返回
+            </a-button>
           </div>
         </a-col>
       </a-row>
@@ -78,9 +77,12 @@
         <a-row>
           <a-col :span="24">
             <div style="text-align: right">
-              <a-button style="margin-right: 10px" type="primary" @click="handleYyzy" :disabled="editDisabled">引用作业</a-button>
+              <a-button style="margin-right: 10px" type="primary" @click="handleYyzy"
+                :disabled="editDisabled">引用作业</a-button>
+            </div>
+            <div>
+              <span class="title">编辑作业</span> - <span class="title2">布置作业：设置第{{ zyInfo.sort }}次作业内容及要求</span>
             </div>
-            <span class="title">编辑作业</span> - <span class="title2">布置作业：设置第{{ zyInfo.sort }}次作业内容及要求</span>
             <a-divider />
           </a-col>
           <a-col :span="24">
@@ -105,42 +107,27 @@
                     </a-col> -->
                     <a-col :span="24">
                       <a-form-item label="作业截止时间" v-bind="validateInfos.endTime">
-                        <a-date-picker
-                          placeholder="请选择作业截止时间"
-                          v-model:value="zyInfo.endTime"
-                          :disabled-date="disabledDate"
-                          :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
-                          valueFormat="YYYY-MM-DD HH:mm"
-                          format="YYYY-MM-DD HH:mm"
-                          style="width: 100%"
-                          @change="handleEndTime"
-                        />
+                        <a-date-picker placeholder="请选择作业截止时间" v-model:value="zyInfo.endTime"
+                          :disabled-date="disabledDate" :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
+                          valueFormat="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm" style="width: 100%"
+                          @change="handleEndTime" />
                       </a-form-item>
                     </a-col>
                     <a-col :span="24">
                       <a-form-item label="作业发布时间" v-bind="validateInfos.startTime">
-                        <a-date-picker
-                          placeholder="请选择作业发布时间"
-                          v-model:value="zyInfo.startTime"
-                          :disabled-date="disabledDate"
-                          :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
-                          valueFormat="YYYY-MM-DD HH:mm"
-                          format="YYYY-MM-DD HH:mm"
-                          style="width: 90%"
-                          :disabled="editDisabled"
-                        />
+                        <a-date-picker placeholder="请选择作业发布时间" v-model:value="zyInfo.startTime"
+                          :disabled-date="disabledDate" :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
+                          valueFormat="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm" style="width: 90%"
+                          :disabled="editDisabled" />
                         <span>
                           <a-popover title="温馨提示">
                             <template #content>
-                              <p
-                                >填写作业发布时间，则作业在指定时间进行发布；如未填写作业发布时间，则布置完成作业后，可手动点击“发布作业”进行作业发布。</p
-                              >
+                              <p>填写作业发布时间，则作业在指定时间进行发布；如未填写作业发布时间，则布置完成作业后，可手动点击“发布作业”进行作业发布。</p>
                             </template>
-                            <Icon
-                              icon="ant-design:question-circle-outlined"
-                              :size="20"
-                              style="float: right; margin-top: 5px; color: #029c88; margin-right: 19px"
-                            />
+                            <Icon 
+                            icon="ant-design:question-circle-outlined" 
+                            :size="20"
+                            class="jbxx-zyfbsj-ico" />
                           </a-popover>
                         </span>
                       </a-form-item>
@@ -160,19 +147,10 @@
                     </a-col>
                     <a-col :span="24">
                       <a-form-item label="评分标准" layout="inline" v-bind="validateInfos.pfbz">
-                        <a-form-item
-                          label="是否允许学生查看"
-                          :labelCol="labelCol2"
-                          :wrapperCol="wrapperCol2"
-                          style="margin-top: -1px; margin-left: -17px"
-                        >
-                          <j-dict-select-tag
-                            type="radio"
-                            v-model:value="zyInfo.sturead"
-                            dictCode="yn"
-                            placeholder="请选择评分标准是否允许学生查看"
-                            :disabled="editDisabled"
-                          />
+                        <a-form-item label="是否允许学生查看" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
+                          class="pjbz-sfyxxsck">
+                          <j-dict-select-tag type="radio" v-model:value="zyInfo.sturead" dictCode="yn"
+                            placeholder="请选择评分标准是否允许学生查看" :disabled="editDisabled" />
                         </a-form-item>
                         <a-form-item label="">
                           <j-editor v-model:value="zyInfo.pfbz" v-if="pfbzShow" @blur="handlePfbzShow(0)" />
@@ -187,41 +165,26 @@
                   <div class="region">
                     <div class="region-title"><span class="region-title-headline"></span><span>学生互评</span></div>
                     <a-form-item label="学生互评">
-                      <div class="tishi" v-if="zyInfo.xshpkg == '1'"
-                        >每份作业至少互评三次，每个学生互评五份作业。按时完成互评任务的学生，可额外获得最终分数的2%作为互评奖励；互评作业质量高的学生，可额外获得最终分数的5%作为互评奖励。</div
-                      >
-                      <j-dict-select-tag
-                        type="radio"
-                        v-model:value="zyInfo.xshpkg"
-                        dictCode="yn"
-                        placeholder="请选择是否允许学生查看"
-                        style="margin-top: 15px"
-                        :disabled="editDisabled"
-                        @change="handleXshpkg"
-                      />
+                      <div class="tishi" v-if="zyInfo.xshpkg == '1'">
+                        每份作业至少互评三次，每个学生互评五份作业。按时完成互评任务的学生，可额外获得最终分数的2%作为互评奖励；互评作业质量高的学生，可额外获得最终分数的5%作为互评奖励。</div>
+                      <j-dict-select-tag type="radio" v-model:value="zyInfo.xshpkg" dictCode="yn"
+                        placeholder="请选择是否允许学生查看" style="margin-top: 15px" :disabled="editDisabled"
+                        @change="handleXshpkg" />
                       <div v-if="zyInfo.xshpkg == '1'">
                         <!-- <a-form-item label="设置互评人数" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="margin-top: 20px">
                         <a-input-number v-model:value="zyInfo.xshprsq" placeholder="请设置互评人数" style="width: 60%" :max="100" :min="0">
                           <template #addonAfter>人</template>
                         </a-input-number>
                       </a-form-item> -->
-                        <a-form-item
-                          label="互评结果使用"
-                          :labelCol="labelCol3"
-                          :wrapperCol="wrapperCol3"
-                          style="margin-top: 20px; margin-left: -30px"
-                        >
-                          <a-radio-group v-model:value="zyInfo.sfzzcj" style="width: 100%" size="default" :disabled="editDisabled">
+                        <a-form-item label="互评结果使用" :labelCol="labelCol3" :wrapperCol="wrapperCol3" class="sshp-hpjgsy">
+                          <a-radio-group v-model:value="zyInfo.sfzzcj" style="width: 100%" size="default"
+                            :disabled="editDisabled">
                             <a-radio :value="'1'" style="width: 100%; margin-bottom: 5px">互评成绩为最终成绩</a-radio>
                             <a-radio :value="'0'" style="width: 100%; margin-bottom: 5px">互评成绩作为教师评分的参考成绩</a-radio>
                           </a-radio-group>
                         </a-form-item>
-                        <a-form-item
-                          label="是否允许学生看到互评成绩"
-                          :labelCol="labelCol4"
-                          :wrapperCol="wrapperCol4"
-                          style="margin-top: 20px; margin-left: -10px"
-                        >
+                        <a-form-item label="是否允许学生看到互评成绩" :labelCol="labelCol4" :wrapperCol="wrapperCol4"
+                          class="sshp-sfyxxskdhpcj">
                           <a-radio-group v-model:value="zyInfo.xssfck">
                             <a-radio :value="'1'" style="margin-top: 5px">是(匿名)</a-radio>
                             <a-radio :value="'0'" style="margin-top: 5px">否</a-radio>
@@ -235,26 +198,14 @@
                         /> -->
                         </a-form-item>
                         <a-form-item label="互评开始时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" hidden>
-                          <a-date-picker
-                            placeholder="请选择互评开始时间"
-                            v-model:value="zyInfo.xshpkssj"
-                            :disabled-date="disabledDate"
-                            :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
-                            valueFormat="YYYY-MM-DD HH:mm"
-                            format="YYYY-MM-DD HH:mm"
-                            style="width: 100%"
-                          />
+                          <a-date-picker placeholder="请选择互评开始时间" v-model:value="zyInfo.xshpkssj"
+                            :disabled-date="disabledDate" :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
+                            valueFormat="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm" style="width: 100%" />
                         </a-form-item>
                         <a-form-item label="互评结束时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
-                          <a-date-picker
-                            placeholder="请选择互评结束时间"
-                            v-model:value="zyInfo.xshpjssj"
-                            :disabled-date="disabledDate"
-                            :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
-                            valueFormat="YYYY-MM-DD HH:mm"
-                            format="YYYY-MM-DD HH:mm"
-                            style="width: 100%"
-                          />
+                          <a-date-picker placeholder="请选择互评结束时间" v-model:value="zyInfo.xshpjssj"
+                            :disabled-date="disabledDate" :show-time="{ format: 'YYYY-MM-DD HH:mm' }"
+                            valueFormat="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm" style="width: 100%" />
                         </a-form-item>
                       </div>
                     </a-form-item>
@@ -264,40 +215,19 @@
                   <div class="region">
                     <div class="region-title"><span class="region-title-headline"></span><span>查重设置</span></div>
                     <a-form-item label="是否进行查重" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
-                      <j-dict-select-tag
-                        type="radio"
-                        v-model:value="zyInfo.sfcc"
-                        dictCode="yn"
-                        placeholder="请选择是否查重"
-                        :disabled="editDisabled"
-                      />
+                      <j-dict-select-tag type="radio" v-model:value="zyInfo.sfcc" dictCode="yn" placeholder="请选择是否查重"
+                        :disabled="editDisabled" />
                     </a-form-item>
 
-                    <a-form-item
-                      label="检测通过率"
-                      :labelCol="labelCol3"
-                      :wrapperCol="wrapperCol3"
-                      style="margin: -1px; margin-left: -10px"
-                      v-if="zyInfo.sfcc == '1'"
-                    >
-                      <a-input-number
-                        v-model:value="zyInfo.wwtgl"
-                        placeholder="请输入检测通过率"
-                        style="width: 50%"
-                        :max="100"
-                        :min="0"
-                        :disabled="editDisabled"
-                      >
+                    <a-form-item label="检测通过率" :labelCol="labelCol3" :wrapperCol="wrapperCol3" class="ccsz-jctgl"
+                      v-if="zyInfo.sfcc == '1'">
+                      <a-input-number v-model:value="zyInfo.wwtgl" placeholder="请输入检测通过率" style="width: 50%" :max="100"
+                        :min="0" :disabled="editDisabled">
                         <template #addonAfter> % </template>
                       </a-input-number>
                     </a-form-item>
-                    <a-form-item
-                      label="比对库设置"
-                      :labelCol="labelCol3"
-                      :wrapperCol="wrapperCol3"
-                      style="margin-left: -10px"
-                      v-if="zyInfo.sfcc == '1'"
-                    >
+                    <a-form-item label="比对库设置" :labelCol="labelCol3" :wrapperCol="wrapperCol3" class="ccsz-bdksz"
+                      v-if="zyInfo.sfcc == '1'">
                       <div style="padding: 5px 0">维普</div>
                       <div style="display: flex; flex-direction: column">
                         <a-checkbox v-model:checked="zyInfo.wwcc" :disabled="editDisabled" style="margin-left: 8px">
@@ -305,18 +235,19 @@
                           <span class="bled-countenance2">中文科技期刊数据库、硕博学位论文库、高校特色论文库、互联网数据资源/互联网文档资源</span>
                         </a-checkbox>
                         <a-checkbox v-model:checked="zyInfo.xncc" :disabled="editDisabled">
-                          <span class="bled-countenance">学校作业库查重</span><br /><span class="bled-countenance2">历届学生提供的作业库内查重</span>
+                          <span class="bled-countenance">学校作业库查重</span><br /><span
+                            class="bled-countenance2">历届学生提供的作业库内查重</span>
                         </a-checkbox>
                         <a-checkbox v-model:checked="zyInfo.nwcc" :disabled="editDisabled">
-                          <span class="bled-countenance">本次作业查重</span><br /><span class="bled-countenance2">本次学生提交的作业间查重</span>
+                          <span class="bled-countenance">本次作业查重</span><br /><span
+                            class="bled-countenance2">本次学生提交的作业间查重</span>
                         </a-checkbox>
                       </div>
                       <div style="padding: 5px 0">AIGC</div>
                       <div>
                         <a-checkbox v-model:checked="zyInfo.aigccc" style="margin-left: 8px" :disabled="editDisabled">
-                          <span class="bled-countenance">AIGC查重</span><br /><span class="bled-countenance2"
-                            >检测作业是否部分或全部由AI模型生成</span
-                          >
+                          <span class="bled-countenance">AIGC查重</span><br /><span
+                            class="bled-countenance2">检测作业是否部分或全部由AI模型生成</span>
                         </a-checkbox>
                       </div>
                     </a-form-item>
@@ -334,9 +265,9 @@
     </div>
     <div v-show="showType == 3" style="overflow-y: auto">
       <a-row>
-        <a-col :span="24"
-          ><span class="title">批阅作业</span> - <span class="title2">作业详情页</span>
-          <a-button type="primary" preIcon="ant-design:export-outlined" @click="reloadZy" style="float: right; margin-right: 8px"> 返回</a-button>
+        <a-col :span="24"><span class="title">批阅作业</span> - <span class="title2">作业详情页</span>
+          <a-button type="primary" preIcon="ant-design:arrow-left-outlined" @click="reloadZy"
+            style="float: right; margin-right: 8px"> 返回</a-button>
           <a-popover title="温馨提示">
             <template #content>
               <p>1、非高峰期预计30分钟内返回检测结果，高峰期预计时间会更长，请您耐心等待！</p>
@@ -344,14 +275,15 @@
               <p>3、点击最高查重率，可分别查看学生“维普作业库查重”、“学校作业库查重”、“本次作业查重”、“AIGC查重”相似率</p>
               <p>4、学生上传的课程作业全部存档</p>
             </template>
-            <Icon icon="ant-design:question-circle-outlined" :size="30" style="float: right; margin-right: 8px; color: #029c88" />
+            <Icon icon="ant-design:question-circle-outlined" :size="30"
+              style="float: right; margin-right: 8px; color: #029c88" />
           </a-popover>
-          <a-divider
-        /></a-col>
+          <a-divider /></a-col>
         <a-col :span="24" style="overflow: hidden">
           <!--查询区域-->
           <div class="sear-distance">
-            <a-form @keyup.enter.native="searchQueryZyxq" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+            <a-form @keyup.enter.native="searchQueryZyxq" :model="queryParam" :label-col="labelCol"
+              :wrapper-col="wrapperCol">
               <a-row :gutter="24">
                 <a-col :lg="12">
                   <a-form-item label="学生姓名">
@@ -375,13 +307,28 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
-                <a-col :span="24">
+                <!-- <a-col :span="24">
                   <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQueryZyxq">查询</a-button>
                   <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
                   <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
-                  <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleFabu" style="margin-left: 8px">发布成绩</a-button>
-                  <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleKhcl" style="margin-left: 8px">上传考核材料</a-button> -->
-                  <span class="tishi" style="margin-left: 20px; padding: 10px">温馨提示：作业完成后，请及时发布评分</span>
+                  <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleFabu" style="margin-left: 8px">发布成绩</a-button> -->
+                <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleKhcl" style="margin-left: 8px">上传考核材料</a-button> -->
+                <!-- <span class="tishi" style="margin-left: 20px; padding: 10px">温馨提示：作业完成后，请及时发布评分</span>
+                </a-col> -->
+              </a-row>
+              <a-row :gutter="[16, 16]">
+                <a-col :span="24" :lg="{ span: 16 }">
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:search-outlined'"
+                    @click="searchQueryZyxq">查询</a-button>
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:reload-outlined'"
+                    @click="searchReset" style="margin-left: 8px">重置</a-button>
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:export-outlined'"
+                    @click="onExportXls" style="margin-left: 8px">导出</a-button>
+                  <a-button type="primary" :preIcon="isSmallScreen ? '' : 'ant-design:export-outlined'"
+                    @click="batchHandleFabu" style="margin-left: 8px">发布成绩</a-button>
+                </a-col>
+                <a-col :span="24" :lg="{ span: 8 }">
+                  <span class="tishi" style="padding: 10px">温馨提示：作业完成后，请及时发布评分</span>
                 </a-col>
               </a-row>
             </a-form>
@@ -395,10 +342,12 @@
               <div v-if="record.alltgl">
                 <span v-if="record.filePath">
                   <template v-if="record.zgccl && record.zgccl != '0'">
-                    <span v-if="parseFloat(record.zgccl) <= parseFloat(record.alltgl)" title="通过" style="color: #36b395; cursor: pointer" @click="handleViewInfo(record)">
+                    <span v-if="parseFloat(record.zgccl) <= parseFloat(record.alltgl)" title="通过"
+                      style="color: #36b395; cursor: pointer" @click="handleViewInfo(record)">
                       {{ record.zgccl }}
                     </span>
-                    <span v-else title="未通过" style="color: red" @click="handleViewInfo(record)">{{ record.zgccl }}</span>
+                    <span v-else title="未通过" style="color: red" @click="handleViewInfo(record)">{{ record.zgccl
+                      }}</span>
                   </template>
                   <template v-else>查重中</template>
                 </span>
@@ -431,13 +380,12 @@
     </div>
     <div v-if="showType == 4">
       <a-row>
-        <a-col :span="24"
-          ><span class="title">批阅作业</span> - <span class="title2">作业详情页</span> - <span class="title2">查重相似度详情</span>
-          <a-button type="primary" @click="handleShowType(3)" style="float: right; margin-right: 8px"
-            ><Icon icon="ant-design:export-outlined" />返回</a-button
-          >
-          <a-divider
-        /></a-col>
+        <a-col :span="24"><span class="title">批阅作业</span> - <span class="title2">作业详情页</span> - <span
+            class="title2">查重相似度详情</span>
+          <a-button type="primary" @click="handleShowType(3)" style="float: right; margin-right: 8px">
+            <Icon icon="ant-design:arrow-left-outlined" />返回
+          </a-button>
+          <a-divider /></a-col>
         <a-col :span="24">
           <a-table :columns="columnsCcjg" :data-source="tableCcjgData" :pagination="false">
             <template #bodyCell="{ column, record }">
@@ -453,13 +401,12 @@
     </div>
     <div v-if="showType == 5">
       <a-row>
-        <a-col :span="24"
-          ><span class="title">批阅作业</span> - <span class="title2">作业详情页</span> - <span class="title2">学生互评详情</span>
-          <a-button type="primary" @click="handleShowType(3)" style="float: right; margin-right: 8px"
-            ><Icon icon="ant-design:export-outlined" />返回</a-button
-          >
-          <a-divider
-        /></a-col>
+        <a-col :span="24"><span class="title">批阅作业</span> - <span class="title2">作业详情页</span> - <span
+            class="title2">学生互评详情</span>
+          <a-button type="primary" @click="handleShowType(3)" style="float: right; margin-right: 8px">
+            <Icon icon="ant-design:arrow-left-outlined" />返回
+          </a-button>
+          <a-divider /></a-col>
         <a-col :span="24">
           <a-table :columns="columnsXshp" :data-source="tableXshpData" :pagination="false"> </a-table>
         </a-col>
@@ -470,27 +417,34 @@
       <a-row>
         <a-col :span="24"><span class="title">布置作业</span><a-divider /></a-col>
         <a-col :span="24" style="text-align: right; margin-top: 5px">
-          <a-button type="primary" @click="handleSzzycs(1)"><Icon icon="ant-design:edit-outlined" />修改课程作业次数</a-button>
+          <a-button type="primary" @click="handleSzzycs(1)">
+            <Icon icon="ant-design:edit-outlined" />修改课程作业次数
+          </a-button>
           <a-divider type="vertical" />
-          <a-button type="primary" @click="handleAddOne" class="mar-right20"><Icon icon="ant-design:file-add-outlined" />新增作业</a-button>
+          <a-button type="primary" @click="handleAddOne" class="mar-right20">
+            <Icon icon="ant-design:file-add-outlined" />新增作业
+          </a-button>
         </a-col>
         <a-col :span="24">
           <a-row style="padding: 10px">
-            <a-col :lg="24" v-for="(item, index) in tableData" style="padding: 0 5px 12px 5px; border-radius: 5px" :key="index">
-              <a-card :title="'第' + item.sort + '次作业(占比' + item.score + '%)'" v-if="!item.endTime" class="cardClass module-bg">
+            <a-col :lg="24" v-for="(item, index) in tableData" style="padding: 0 5px 12px 5px; border-radius: 5px"
+              :key="index">
+              <a-card :title="'第' + item.sort + '次作业(占比' + item.score + '%)'" v-if="!item.endTime"
+                class="cardClass module-bg">
                 <template #extra><span class="card-label3"> 待设置</span> </template>
                 <p class="sznrClass">尚未布置作业题目及具体要求</p>
                 <div style="text-align: right">
-                  <a @click="handleEdit(item, false)" class="home-status"><Icon icon="ant-design:file-text-outlined" />设置作业内容及要求</a>
+                  <a @click="handleEdit(item, false)" class="home-status">
+                    <Icon icon="ant-design:file-text-outlined" />设置作业内容及要求
+                  </a>
                   <a-divider type="vertical" />
-                  <a @click="handleDelete(item)" class="home-status"><Icon icon="ant-design:delete-outlined" />删除</a>
+                  <a @click="handleDelete(item)" class="home-status">
+                    <Icon icon="ant-design:delete-outlined" />删除
+                  </a>
                 </div>
               </a-card>
-              <a-card
-                :title="'第' + item.sort + '次作业(占比' + item.score + '%)'"
-                v-if="item.endTime && (item.zyStatus == '1' || item.zyStatus == '2')"
-                class="cardClass module-bg"
-              >
+              <a-card :title="'第' + item.sort + '次作业(占比' + item.score + '%)'"
+                v-if="item.endTime && (item.zyStatus == '1' || item.zyStatus == '2')" class="cardClass module-bg">
                 <template #extra><span class="card-label">已发布</span> </template>
                 <div class="ellip-title">
                   <span class="ellipsis elli-title" :title="item.title">{{ item.title }}</span>
@@ -498,69 +452,78 @@
                 </div>
 
                 <div style="width: 100%; display: flex">
-                  <div class="data-suggest zuanqu" @click="handleZyxx(item, '1')"
-                    ><span>{{ item.wtjnum }}人</span><span>待提交</span></div
-                  >
+                  <div class="data-suggest zuanqu" @click="handleZyxx(item, '1')"><span>{{ item.wtjnum
+                      }}人</span><span>待提交</span></div>
                   <!-- <div class="data-suggest zuanqu" @click="handleZyxx(item, '2')"
                     ><span>{{ item.ytjnum }}人</span><span>已提交</span></div
                   > -->
-                  <div class="data-suggest zuanqu" @click="handleZyxx(item, '5')"
-                    ><span>{{ item.dpynum }}人</span><span>待评阅</span></div
-                  >
-                  <div class="data-suggest zuanqu" @click="handleZyxx(item, '4')"
-                    ><span>{{ item.ypynum }}人</span><span>已评阅</span></div
-                  >
+                  <div class="data-suggest zuanqu" @click="handleZyxx(item, '5')"><span>{{ item.dpynum
+                      }}人</span><span>待评阅</span></div>
+                  <div class="data-suggest zuanqu" @click="handleZyxx(item, '4')"><span>{{ item.ypynum
+                      }}人</span><span>已评阅</span></div>
                 </div>
-                <div class="flex">
+                <div>
                   <div style="width: 100%; display: flex; margin-top: 20px">
-                    <div class="ellip-word"
-                      ><span class="ellip-word2">作业发布时间：</span
-                      >{{ item.startTime ? dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div
-                    >
-                    <div class="ellip-word"><span class="ellip-word2">作业截止时间：</span>{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
+                    <div class="ellip-word flex"><span class="ellip-word2">作业发布时间：</span>{{ item.startTime ?
+                      dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div>
+                    <div class="ellip-word flex"><span class="ellip-word2">作业截止时间：</span>{{
+                      dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
                   </div>
                   <div style="text-align: right; margin-top: 20px; margin-bottom: -10px; width: 100%">
                     <!-- <a @click="handleWxtx(item)" class="home-status"><Icon icon="ant-design:wechat-outlined" />微信提醒</a>
                     <a-divider type="vertical" /> -->
-                    <a @click="handleEdit(item, true)" v-if="item.ytjnum > 0" class="home-status"><Icon icon="ant-design:form-outlined" />编辑作业</a>
-                    <a-divider type="vertical"  v-if="item.ytjnum > 0"/>
-                    <a @click="handleFenxiang(item)" class="home-status"><Icon icon="ant-design:share-alt-outlined" />分享</a>
+                    <a @click="handleEdit(item, true)" v-if="item.ytjnum > 0" class="home-status">
+                      <Icon icon="ant-design:form-outlined" />编辑作业
+                    </a>
+                    <a-divider type="vertical" v-if="item.ytjnum > 0" />
+                    <a @click="handleFenxiang(item)" class="home-status">
+                      <Icon icon="ant-design:share-alt-outlined" />分享
+                    </a>
                     <a-divider type="vertical" />
-                    <a @click="handleChehui(item)" v-if="item.dpynum == 0 && item.ypynum == 0" class="home-status"><Icon icon="ant-design:import-outlined" />撤回作业</a>
-                    <a-divider type="vertical"  v-if="item.dpynum == 0 && item.ypynum == 0"/>
-                    <a @click="handleZyxx(item, '')" class="home-status"><Icon icon="ant-design:file-done-outlined" />批阅作业</a>
-                    <a-divider type="vertical"  v-if="item.dpynum == 0 && item.ypynum == 0"/>
-                    <a @click="handleDelete(item)" v-if="item.dpynum == 0 && item.ypynum == 0" class="home-status"><Icon icon="ant-design:delete-outlined" />删除</a>
+                    <a @click="handleChehui(item)" v-if="item.dpynum == 0 && item.ypynum == 0" class="home-status">
+                      <Icon icon="ant-design:import-outlined" />撤回作业
+                    </a>
+                    <a-divider type="vertical" v-if="item.dpynum == 0 && item.ypynum == 0" />
+                    <a @click="handleZyxx(item, '')" class="home-status">
+                      <Icon icon="ant-design:file-done-outlined" />批阅作业
+                    </a>
+                    <a-divider type="vertical" v-if="item.dpynum == 0 && item.ypynum == 0" />
+                    <a @click="handleDelete(item)" v-if="item.dpynum == 0 && item.ypynum == 0" class="home-status">
+                      <Icon icon="ant-design:delete-outlined" />删除
+                    </a>
                   </div>
                 </div>
               </a-card>
-              <a-card
-                :title="'第' + item.sort + '次作业(占比' + item.score + '%)'"
-                v-if="item.endTime && item.zyStatus == '0'"
-                class="cardClass"
-                bodyStyle="background: #fff;"
-              >
+              <a-card :title="'第' + item.sort + '次作业(占比' + item.score + '%)'"
+                v-if="item.endTime && item.zyStatus == '0'" class="cardClass" bodyStyle="background: #fff;">
                 <template #extra><span class="card-label2">待发布</span> </template>
                 <div class="ellip-title">
                   <span class="ellipsis elli-title" :title="item.title">{{ item.title }}</span>
                   <a class="button-zhta" @click="openXkrs(item)">{{ item.xkxs }}人选课</a>
                 </div>
                 <div style="width: 100%">
-                  <div class="ellip-word"
-                    ><span class="ellip-word2">作业发布时间：</span
-                    >{{ item.startTime ? dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div
-                  >
-                  <div class="ellip-word"><span class="ellip-word2">作业截止时间：</span>{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
+                  <div class="ellip-word flex"><span class="ellip-word2">作业发布时间：</span>{{ item.startTime ?
+                    dayjs(item.startTime).format('YYYY.MM.DD HH:mm') : '未设置' }}</div>
+                  <div class="ellip-word flex"><span class="ellip-word2">作业截止时间：</span>{{
+                    dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}</div>
                 </div>
                 <div style="height: 45px">&nbsp;</div>
                 <div style="text-align: right; margin-top: 30px">
-                  <a @click="handleEdit(item, false)" class="home-status"><Icon icon="ant-design:form-outlined" />编辑作业</a>
+                  <a @click="handleEdit(item, false)" class="home-status">
+                    <Icon icon="ant-design:form-outlined" />编辑作业
+                  </a>
                   <a-divider type="vertical" />
-                  <a @click="handleFenxiang(item)" class="home-status"><Icon icon="ant-design:share-alt-outlined" />分享</a>
+                  <a @click="handleFenxiang(item)" class="home-status">
+                    <Icon icon="ant-design:share-alt-outlined" />分享
+                  </a>
                   <a-divider type="vertical" />
-                  <a @click="handleFabu(item)" class="home-status"><Icon icon="ant-design:upload-outlined" />发布作业</a>
+                  <a @click="handleFabu(item)" class="home-status">
+                    <Icon icon="ant-design:upload-outlined" />发布作业
+                  </a>
                   <a-divider type="vertical" />
-                  <a @click="handleDelete(item)" class="home-status"><Icon icon="ant-design:delete-outlined" />删除</a>
+                  <a @click="handleDelete(item)" class="home-status">
+                    <Icon icon="ant-design:delete-outlined" />删除
+                  </a>
                 </div>
               </a-card>
             </a-col>
@@ -572,7 +535,8 @@
     <SzybStudentModal ref="SzybStudentModalpage" @success="handleSuccess"></SzybStudentModal>
     <ZyInfoStudentScoreModal ref="registerScoreModal" @success="handleSuccess"></ZyInfoStudentScoreModal>
     <ZyInfoStudentPiyueModal ref="registerPiyueModal" @success="handleSuccess"></ZyInfoStudentPiyueModal>
-    <KcTeachingUnitContentOneListModal ref="registerZcjcModal" @success="handleCheckZcjcSuccess"></KcTeachingUnitContentOneListModal>
+    <KcTeachingUnitContentOneListModal ref="registerZcjcModal" @success="handleCheckZcjcSuccess">
+    </KcTeachingUnitContentOneListModal>
 
     <ZyInfoDetailModal ref="registerDetialModal" @success="handleSuccess"></ZyInfoDetailModal>
     <ZyInfoModal ref="registerModal" @success="handleSuccess"></ZyInfoModal>
@@ -583,7 +547,8 @@
     <YyzyListModal ref="YyzyListModalPage" @success="handleCallYinyong"></YyzyListModal>
     <ZyCyFenxiangListModal ref="ZyCyFenxiangListModalpage"></ZyCyFenxiangListModal>
 
-    <a-modal v-model:visible="imgvisible" title="图片预览" width="800px" :cancelText="`关闭`" :okButtonProps="{ class: { 'jee-hidden': true } }">
+    <a-modal v-model:visible="imgvisible" title="图片预览" width="800px" :cancelText="`关闭`"
+      :okButtonProps="{ class: { 'jee-hidden': true } }">
       <div style="padding: 10px 20px">
         <a-button type="primary" @click="rotateImage">顺时针旋转</a-button>
         <a-button type="primary" @click="rotateImage2" style="margin-left: 20px">逆时针旋转</a-button>
@@ -596,7 +561,7 @@
 </template>
 
 <script lang="ts" name="zyInfo-zyInfo" setup>
-import { ref, reactive, onMounted, unref } from 'vue';
+import { ref, reactive, onMounted, unref , onUnmounted, watchEffect} from 'vue';
 import { list, deleteOne } from './ZyInfo.api';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
@@ -1859,18 +1824,96 @@ function handlePageChange(record) {
 onMounted(() => {
   searchQuery();
 });
+
+const isSmallScreen = ref(false);
+
+const checkScreenSize = () => {
+  isSmallScreen.value = window.innerWidth <= 768; // 根据需要调整断点
+};
+
+// 立即执行一次以设置初始值，并在组件卸载前监听窗口大小变化
+watchEffect(() => {
+  checkScreenSize();
+  const resizeObserver = () => checkScreenSize();
+  window.addEventListener('resize', resizeObserver);
+  onUnmounted(() => {
+    window.removeEventListener('resize', resizeObserver);
+  });
+});
+
 </script>
 
 <style lang="less" scoped>
-.title {
-  margin-left: 20px;
-  font-size: 16px;
-  font-weight: bold;
+// 小屏
+@media (max-width: 768px) {
+  .jbxx-zyfbsj-ico{
+    float: right; 
+    margin-top: 5px; 
+    color: #029c88; 
+    margin-right: 5px
+  }
+  .ccsz-bdksz{}
+
+  .ccsz-jctgl{}
+
+  .sshp-sfyxxskdhpcj{}
+
+  .sshp-hpjgsy {}
+
+  .pjbz-sfyxxsck {}
+
+  .title {
+    margin-left: 10px;
+    font-size: 16px;
+    font-weight: bold;
+  }
 }
+
+// PC大屏
+@media (min-width: 769px) {
+  .jbxx-zyfbsj-ico{
+    float: right; 
+    margin-top: 5px; 
+    color: #029c88; 
+    margin-right: 19px
+  }
+
+  .ccsz-bdksz{
+    margin-left: -10px;
+  }
+
+  .ccsz-jctgl{
+    margin-top: -1px;
+    margin-left: -10px;
+  }
+
+  .sshp-sfyxxskdhpcj{
+    margin-top: 20px;
+    margin-left: -10px;
+  }
+
+  .sshp-hpjgsy {
+    margin-top: -20px;
+    margin-left: -30px;
+  }
+
+  .pjbz-sfyxxsck {
+    margin-top: -1px;
+    margin-left: -17px;
+  }
+
+  .title {
+    margin-left: 20px;
+    font-size: 16px;
+    font-weight: bold;
+  }
+}
+
 .title2 {
   font-size: 16px;
   font-weight: bold;
 }
+
 .ant-divider-horizontal {
   display: flex;
   clear: both;
@@ -1878,6 +1921,7 @@ onMounted(() => {
   min-width: 100%;
   margin: 3px 0 5px;
 }
+
 .tishi {
   width: 100%;
   font-size: 12px;
@@ -1887,13 +1931,16 @@ onMounted(() => {
   text-align: center;
   padding: 6px 0;
 }
+
 .cardClass {
   min-height: 200px;
 }
+
 .sznrClass {
   line-height: 40px;
   text-align: center;
 }
+
 .ant-card {
   box-sizing: border-box;
   margin: 0;
@@ -1909,10 +1956,12 @@ onMounted(() => {
   border: 1px solid #f0f0f0;
   background: #f7f7f7;
 }
+
 .ant-card:hover {
   box-sizing: border-box;
   box-shadow: 2px 2px 10px 1px #d4d4d4;
 }
+
 .ant-card-head {
   min-height: 48px;
   margin-bottom: -1px;
@@ -1924,36 +1973,46 @@ onMounted(() => {
   border-bottom: 1px solid #dadada;
   border-radius: 2px 2px 0 0;
 }
+
 .ellipsis {
-  overflow: hidden; /* 确保超出容器的内容被裁剪 */
-  white-space: nowrap; /* 确保文本在一行内显示 */
-  text-overflow: ellipsis; /* 超出部分显示省略号 */
+  overflow: hidden;
+  /* 确保超出容器的内容被裁剪 */
+  white-space: nowrap;
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+  /* 超出部分显示省略号 */
 }
+
 .ellip-title {
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
   margin-top: -10px;
 }
+
 .elli-title {
   font-size: 16px;
   font-weight: bold;
 }
+
 .ellip-word {
   font-size: 12px;
   color: #666666;
   margin-right: 10px;
 }
+
 .ellip-word2 {
   font-size: 12px;
   color: #333;
   font-weight: bold;
 }
+
 .zuanqu:hover {
   cursor: pointer;
   color: #18a689;
   background: #eff6f4;
 }
+
 .data-suggest {
   display: flex;
   flex-direction: column;
@@ -1965,13 +2024,16 @@ onMounted(() => {
   background: #f7f7f7;
   margin-top: 10px;
 }
+
 .data-suggest span:nth-child(1) {
   font-size: 16px;
   font-weight: bold;
 }
+
 .data-suggest span:nth-child(2) {
   font-size: 12px;
 }
+
 .work-img {
   width: 100%;
   display: flex;
@@ -1979,10 +2041,12 @@ onMounted(() => {
   margin-top: 80px;
   margin-bottom: 30px;
 }
+
 .work-img-img {
   width: 180px;
   height: 139px;
 }
+
 .buttonClass {
   background: #1ab394;
   font-weight: 600;
@@ -1990,20 +2054,25 @@ onMounted(() => {
   border-radius: 3px;
   border: none;
 }
+
 .mar-right20 {
   margin-right: 14px;
 }
+
 .button-zhta {
   color: #666666;
   cursor: pointer;
 }
+
 .button-zhta:hover {
   cursor: pointer;
   color: #18a689;
 }
+
 .sear-distance {
   padding: 0 10px;
 }
+
 .ant-form-item {
   box-sizing: border-box;
   margin: 10px 0;
@@ -2017,20 +2086,25 @@ onMounted(() => {
   /* margin-bottom: 24px; */
   vertical-align: top;
 }
+
 .bled-countenance {
   color: #666;
 }
+
 .bled-countenance2 {
   color: #999999;
   font-size: 12px;
 }
+
 .region {
   margin: 6px 12px;
   padding-bottom: 20px;
   background: #fff;
   border-radius: 5px;
   border: 1px solid #e6e6e6;
+  padding: 10px;
 }
+
 .region:hover {
   margin: 6px 12px;
   padding-bottom: 20px;
@@ -2039,6 +2113,7 @@ onMounted(() => {
   border: 1px solid #e6e6e6;
   box-shadow: 2px 2px 10px 1px #d4d4d4;
 }
+
 .region-title {
   font-size: 16px;
   color: #333;
@@ -2048,6 +2123,7 @@ onMounted(() => {
   margin-bottom: 20px;
   display: flex;
 }
+
 .region-title-headline {
   display: block;
   width: 5px;
@@ -2057,52 +2133,72 @@ onMounted(() => {
   margin-top: 18px;
   margin-right: 20px;
 }
+
 .module-bg {
   background: #fff;
   border-radius: 6px;
   border: 1px solid #e6e6e6;
 }
+
 .home-status {
   color: #1ab394;
 }
+
 .home-status:hover {
   color: #333;
 }
+
 .card-label {
   background: #81cbbc;
   border-radius: 4px;
   color: #fff;
   padding: 2px 6px;
 }
+
 .card-label2 {
   background: #84c4fa;
   border-radius: 4px;
   color: #fff;
   padding: 2px 6px;
 }
+
 .card-label3 {
   background: #fabe84;
   border-radius: 4px;
   color: #fff;
   padding: 2px 6px;
 }
+
 .zbClass {
   margin-left: 15px;
 }
+
 .image-container {
   padding: 10px;
-  width: 100%; /* 设置容器宽度 */
-  height: auto; /* 设置容器高度 */
-  overflow: hidden; /* 隐藏溢出的部分 */
+  width: 100%;
+  /* 设置容器宽度 */
+  height: auto;
+  /* 设置容器高度 */
+  overflow: hidden;
+  /* 隐藏溢出的部分 */
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
 .rotated-image {
-  max-width: 100%; /* 最大宽度为容器宽度 */
-  max-height: 100%; /* 最大高度为容器高度 */
-  object-fit: contain; /* 保持图片内容不失真 */
-  transform: rotate(90deg); /* 假设图片已经旋转90度 */
+  max-width: 100%;
+  /* 最大宽度为容器宽度 */
+  max-height: 100%;
+  /* 最大高度为容器高度 */
+  object-fit: contain;
+  /* 保持图片内容不失真 */
+  transform: rotate(90deg);
+  /* 假设图片已经旋转90度 */
 }
+
+:deep(.ant-card-body) {
+  padding: 20px;
+}
+
 </style>

src/views/zy/zyInfo/components/ZyInfoDetailForm.vue

@@ -47,7 +47,7 @@
               </div>
               <a-col :span="24" v-if="formData.wwtgl" class="wrapper-back">
                 <div class="wrapper-title">查重设置</div>
-                <a-form-item layout="inline" style="margin-left: 100px">
+                <a-form-item layout="inline" class="ccsz-main">
                   <a-form-item label="检测通过率" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
                     <span style="padding: 7px 10px"></span>
                     <a-input-number v-model:value="formData.wwtgl" placeholder="检测通过率" style="width: 60%" :max="100" :min="0" disabled>
@@ -437,11 +437,30 @@ defineExpose({
 </script>
 
 <style lang="less" scoped>
-.antd-modal-form {
-  min-height: 300px !important;
-  overflow-y: auto;
-  padding: 24px 24px 24px 24px;
+// 小屏
+@media (max-width: 768px) {
+  .ccsz-main{}
+
+  .antd-modal-form {
+    min-height: 300px !important;
+    overflow-y: auto;
+    padding: 5px 5px 5px 5px;
+  }
 }
+
+// 大屏
+@media (min-width: 769px) {
+  .ccsz-main{
+    margin-left: 100px;
+  }
+
+  .antd-modal-form {
+    min-height: 300px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+}
+
 .spanSm {
   top: -22px;
   position: inherit;

src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue

@@ -1,8 +1,8 @@
 <template>
   <a-spin :spinning="confirmLoading">
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
-      <a-row>
-        <a-col :span="12">
+      <a-row :gutter="[16, 16]">
+        <a-col  :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
           <div v-if="showType=='1'">
             <iframe id="pdfPreviewIframe" :src="ylurl" frameborder="0" width="100%" height="550px" scrolling="auto"></iframe>
           </div>
@@ -33,7 +33,7 @@
             <a-button type="primary">下载文件</a-button>
           </div>
         </a-col>
-        <a-col :span="12">
+        <a-col  :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
           <a-row>
             <a-col :span="24">
               <a-form-item label="作业名称">

src/views/zy/zyZyxx/ZyZyxxListhis.vue

@@ -0,0 +1,397 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <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="标题">
+              <j-input placeholder="请输入标题" v-model:value="queryParam.title"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="是否发布">
+              <j-dict-select-tag placeholder="请选择是否发布" v-model:value="queryParam.sffb" dictCode="yn"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" style="margin-left: 8px"> 新增</a-button> -->
+                <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>-->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <!--<template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>-->
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary"  size="small" @click="downloadFile(text)">下载</a-button>
+        <a-button v-if="text" type="primary" size="small" @click="handlePreview(text)" style="margin-left: 10px;">预览</a-button>
+      </template>
+    </BasicTable>
+    
+  <a-modal
+        title="视频播放"
+        :width="800"
+        :visible="videoOpen"
+        :maskClosable="false"
+        :okButtonProps="{ class: { 'jee-hidden': true } }"
+        @cancel="videoHandleCancel"
+        cancelText="关闭"
+      >
+      <div style="text-align: center;width:100%;">
+        <video
+        style="text-align: center;"
+          ref="videoPlayer"
+          :controls="controls"
+          :autoplay="autoplay"
+          :loop="loop"
+          :src="videoUrl"
+          @loadedmetadata="playVideoInFullscreen"
+        >
+          <!-- <source  type="video/mp4" /> -->
+          <!-- Your browser does not support the video tag. -->
+        </video>
+    
+        <!-- <button @click="playVideo">开始播放</button>
+        <button @click="pauseVideo">停止播放</button> -->
+      </div>
+      </a-modal>
+    <!-- 表单区域 -->
+    <ZyZyxxModalhis ref="registerModal" @success="handleSuccess"></ZyZyxxModalhis>
+  </div>
+</template>
+
+<script lang="ts" name="zyZyxx-zyZyxx" setup>
+  import { ref, reactive,onMounted,onUnmounted,unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './ZyZyxx.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ZyZyxx.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ZyZyxxModalhis from './components/ZyZyxxModalhis.vue'
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { encryptByBase64 } from '/@/utils/cipher';
+  import { useRouter } from 'vue-router';
+  import { JInput } from '/@/components/Form';
+
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, type, teano } = query; //获取传递参数
+const { createConfirm, createMessage } = useMessage();
+  const queryParam = ref<any>({rwbh});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const globSetting = useGlobSetting();
+  const baseApiUrl = globSetting.domainUrl;
+
+  
+const videoPlayer = ref(null);
+const videoOpen = ref<boolean>(false);
+  const controls = ref(true);
+  const autoplay = ref(false)
+  const loop = ref(false);
+const videoUrl = ref<String>('');
+
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 170,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "资源信息",
+      url: getExportUrl,
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+// --------------------------视频------------------------------
+const playVideo = () => {
+  videoPlayer.value.play();
+};
+
+const pauseVideo = () => {
+  videoPlayer.value.pause();
+};
+const handleFullScreenChange = () => {
+  if (!document.fullscreenElement) {
+    console.log('Video exited fullscreen');
+    // 这里可以执行取消全屏后的逻辑
+    videoOpen.value = false;
+    videoPlayer.value.pause();
+  }
+};
+
+function videoHandleCancel(){
+  pauseVideo();
+  videoOpen.value = false;
+}
+onMounted(() => {
+  document.addEventListener('fullscreenchange', handleFullScreenChange);
+});
+ 
+onUnmounted(() => {
+  document.removeEventListener('fullscreenchange', handleFullScreenChange);
+});
+
+//视频预览
+function handleVideo(three){
+  let url = getFileAccessHttpUrl(three.filePath);
+  console.log('视频预览-----》',url);
+  videoOpen.value = true;
+  videoUrl.value = url;
+  playVideoInFullscreen();
+  setTimeout(() => {
+    playVideo();
+  }, 1000);
+  
+}
+
+// --------------------------视频------------------------------
+  const playVideoInFullscreen = async () => {
+  if (videoPlayer.value) {
+    try {
+      // 使用原生DOM方法请求全屏
+      await videoPlayer.value.requestFullscreen();
+    } catch (err) {
+      console.error(err);
+    }
+  }
+};
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+  
+//预览
+function handlePreview(record) {
+  const parts = record.split('.');
+  const filetype = parts[parts.length - 1];
+  if(filetype=='jpg' || filetype=='png' || filetype=='jpeg' || filetype=='xls' || filetype=='xlsx' || filetype=='text' ){
+    var file = baseApiUrl + "/"+record;
+    console.log('🤬', file);
+    window.open('https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file))); 
+  }else if(filetype=='doc' || filetype=='docx' || filetype=='pdf'){
+    var url2 = getFileAccessHttpUrl(record);
+    let url = baseApiUrl + '/generic/web/viewer.html?file=' + encodeURIComponent(url2);
+    window.open(url, '_blank');
+  }else if(filetype=='mp4' || filetype=='mp3'){
+    
+  let url = getFileAccessHttpUrl(record);
+  console.log('视频预览-----》',url);
+  videoOpen.value = true;
+  videoUrl.value = url;
+  playVideoInFullscreen();
+  setTimeout(() => {
+    playVideo();
+  }, 1000);
+  }
+  else{
+    createMessage.error('暂不支持该文件预览！');
+  }
+ 
+}
+   
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+   
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  function handleFabu(record: Recordable) {
+    defHttp.post({ url: '/zyZyxx/zyZyxx/edit', params: { id: record.id,sffb:'1' } }).then(res => {
+      handleSuccess();
+    })
+  }
+   
+  
+  function handleChehui(record: Recordable) {
+    defHttp.post({ url: '/zyZyxx/zyZyxx/edit', params: { id: record.id,sffb:'0' } }).then(res => {
+      handleSuccess();
+    })
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    if(record.sffb == '0'){
+      return [
+      {
+        label: '详情',
+        onClick: handleEdit.bind(null, record),
+      },
+      // {
+      //   label: '发布',
+      //   onClick: handleFabu.bind(null, record),
+      // }, {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //   }
+      // }
+    ];
+    }else{
+      return [
+        {
+          label: '详情',
+          onClick: handleEdit.bind(null, record),
+        },
+      // {
+      //   label: '撤回',
+      //   onClick: handleChehui.bind(null, record),
+      // }, {
+      //     label: '删除',
+      //     popConfirm: {
+      //       title: '是否确认删除',
+      //       confirm: handleDelete.bind(null, record),
+      //     }
+      //   }
+      ];
+      
+    }
+    
+  }
+   
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

src/views/zy/zyZyxx/components/ZyZyxxFormhis.vue

@@ -0,0 +1,154 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="标题" v-bind="validateInfos.title">
+            <a-input v-model:value="formData.title" placeholder="请输入标题" disabled></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="内容" v-bind="validateInfos.content">
+	          <a-textarea v-model:value="formData.content" rows="4" placeholder="请输入内容" disabled/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="资源" v-bind="validateInfos.filePath">
+	          <j-upload v-model:value="formData.filePath"  disabled ></j-upload>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="是否发布" v-bind="validateInfos.sffb">
+            <j-dict-select-tag type='radio' v-model:value="formData.sffb" dictCode="yn" placeholder="请选择是否发布" disabled/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted ,unref} from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../ZyZyxx.api';
+  import { Form } from 'ant-design-vue';
+  import { useRouter } from 'vue-router';
+  
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, type, teano } = query; //获取传递参数
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    title: '',
+    content: '',
+    filePath: '',
+    sffb: '',
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    title: [{ required: true, message: '请输入标题!'},],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    model.rwbh = rwbh;
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>

src/views/zy/zyZyxx/components/ZyZyxxModalhis.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleCancel" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <ZyZyxxFormhis ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ZyZyxxFormhis>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import ZyZyxxFormhis from './ZyZyxxFormhis.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>