diff --git a/.env.production b/.env.production
index 9f18d7b..276d4f9 100644
--- a/.env.production
+++ b/.env.production
@@ -20,16 +20,16 @@ VITE_GLOB_API_URL=/jeecg-boot
 
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=https://zxkccx.webvpn.nenu.edu.cn/jeecg-boot
-VITE_GLOB_DOMAIN_URL=https://smartedu.nenu.edu.cn/jeecg-boot
-# VITE_GLOB_DOMAIN_URL=https://xxhbtest2.nenu.edu.cn/jeecg-boot
+# VITE_GLOB_DOMAIN_URL=https://smartedu.nenu.edu.cn/jeecg-boot
+VITE_GLOB_DOMAIN_URL=https://xxhbtest2.nenu.edu.cn/jeecg-boot
 #VITE_GLOB_DOMAIN_URL=http://210.47.29.177
 # VITE_GLOB_DOMAIN_URL=https://kczxcs.nenu.edu.cn/jeecg-boot
 # VITE_GLOB_DOMAIN_URL=http://210.47.29.100/jeecg-boot
 
 #RTC服务器地址
 # VITE_GLOB_RTC_SERVER = https://zxkccx.webvpn.nenu.edu.cn:8081
-VITE_GLOB_RTC_SERVER = https://smartedu.nenu.edu.cn:8081
-# VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081
+# VITE_GLOB_RTC_SERVER = https://smartedu.nenu.edu.cn:8081
+VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=
diff --git a/src/components/Form/src/jeecg/components/JEditor3.vue b/src/components/Form/src/jeecg/components/JEditor3.vue
new file mode 100644
index 0000000..b5c8364
--- /dev/null
+++ b/src/components/Form/src/jeecg/components/JEditor3.vue
@@ -0,0 +1,39 @@
+<template>
+  <Tinymce v-bind="bindProps" @change="onChange" />
+</template>
+
+<script lang="ts">
+  import { computed, defineComponent } from 'vue';
+
+  import { Tinymce } from '/@/components/Tinymce/index3';
+  import { propTypes } from '/@/utils/propTypes';
+
+  export default defineComponent({
+    name: 'JEditor',
+    // 不将 attrs 的属性绑定到 html 标签上
+    inheritAttrs: false,
+    components: { Tinymce },
+    props: {
+      value: propTypes.string.def(''),
+      disabled: propTypes.bool.def(false),
+    },
+    emits: ['change', 'update:value'],
+    setup(props, { emit, attrs }) {
+      // 合并 props 和 attrs
+      const bindProps = computed(() => Object.assign({}, props, attrs));
+
+      // value change 事件
+      function onChange(value) {
+        emit('change', value);
+        emit('update:value', value);
+      }
+
+      return {
+        bindProps,
+        onChange,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/components/Tinymce/index3.ts b/src/components/Tinymce/index3.ts
new file mode 100644
index 0000000..98882e5
--- /dev/null
+++ b/src/components/Tinymce/index3.ts
@@ -0,0 +1,4 @@
+import { withInstall } from '/@/utils/index';
+import tinymce from './src/Editor3.vue';
+
+export const Tinymce = withInstall(tinymce);
diff --git a/src/components/Tinymce/src/Editor3.vue b/src/components/Tinymce/src/Editor3.vue
new file mode 100644
index 0000000..da32fd2
--- /dev/null
+++ b/src/components/Tinymce/src/Editor3.vue
@@ -0,0 +1,366 @@
+<template> 
+  <div :class="prefixCls" :style="{ width: containerWidth }">
+    <textarea :id="tinymceId" ref="elRef" :style="{ visibility: 'hidden' }" v-if="!initOptions.inline"></textarea>
+    <slot v-else></slot>
+  </div>
+</template>
+
+<script lang="ts">
+  import type { Editor, RawEditorSettings } from 'tinymce';
+  import tinymce from 'tinymce/tinymce';
+  import 'tinymce/themes/silver';
+  import 'tinymce/icons/default/icons';
+  import 'tinymce/plugins/advlist';
+  import 'tinymce/plugins/anchor';
+  import 'tinymce/plugins/autolink';
+  import 'tinymce/plugins/autosave';
+  import 'tinymce/plugins/code';
+  import 'tinymce/plugins/codesample';
+  import 'tinymce/plugins/directionality';
+  import 'tinymce/plugins/fullscreen';
+  import 'tinymce/plugins/hr';
+  import 'tinymce/plugins/insertdatetime';
+  import 'tinymce/plugins/link';
+  import 'tinymce/plugins/lists';
+  import 'tinymce/plugins/media';
+  import 'tinymce/plugins/nonbreaking';
+  import 'tinymce/plugins/noneditable';
+  import 'tinymce/plugins/pagebreak';
+  import 'tinymce/plugins/paste';
+  import 'tinymce/plugins/preview';
+  import 'tinymce/plugins/print';
+  import 'tinymce/plugins/save';
+  import 'tinymce/plugins/searchreplace';
+  import 'tinymce/plugins/spellchecker';
+  import 'tinymce/plugins/tabfocus';
+  // import 'tinymce/plugins/table';
+  import 'tinymce/plugins/template';
+  import 'tinymce/plugins/textpattern';
+  import 'tinymce/plugins/visualblocks';
+  import 'tinymce/plugins/visualchars';
+  import 'tinymce/plugins/wordcount';
+  import 'tinymce/plugins/image';
+  import 'tinymce/plugins/table';
+  import 'tinymce/plugins/textcolor';
+  import 'tinymce/plugins/contextmenu';
+//  import '/@/components/Tinymce/plugins/kityformula-editor';
+  import { defineComponent, computed, nextTick, ref, unref, watch, onDeactivated, onBeforeUnmount } from 'vue';
+  import ImgUpload from './ImgUpload.vue';
+  import { toolbar, plugins, simplePlugins, simpleToolbar, menubar } from './tinymce';
+  import { buildShortUUID } from '/@/utils/uuid';
+  import { bindHandlers } from './helper';
+  import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated';
+  import { useDesign } from '/@/hooks/web/useDesign';
+  import { isNumber } from '/@/utils/is';
+  import { useLocale } from '/@/locales/useLocale';
+  import { useAppStore } from '/@/store/modules/app';
+  import { uploadFile } from '/@/api/common/api';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  const tinymceProps = {
+    options: {
+      type: Object as PropType<Partial<RawEditorSettings>>,
+      default: {},
+    },
+    value: {
+      type: String,
+    },
+
+    toolbar: {
+      type: [Array as PropType<string[]>, String],
+      default: toolbar,
+    },
+    plugins: {
+      type: Array as PropType<string[]>,
+      default: plugins,
+    },
+    menubar: {
+      type: [Object, String],
+      default: menubar,
+    },
+    modelValue: {
+      type: String,
+    },
+    height: {
+      type: [Number, String] as PropType<string | number>,
+      required: false,
+      default: 220,
+    },
+    width: {
+      type: [Number, String] as PropType<string | number>,
+      required: false,
+      default: 'auto',
+    },
+    showImageUpload: {
+      type: Boolean,
+      default: true,
+    },
+  };
+
+  export default defineComponent({
+    name: 'Tinymce',
+    components: { ImgUpload },
+    inheritAttrs: false,
+    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'));
+      const elRef = ref<Nullable<HTMLElement>>(null);
+
+      const { prefixCls } = useDesign('tinymce-container');
+
+      const appStore = useAppStore();
+
+      const tinymceContent = computed(() => props.modelValue);
+
+      const containerWidth = computed(() => {
+        const width = props.width;
+        if (isNumber(width)) {
+          return `${width}px`;
+        }
+        return width;
+      });
+
+      const skinName = computed(() => {
+        return appStore.getDarkMode === 'light' ? 'jeecg' : 'oxide-dark';
+      });
+
+      const langName = computed(() => {
+        const lang = useLocale().getLocale.value;
+        return ['zh_CN', 'en'].includes(lang) ? lang : 'zh_CN';
+      });
+
+      const initOptions = computed((): RawEditorSettings => {
+        const { height, options, toolbar, plugins, menubar } = props;
+        const publicPath = import.meta.env.VITE_PUBLIC_PATH || '/';
+        return {
+          selector: `#${unref(tinymceId)}`,
+          height,
+          toolbar: [...toolbar],
+          menubar: menubar,
+          plugins,
+          // external_plugins: {
+          //   'kityformula-editor': publicPath + 'resource/tinymce/plugins/kityformula-editor/plugin.min.js'
+          // },
+          language_url: publicPath + 'resource/tinymce/langs/' + langName.value + '.js',
+          language: langName.value,
+          branding: false,
+          default_link_target: '_blank',
+          link_title: false,
+          object_resizing: true,
+          toolbar_mode: 'sliding',
+          auto_focus: true,
+          toolbar_groups: true,
+          skin: skinName.value,
+          skin_url: publicPath + 'resource/tinymce/skins/ui/' + skinName.value,
+          images_upload_handler: (blobInfo, success) => {
+            let params = {
+              file: blobInfo.blob(),
+              filename: blobInfo.filename(),
+              data: { biz: 'jeditor', jeditor: '1' },
+            };
+            const uploadSuccess = (res) => {
+              if (res.success) {
+                if (res.message == 'local') {
+                  const img = 'data:image/jpeg;base64,' + blobInfo.base64();
+                  success(img);
+                } else {
+                  let img = getFileAccessHttpUrl(res.message);
+                  success(img);
+                }
+              }
+            };
+            uploadFile(params, uploadSuccess);
+          },
+          content_css: publicPath + 'resource/tinymce/skins/ui/' + skinName.value + '/content.min.css',
+          ...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));
+          },
+        };
+      });
+
+      const disabled = computed(() => {
+        const { options } = props;
+        const getdDisabled = options && Reflect.get(options, 'readonly');
+        const editor = unref(editorRef);
+        // update-begin-author:taoyan date:20220407 for: 设置disabled，图片上传没有被禁用
+        if (editor) {
+          editor.setMode(getdDisabled || attrs.disabled === true ? 'readonly' : 'design');
+        }
+        if (attrs.disabled === true) {
+          return true;
+        }
+        // update-end-author:taoyan date:20220407 for: 设置disabled，图片上传没有被禁用
+        return getdDisabled ?? false;
+      });
+
+      watch(
+        () => attrs.disabled,
+        () => {
+          const editor = unref(editorRef);
+          if (!editor) {
+            return;
+          }
+          editor.setMode(attrs.disabled ? 'readonly' : 'design');
+        }
+      );
+
+      onMountedOrActivated(() => {
+        if (!initOptions.value.inline) {
+          tinymceId.value = buildShortUUID('tiny-vue');
+        }
+        nextTick(() => {
+          setTimeout(() => {
+            initEditor();
+          }, 30);
+        });
+      });
+
+      onBeforeUnmount(() => {
+        destory();
+      });
+
+      onDeactivated(() => {
+        destory();
+      });
+
+      function destory() {
+        if (tinymce !== null) {
+          tinymce?.remove?.(unref(initOptions).selector!);
+        }
+      }
+
+      function initEditor() {
+        const el = unref(elRef);
+        if (el) {
+          el.style.visibility = '';
+        }
+        tinymce
+          .init(unref(initOptions))
+          .then((editor) => {
+            emit('inited', editor);
+          })
+          .catch((err) => {
+            emit('init-error', err);
+          });
+      }
+
+      function initSetup(e) {
+        const editor = unref(editorRef);
+        if (!editor) {
+          return;
+        }
+        const value = props.modelValue || '';
+
+        editor.setContent(value);
+        bindModelHandlers(editor);
+        bindHandlers(e, attrs, unref(editorRef));
+      }
+
+      function setValue(editor: Recordable, val: string, prevVal?: string) {
+        if (editor && typeof val === 'string' && val !== prevVal && val !== editor.getContent({ format: attrs.outputFormat })) {
+          editor.setContent(val);
+        }
+      }
+
+      function bindModelHandlers(editor: any) {
+        const modelEvents = attrs.modelEvents ? attrs.modelEvents : null;
+        const normalizedEvents = Array.isArray(modelEvents) ? modelEvents.join(' ') : modelEvents;
+
+        watch(
+          () => props.modelValue,
+          (val: string, prevVal: string) => {
+            setValue(editor, val, prevVal);
+          }
+        );
+
+        watch(
+          () => props.value,
+          (val: string, prevVal: string) => {
+            setValue(editor, val, prevVal);
+          },
+          {
+            immediate: true,
+          }
+        );
+
+        editor.on(normalizedEvents ? normalizedEvents : 'change keyup undo redo', () => {
+          const content = editor.getContent({ format: attrs.outputFormat });
+          emit('update:modelValue', content);
+          emit('change', content);
+        });
+
+        editor.on('FullscreenStateChanged', (e) => {
+          fullscreen.value = e.state;
+        });
+      }
+
+      function handleImageUploading(name: string) {
+        const editor = unref(editorRef);
+        if (!editor) {
+          return;
+        }
+        editor.execCommand('mceInsertContent', false, getUploadingImgName(name));
+        const content = editor?.getContent() ?? '';
+        setValue(editor, content);
+      }
+
+      function handleDone(name: string, url: string) {
+        const editor = unref(editorRef);
+        if (!editor) {
+          return;
+        }
+        const content = editor?.getContent() ?? '';
+        const val = content?.replace(getUploadingImgName(name), `<img src="${url}"/>`) ?? '';
+        setValue(editor, val);
+      }
+
+      function getUploadingImgName(name: string) {
+        return `[uploading:${name}]`;
+      }
+
+      return {
+        prefixCls,
+        containerWidth,
+        initOptions,
+        tinymceContent,
+        elRef,
+        tinymceId,
+        handleImageUploading,
+        handleDone,
+        editorRef,
+        fullscreen,
+        disabled,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped></style>
+
+<style lang="less">
+  @prefix-cls: ~'@{namespace}-tinymce-container';
+
+  .@{prefix-cls} {
+    position: relative;
+    line-height: normal;
+
+    textarea {
+      z-index: -1;
+      visibility: hidden;
+    }
+  }
+</style>
diff --git a/src/components/Tinymce/src/tinymce.ts b/src/components/Tinymce/src/tinymce.ts
index 0840912..336a465 100644
--- a/src/components/Tinymce/src/tinymce.ts
+++ b/src/components/Tinymce/src/tinymce.ts
@@ -23,6 +23,10 @@ export const plugins = [
   'advlist anchor autolink autosave code codesample  directionality  fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus  template  textpattern visualblocks visualchars wordcount image',
 ];
 
+export const plugins2 = [
+  'advlist anchor autolink autosave code codesample  directionality  fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus  template  textpattern visualblocks visualchars wordcount image',
+];
+
 // export const toolbar =
 //   'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons   | insertfile image media pageembed  link anchor  codesample insertdatetime hr| a11ycheck ltr rtl';
 
@@ -31,6 +35,7 @@ export const plugins = [
   // fullscreen code preview | undo redo | 
 
 export const simplePlugins = ['lists image link media table textcolor wordcount contextmenu fullscreen'];
+export const simple2Plugins = [''];
 
 export const simpleToolbar = [
   'undo redo  formatselect bold italic alignleft aligncenter alignright alignjustify bullist numlist outdent indent',
diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts
index 6dd5f16..02d48b5 100644
--- a/src/router/routes/modules/zy/zy.ts
+++ b/src/router/routes/modules/zy/zy.ts
@@ -90,7 +90,7 @@ const zuoye: AppRouteModule = {
     {
       path: 'dcwjWenjuan',
       name: 'dcwjWenjuan',
-      component: () => import('/@/views/kc/wjxDcwj/WjxDcwjMainList.vue'),
+      component: () => import('/@/views/kc/wjxCswj/WjxDcwjV2List.vue'),
       meta: {
         title: '调查问卷',
       },
diff --git a/src/views/kc/kcZjInfo/KcZjInfo.data.ts b/src/views/kc/kcZjInfo/KcZjInfo.data.ts
index a5db6ac..0246a07 100644
--- a/src/views/kc/kcZjInfo/KcZjInfo.data.ts
+++ b/src/views/kc/kcZjInfo/KcZjInfo.data.ts
@@ -4,13 +4,18 @@ import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
+  // {
+  //   title: '任务编号',
+  //   align: "center",
+  //   dataIndex: 'rwbh'
+  // },
   {
-    title: '任务编号',
+    title: '助教工号',
     align: "center",
-    dataIndex: 'rwbh'
+    dataIndex: 'zjbh'
   },
   {
-    title: '助教',
+    title: '助教名称',
     align: "center",
     dataIndex: 'zjbh_dictText'
   },
diff --git a/src/views/kc/kcZjInfo/KcZjInfoList.vue b/src/views/kc/kcZjInfo/KcZjInfoList.vue
index 53908e8..daa2e1d 100644
--- a/src/views/kc/kcZjInfo/KcZjInfoList.vue
+++ b/src/views/kc/kcZjInfo/KcZjInfoList.vue
@@ -5,8 +5,8 @@
       <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.zjbh"></j-input>
+            <a-form-item label="助教工号">
+              <j-input placeholder="请输入助教工号" v-model:value="queryParam.zjbh"></j-input>
             </a-form-item>
           </a-col>
           <a-col :lg="8">
@@ -25,14 +25,14 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{text}">
@@ -156,10 +156,17 @@ const { rwbh,xqxn } = query;//获取传递参数
    */
   function getTableAction(record) {
     return [
+      // {
+      //   label: '编辑',
+      //   onClick: handleEdit.bind(null, record),
+      // },
       {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
     ];
   }
    
diff --git a/src/views/kc/wjxCswj/WjxCywjV2List.vue b/src/views/kc/wjxCswj/WjxCywjV2List.vue
index 1c783c5..7a67a5e 100644
--- a/src/views/kc/wjxCswj/WjxCywjV2List.vue
+++ b/src/views/kc/wjxCswj/WjxCywjV2List.vue
@@ -1556,11 +1556,16 @@ function handleCallYinyong(record) {
   console.log('😠', zyInfo);
 
 
-  // defHttp.get({ url: '/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId', params: { id: yyzyid } }).then((res) => {
-  //   console.log('🥴', res);
-  //   tiganData.value = res;
-  //   console.log('🧞‍♂️1111111111', tiganData.value);
-  // });
+  defHttp.get({ url: '/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId', params: { id: yyzyid } }).then((res) => {
+    console.log('🥴', res);
+    for(var i=0;i<res.length;i++){
+      res[i].createBy = null;
+      res[i].createTime = null;
+      res[i].wjLeixing = wjLeixing.value;
+    }
+    tiganData.value = res;
+    console.log('🧞‍♂️1111111111', tiganData.value);
+  });
   
 }
 
diff --git a/src/views/kc/wjxCswj/WjxDcwjV2List.vue b/src/views/kc/wjxCswj/WjxDcwjV2List.vue
new file mode 100644
index 0000000..3e38925
--- /dev/null
+++ b/src/views/kc/wjxCswj/WjxDcwjV2List.vue
@@ -0,0 +1,2553 @@
+<template>
+  <div style="background: #fafafa; height: calc(100vh - 225px); overflow-y: auto; margin: 10px 0; padding: 8px 0 0 0">
+
+    <div v-if="showType == 2">
+      <a-spin :spinning="confirmLoading">
+        <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>
+            </div>
+            <span class="title">编辑问卷</span> - <span class="title2">布置问卷：设置第{{ zyInfo.sort }}次问卷内容及要求</span>
+            <a-divider />
+          </a-col>
+          <a-col :span="24">
+            <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-row>
+                <a-col :span="24">
+                  <div class="region">
+                    <div class="region-title">基本信息</div>
+                    <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>
+                    </a-col>
+                    <a-col :span="24" class="jbxx-cykssj">
+                      <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"
+                        />
+                        <span>
+                          <a-popover title="温馨提示">
+                            <template #content>
+                              <p
+                                >填写问卷开始时间，则问卷在指定时间进行发布；如未填写问卷开始时间，则布置完成问卷后，可手动点击“发布问卷”进行问卷发布。</p
+                              >
+                            </template>
+                            <Icon
+                              icon="ant-design:question-circle-outlined"
+                              :size="20"
+                              class="jbxx-cykssj-ico"
+                            />
+                          </a-popover>
+                        </span>
+                      </a-form-item>
+                    </a-col>
+                    <a-col :span="24" class="jbxx-cyjssj">
+                      <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%"
+                           :disabled="editDisabled"
+                        />
+                      </a-form-item>
+                    </a-col>
+                    <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>
+                        <div v-show="!editDisabled" @click="handleZyyqShow(1)" class="tishi" style="width: 100%" :disabled="!editDisabled">温馨提示：点击可编辑描述</div>
+                      </a-form-item>
+                    </a-col>
+                  </div>
+                </a-col>
+                <a-col :span="24">
+                  <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="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>
+                            <!-- 单选题 -->
+                            <div style="width: 100%" v-if="(item.wjType == 3 || item.wjType == '3') && item.wjSubtype == null">
+                              <a-card>
+                                <template #title>
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="11">
+                                         <span>{{ index + 1 }}、<span style="color: #c2bfbf">[单选题]</span></span>
+                                      </a-col>
+                                      <a-col :span="13" style="text-align: right;">
+                                        <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>
+                                        <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 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"/>
+                                    </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">
+                                  <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"
+                                      />
+                                      <span style="color: #ecb646" v-if="item.itemSelected == tmxx.itemIndex">(正确答案)</span>
+                                      <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"
+                                          style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
+                                          @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 == 4 || item.wjType == '4'">
+                              <a-card>
+                                <template #title>
+
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="11">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[多选题]</span></span>
+                                      </a-col>
+                                      <a-col :span="13" style="text-align: right;">
+                                        <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>
+                                        <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 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"/>
+                                    </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-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>
+                                      <span style="color: #ecb646" v-if="cheGrp(item.itemSelected, tmxx.itemIndex)">(正确答案)</span>
+                                      <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"
+                                          style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
+                                          @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">
+                              <a-card>
+                                <template #title>
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="11">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[填空题]</span></span>
+                                      </a-col>
+                                      <a-col :span="13" style="text-align: right;">
+                                        <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>
+                                        <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 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"/>
+                                    </div>
+                                </template>
+                                <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-col>
+                                </a-row>
+                              </a-card>
+                            </div>
+                            <!-- 文件上传 -->
+                            <div style="width: 100%" v-else-if="item.wjType == 8 || item.wjType == '8'">
+                              <a-card>
+                                <template #title>
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="11">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[文件题]</span></span>
+                                      </a-col>
+                                      <a-col :span="13" style="text-align: right;">
+                                        <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>
+                                        <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 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"/>
+                                    </div>
+                                </template>
+                              </a-card>
+                            </div>
+                            <!-- 判断题 -->
+                            <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="11">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[判断题]</span></span>
+                                      </a-col>
+                                      <a-col :span="13" style="text-align: right;">
+                                        <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>
+                                        <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 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"/>
+                                    </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">
+                                  <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"
+                                      />
+                                      <span style="color: #ecb646" v-if="item.itemSelected == tmxx.itemIndex">(正确答案)</span>
+                                      <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"
+                                          style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
+                                          @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')">
+                              <a-card>
+                                <template #title>
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="11">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[简答题]</span></span>
+                                      </a-col>
+                                      <a-col :span="13" style="text-align: right;">
+                                        <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>
+                                        <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 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"/>
+                                    </div>
+                                </template>
+                              </a-card>
+                            </div>
+
+                            <div v-else></div>
+                          </div>
+                        </template>
+                      </draggable>
+
+                      <!-- 题干信息 -->
+                      <div style="width: 100%" v-for="(item, index) in tiganData" :key="index"> </div>
+                    </a-col>
+                  </a-row>
+                </a-col>
+
+                <a-col :span="24" style="text-align: center; margin-top: 10px; margin-bottom: 40px">
+                  <a-button type="primary" @click="submitForm" v-if="!editDisabled">保存</a-button>
+                  <a-button type="primary" @click="reloadZy" style="margin-left: 15px">返回</a-button>
+                </a-col>
+              </a-row>
+            </a-form>
+          </a-col>
+        </a-row>
+      </a-spin>
+    </div>
+
+    <div v-if="showType == 3">
+      <a-row>
+        <a-col :span="24">
+          <a-row>
+            <a-col :span="20">
+              <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:arrow-left-outlined" />返回</a-button>
+            </a-col>
+          </a-row>
+          <a-divider />
+        </a-col>
+        <a-col :span="24">
+          <a-row>
+            <div style="width: 100%; height: 130px; background: #fff">
+              <div style="display: flex; justify-content: space-between; padding-top: 5px">
+                <span class="tjfx-col-title">{{ zyInfo.title }} </span>
+                <span class="tjfx-col">
+                  问卷时间：{{ dayjs(zyInfo.startTime).format('MM.DD HH:mm') }} ~ {{ dayjs(zyInfo.endTime).format('MM.DD HH:mm') }}</span
+                >
+              </div>
+              <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>
+            </div>
+            <a-col :span="24">
+              <div class="region-title">基本信息</div>
+            </a-col>
+            <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 && item.wjSubtype == null">
+                  <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 style="width: 98%; margin: 0 auto" v-else-if="item.wjType == 4">
+                  <a-card>
+                    <!-- <template #title> -->
+                      <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
+                    <!-- </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-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 && 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> -->
+                      <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-else-if="item.wjType == 8">
+                  <a-card>
+                    <!-- <template #title> -->
+                      <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
+                    <!-- </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>
+                    
+                    <j-upload v-model:value="item.picPath"  fileType="image" :max-count="1" disabled :buttonVisible="false"></j-upload>
+                  </a-card>
+                </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>
+        </a-col>
+      </a-row>
+    </div>
+
+    <div v-if="showType == 999">
+      <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="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>
+        <a-col :span="24">
+          <a-row style="padding: 10px">
+            <a-col :lg="24" v-for="(item, index) in tableData" style="padding: 0 5px 5px 5px" :key="index">
+              <a-card v-if="!item.endTime" bodyStyle="">
+                <template #title>第{{ item.sort }}次问卷：暂未设置问卷信息 <span class="card-label3"> 待设置</span> </template>
+                <a-row>
+                  <a-col :lg="18" :xs="24">
+                    <a-row>
+                      <a-col :md="4" :xs="12">
+                        <span style="margin-left: 10px">
+                          <a-dropdown>
+                            <a class="ant-dropdown-link" @click.prevent> <Icon icon="ant-design:form-outlined" />设计问卷 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" @click="handleEdit(item, false)">设置问卷</a>
+                                </a-menu-item>
+                                <a-menu-item>
+                                  <a href="javascript:;" disabled style="color: #9e9e9e">问卷详情</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                      <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" />发送问卷 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" disabled style="color: #9e9e9e">链接&二维码</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                      <a-col :md="4" :xs="12">
+                        <span style="margin-left: 10px">
+                          <a-dropdown>
+                            <a class="ant-dropdown-link" @click.prevent><Icon icon="ant-design:line-chart-outlined" />问卷结果 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" disabled style="color: #9e9e9e">问卷结果</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                    </a-row>
+                    
+                    
+                    
+                  </a-col>
+                  <a-col :lg="6" :xs="24">
+                    <div style="text-align: right">
+                      <a @click="handleEdit(item, false)" class="ant-dropdown-link1">设置问卷内容及要求</a>
+                      <a-divider type="vertical" />
+                      <a @click="handleDelete(item)" class="ant-dropdown-link1">删除</a>
+                    </div>
+                  </a-col>
+                </a-row>
+              </a-card>
+
+              <a-card v-if="item.endTime && (item.qpublish == '1' || item.qpublish == '2')" bodyStyle="">
+                <template #title>
+                  <span>第{{ item.sort }}次问卷：{{ item.title }}</span>
+                  <span class="card-label">已发布</span>
+                </template>
+                <template #extra>
+                  <a-row>
+                    <a-col :xs="0" :md="24"><span>ID:{{ item.id }}</span><span style="margin-left: 10px">{{ dayjs(item.endTime).format('MM.DD HH:mm') }}</span></a-col>
+                    <a-col :xs="24" :md="0"><span style="margin-left: 10px">{{ dayjs(item.endTime).format('MM.DD HH:mm') }}</span></a-col>
+                  </a-row>
+                  <!-- <span>ID:{{ item.id }}</span> -->
+                  <!-- <span style="margin-left: 10px">{{ dayjs(item.endTime).format('MM.DD HH:mm') }}</span> -->
+                </template>
+                
+                <a-row>
+                  <a-col :lg="18" :xs="24">
+                    <a-row>
+                      <a-col :md="4" :xs="12">
+                        <span style="margin-left: 10px">
+                          <a-dropdown>
+                            <a class="ant-dropdown-link" @click.prevent> <Icon icon="ant-design:form-outlined" /> 设计问卷 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" disabled  style="color: #9e9e9e">设置问卷</a>
+                                </a-menu-item>
+                                <!-- <a-menu-item>
+                                  <a href="javascript:;" disabled style="color: #9e9e9e">修改题目</a>
+                                </a-menu-item> -->
+                                <a-menu-item>
+                                  <a href="javascript:;" @click="handleEdit(item, true)">问卷详情</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                      <a-col :md="4" :xs="12">
+                        <span style="margin-left: 10px">
+                          <a-dropdown>
+                            <a class="ant-dropdown-link" @click.prevent="handleViewEwm(item)" >
+                              <Icon icon="ant-design:setting-outlined" />
+                              <span> 发送问卷</span>
+                            </a>
+                            <template #overlay>
+                              <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" /> -->
+                                  <QrCode :value="goewm(item)" class="enter-x flex justify-center xl:justify-start" :width="280" />
+                                  <span
+                                    >链接：<a-input :value="goewm(item)" disabled style="width: 200px"></a-input>
+                                    <a-button @click="copyToClipboard(item)">复制</a-button>
+                                  </span>
+                                  <!--  -->
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                      <a-col :md="4" :xs="12">
+                        <span style="margin-left: 10px">
+                          <a-dropdown>
+                            <a class="ant-dropdown-link" @click.prevent><Icon icon="ant-design:line-chart-outlined" /> 问卷结果 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" @click="handleDjjgs(item, '')">问卷结果</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                    </a-row>
+                  </a-col>
+                  <a-col :lg="6" :xs="24">
+                    <div style="text-align: right">
+
+                      <a @click="handleFenxiang(item)" class="home-status">分享</a>
+                      <a-divider type="vertical" />
+
+                      <a @click="handleWxtx(item)">微信提醒</a>
+                      <!-- <a-divider type="vertical" /> -->
+                      <!-- <a @click="handleDelete(item)" v-if="item.ytjnum == '0'">删除</a> -->
+                    </div>
+                  </a-col>
+                </a-row>
+              </a-card>
+
+              <a-card v-if="item.endTime && item.qpublish == '0'" bodyStyle="">
+                <template #title>
+                  <span>第{{ item.sort }}次问卷：{{ item.title }}</span>
+                  <span class="card-label2">待发布</span>
+                </template>
+                <template #extra>
+                  <a-row>
+                    <a-col :xs="0" :md="24"><span>ID:{{ item.id }}</span><span style="margin-left: 10px">{{ dayjs(item.endTime).format('MM.DD HH:mm') }}</span></a-col>
+                    <a-col :xs="24" :md="0"><span style="margin-left: 10px">{{ dayjs(item.endTime).format('MM.DD HH:mm') }}</span></a-col>
+                  </a-row>
+                </template>
+                <a-row>
+                  <a-col :lg="16" :xs="24">
+                    <a-row>
+                      <a-col :md="4" :xs="12">
+                        <span style="margin-left: 10px">
+                          <a-dropdown>
+                            <a class="ant-dropdown-link" @click.prevent><Icon icon="ant-design:form-outlined" />设计问卷 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" @click="handleEdit(item, false)">设置问卷</a>
+                                </a-menu-item>
+                                <!-- <a-menu-item>
+                                  <a href="javascript:;" @click="handleEdit(item, false)">修改题目</a>
+                                </a-menu-item> -->
+                                <a-menu-item>
+                                  <a href="javascript:;" @click="handleEdit(item, true)">问卷详情</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                      <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" />发送问卷 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" disabled style="color: #9e9e9e">链接&二维码</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                      <a-col :md="4" :xs="12">
+                        <span style="margin-left: 10px">
+                          <a-dropdown>
+                            <a class="ant-dropdown-link" @click.prevent><Icon icon="ant-design:line-chart-outlined" />问卷结果 </a>
+                            <template #overlay>
+                              <a-menu>
+                                <a-menu-item>
+                                  <a href="javascript:;" disabled style="color: #9e9e9e">问卷结果</a>
+                                </a-menu-item>
+                              </a-menu>
+                            </template>
+                          </a-dropdown>
+                        </span>
+                      </a-col>
+                    </a-row>
+                  </a-col>
+                  <a-col :lg="8" :xs="24">
+                    <div style="text-align: right">
+                      <a @click="handleEdit(item, false)" class="ant-dropdown-link1">编辑问卷</a>
+                      <a-divider type="vertical" />
+                      <a @click="handleFenxiang(item)" class="ant-dropdown-link1">分享</a>
+                      <a-divider type="vertical" />
+                      <a @click="handleFabu(item)" class="ant-dropdown-link1">发布问卷</a>
+                      <a-divider type="vertical" />
+                      <a @click="handleDelete(item)" class="ant-dropdown-link1">删除</a>
+                    </div>
+                  </a-col>
+                </a-row>
+              </a-card>
+            </a-col>
+          </a-row>
+        </a-col>
+      </a-row>
+      <a-row v-if="tableData.length==0" style="text-align: center;" :span="24">
+        <a-col :span="24" style="text-align: center;">
+          <a-empty />
+        </a-col>
+      </a-row>
+    </div>
+    <a-modal v-model:visible="ewmvisible" title="链接&二维码" :width="360" okText="下载" @ok="downloadEwm" cancelText="关闭">
+      <div style="text-align: center; padding: 20px">
+        <QrCode id="qrcode" :value="goewm(ewmInfo)" class="enter-x flex justify-center xl:justify-start" :width="280" style="margin-left: 20px" />
+        <span
+          >链接：<a-input :value="goewm(ewmInfo)" disabled style="width: 200px"></a-input>
+          <a-button @click="copyToClipboard(ewmInfo)">复制</a-button>
+        </span>
+      </div>
+    </a-modal>
+
+    <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 style="font-size: 18px; font-weight: 700p; color: red">*注意：导入题目时请先保存手动添加的题目，防止手动添加的题目丢失！！！</p>
+        <p>1.下载题目导入模板文件。</p>
+        <p>2.按要求格式填写题目信息。</p>
+        <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
+        >
+      </div>
+      <div style="text-align: center; margin-top: 20px; margin-bottom: 20px">
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="importDrtmXls">导入试题</j-upload-button>
+      </div>
+    </a-modal>
+
+    <KcTeachingUnitContentOneListModal ref="registerZcjcModal" @success="handleCheckZcjcSuccess"></KcTeachingUnitContentOneListModal>
+    <WjxWjxxTmlbDjjgsModal ref="WjxWjxxTmlbDjjgsModalPage"></WjxWjxxTmlbDjjgsModal>
+    <XxhbbksListModal ref="XxhbbksListModalPage"></XxhbbksListModal>
+
+    <YinyongTikuListModal ref="YinyongTikuListModalpage" @success="handleYytkSuccess" />
+    <YinyongTikuDcListModal ref="YinyongTikuDcListModalpage" @success="handleYytkSuccess" />
+    <TikuListModal ref="TikuListModalPage"></TikuListModal>
+    <YycyListModal ref="YycyListModalPage" @success="handleCallYinyong"></YycyListModal>
+    <ZyCyFenxiangListModal ref="ZyCyFenxiangListModalpage"></ZyCyFenxiangListModal>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfo-zyInfo" setup>
+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';
+import dayjs, { Dayjs } from 'dayjs';
+import { list, deleteOne, saveOrUpdate } from '/@/views/kc/wjxWjxx/WjxWjxx.api';
+import { Form } from 'ant-design-vue';
+import { getValueType } from '/@/utils';
+import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+import JEditor2 from '/@/components/Form/src/jeecg/components/JEditor2.vue';
+import { useUserStore } from '/@/store/modules/user';
+import draggable from 'vuedraggable';
+import { QrCode } from '/@/components/Qrcode/index';
+import { useGlobSetting } from '/@/hooks/setting';
+import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+
+import WjxWjxxTmlbDjjgsModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue';
+import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
+import KcTeachingUnitContentOneListModal from '/@/views/zy/zyInfo/zyCheckZcjc/KcTeachingUnitContentOneListModal.vue';
+import YinyongTikuListModal from '/@/views/kc/wjxWjxxTmlb/YinyongTikuListModal.vue';
+import YinyongTikuDcListModal from '/@/views/kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue';
+import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue';
+import YycyListModal from '/@/views/kc/wjxWjxx/YycyListModal.vue';
+import { create } from 'sortablejs';
+import { downloadByUrl } from '/@/utils/file/download';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import ZyCyFenxiangListModal from '/@/views/zy/zyCyFenxiang/ZyCyFenxiangListModal.vue';
+
+const glob = useGlobSetting();
+const globSetting = useGlobSetting();
+
+/**
+ * 导出文件xlsx的mime-type
+ */
+const XLSX_MIME_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+/**
+ * 导出文件xlsx的文件后缀
+ */
+const XLSX_FILE_SUFFIX = '.xlsx';
+
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, type, teano } = query; //获取传递参数
+const { createConfirm, createMessage, createWarningModal } = useMessage();
+//用户相关
+const userStore = useUserStore();
+const XxhbbksListModalPage = ref();
+const WjxWjxxTmlbDjjgsModalPage = ref();
+const registerZcjcModal = ref();
+const YinyongTikuListModalpage = ref();
+const YinyongTikuDcListModalpage = ref();
+const TikuListModalPage = ref();
+const ZyCyFenxiangListModalpage = ref();
+
+const showType = ref<number>(999);
+const zycs = ref<number>(0);
+const zycsDisabled = ref<boolean>(false);
+const tableData = ref<any>([]);
+const queryParamZy = ref<any>({});
+const current = ref<number>(0);
+const total = ref<number>(0);
+const pageNo = ref<number>(0);
+const pageSize = ref<number>(100);
+const editDisabled = ref<boolean>(false);
+const zyInfo = ref<any>({fzbms:'N'});
+const dataKhnr = ref<any>([]);
+const confirmLoading = ref<boolean>(false);
+const zyyqShow = ref<boolean>(false);
+const useForm = Form.useForm;
+const formRef = ref();
+const YycyListModalPage = ref();
+const tiganData = ref<any>([]);
+const isShow = ref<boolean>(false);
+const mainId = ref<string>('');
+const wjLeixing = ref<string>('1');
+const qrCodeUrl = ref<string>('');
+const ewmvisible = ref<boolean>(false);
+const ewmInfo = ref<any>({});
+
+const kczyzb = ref<number>(0);
+const qmkszb = ref<number>(0);
+const ktcyzb = ref<number>(0);
+const importOpen = ref<boolean>(false);
+
+//设置问卷删除功能
+const disabledDate = (current: Dayjs) => {
+  return current && current < dayjs().subtract(1, 'days').endOf('day');
+};
+
+const scoreData = [
+  1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,60,70,80,90,100
+]
+
+//表单验证
+const validatorRules = {
+  title: [{ required: true, message: '请输入问卷名称!' }],
+  startTime: [{ required: true, message: '请输入开始时间!' }],
+  endTime: [{ required: true, message: '请输入结束时间!' }],
+};
+const { resetFields, validate, validateInfos } = useForm(zyInfo, validatorRules, { immediate: true });
+const labelCol = reactive({
+  xs: { span: 24 },
+  sm: { span: 4 },
+});
+const wrapperCol = reactive({
+  xs: { span: 24 },
+  sm: { span: 16 },
+});
+const labelCol2 = reactive({
+  sm: { span: 6 },
+});
+const wrapperCol2 = reactive({
+  sm: { span: 18 },
+});
+const labelCol3 = reactive({
+  sm: { span: 4 },
+});
+const wrapperCol3 = reactive({
+  sm: { span: 20 },
+});
+const labelCol4 = reactive({
+  sm: { span: 10 },
+});
+const wrapperCol4 = reactive({
+  sm: { span: 12 },
+});
+const fzbOptions = ref([
+  { label: '关闭', value: 'N' },
+  { label: '开启', value: 'Y' },
+]);
+//分享给他人
+function handleFenxiang(record){
+  console.log(record);
+  record.type="1";
+  ZyCyFenxiangListModalpage.value.init(record)
+  ZyCyFenxiangListModalpage.value.disableSubmit = true;
+}
+
+//引用作业
+function handleYyzy() {
+  var params = { xqxn, rwbh,atype:'6' };
+  YycyListModalPage.value.disableSubmit = true;
+  YycyListModalPage.value.init(params);
+}
+//引用作业回调
+function handleCallYinyong(record) {
+  console.log("🚀 ~ handleCallYinyong ~ record:", record)
+  var yyzyid = record.id;//引用作业id
+  var zysort = zyInfo.value.sort;//防止顺序错误
+  var zyid = zyInfo.value.id;//替换原来的id，防止新增
+  var createBy = zyInfo.value.createBy;//替换原来的id，防止新增
+  var rwbh = zyInfo.value.rwbh;//替换原来的id，防止新增
+  var kcmc = zyInfo.value.kcmc;//替换原来的id，防止新增
+  var xkrs = zyInfo.value.xkrs;//替换原来的id，防止新增
+  record.id = zyid;
+  record.sort = zysort;
+  record.atype = wjLeixing.value;//作业类型，课程作业
+  record.qpublish = "0";
+  record.vid = "";
+  zyInfo.value = record;
+  zyInfo.value.createBy = createBy
+  zyInfo.value.rwbh = rwbh
+  zyInfo.value.xkrs = xkrs;
+  zyInfo.value.kcmc = kcmc;
+  zyInfo.value.createTime = null;
+  console.log('😠', zyInfo);
+
+
+  defHttp.get({ url: '/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId', params: { id: yyzyid } }).then((res) => {
+    console.log('🥴', res);
+    for(var i=0;i<res.length;i++){
+      res[i].createBy = null;
+      res[i].createTime = null;
+      res[i].wjLeixing = wjLeixing.value;
+    }
+    tiganData.value = res;
+    console.log('🧞‍♂️1111111111', tiganData.value);
+  });
+  
+}
+
+
+//弹出二维码页面
+function handleViewEwm(record) {
+  console.log('🙎', record);
+  ewmvisible.value = true;
+  ewmInfo.value = record;
+}
+
+//题库类型（6作业，1问卷）
+function handleTiku(wjLeixing) {
+  var record = { wjLeixing };
+  TikuListModalPage.value.disableSubmit = true;
+  TikuListModalPage.value.init(record);
+}
+
+async function exportTmlbXls(isXlsx = false) {
+  var name = '问卷导入模板';
+  var url = '/wjxWjxxTmlb/wjxWjxxTmlb/exportDownXls';
+  var params = { title: '-1' };
+  const data = await defHttp.get({ url: url, params: params, responseType: 'blob', timeout: 9000000 }, { isTransformResponse: false });
+  if (!data) {
+    createMessage.warning('文件下载失败');
+    return;
+  }
+  if (!name || typeof name != 'string') {
+    name = '导出文件';
+  }
+  let blobOptions = { type: 'application/vnd.ms-excel' };
+  let fileSuffix = '.xls';
+  if (isXlsx === true) {
+    blobOptions['type'] = XLSX_MIME_TYPE;
+    fileSuffix = XLSX_FILE_SUFFIX;
+  }
+  if (typeof window.navigator.msSaveBlob !== 'undefined') {
+    window.navigator.msSaveBlob(new Blob([data], blobOptions), name + fileSuffix);
+  } else {
+    let url = window.URL.createObjectURL(new Blob([data], blobOptions));
+    let link = document.createElement('a');
+    link.style.display = 'none';
+    link.href = url;
+    link.setAttribute('download', name + fileSuffix);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link); //下载完成移除元素
+    window.URL.revokeObjectURL(url); //释放掉blob对象
+  }
+}
+
+async function importDrtmXls(data, url) {
+  url = '/wjxWjxxTmlb/wjxWjxxTmlb/importTmlbExcel?mainId=' + zyInfo.value.id;
+  console.log('🧤', url);
+  const isReturn = (fileInfo) => {
+    try {
+      if (fileInfo.code === 201) {
+        let {
+          message,
+          result: { msg, fileUrl, fileName },
+        } = fileInfo;
+        let href = glob.uploadUrl + fileUrl;
+        createWarningModal({
+          title: message,
+          centered: false,
+          content: `<div>
+              <span>${msg}</span><br/>
+              <span>具体详情请<a href = ${href} download = ${fileName}> 点击下载 </a> </span>
+            </div>`,
+        });
+        //update-begin---author:wangshuai ---date:20221121  for：[VUEN-2827]导入无权限，提示图标错误------------
+      } else if (fileInfo.code === 500 || fileInfo.code === 510) {
+        createMessage.error(fileInfo.message || `${data.file.name} 导入失败`);
+        //update-end---author:wangshuai ---date:20221121  for：[VUEN-2827]导入无权限，提示图标错误------------
+      } else {
+        createWarningModal({
+          centered: false,
+          content: `<div>
+              <span>${fileInfo.message}</span><br/>
+            </div>`,
+        });
+      }
+    } catch (error) {
+      console.log('导入的数据异常', error);
+    } finally {
+    }
+  };
+  await defHttp.uploadFile({ url }, { file: data.file }, { success: isReturn });
+  console.log('22222222222222222222222', zyInfo.value);
+  handleEdit(zyInfo.value, false);
+  importOpen.value = false;
+}
+/**
+ * 导入xls
+ * @param data 导入的数据
+ * @param url
+ */
+async function importXls(data, url) {
+  url = '/wjxWjxxTmlb/wjxWjxxTmlb/importExcel';
+  const isReturn = (fileInfo) => {
+    try {
+      if (fileInfo.code === 201) {
+        let {
+          message,
+          result: { msg, fileUrl, fileName },
+        } = fileInfo;
+        let href = glob.uploadUrl + fileUrl;
+        createWarningModal({
+          title: message,
+          centered: false,
+          content: `<div>
+              <span>${msg}</span><br/>
+              <span>具体详情请<a href = ${href} download = ${fileName}> 点击下载 </a> </span>
+            </div>`,
+        });
+        //update-begin---author:wangshuai ---date:20221121  for：[VUEN-2827]导入无权限，提示图标错误------------
+      } else if (fileInfo.code === 500 || fileInfo.code === 510) {
+        createMessage.error(fileInfo.message || `${data.file.name} 导入失败`);
+        //update-end---author:wangshuai ---date:20221121  for：[VUEN-2827]导入无权限，提示图标错误------------
+      } else {
+        createWarningModal({
+          centered: false,
+          content: `<div>
+              <span>${fileInfo.message}</span><br/>
+            </div>`,
+        });
+      }
+    } catch (error) {
+      console.log('导入的数据异常', error);
+    } finally {
+    }
+  };
+  await defHttp.uploadFile({ url }, { file: data.file }, { success: isReturn });
+}
+
+function handleWxtx(record) {
+  createConfirm({
+    iconType: 'warning',
+    title: '微信提醒',
+    content: '确认发送微信提醒信息么？',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      defHttp.get({ url: '/wjxWjxx/wjxWjxx/sendWxtx', params: { id: record.id, wjlx: wjLeixing.value } }).then((res) => {
+        console.log('👣', res);
+      });
+      createMessage.success('发送成功');
+    },
+  });
+}
+
+//答题结果
+function handleTeaDtjg(item) {
+  console.log('🧳', item);
+
+  var url = '/site/WjxCywjV2Dtjg';
+  url = url + '?rwbh=' + rwbh + '&xqxn=' + xqxn + '&teano=' + teano + '&cyid=' + item.id;
+  window.open(url, '_blank');
+}
+//下载二维码
+function downloadEwm() {
+  let myCanvas = document.getElementById('qrcode').getElementsByTagName('canvas');
+  console.log('🧵', myCanvas);
+  let a = document.createElement('a');
+  a.href = myCanvas[0].toDataURL('image/URL');
+  a.download = '二维码';
+  a.click();
+}
+
+//统计分析
+function handleTjfx(record) {
+  console.log('🥺', record);
+  zyInfo.value = record;
+  defHttp.get({ url: '/wjxWjxxTmlb/wjxWjxxTmlb/getTmxxPeop', params: { id: record.id } }).then((res) => {
+    tiganData.value = res;
+  });
+
+  handleShowType(3);
+}
+
+function handleChecked(record) {
+  console.log('👙', record);
+  record = record + '';
+  console.log('🙃', record);
+}
+
+function goewm(record) {
+  var baseUrl = window.location.origin;
+  var url = baseUrl + '/site/studentDjcy?cytitle=' + record.title + '&cyid=' + record.id + '&cyatype=' + record.atype + '&sfzd=0&sfbs=xs';
+  return url;
+}
+
+async function copyToClipboard(record) {
+  try {
+    var baseUrl = window.location.origin;
+    var url = baseUrl + '/site/studentDjcy?cytitle=' + record.title + '&cyid=' + record.id + '&cyatype=' + record.atype + '&sfzd=0&sfbs=xs';
+    await navigator.clipboard.writeText(url);
+    createMessage.success('内容已复制到剪贴板');
+    console.log('内容已复制到剪贴板');
+  } catch (err) {
+    console.error('复制到剪贴板失败:', err);
+  }
+}
+
+//切换题目分数类型
+function handleQiehuan(record, type) {
+  console.log(`🚀 ~ handleQiehuan ~ type:`, type);
+  console.log(`🚀 ~ handleQiehuan ~ record:`, record);
+  record.wjSfqh = type;
+}
+
+//引用题库
+function handleYylx(sylx) {
+  var createBy = '';
+  var wjSytype = '';
+  if (sylx == '0') {
+    //我的题库
+    createBy = userStore.getUserInfo.username;
+  } else {
+    //公有题库
+    wjSytype = '1';
+  }
+  var record = { wjLeixing, createBy, wjSytype };
+  if (wjLeixing.value == '6') {
+    console.log('11111111111');
+    YinyongTikuListModalpage.value.disableSubmit = false;
+    YinyongTikuListModalpage.value.init(record);
+  } else {
+    console.log('22222222222');
+    YinyongTikuDcListModalpage.value.disableSubmit = false;
+    YinyongTikuDcListModalpage.value.init(record);
+  }
+}
+
+
+//引用题库回调
+function handleYytkSuccess(record) {
+  console.log('💇‍♀️', record);
+  for (var i = 0; i < record.length; i++) {
+    var type = record[i].wjType;
+    var list = tiganData.value;
+
+    var wjxWjxxTmxxList = record[i].wjxWjxxTmxxList;
+
+    if (type == 3) {
+      var addwjxWjxxTmxxList = [];
+      var sfxz = '';
+      for (var j = 0; j < wjxWjxxTmxxList.length; j++) {
+        if (wjxWjxxTmxxList[j].itemSelected == 'true') {
+          sfxz = wjxWjxxTmxxList[j].itemIndex;
+        }
+        addwjxWjxxTmxxList.push({ itemTitle: wjxWjxxTmxxList[j].itemTitle, itemIndex: wjxWjxxTmxxList[j].itemIndex });
+      }
+      if (wjLeixing.value == '1') {
+        sfxz = '';
+      }
+      let params = {
+        wjType: parseInt(type),
+        wjIndex: list.length + 1,
+        mainId: mainId,
+        wjTitle: record[i].wjTitle,
+        wjScore: record[i].wjScore,
+        wjLeixing,
+        itemSelected: sfxz + '',
+        wjSfqh: '0',
+        sftjtk: record[i].sftjtk,
+        picPath: record[i].picPath,
+        wjxWjxxTmxxList: addwjxWjxxTmxxList,
+      };
+      list.push(params);
+      tiganData.value = [...list];
+    } else if (type == 4) {
+      var addwjxWjxxTmxxList = [];
+      let sfxz = [];
+      for (var j = 0; j < wjxWjxxTmxxList.length; j++) {
+        if (wjxWjxxTmxxList[j].itemSelected == 'true') {
+          sfxz.push(wjxWjxxTmxxList[j].itemIndex);
+        }
+        addwjxWjxxTmxxList.push({ itemTitle: wjxWjxxTmxxList[j].itemTitle, itemIndex: wjxWjxxTmxxList[j].itemIndex });
+      }
+      if (wjLeixing.value == '1') {
+        sfxz = [];
+      }
+      let params = {
+        wjType: parseInt(type),
+        wjIndex: list.length + 1,
+        mainId: mainId,
+        wjTitle: record[i].wjTitle,
+        wjScore: record[i].wjScore,
+        wjLeixing,
+        itemSelected: sfxz,
+        wjSfqh: '0',
+        sftjtk: record[i].sftjtk,
+        picPath: record[i].picPath,
+        wjxWjxxTmxxList: addwjxWjxxTmxxList,
+      };
+      list.push(params);
+      tiganData.value = [...list];
+    } else if (type == 5) {
+      var huida = record[i].wjAnswer;
+      if (wjLeixing.value == '1') {
+        huida = '';
+      }
+      let params = {
+        wjType: parseInt(type),
+        wjIndex: list.length + 1,
+        mainId: mainId,
+        wjTitle: record[i].wjTitle,
+        wjScore: record[i].wjScore,
+        wjLeixing,
+        wjAnswer: huida,
+        wjSfqh: '0',
+        sftjtk: record[i].sftjtk,
+        picPath: record[i].picPath
+      };
+      list.push(params);
+      tiganData.value = [...list];
+    } else if (type == 8) {
+      var huida = record[i].wjAnswer;
+      if (wjLeixing.value == '1') {
+        huida = '';
+      }
+      let params = {
+        wjType: parseInt(type),
+        wjIndex: list.length + 1,
+        mainId: mainId,
+        wjTitle: record[i].wjTitle,
+        wjScore: record[i].wjScore,
+        wjLeixing,
+        wjAnswer: huida,
+        wjSfqh: '0',
+        sftjtk: record[i].sftjtk,
+        picPath: record[i].picPath
+      };
+      list.push(params);
+      tiganData.value = [...list];
+    }
+  }
+}
+
+//添加选项
+function handleAddTmxx(record, index, list) {
+  var itemIndex = 0;
+  for (var i = 0; i < list.length; i++) {
+    var lssx = list[i].itemIndex;
+    if (itemIndex < parseInt(lssx)) {
+      itemIndex = lssx;
+    }
+  }
+
+  list.push({ itemTitle: null, itemIndex: parseInt(itemIndex) + 1 });
+}
+
+//删除选项
+function handleRemTmxx(record, index, list) {
+  if (list.length <= 2) {
+    createMessage.error('至少保留两个选项');
+  } else {
+    list.splice(index, 1);
+  }
+}
+
+//删除题目
+function handleDelTigan(record, index) {
+  tiganData.value.splice(index, 1);
+  for (var i = 0; i < tiganData.value.length; i++) {
+    tiganData.value[i].wjIndex = i + 1;
+  }
+}
+
+function letterCount(val) {
+  return val.replace(/[^a-zA-Z]/g, '').length;
+}
+
+function digitCount(val) {
+  return val.replace(/\D/g, '').length;
+}
+
+function chineseCharCount(val) {
+  const regex = /[\u4e00-\u9fa5]/g;
+  return val.match(regex)?.length || 0;
+}
+
+//计算输入框宽度
+function handinpwei(value) {
+  if (!value) {
+    return '20rem';
+  } else {
+    var a = letterCount(value); //判断字母
+    var b = digitCount(value); //判断数字
+    var c = chineseCharCount(value); //判断中文
+
+    var d = a + b + c;
+    if (d * 1.1 < 20) {
+      return '20rem';
+    } else if (d * 1.1 > 60) {
+      return '60rem';
+    } else {
+      return d * 1.1 + 'rem';
+    }
+  }
+}
+
+//添加单选题
+function addTigan(type) {
+  var list = tiganData.value;
+  //单选题
+  if (type == 3) {
+    var chk = '';
+    if (isShow.value) {
+      chk = '1';
+    }
+    let params = {
+      wjType: parseInt(type),
+      wjIndex: list.length + 1,
+      mainId: mainId,
+      wjTitle: null,
+      wjScore: null,
+      wjLeixing,
+      itemSelected: chk,
+      wjSfqh: '0',
+      sftjtk: '1',
+      wjxWjxxTmxxList: [
+        { itemTitle: null, itemIndex: '1' },
+        { itemTitle: null, itemIndex: '2' },
+      ],
+    };
+    console.log('💇‍♀️', params);
+    list.push(params);
+    console.log('👩‍🔬', list);
+    tiganData.value = [...list];
+    //多选题
+  } else if (type == 4) {
+    let chk = '';
+    if (isShow.value) {
+      chk = '1,2';
+    }
+    let params = {
+      wjType: parseInt(type),
+      wjIndex: list.length + 1,
+      mainId: mainId,
+      wjTitle: null,
+      wjScore: null,
+      wjLeixing,
+      itemSelected: chk,
+      wjSfqh: '0',
+      sftjtk: '1',
+      wjxWjxxTmxxList: [
+        { itemTitle: null, itemIndex: '1' },
+        { itemTitle: null, itemIndex: '2' },
+      ],
+    };
+    list.push(params);
+    tiganData.value = [...list];
+    //填空题
+  } else if (type == 5) {
+    let params = {
+      wjType: parseInt(type),
+      wjSubtype: null,
+      wjIndex: list.length + 1,
+      mainId: mainId,
+      wjTitle: null,
+      wjScore: null,
+      wjLeixing,
+      wjAnswer: null,
+      wjSfqh: '0',
+      sftjtk: '1',
+    };
+    list.push(params);
+    tiganData.value = [...list];
+    //文件题
+  } else if (type == 8) {
+    var chk = '';
+    if (isShow.value) {
+      chk = '1';
+    }
+    let params = {
+      wjType: parseInt(type),
+      wjIndex: list.length + 1,
+      mainId: mainId,
+      wjTitle: null,
+      wjScore: null,
+      wjLeixing,
+      wjSfqh: '0',
+      sftjtk: '1',
+    };
+    list.push(params);
+    tiganData.value = [...list];
+    //判断题
+  }else if (type == 305) {
+    var chk = '';
+    if (isShow.value) {
+      chk = '1';
+    }
+    let params = {
+      wjType: 3,
+      wjSubtype: 305,
+      wjIndex: list.length + 1,
+      mainId: mainId,
+      wjTitle: null,
+      wjScore: null,
+      wjLeixing,
+      itemSelected: chk,
+      wjSfqh: '0',
+      sftjtk: '1',
+      wjxWjxxTmxxList: [
+        { itemTitle: '对', itemIndex: '1' },
+        { itemTitle: '错', itemIndex: '2' },
+      ],
+    };
+    list.push(params);
+    tiganData.value = [...list];
+  } else if (type == 502) {
+    let params = {
+      wjType: 5,
+      wjSubtype: 5,
+      wjIndex: list.length + 1,
+      mainId: mainId,
+      wjTitle: null,
+      wjScore: null,
+      wjLeixing,
+      wjAnswer: null,
+      wjSfqh: '0',
+      sftjtk: '1',
+    };
+    list.push(params);
+    tiganData.value = [...list];
+    //文件题
+  } 
+}
+
+/**
+ * 拖动结束事件
+ * @param evt
+ */
+function end(evt) {
+  for (var i = 0; i < tiganData.value.length; i++) {
+    tiganData.value[i].wjIndex = i + 1;
+  }
+  console.log(`🚀 ~ end ~ tiganData:`, tiganData);
+}
+
+function cheGrp(a, b) {
+  var retChe = false;
+  if (a) {
+    for (var i = 0; i < a.length; i++) {
+      if (a[i] == b) {
+        retChe = true;
+        break;
+      }
+    }
+  }
+
+  return retChe;
+}
+
+//显示第几个类型模块
+function handleShowType(val) {
+  zycs.value = tableData.value.length;
+  if (tableData.value.length > 0) {
+    zycsDisabled.value = true;
+  } else {
+    zycsDisabled.value = false;
+  }
+  console.log('👩‍👩‍👧‍👧', zycsDisabled);
+
+  showType.value = val;
+}
+
+/**
+ * 发布
+ */
+function handleFabu(record: Recordable) {
+  createConfirm({
+    iconType: 'warning',
+    title: '发布问卷',
+    content: '是否发布此问卷？',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      //发布问卷
+      defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id, wjlx: wjLeixing.value } }).then((res) => {
+        reloadZy();
+      });
+    },
+  });
+  //推送微信信息
+  // setTimeout(() => {
+  //   defHttp.get({ url: '/wjxWjxx/wjxWjxx/sendWjWechat', params: { id: record.id, wjlx: wjLeixing.value } }).then((res) => {});
+  // }, 5000);
+}
+
+//动态添加问卷次数
+function handleZycs() {
+  var dataList = tableData.value;
+  var changeZycs = zycs.value;
+  if (changeZycs > dataList.length) {
+    for (var i = dataList.length; i < changeZycs; i++) {
+      dataList.push({
+        sort: i + 1,
+        lstitle: '第' + (i + 1) + '次问卷',
+        score: '',
+        rwbh: rwbh,
+        xqxn: xqxn,
+        atype: wjLeixing.value,
+      });
+    }
+  } else if (changeZycs < dataList.length) {
+    for (var i = dataList.length; i > changeZycs; i--) {
+      dataList.pop();
+    }
+  } else {
+    for (let i = 0; i < dataList.length; i++) {
+      var ppar = dataList[i];
+      ppar.sort = i + 1;
+      dataList[i] = ppar;
+    }
+  }
+  tableData.value = dataList;
+}
+//新增一次问卷，再最后面添加
+function handleAddZycs() {
+  var changeZycs = zycs.value;
+  zycs.value = changeZycs + 1;
+  handleZycs();
+}
+//删除指定第几次问卷
+function handleDelZycs(index) {
+  var dataList = tableData.value;
+  dataList.splice(index - 1, 1);
+  tableData.value = dataList;
+  zycs.value = dataList.length;
+  handleZycs();
+}
+
+function handleSzzycs(val) {
+  defHttp.get({ url: '/zyInfo/zyInfo/zyzb', params: { rwbh, xqxn, zyLeixing: '1' } }).then((res) => {
+    console.log('😥', res);
+    var list = res;
+    for (var i = 0; i < list.length; i++) {
+      if (list[i].zyLeixing == '0') {
+        kczyzb.value = list[i].score;
+      } else if (list[i].zyLeixing == '1') {
+        qmkszb.value = list[i].score;
+      } else if (list[i].zyLeixing == '2') {
+      } else if (list[i].zyLeixing == '3') {
+        ktcyzb.value = list[i].score;
+      }
+    }
+  });
+  handleShowType(1);
+}
+
+const columns = [
+  {
+    title: '序号',
+    dataIndex: 'sort',
+    key: 'sort',
+  },
+  {
+    title: '问卷次数',
+    dataIndex: 'lstitle',
+    key: 'lstitle',
+  },
+  {
+    title: '本次问卷占总成绩的百分比',
+    dataIndex: 'score',
+    key: 'score',
+  },
+  {
+    title: '操作',
+    key: 'action',
+  },
+];
+
+const columnsKhnr = [
+  {
+    title: '序号',
+    dataIndex: 'no',
+    key: 'no',
+    customRender: (text) => {
+      return text.index + 1;
+    },
+    width: 80,
+  },
+  {
+    title: '章次',
+    dataIndex: 'title',
+    key: 'title',
+  },
+  {
+    title: '节次',
+    dataIndex: 'twoTitle',
+    key: 'twoTitle',
+  },
+];
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  // 触发表单验证
+  await validate();
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = zyInfo.value;
+  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(',');
+      }
+    }
+  }
+  console.log('👕', model);
+
+  var endTime = model.endTime;
+  var startTime = model.startTime;
+  if (endTime && startTime) {
+    var endTimestamp = Date.parse(endTime);
+    var startTimestamp = Date.parse(startTime);
+    if (endTimestamp < startTimestamp) {
+      createMessage.warning('问卷发布时间不能大于问卷结束时间！');
+      confirmLoading.value = false;
+      return;
+    }
+  }
+  const data = tiganData.value;
+
+  const values = Object.assign([], data);
+  if (values.length > 0) {
+    var sfjx = '1';
+    for (let i = 0; i < values.length; i++) {
+      let param = values[i];
+
+      values[i].itemSelected = param.itemSelected + '';
+
+      if (!param.wjTitle) {
+        createMessage.error('请填写题目信息');
+        sfjx = '0';
+        confirmLoading.value = false;
+        return;
+      }
+      if (isShow.value) {
+        if (!param.wjScore) {
+          createMessage.error('请填写题目分数');
+          sfjx = '0';
+          confirmLoading.value = false;
+          return;
+        }
+      }
+
+      var wjType = param.wjType;
+      if (wjType == 3 && wjType == 4) {
+        var itemlist = param.wjxWjxxTmxxList;
+        for (let j = 0; j < itemlist.length; j++) {
+          if (!itemlist[j].itemTitle) {
+            createMessage.error('请填写选项信息');
+            sfjx = '0';
+            confirmLoading.value = false;
+            return;
+          }
+        }
+
+        if (isShow.value) {
+          var zqda = values[i].itemSelected;
+          if (!zqda || zqda == 'NaN' || zqda == 'undefined') {
+            createMessage.error('请选择正确答案');
+            sfjx = '0';
+            confirmLoading.value = false;
+            return;
+          }
+        }
+      } else if (wjType == 8) {
+      } else if (wjType == 6) {
+        if (isShow.value) {
+          var wjAnswer = values[i].wjAnswer;
+          if (!wjAnswer || wjAnswer == 'NaN' || wjAnswer == 'undefined') {
+            createMessage.error('请选择正确答案');
+            sfjx = '0';
+            confirmLoading.value = false;
+            return;
+          }
+        }
+      }
+    }
+    if (sfjx == '0') {
+      return;
+    }
+  } else {
+    createMessage.error('至少创建一个试题');
+    confirmLoading.value = false;
+    return;
+  }
+  // 如果有文件题 且 开启了防作弊 需要关掉防作弊 并提示用户
+  if (zyInfo.value.fzbms == 'Y') {
+    let falg = true
+    tiganData.value.forEach(item => {
+      if (item.wjType == 8) falg = false
+    });
+    if (!falg) {
+      createMessage.error('包含文件题时，无法启用防作弊模式，请主动关闭！');
+      confirmLoading.value = false;
+      return;
+    }
+  }
+
+  model.list = values;
+  console.log('😨', model);
+  confirmLoading.value = false;
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        reloadZy();
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record, type) {
+  console.log('🤲', record);
+  if (!type) {
+    isShow.value = true;
+  } else {
+    isShow.value = false;
+  }
+  if (!record.sturead) {
+    record.sturead = '1';
+  }
+  if (!record.xshpkg) {
+    record.xshpkg = '1';
+  }
+  if (!record.sfzzcj) {
+    record.sfzzcj = '1';
+  }
+  if (!record.xssfck) {
+    record.xssfck = '1';
+  }
+  editDisabled.value = type;
+  zyInfo.value = record;
+  if(!zyInfo.value.fzbms)zyInfo.value.fzbms = 'N'
+  dataKhnr.value = [];
+  mainId.value = record.id;
+
+  defHttp.get({ url: '/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId', params: { id: record.id } }).then((res) => {
+    tiganData.value = res;
+  });
+  handleShowType(2);
+}
+
+//问卷要求切换
+function handleZyyqShow(type) {
+  console.log('👯', type);
+  if (type == 1) {
+    zyyqShow.value = true;
+  } else {
+    zyyqShow.value = false;
+  }
+}
+
+//查询列表数据
+function reloadZy() {
+  queryParamZy.value.pageNo = current.value;
+  queryParamZy.value.pageSize = pageSize.value;
+  queryParamZy.value.rwbh = rwbh;
+  queryParamZy.value.xqxn = xqxn;
+  queryParamZy.value.atype = wjLeixing.value;
+  defHttp.get({ url: '/wjxWjxx/wjxWjxx/list', params: queryParamZy.value }).then((res) => {
+    total.value = res.total;
+    pageNo.value = res.pages;
+    current.value = res.current;
+    tableData.value = res.records;
+    showType.value = 999;
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  if (record.endTime) {
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '您已经对问卷的内容和要求进行了设置，如果继续删除，内容和要求将一并删除，确认进行删除吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, reloadZy);
+      },
+    });
+  } else {
+    deleteOne({ id: record.id }, reloadZy);
+  }
+}
+
+//新增一次问卷
+function handleAddOne() {
+  defHttp.post({ url: '/wjxWjxx/wjxWjxx/addOne', params: { rwbh, xqxn, atype: wjLeixing.value } }).then((res) => {
+    reloadZy();
+  });
+}
+
+//选择考察内容
+function handleKcnr() {
+  registerZcjcModal.value.disableSubmit = false;
+  registerZcjcModal.value.init({ rwbh, xnxq: xqxn, createBy: teano });
+}
+
+//选择章次节次后的回调
+function handleCheckZcjcSuccess(record) {
+  console.log('🙅‍♂️', record);
+  console.log('🙅‍♂️', record[0]);
+  var kcnr = '';
+  kcnr = kcnr ? kcnr : '';
+  for (var i = 0; i < record.length; i++) {
+    kcnr = kcnr + record[i] + ',';
+  }
+  if (kcnr.indexOf(',') > -1) {
+    kcnr = kcnr.substring(0, kcnr.length - 1);
+  }
+  zyInfo.value.kcnr = kcnr;
+
+  console.log('💑', kcnr);
+  if (kcnr) {
+    defHttp.get({ url: '/teachingunitcontent/kcTeachingUnitContentOne/getAllList', params: { id: kcnr } }).then((res) => {
+      console.log('🤦‍♀️', res);
+      dataKhnr.value = res;
+    });
+  } else {
+    dataKhnr.value = [];
+  }
+}
+
+/**
+ * 学生答卷列表
+ */
+function handleDjjgs(record: Recordable, flag) {
+  WjxWjxxTmlbDjjgsModalPage.value.disableSubmit = true;
+  WjxWjxxTmlbDjjgsModalPage.value.edit(record, flag);
+}
+
+/**
+ * 获取选课人数
+ */
+function openXkrs(record) {
+  XxhbbksListModalPage.value.disableSubmit = true;
+  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>
+@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;
+}
+.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;
+  border-radius: 5px;
+  border: 1px solid #e6e6e6;
+  margin: 6px 0;
+  background: #fff;
+}
+
+.ant-card:hover {
+  box-shadow: 2px 2px 10px 1px #d4d4d4;
+}
+.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: 30%;
+  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;
+}
+.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;
+}
+.ant-dropdown-link {
+  color: #029c88;
+}
+.ant-dropdown-link:hover {
+  color: #333;
+}
+.ant-dropdown-link1 {
+  color: #666;
+}
+.ant-dropdown-link1:hover {
+  color: #029c88;
+}
+.card-label {
+  background: #81cbbc;
+  border-radius: 4px;
+  color: #fff;
+  padding: 3px 6px;
+  margin-left: 10px;
+  font-size: 12px;
+}
+.card-label2 {
+  background: #84c4fa;
+  border-radius: 4px;
+  color: #fff;
+  padding: 3px 6px;
+  margin-left: 10px;
+  font-size: 12px;
+}
+.card-label3 {
+  background: #fabe84;
+  border-radius: 4px;
+  color: #fff;
+  padding: 3px 6px;
+  margin-left: 10px;
+  font-size: 12px;
+}
+/deep/.ant-card-head-title {
+  display: inline-block;
+  flex: 1;
+  padding: 16px 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: clip;
+}
+// /deep/.jeecg-tinymce-container{
+//   width: 20rem !important;
+//     height: 100px;
+// }
+
+.rich-text-container {
+  white-space: pre-wrap; /* 强制换行 */
+  word-break: break-all; /* 长单词和 URL 地址换行 */
+  overflow-wrap: break-word; /* 在长单词内部换行 */
+}
+</style>
diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
index 25db207..7e64e5a 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
@@ -44,6 +44,9 @@
                 <a-col :span="24" class="zyCon">
                   时间：{{dayjs(item.startTime).format('YYYY.MM.DD')}} - {{dayjs(item.endTime).format('YYYY.MM.DD')}}
                 </a-col>
