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

.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://smartedu.nenu.edu.cn/jeecg-boot
-# VITE_GLOB_DOMAIN_URL=https://xxhbtest2.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://smartedu.nenu.edu.cn:8081
-# VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081
+VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=

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>

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);

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>

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',

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: '调查问卷',
       },

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'
   },

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="助教编号">
+            <a-form-item label="助教工号">
-              <j-input placeholder="请输入助教编号" v-model:value="queryParam.zjbh"></j-input>
+              <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: '编辑',
+        label: '删除',
-        onClick: handleEdit.bind(null, record),
+        popConfirm: {
-      },
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
     ];
   }
    

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) => {
+  defHttp.get({ url: '/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId', params: { id: yyzyid } }).then((res) => {
-  //   console.log('🥴', res);
+    console.log('🥴', res);
-  //   tiganData.value = res;
+    for(var i=0;i<res.length;i++){
-  //   console.log('🧞‍♂️1111111111', tiganData.value);
+      res[i].createBy = null;
-  // });
+      res[i].createTime = null;
+      res[i].wjLeixing = wjLeixing.value;
+    }
+    tiganData.value = res;
+    console.log('🧞‍♂️1111111111', tiganData.value);
+  });
   
 }
 

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 "已完成";
     }

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"

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="sub12" @click="getGzt('dcwj')">
-            <a-menu-item key="sub9">
+            <Icon icon="ant-design:contacts-outlined" />
-              <BlockOutlined />
+              <span >问卷调查</span>
-              <span @click="getGzt('dcwj')">问卷调查</span>
             </a-menu-item>
+          <!-- 
+            
             <a-menu-item key="sub10">
               <BlockOutlined />
               <span @click="getGzt('yiykzyk')">教学资源库</span>

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';