+                <a-col :span="24" class="ellipsis" :title="item.errorMsg" v-if="item.errorMsg" style="color: red;">
+                  {{item.errorMsg}}
+                </a-col>
                 <!-- <a-col :span="16" class="zyCon">
                   <a-col :span="24" class="zyCon">从{{item.startTime}}</a-col>
                   <a-col :span="24" class="zyCon">至{{item.endTime}}</a-col>
@@ -52,7 +55,7 @@
             </a-col>
             <a-col :span="24" style="text-align:center;margin-top:20px;">
               <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='-1'">开始答卷</a-button>
-              <a-button type="primary" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);color:#ffffff;" v-if="item.flag=='0'" disabled>正在批卷</a-button>
+              <a-button type="primary" @click="handleDj(item)"  style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);color:#ffffff;" v-if="item.flag=='0'" >重新答卷</a-button>
               <a-button type="primary" @click="handleDjjg(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.flag=='1'">查看答卷</a-button>
             </a-col>
           </a-row>
@@ -197,7 +200,7 @@
     if(flag == '-1'){
       return "待提交";
     }else if(flag == '0'){
-      return "待评分";
+      return "需重答";
     }else if(flag == '1'){
       return "已完成";
     }
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue
index c24f3a5..34ed5e5 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue
@@ -36,11 +36,11 @@
                   >所得分值：<span class="answer-word"> {{ item.itemScore }}</span> 分</div
                 >
               </template>
-              <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+              <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled >
                 <div style="width: 100%" v-for="(tmxx, index) in item.wjxWjxxTmxxList">
                   <a-radio :value="tmxx.itemIndex + ``" style="width: 100%; margin-bottom: 5px">
                     <span v-html:value="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 v-if="tmxx.itemSelected == 'true' && djxxData.atype == 6"  style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(此选项是正确答案)</span>
                   </a-radio>
                 </div>
               </a-radio-group>
@@ -75,7 +75,7 @@
                 <div style="width: 100%" v-for="(tmxx, index) in item.wjxWjxxTmxxList">
                   <a-radio :value="tmxx.itemIndex + ``" style="width: 100%; margin-bottom: 5px">
                     <span v-html:value="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 v-if="tmxx.itemSelected == 'true' && djxxData.atype == 6" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(此选项是正确答案)</span>
                   </a-radio>
                 </div>
               </a-radio-group>
@@ -113,7 +113,7 @@
                     <!-- -{{tmxx}}- -->
                     <a-checkbox :value="tmxx.itemIndex" style="width: 100%; margin-bottom: 5px">
                       <span v-html:value="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 v-if="tmxx.itemSelected == 'true' && djxxData.atype == 6" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(此选项是正确答案)</span>
                     </a-checkbox>
                   </a-col>
                 </a-row>
@@ -126,7 +126,7 @@
             <a-card>
               <template #title>
                 <span>{{ index + 1 }}、</span><span v-html:value="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
-                <span v-if="item.tktda" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.tktda }})</span>
+                <span v-if="item.tktda  && djxxData.atype == 6" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.tktda }})</span>
                 
                 <div v-if="item.picPath">
                     <j-upload
@@ -203,7 +203,6 @@
                     :buttonVisible="false"
                   ></j-upload>
                   </div>
-                <!-- <span v-if="item.tktda" style="color:#9e9e9e;margin-left:30px;font-size:12px;">(正确答案:{{item.tktda}})</span> -->
               </template>
               <template #extra v-if="djxxData.atype == 6">
                 <div style="margin-left: 40px"
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index faf215c..e23e394 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -63,11 +63,12 @@
             <Icon icon="ant-design:team-outlined" />
             <span>课程助教</span>
           </a-menu-item >
-          <!-- 
-            <a-menu-item key="sub9">
-              <BlockOutlined />
-              <span @click="getGzt('dcwj')">问卷调查</span>
+          <a-menu-item key="sub12" @click="getGzt('dcwj')">
+            <Icon icon="ant-design:contacts-outlined" />
+              <span >问卷调查</span>
             </a-menu-item>
+          <!-- 
+            
             <a-menu-item key="sub10">
               <BlockOutlined />
               <span @click="getGzt('yiykzyk')">教学资源库</span>
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index 6c8730c..b747b73 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -134,7 +134,8 @@
                     </a-col>
                     <a-col :span="24">
                       <a-form-item label="作业要求" v-bind="validateInfos.content">
-                        <j-editor v-model:value="zyInfo.content" v-if="zyyqShow" @blur="handleZyyqShow(0)" />
+                        <!-- <j-editor v-model:value="zyInfo.content" v-if="zyyqShow" @blur="handleZyyqShow(0)" /> -->
+                        <a-textarea v-model:value="zyInfo.content" v-if="zyyqShow" @blur="handleZyyqShow(0)"></a-textarea>
                         <div style="color: #777777" v-html="zyInfo.content" v-if="!zyyqShow"></div>
                         <div @click="handleZyyqShow(1)" class="tishi" v-if="!editDisabled">温馨提示：点击可编辑作业要求</div>
                         <!-- <div @click="handleZyyqShow(1)"><span style="cursor: pointer; color: #18a689">温馨提示：点击可编辑作业要求</span></div> -->
@@ -153,7 +154,8 @@
                             placeholder="请选择评分标准是否允许学生查看" :disabled="editDisabled" />
                         </a-form-item>
                         <a-form-item label="">
-                          <j-editor v-model:value="zyInfo.pfbz" v-if="pfbzShow" @blur="handlePfbzShow(0)" />
+                          <!-- <j-editor v-model:value="zyInfo.pfbz" v-if="pfbzShow" @blur="handlePfbzShow(0)" /> -->
+                           <a-textarea v-model:value="zyInfo.pfbz" v-if="pfbzShow" @blur="handlePfbzShow(0)"></a-textarea>
                           <div v-html="zyInfo.pfbz" v-if="!pfbzShow"></div>
                           <div class="tishi" @click="handlePfbzShow(1)" v-if="!editDisabled">温馨提示：点击可编辑评分标准</div>
                         </a-form-item>
@@ -582,7 +584,7 @@ import { Form } from 'ant-design-vue';
 import { saveOrUpdate } from '/@/views/zy/zyInfo/ZyInfo.api';
 import { getValueType } from '/@/utils';
 import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+import JEditor from '/@/components/Form/src/jeecg/components/JEditor3.vue';
 import dayjs, { Dayjs } from 'dayjs';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { newcolumns } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.data';