From 4bd1531ef5f314256d399a63bc115ebe92d83e08 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 5 Aug 2024 10:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jeecg/components/JUpload/JUpload.vue  | 1378 +++++++++--------
 src/views/site/studentWdkc/teacherDbtx.vue    |    2 +-
 .../site/studentWdkc/teacherWeiduMore.vue     |    4 +-
 src/views/zy/jiaoXueDanYuanNeiRong/index.vue  |   46 +-
 .../zy/jiaoXueDanYuanNeiRong/stuIndex.vue     |   17 +-
 src/views/zy/zyInfo/StudentZyInfoList.vue     |    2 +-
 src/views/zy/zyInfo/ZyInfoV2List.vue          |   12 +-
 .../zy/zyInfoStudent/ZyInfoStudent.data.ts    |    2 +-
 src/views/zy/zyInfoStudentHp/ZyhpMainList.vue |   18 +-
 9 files changed, 776 insertions(+), 705 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
index 85d5051..a54ddff 100644
--- a/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
+++ b/src/components/Form/src/jeecg/components/JUpload/JUpload.vue
@@ -28,523 +28,530 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue';
-  import { Icon } from '/@/components/Icon';
-  import { getToken } from '/@/utils/auth';
-  import { uploadUrl, baseUploadUrl } from '/@/api/common/api';
-  import { propTypes } from '/@/utils/propTypes';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { createImgPreview } from '/@/components/Preview/index';
-  import { useAttrs } from '/@/hooks/core/useAttrs';
-  import { useDesign } from '/@/hooks/web/useDesign';
-  import { UploadTypeEnum } from './upload.data';
-  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-  import UploadItemActions from './components/UploadItemActions.vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import { buildUUID } from '/@/utils/uuid';
-  import CryptoJS from 'crypto-js';
+import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { getToken } from '/@/utils/auth';
+import { uploadUrl, baseUploadUrl } from '/@/api/common/api';
+import { propTypes } from '/@/utils/propTypes';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { createImgPreview } from '/@/components/Preview/index';
+import { useAttrs } from '/@/hooks/core/useAttrs';
+import { useDesign } from '/@/hooks/web/useDesign';
+import { UploadTypeEnum } from './upload.data';
+import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+import UploadItemActions from './components/UploadItemActions.vue';
+import { defHttp } from '/@/utils/http/axios';
+import { buildUUID } from '/@/utils/uuid';
+import CryptoJS from 'crypto-js';
 
-  import { downloadFile as ajaxDownloadFileFn } from '/@/api/common/api';
+import { downloadFile as ajaxDownloadFileFn } from '/@/api/common/api';
 
-  const spinning = ref<boolean>(false);
-  const { createMessage, createConfirm } = useMessage();
-  const { prefixCls } = useDesign('j-upload');
-  const attrs = useAttrs();
-  const emit = defineEmits(['change', 'update:value']);
-  const props = defineProps({
-    value: propTypes.oneOfType([propTypes.string, propTypes.array]),
-    text: propTypes.string.def('上传'),
-    fileType: propTypes.string.def(UploadTypeEnum.all),
-    /*这个属性用于控制文件上传的业务路径*/
-    bizPath: propTypes.string.def('temp'),
-    /**
-     * 是否返回url，
-     * true：仅返回url
-     * false：返回fileName filePath fileSize
-     */
-    returnUrl: propTypes.bool.def(true),
-    // 最大上传数量
-    maxCount: propTypes.number.def(0),
-    buttonVisible: propTypes.bool.def(true),
-    multiple: propTypes.bool.def(true),
-    // 是否显示左右移动按钮
-    mover: propTypes.bool.def(true),
-    // 是否显示下载按钮
-    download: propTypes.bool.def(true),
-    // 删除时是否显示确认框
-    removeConfirm: propTypes.bool.def(false),
-    beforeUpload: propTypes.func,
-    //后加的，强制直接使用传来的beforeUpload方法
-    forceBeforeUploadFn: propTypes.bool.def(true),
-    //后加的，强制验证accept，目前仅支持*.jpg,*.gif之类的扩展名验证，video/*,audio/*,image/jpeg之类的暂不支持
-    forceAcceptVerify: propTypes.bool.def(false),
-    //后加的，是否查询biz
-    isGetBiz: propTypes.bool.def(false),
-    //后加的，查询biz参数
-    getBizParam: propTypes.object.def({}),
-    disabled: propTypes.bool.def(false),
-  });
+const spinning = ref<boolean>(false);
+const { createMessage, createConfirm } = useMessage();
+const { prefixCls } = useDesign('j-upload');
+const attrs = useAttrs();
+const emit = defineEmits(['change', 'update:value']);
+const props = defineProps({
+  value: propTypes.oneOfType([propTypes.string, propTypes.array]),
+  text: propTypes.string.def('上传'),
+  fileType: propTypes.string.def(UploadTypeEnum.all),
+  /*这个属性用于控制文件上传的业务路径*/
+  bizPath: propTypes.string.def('temp'),
+  /**
+   * 是否返回url，
+   * true：仅返回url
+   * false：返回fileName filePath fileSize
+   */
+  returnUrl: propTypes.bool.def(true),
+  // 最大上传数量
+  maxCount: propTypes.number.def(0),
+  buttonVisible: propTypes.bool.def(true),
+  multiple: propTypes.bool.def(true),
+  // 是否显示左右移动按钮
+  mover: propTypes.bool.def(true),
+  // 是否显示下载按钮
+  download: propTypes.bool.def(true),
+  // 删除时是否显示确认框
+  removeConfirm: propTypes.bool.def(false),
+  beforeUpload: propTypes.func,
+  //后加的，强制直接使用传来的beforeUpload方法
+  forceBeforeUploadFn: propTypes.bool.def(true),
+  //后加的，强制验证accept，目前仅支持*.jpg,*.gif之类的扩展名验证，video/*,audio/*,image/jpeg之类的暂不支持
+  forceAcceptVerify: propTypes.bool.def(false),
+  //后加的，是否查询biz
+  isGetBiz: propTypes.bool.def(false),
+  //后加的，查询biz参数
+  getBizParam: propTypes.object.def({}),
+  disabled: propTypes.bool.def(false),
+});
 
-  const otherData = ref<Object>({});
-  const otherClass = ref<Object>({});
+const otherData = ref<Object>({});
+const otherClass = ref<Object>({});
 
-  const headers = reactive({
-    'X-Access-Token': getToken(),
-  });
-  const fileList = ref<any[]>([]);
-  const uploadGoOn = ref<boolean>(true);
-  // refs
-  const containerRef = ref();
-  // 是否达到了最大上传数量
-  const isMaxCount = computed(() => props.maxCount > 0 && fileList.value.length >= props.maxCount);
-  // 当前是否是上传图片模式
-  const isImageMode = computed(() => props.fileType === UploadTypeEnum.image);
-  // 合并 props 和 attrs
-  const bindProps = computed(() => {
-    const bind: any = Object.assign({}, props, unref(attrs));
-    bind.name = 'file';
-    bind.listType = isImageMode.value ? 'picture-card' : 'text';
-    bind.class = [bind.class, { 'upload-disabled': props.disabled, ...unref(otherClass) }];
-    bind.data = { biz: props.bizPath, ...bind.data, ...unref(otherData) };
-    //update-begin-author:taoyan date:20220407 for: 自定义beforeUpload return false，并不能中断上传过程
-    if (!bind.beforeUpload) {
-      bind.beforeUpload = onBeforeUpload;
-    } else if(!bind.forceBeforeUploadFn){
-      //强制使用
-      bind.beforeUpload = onBeforeUpload;
-    }
-    //update-end-author:taoyan date:20220407 for: 自定义beforeUpload return false，并不能中断上传过程
-    // 如果当前是图片上传模式，就只能上传图片
-    if (isImageMode.value && !bind.accept) {
-      bind.accept = 'image/*';
-    }
-    return bind;
-  });
+const headers = reactive({
+  'X-Access-Token': getToken(),
+});
+const fileList = ref<any[]>([]);
+const uploadGoOn = ref<boolean>(true);
+// refs
+const containerRef = ref();
+// 是否达到了最大上传数量
+const isMaxCount = computed(() => props.maxCount > 0 && fileList.value.length >= props.maxCount);
+// 当前是否是上传图片模式
+const isImageMode = computed(() => props.fileType === UploadTypeEnum.image);
+// 合并 props 和 attrs
+const bindProps = computed(() => {
+  const bind: any = Object.assign({}, props, unref(attrs));
+  bind.name = 'file';
+  bind.listType = isImageMode.value ? 'picture-card' : 'text';
+  bind.class = [bind.class, { 'upload-disabled': props.disabled, ...unref(otherClass) }];
+  bind.data = { biz: props.bizPath, ...bind.data, ...unref(otherData) };
+  //update-begin-author:taoyan date:20220407 for: 自定义beforeUpload return false，并不能中断上传过程
+  if (!bind.beforeUpload) {
+    bind.beforeUpload = onBeforeUpload;
+  } else if (!bind.forceBeforeUploadFn) {
+    //强制使用
+    bind.beforeUpload = onBeforeUpload;
+  }
+  //update-end-author:taoyan date:20220407 for: 自定义beforeUpload return false，并不能中断上传过程
+  // 如果当前是图片上传模式，就只能上传图片
+  if (isImageMode.value && !bind.accept) {
+    bind.accept = 'image/*';
+  }
+  return bind;
+});
 
-  watch(
-    () => props.value,
-    (val) => {
-      if (Array.isArray(val)) {
-        if (props.returnUrl) {
-          parsePathsValue(val.join(','));
-        } else {
-          parseArrayValue(val);
-        }
+watch(
+  () => props.value,
+  (val) => {
+    if (Array.isArray(val)) {
+      if (props.returnUrl) {
+        parsePathsValue(val.join(','));
       } else {
-        parsePathsValue(val);
+        parseArrayValue(val);
       }
-    },
-    { immediate: true }
-  );
+    } else {
+      parsePathsValue(val);
+    }
+  },
+  { immediate: true }
+);
 
-  watch(fileList, () => nextTick(() => addActionsListener()), { immediate: true });
+watch(fileList, () => nextTick(() => addActionsListener()), { immediate: true });
 
-  const loadBizFn = (params) => defHttp.get({ url: '/ktgl/kcKetangbiao/getBizPath', params }, { isTransformResponse: false })
+const loadBizFn = (params) => defHttp.get({ url: '/ktgl/kcKetangbiao/getBizPath', params }, { isTransformResponse: false });
 
-  function loadBiz(param){
-    otherData.value.loading = true;
-    // otherClass.value = { 'upload-disabled': true, }
-    loadBizFn(param).then(res => {
-      //otherData.value
-      if(res.success){
-        otherData.value.biz = res.result;
-      }else{
-        delete otherData.value.biz;
+function loadBiz(param) {
+  otherData.value.loading = true;
+  // otherClass.value = { 'upload-disabled': true, }
+  loadBizFn(param).then((res) => {
+    //otherData.value
+    if (res.success) {
+      otherData.value.biz = res.result;
+    } else {
+      delete otherData.value.biz;
+    }
+    // otherClass.value = {}
+    delete otherData.value.loading;
+  });
+}
+
+watch(
+  () => props.getBizParam,
+  (param, oldParam) => {
+    if (JSON.stringify(param) != JSON.stringify(oldParam)) {
+      nextTick(() => {
+        console.log(`🚀 ~ props.isGetBiz:`, props.isGetBiz, bindProps.value.disabled, loadBiz);
+        if (props.isGetBiz && !bindProps.value.disabled) {
+          //非被禁用状态，查询
+          nextTick(() => {
+            loadBiz(param);
+          });
+        }
+      });
+    }
+  },
+  { immediate: true }
+);
+
+const antUploadItemCls = 'ant-upload-list-item';
+
+// Listener
+function addActionsListener() {
+  if (!isImageMode.value) {
+    return;
+  }
+  const uploadItems = containerRef.value ? containerRef.value.getElementsByClassName(antUploadItemCls) : null;
+  if (!uploadItems || uploadItems.length === 0) {
+    return;
+  }
+  for (const uploadItem of uploadItems) {
+    let hasActions = uploadItem.getAttribute('data-has-actions') === 'true';
+    if (!hasActions) {
+      uploadItem.addEventListener('mouseover', onAddActionsButton);
+    }
+  }
+}
+
+// 添加可左右移动的按钮
+function onAddActionsButton(event) {
+  const getUploadItem = () => {
+    for (const path of event.path) {
+      if (path.classList.contains(antUploadItemCls)) {
+        return path;
+      } else if (path.classList.contains(`${prefixCls}-container`)) {
+        return null;
       }
-      // otherClass.value = {}
-      delete otherData.value.loading;
+    }
+    return null;
+  };
+  const uploadItem = getUploadItem();
+  if (!uploadItem) {
+    return;
+  }
+  const actions = uploadItem.getElementsByClassName('ant-upload-list-item-actions');
+  if (!actions || actions.length === 0) {
+    return;
+  }
+  // 添加操作按钮
+  const div = document.createElement('div');
+  div.className = 'upload-actions-container';
+  createApp(UploadItemActions, {
+    element: uploadItem,
+    fileList: fileList,
+    mover: props.mover,
+    download: props.download,
+    emitValue: emitValue,
+  }).mount(div);
+  actions[0].appendChild(div);
+  uploadItem.setAttribute('data-has-actions', 'true');
+  uploadItem.removeEventListener('mouseover', onAddActionsButton);
+}
+
+// 解析数据库存储的逗号分割
+function parsePathsValue(paths) {
+  if (!paths || paths.length == 0) {
+    fileList.value = [];
+    return;
+  }
+  let list: any[] = [];
+  for (const item of paths.split(',')) {
+    let url = getFileAccessHttpUrl(item);
+    list.push({
+      uid: uidGenerator(),
+      name: getFileName(item),
+      status: 'done',
+      url: url,
+      response: { status: 'history', message: item },
     });
   }
+  fileList.value = list;
+}
 
+// 解析数组值
+function parseArrayValue(array) {
+  if (!array || array.length == 0) {
+    fileList.value = [];
+    return;
+  }
+  let list: any[] = [];
+  for (const item of array) {
+    let url = getFileAccessHttpUrl(item.filePath);
+    list.push({
+      uid: uidGenerator(),
+      name: item.fileName,
+      url: url,
+      status: 'done',
+      response: { status: 'history', message: item.filePath },
+    });
+  }
+  fileList.value = list;
+}
 
-  watch(() => props.getBizParam,
-    (param, oldParam) => {
-      if(JSON.stringify(param) != JSON.stringify(oldParam)){
-        nextTick(() => {
-          console.log(`🚀 ~ props.isGetBiz:`, props.isGetBiz, bindProps.value.disabled, loadBiz);
-          if(props.isGetBiz && !bindProps.value.disabled){
-            //非被禁用状态，查询
-            nextTick(() => {
-              loadBiz(param);
-            });
-          }
-        });
-      }
-    },
-    { immediate: true }
-  );
-
-  const antUploadItemCls = 'ant-upload-list-item';
-
-  // Listener
-  function addActionsListener() {
-    if (!isImageMode.value) {
-      return;
-    }
-    const uploadItems = containerRef.value ? containerRef.value.getElementsByClassName(antUploadItemCls) : null;
-    if (!uploadItems || uploadItems.length === 0) {
-      return;
-    }
-    for (const uploadItem of uploadItems) {
-      let hasActions = uploadItem.getAttribute('data-has-actions') === 'true';
-      if (!hasActions) {
-        uploadItem.addEventListener('mouseover', onAddActionsButton);
-      }
+// 文件上传之前的操作
+function onBeforeUpload(file) {
+  uploadGoOn.value = true;
+  if (isImageMode.value) {
+    if (file.type.indexOf('image') < 0) {
+      createMessage.warning('请上传图片');
+      uploadGoOn.value = false;
+      return false;
     }
   }
-
-  // 添加可左右移动的按钮
-  function onAddActionsButton(event) {
-    const getUploadItem = () => {
-      for (const path of event.path) {
-        if (path.classList.contains(antUploadItemCls)) {
-          return path;
-        } else if (path.classList.contains(`${prefixCls}-container`)) {
-          return null;
+  //扩展验证(目前仅支持扩展名验证)
+  if (props.forceAcceptVerify) {
+    let fileName = file?.name;
+    console.log('👩‍⚕️', fileName);
+    if (fileName.indexOf('.')) {
+      let suffix = fileName.split('.').pop().toLowerCase();
+      console.log('🤶', suffix);
+      let fileTypes = unref(bindProps).accept;
+      if (fileTypes) {
+        if (fileTypes.indexOf(',')) {
+          let typeList = fileTypes.split(',');
+          if (typeList.indexOf('.' + suffix) == -1) {
+            createMessage.warning('请上传【*' + typeList.join(',*') + '】格式的文件');
+            uploadGoOn.value = false;
+            return false;
+          }
         }
       }
-      return null;
-    };
-    const uploadItem = getUploadItem();
-    if (!uploadItem) {
-      return;
     }
-    const actions = uploadItem.getElementsByClassName('ant-upload-list-item-actions');
-    if (!actions || actions.length === 0) {
-      return;
-    }
-    // 添加操作按钮
-    const div = document.createElement('div');
-    div.className = 'upload-actions-container';
-    createApp(UploadItemActions, {
-      element: uploadItem,
-      fileList: fileList,
-      mover: props.mover,
-      download: props.download,
-      emitValue: emitValue,
-    }).mount(div);
-    actions[0].appendChild(div);
-    uploadItem.setAttribute('data-has-actions', 'true');
-    uploadItem.removeEventListener('mouseover', onAddActionsButton);
   }
 
-  // 解析数据库存储的逗号分割
-  function parsePathsValue(paths) {
-    if (!paths || paths.length == 0) {
-      fileList.value = [];
-      return;
-    }
-    let list: any[] = [];
-    for (const item of paths.split(',')) {
-      let url = getFileAccessHttpUrl(item);
-      list.push({
-        uid: uidGenerator(),
-        name: getFileName(item),
-        status: 'done',
-        url: url,
-        response: { status: 'history', message: item },
+  // 扩展 beforeUpload 验证
+  if (typeof props.beforeUpload === 'function') {
+    return props.beforeUpload(file, unref(bindProps), () => (uploadGoOn.value = false));
+  }
+  return true;
+}
+
+// 删除处理事件
+function onRemove() {
+  if (props.removeConfirm) {
+    return new Promise((resolve) => {
+      createConfirm({
+        title: '删除',
+        content: `确定要删除这${isImageMode.value ? '张图片' : '个文件'}吗？`,
+        iconType: 'warning',
+        onOk: () => resolve(true),
+        onCancel: () => resolve(false),
       });
-    }
-    fileList.value = list;
+    });
   }
+  return true;
+}
 
-  // 解析数组值
-  function parseArrayValue(array) {
-    if (!array || array.length == 0) {
-      fileList.value = [];
-      return;
-    }
-    let list: any[] = [];
-    for (const item of array) {
-      let url = getFileAccessHttpUrl(item.filePath);
-      list.push({
-        uid: uidGenerator(),
-        name: item.fileName,
-        url: url,
-        status: 'done',
-        response: { status: 'history', message: item.filePath },
-      });
-    }
-    fileList.value = list;
+// upload组件change事件
+function onFileChange(info) {
+  if (!info.file.status && uploadGoOn.value === false) {
+    info.fileList.pop();
   }
-
-  // 文件上传之前的操作
-  function onBeforeUpload(file) {
-    uploadGoOn.value = true;
-    if (isImageMode.value) {
-      if (file.type.indexOf('image') < 0) {
-        createMessage.warning('请上传图片');
-        uploadGoOn.value = false;
-        return false;
-      }
-    }
-    //扩展验证(目前仅支持扩展名验证)
-    if(props.forceAcceptVerify){
-      let fileName = file?.name;
-      if(fileName.indexOf('.')){
-        let suffix = fileName.split('.')[1];
-        let fileTypes = unref(bindProps).accept;
-        if(fileTypes){
-          if(fileTypes.indexOf(',')){
-            let typeList = fileTypes.split(',');
-            if(typeList.indexOf('.' + suffix) == -1){
-              createMessage.warning('请上传【*' + typeList.join(',*') + '】格式的文件');
-              uploadGoOn.value = false;
-              return false;
-            }
-          }
-        }
-      }
-    }
-
-    // 扩展 beforeUpload 验证
-    if (typeof props.beforeUpload === 'function') {
-      return props.beforeUpload(file, unref(bindProps), () => uploadGoOn.value = false );
-    }
-    return true;
-  }
-
-  // 删除处理事件
-  function onRemove() {
-    if (props.removeConfirm) {
-      return new Promise((resolve) => {
-        createConfirm({
-          title: '删除',
-          content: `确定要删除这${isImageMode.value ? '张图片' : '个文件'}吗？`,
-          iconType: 'warning',
-          onOk: () => resolve(true),
-          onCancel: () => resolve(false),
-        });
-      });
-    }
-    return true;
-  }
-
-  // upload组件change事件
-  function onFileChange(info) {
-    if (!info.file.status && uploadGoOn.value === false) {
-      info.fileList.pop();
-    }
-    let fileListTemp = info.fileList;
-    // 限制最大上传数
-    if (props.maxCount > 0) {
-      let count = fileListTemp.length;
-      if (count >= props.maxCount) {
-        let diffNum = props.maxCount - fileListTemp.length;
-        if (diffNum >= 0) {
-          fileListTemp = fileListTemp.slice(-props.maxCount);
-        } else {
-          return;
-        }
-      }
-    }
-    if (info.file.status === 'done') {
-      if (info.file.response.success) {
-        fileListTemp = fileListTemp.map((file) => {
-          if (file.response) {
-            let reUrl = file.response.message;
-            file.url = getFileAccessHttpUrl(reUrl);
-          }
-          return file;
-        });
-      }
-    } else if (info.file.status === 'error') {
-      createMessage.error(`${info.file.name} 上传失败. ${info.file.response.message}`);
-    }
-    fileList.value = fileListTemp;
-    if (info.file.status === 'done' || info.file.status === 'removed') {
-      //returnUrl为true时仅返回文件路径
-      if (props.returnUrl) {
-        handlePathChange();
-      } else {
-        //returnUrl为false时返回文件名称、文件路径及文件大小
-        let newFileList: any[] = [];
-        for (const item of fileListTemp) {
-          if (item.status === 'done') {
-            let fileJson = {
-              fileName: item.name,
-              filePath: item.response.message,
-              fileSize: item.size,
-            };
-            newFileList.push(fileJson);
-          }else{
-            return;
-          }
-        }
-        emitValue(newFileList);
-      }
-    }
-  }
-
-  function handlePathChange() {
-    let uploadFiles = fileList.value;
-    let path = '';
-    if (!uploadFiles || uploadFiles.length == 0) {
-      path = '';
-    }
-    let pathList: string[] = [];
-    for (const item of uploadFiles) {
-      if (item.status === 'done') {
-        pathList.push(item.response.message);
+  let fileListTemp = info.fileList;
+  // 限制最大上传数
+  if (props.maxCount > 0) {
+    let count = fileListTemp.length;
+    if (count >= props.maxCount) {
+      let diffNum = props.maxCount - fileListTemp.length;
+      if (diffNum >= 0) {
+        fileListTemp = fileListTemp.slice(-props.maxCount);
       } else {
         return;
       }
     }
-    if (pathList.length > 0) {
-      path = pathList.join(',');
-    }
-    emitValue(path);
   }
-
-  // 预览文件、图片
-  function onFilePreview(file) {
-    if (isImageMode.value) {
-      createImgPreview({ imageList: [file.url], maskClosable: true });
-    } else {
-      // window.open(file.url);
-      openWindowWithLoading(file.url);
-    }
-  }
-
-  /**
-   * 自定义下载事件，带加载中
-   */
-  function openWindowWithLoading(url){
-    spinning.value = true;
-    let fileName = url.substring(url.lastIndexOf("/")+1);
-    let uploadAxiosHttpConfig = {
-      //超时时间，分钟 * 秒 * 毫秒 60分钟
-      timeout: 60 * 60 * 1000,
-      //不自动拼接前缀
-      joinPrefix: false,
-      //自定义前缀
-      apiUrl: '',
-      //不自动处理
-      isTransformResponse: false
-    }
-    ajaxDownloadFileFn(url, fileName, {}, () => { spinning.value = false; }, uploadAxiosHttpConfig);
-    //spinning.value = false;
-    // let xhr = new XMLHttpRequest();
-    // xhr.open('GET',url,true);
-    // // xhr.onprogress = function (e){
-    // //   let percent = Math.floor(e.loaded / e.total * 100);//百分比加载，用于进度条
-    // //   console.log(percent);
-    // // }
-    // xhr.send();
-    // xhr.responseType = "arraybuffer";
-    // xhr.onreadystatechange = event =>{
-    //   console.log(xhr);
-    //   if(xhr.readyState == 4){
-    //     if(xhr.status == 200){
-    //       let fileName = url.substring(url.lastIndexOf("/")+1);
-    //       let blob = new Blob([xhr.response]);
-    //       const downLoadLink = document.createElement('a');
-    //       downLoadLink.download = fileName;
-    //       downLoadLink.href = URL.createObjectURL(blob);
-    //       downLoadLink.click();
-    //     }else if (xhr.status == 404){
-    //       createMessage.warning('没有找到可下载的资源！');
-    //     }
-    //   }
-    //   spinning.value = false;
-    // }
-  }
-
-  function emitValue(value) {
-    emit('change', value);
-    emit('update:value', value);
-  }
-
-  function uidGenerator() {
-    return '-' + parseInt(Math.random() * 10000 + 1, 10);
-  }
-
-  function getFileName(path) {
-    if (path.lastIndexOf('\\') >= 0) {
-      let reg = new RegExp('\\\\', 'g');
-      path = path.replace(reg, '/');
-    }
-    return path.substring(path.lastIndexOf('/') + 1);
-  }
-
-  // //获取文件md5（仅支持小文件，，，弃用）
-  // function calculateFileMd5(file) {
-  //   return new Promise((resolve, reject) => {
-  //     const reader = new FileReader();
-  //     // 当文件被成功读取时调用onload事件
-  //     reader.onload = function (event) {
-  //       const arrayBufferView = event.target.result;
-  //       // 将ArrayBuffer转换为WordArray对象
-  //       const wordArray = CryptoJS.lib.WordArray.create(arrayBufferView);
-  //       // 计算MD5哈希值
-  //       const md5Hash = CryptoJS.MD5(wordArray).toString();
-  //       resolve(md5Hash);
-  //     };
-  //     // 当发生错误时调用onerror事件
-  //     reader.onerror = function () {
-  //       reject('Failed to read file');
-  //     };
-  //     // 开始读取文件内容
-  //     reader.readAsArrayBuffer(file);
-  //   });
-  // }
-
-  /**
-   * 计算文件md5（分批次计算，挺慢的，支持大文件）
-   */
-  function calFileMd5(file){
-    return new Promise((resolve, reject) => {
-      let md5 = CryptoJS.algo.MD5.create();
-      //获取文件对象
-      let reader = new FileReader();
-      let step = 1024* 1024;
-      let total = file.size;
-      let cuLoaded = 0;
-      let time=1;
-      console.info("文件大小：" + file.size);
-      //读取一段成功
-      reader.onload = (e) => {
-        //console.log("开始读取第"+time+"段");
-        //处理读取的结果
-        let wordArray = CryptoJS.lib.WordArray.create(reader.result);
-        md5.update(wordArray);
-        cuLoaded += e.loaded;
-        //如果没有读完，继续
-        if (cuLoaded < total) {
-          readBlob(cuLoaded);
-        } else {
-          cuLoaded = total;
-          let hash = md5.finalize().toString();
-          //document.getElementById("result").innerText=hash;
-          resolve(hash + buildUUID());
+  if (info.file.status === 'done') {
+    if (info.file.response.success) {
+      fileListTemp = fileListTemp.map((file) => {
+        if (file.response) {
+          let reUrl = file.response.message;
+          file.url = getFileAccessHttpUrl(reUrl);
         }
-        time++;
-      }
-      reader.onerror = (e) => {
-        console.error('读取文件MD5出现错误 =>',e);
-        reject(e);
-      }
-      //开始读取
-      readBlob(0);
-      //指定开始位置，分块读取文件
-      function readBlob(start) {
-        //指定开始位置和结束位置读取文件
-        let blob = file.slice(start, start + step);
-        reader.readAsArrayBuffer(blob);
-      }
-    });
+        return file;
+      });
+    }
+  } else if (info.file.status === 'error') {
+    createMessage.error(`${info.file.name} 上传失败. ${info.file.response.message}`);
   }
-
-  function calFileUid(file){
-    return new Promise((resolve, reject) => {
-      resolve(buildUUID());
-    });
+  fileList.value = fileListTemp;
+  if (info.file.status === 'done' || info.file.status === 'removed') {
+    //returnUrl为true时仅返回文件路径
+    if (props.returnUrl) {
+      handlePathChange();
+    } else {
+      //returnUrl为false时返回文件名称、文件路径及文件大小
+      let newFileList: any[] = [];
+      for (const item of fileListTemp) {
+        if (item.status === 'done') {
+          let fileJson = {
+            fileName: item.name,
+            filePath: item.response.message,
+            fileSize: item.size,
+          };
+          newFileList.push(fileJson);
+        } else {
+          return;
+        }
+      }
+      emitValue(newFileList);
+    }
   }
+}
 
+function handlePathChange() {
+  let uploadFiles = fileList.value;
+  let path = '';
+  if (!uploadFiles || uploadFiles.length == 0) {
+    path = '';
+  }
+  let pathList: string[] = [];
+  for (const item of uploadFiles) {
+    if (item.status === 'done') {
+      pathList.push(item.response.message);
+    } else {
+      return;
+    }
+  }
+  if (pathList.length > 0) {
+    path = pathList.join(',');
+  }
+  emitValue(path);
+}
 
+// 预览文件、图片
+function onFilePreview(file) {
+  if (isImageMode.value) {
+    createImgPreview({ imageList: [file.url], maskClosable: true });
+  } else {
+    // window.open(file.url);
+    openWindowWithLoading(file.url);
+  }
+}
 
+/**
+ * 自定义下载事件，带加载中
+ */
+function openWindowWithLoading(url) {
+  spinning.value = true;
+  let fileName = url.substring(url.lastIndexOf('/') + 1);
+  let uploadAxiosHttpConfig = {
+    //超时时间，分钟 * 秒 * 毫秒 60分钟
+    timeout: 60 * 60 * 1000,
+    //不自动拼接前缀
+    joinPrefix: false,
+    //自定义前缀
+    apiUrl: '',
+    //不自动处理
+    isTransformResponse: false,
+  };
+  ajaxDownloadFileFn(
+    url,
+    fileName,
+    {},
+    () => {
+      spinning.value = false;
+    },
+    uploadAxiosHttpConfig
+  );
+  //spinning.value = false;
+  // let xhr = new XMLHttpRequest();
+  // xhr.open('GET',url,true);
+  // // xhr.onprogress = function (e){
+  // //   let percent = Math.floor(e.loaded / e.total * 100);//百分比加载，用于进度条
+  // //   console.log(percent);
+  // // }
+  // xhr.send();
+  // xhr.responseType = "arraybuffer";
+  // xhr.onreadystatechange = event =>{
+  //   console.log(xhr);
+  //   if(xhr.readyState == 4){
+  //     if(xhr.status == 200){
+  //       let fileName = url.substring(url.lastIndexOf("/")+1);
+  //       let blob = new Blob([xhr.response]);
+  //       const downLoadLink = document.createElement('a');
+  //       downLoadLink.download = fileName;
+  //       downLoadLink.href = URL.createObjectURL(blob);
+  //       downLoadLink.click();
+  //     }else if (xhr.status == 404){
+  //       createMessage.warning('没有找到可下载的资源！');
+  //     }
+  //   }
+  //   spinning.value = false;
+  // }
+}
 
-  //请求接口的数据返回
+function emitValue(value) {
+  emit('change', value);
+  emit('update:value', value);
+}
+
+function uidGenerator() {
+  return '-' + parseInt(Math.random() * 10000 + 1, 10);
+}
+
+function getFileName(path) {
+  if (path.lastIndexOf('\\') >= 0) {
+    let reg = new RegExp('\\\\', 'g');
+    path = path.replace(reg, '/');
+  }
+  return path.substring(path.lastIndexOf('/') + 1);
+}
+
+// //获取文件md5（仅支持小文件，，，弃用）
+// function calculateFileMd5(file) {
+//   return new Promise((resolve, reject) => {
+//     const reader = new FileReader();
+//     // 当文件被成功读取时调用onload事件
+//     reader.onload = function (event) {
+//       const arrayBufferView = event.target.result;
+//       // 将ArrayBuffer转换为WordArray对象
+//       const wordArray = CryptoJS.lib.WordArray.create(arrayBufferView);
+//       // 计算MD5哈希值
+//       const md5Hash = CryptoJS.MD5(wordArray).toString();
+//       resolve(md5Hash);
+//     };
+//     // 当发生错误时调用onerror事件
+//     reader.onerror = function () {
+//       reject('Failed to read file');
+//     };
+//     // 开始读取文件内容
+//     reader.readAsArrayBuffer(file);
+//   });
+// }
+
+/**
+ * 计算文件md5（分批次计算，挺慢的，支持大文件）
+ */
+function calFileMd5(file) {
+  return new Promise((resolve, reject) => {
+    let md5 = CryptoJS.algo.MD5.create();
+    //获取文件对象
+    let reader = new FileReader();
+    let step = 1024 * 1024;
+    let total = file.size;
+    let cuLoaded = 0;
+    let time = 1;
+    console.info('文件大小：' + file.size);
+    //读取一段成功
+    reader.onload = (e) => {
+      //console.log("开始读取第"+time+"段");
+      //处理读取的结果
+      let wordArray = CryptoJS.lib.WordArray.create(reader.result);
+      md5.update(wordArray);
+      cuLoaded += e.loaded;
+      //如果没有读完，继续
+      if (cuLoaded < total) {
+        readBlob(cuLoaded);
+      } else {
+        cuLoaded = total;
+        let hash = md5.finalize().toString();
+        //document.getElementById("result").innerText=hash;
+        resolve(hash + buildUUID());
+      }
+      time++;
+    };
+    reader.onerror = (e) => {
+      console.error('读取文件MD5出现错误 =>', e);
+      reject(e);
+    };
+    //开始读取
+    readBlob(0);
+    //指定开始位置，分块读取文件
+    function readBlob(start) {
+      //指定开始位置和结束位置读取文件
+      let blob = file.slice(start, start + step);
+      reader.readAsArrayBuffer(blob);
+    }
+  });
+}
+
+function calFileUid(file) {
+  return new Promise((resolve, reject) => {
+    resolve(buildUUID());
+  });
+}
+
+//请求接口的数据返回
 // function upSearch(data){
 //     return new Promise((resolve,reject)=>{
 //         setTimeout(()=>{
@@ -585,263 +592,266 @@
 
 //limitUp([1,2,3,4,5,6,7,8], 3)
 
+async function limitPromise(promises, limit) {
+  const results = [];
 
-  async function limitPromise(promises, limit) {
-    const results = []
-
-    for(let i=0; i<=promises.length; i+=limit) {
-      const tasks = []
-      // 切片 Promise.all 的参数
-      for(const promise of promises.slice(i, i + limit)) {
-        tasks.push(promise)
-      }
-      // 用 await 以确保后面的任务不会在执行当前任务时执行
-      const result = await Promise.all(tasks)
-      results.push(...result)
+  for (let i = 0; i <= promises.length; i += limit) {
+    const tasks = [];
+    // 切片 Promise.all 的参数
+    for (const promise of promises.slice(i, i + limit)) {
+      tasks.push(promise);
     }
-
-    return results
+    // 用 await 以确保后面的任务不会在执行当前任务时执行
+    const result = await Promise.all(tasks);
+    results.push(...result);
   }
 
-  //分片大小 5m
-  const chunkSize = 5 * 1024 * 1024;
+  return results;
+}
 
-  const runBatchNum = 20;
+//分片大小 5m
+const chunkSize = 5 * 1024 * 1024;
 
-  const uploadAxiosHttpConfig = {
-    //超时时间，分钟 * 秒 * 毫秒 60分钟
-    timeout: 60 * 60 * 1000,
-    //不自动拼接前缀
-    joinPrefix: false,
-    //自定义前缀
-    apiUrl: baseUploadUrl,
-    //不自动处理
-    isTransformResponse: false
-  }
+const runBatchNum = 20;
 
-  const defUploadFn = (params) => defHttp.post({ url: '/sys/common/upload', params }, uploadAxiosHttpConfig );
+const uploadAxiosHttpConfig = {
+  //超时时间，分钟 * 秒 * 毫秒 60分钟
+  timeout: 60 * 60 * 1000,
+  //不自动拼接前缀
+  joinPrefix: false,
+  //自定义前缀
+  apiUrl: baseUploadUrl,
+  //不自动处理
+  isTransformResponse: false,
+};
 
-  const bigFileUploadInit = (params) => defHttp.post({ url: '/sys/common/sectionUpload/init', params }, uploadAxiosHttpConfig );
+const defUploadFn = (params) => defHttp.post({ url: '/sys/common/upload', params }, uploadAxiosHttpConfig);
 
-  const bigFileUploadUpload = (params) => defHttp.post({ url: '/sys/common/sectionUpload/upload', params }, uploadAxiosHttpConfig );
+const bigFileUploadInit = (params) => defHttp.post({ url: '/sys/common/sectionUpload/init', params }, uploadAxiosHttpConfig);
 
-  const bigFileUploadEnd = (params) => defHttp.post({ url: '/sys/common/sectionUpload/end', params }, uploadAxiosHttpConfig)
+const bigFileUploadUpload = (params) => defHttp.post({ url: '/sys/common/sectionUpload/upload', params }, uploadAxiosHttpConfig);
 
-  /**
-   * 自定义文件上传方法，小于5m的走默认上传，大于5m的走切片上传
-   */
-  function uploadFn(customRequestData){
-    const { data, file, onProgress, onSuccess, onError } = customRequestData; // 解构出a-upload的内置的方法（进度条，成功失败等）
+const bigFileUploadEnd = (params) => defHttp.post({ url: '/sys/common/sectionUpload/end', params }, uploadAxiosHttpConfig);
 
-    let fileSize = file.size;
-    let uploadPromiseList = [];
+/**
+ * 自定义文件上传方法，小于5m的走默认上传，大于5m的走切片上传
+ */
+function uploadFn(customRequestData) {
+  const { data, file, onProgress, onSuccess, onError } = customRequestData; // 解构出a-upload的内置的方法（进度条，成功失败等）
 
-    if(fileSize <= chunkSize){
-      let formData = new FormData();
-      Object.keys(data).forEach(key => {
-        formData.append(key, data[key]);
-      });
-      formData.append('file', file);
-      //传统直传
-      defUploadFn(formData).then(res => {
+  let fileSize = file.size;
+  let uploadPromiseList = [];
+
+  if (fileSize <= chunkSize) {
+    let formData = new FormData();
+    Object.keys(data).forEach((key) => {
+      formData.append(key, data[key]);
+    });
+    formData.append('file', file);
+    //传统直传
+    defUploadFn(formData)
+      .then((res) => {
         console.log(`🚀 ~ 传统直传 - defUploadFn ~ res:`, res);
-        if(res.success){
-          onProgress({ percent: 100 }, file) // 进度条
-          onSuccess(res, file) // 上传文件的状态
+        if (res.success) {
+          onProgress({ percent: 100 }, file); // 进度条
+          onSuccess(res, file); // 上传文件的状态
         } else {
           onError(res, res, file);
         }
-      }).catch(err => {
+      })
+      .catch((err) => {
         console.log(`🚀 ~ 传统直传 - defUploadFn ~ err:`, err);
         onError(err, err, file);
       });
-    } else {
-      //计算当前选择文件需要的分片数量
-      const chunkCount = Math.ceil(fileSize / chunkSize);
-      console.log("文件大小：",(file.size / 1024 / 1024) + "Mb","分片数：",chunkCount);
-      //获取文件md5
-      console.log('第一步，计算文件的md5',calFileMd5, file);
-      calFileMd5(file).then(fileMd5 => {
-        console.log(`🚀 ~ 文件的md5是:`, fileMd5);
-        const initUploadParams = { chunkCount, fileMd5 , ...data, };
-        let successNum = 0;
+  } else {
+    //计算当前选择文件需要的分片数量
+    const chunkCount = Math.ceil(fileSize / chunkSize);
+    console.log('文件大小：', file.size / 1024 / 1024 + 'Mb', '分片数：', chunkCount);
+    //获取文件md5
+    console.log('第一步，计算文件的md5', calFileMd5, file);
+    calFileMd5(file).then((fileMd5) => {
+      console.log(`🚀 ~ 文件的md5是:`, fileMd5);
+      const initUploadParams = { chunkCount, fileMd5, ...data };
+      let successNum = 0;
 
-        let taskAllList = [];
-        //切片上传（开始）
-        console.log('第二步，根据md5创建文件夹', initUploadParams);
-        bigFileUploadInit(initUploadParams).then(res => {
-          console.log('第三步，准备切片文件', res);
-          if(res.success){
-            onProgress({ percent: 0 }, file); // 进度条
-            //后台创建成功，下一步，分批次上传
-            for (let i = 1; i <= chunkCount; i++) {
-              let uploadParams = {
-                partNumber: i,
-                ...initUploadParams,
-                file: null,
-              }
-              //分片开始位置
-              let start = (i - 1) * chunkSize
-              //分片结束位置
-              let end = Math.min(fileSize, start + chunkSize)
-              //取文件指定范围内的byte，从而得到分片数据
-              let _chunkFile = file.slice(start, end)
-              console.log("第四步，开始准备文件第" + i + "个分片" + "，切片范围从" + start + "到" + end)
+      let taskAllList = [];
+      //切片上传（开始）
+      console.log('第二步，根据md5创建文件夹', initUploadParams);
+      bigFileUploadInit(initUploadParams).then((res) => {
+        console.log('第三步，准备切片文件', res);
+        if (res.success) {
+          onProgress({ percent: 0 }, file); // 进度条
+          //后台创建成功，下一步，分批次上传
+          for (let i = 1; i <= chunkCount; i++) {
+            let uploadParams = {
+              partNumber: i,
+              ...initUploadParams,
+              file: null,
+            };
+            //分片开始位置
+            let start = (i - 1) * chunkSize;
+            //分片结束位置
+            let end = Math.min(fileSize, start + chunkSize);
+            //取文件指定范围内的byte，从而得到分片数据
+            let _chunkFile = file.slice(start, end);
+            console.log('第四步，开始准备文件第' + i + '个分片' + '，切片范围从' + start + '到' + end);
 
-              uploadParams.file = _chunkFile;
-              let uploadFormData = new FormData();
-              Object.keys(uploadParams).forEach(key => {
-                uploadFormData.append(key, uploadParams[key]);
-              });
+            uploadParams.file = _chunkFile;
+            let uploadFormData = new FormData();
+            Object.keys(uploadParams).forEach((key) => {
+              uploadFormData.append(key, uploadParams[key]);
+            });
 
-              console.log('第五步，准备切片文件上传参数', uploadFormData);
-              taskAllList.push(new Promise((resolve, reject) => {
+            console.log('第五步，准备切片文件上传参数', uploadFormData);
+            taskAllList.push(
+              new Promise((resolve, reject) => {
                 console.log('第六步，准备切片文件上传前，', uploadFormData);
-                bigFileUploadUpload(uploadFormData).then(res => {
-                  console.log('第七步，切片文件上传后，', uploadFormData, res);
-                  if(res.success) {
-                    successNum++;
-                    let percent = Number(Number(successNum/chunkCount*100).toFixed(0))
-                    onProgress({ percent }, file) // 进度条
-                    resolve(res);
-                  }else{
-                    reject(res);
-                  }
-                }).catch(err => {
-                  reject(err)
-                });
-              }));
-            }
-            //任务分片,一次20片
-            console.log('第八步，全部切片，根据指定线程数执行，', limitPromise, taskAllList);
-            limitPromise(taskAllList, runBatchNum).then(resList => {
+                bigFileUploadUpload(uploadFormData)
+                  .then((res) => {
+                    console.log('第七步，切片文件上传后，', uploadFormData, res);
+                    if (res.success) {
+                      successNum++;
+                      let percent = Number(Number((successNum / chunkCount) * 100).toFixed(0));
+                      onProgress({ percent }, file); // 进度条
+                      resolve(res);
+                    } else {
+                      reject(res);
+                    }
+                  })
+                  .catch((err) => {
+                    reject(err);
+                  });
+              })
+            );
+          }
+          //任务分片,一次20片
+          console.log('第八步，全部切片，根据指定线程数执行，', limitPromise, taskAllList);
+          limitPromise(taskAllList, runBatchNum)
+            .then((resList) => {
               console.log('第九步，全部切片，根据指定线程数执行完成后的结果，', resList);
               //完成后再执行一个合并
               let endUploadParams = {
                 ...initUploadParams,
                 fileName: file.name,
-              }
+              };
               console.log('第十步，全部切片，发生合并指令，', endUploadParams);
-              bigFileUploadEnd(endUploadParams).then(res => {
-                console.log(`第十一步 ~ 合并返回值 defHttp.post ~ res:`, res);
-                //返回跟单个上传一样的返回值，
-                if(res.success){
-                  onProgress({ percent: 100 }, file) // 进度条
-                  onSuccess(res, file) // 上传文件的状态
-                } else {
-                  onError(res, res, file);
-                }
-
-              }).catch(err => {
-                console.error(`🚀 ~ 合并出现错误！ defHttp.post ~ err:`, err);
-                onError(err, err, file);
-              })
-            }).catch(err => {
+              bigFileUploadEnd(endUploadParams)
+                .then((res) => {
+                  console.log(`第十一步 ~ 合并返回值 defHttp.post ~ res:`, res);
+                  //返回跟单个上传一样的返回值，
+                  if (res.success) {
+                    onProgress({ percent: 100 }, file); // 进度条
+                    onSuccess(res, file); // 上传文件的状态
+                  } else {
+                    onError(res, res, file);
+                  }
+                })
+                .catch((err) => {
+                  console.error(`🚀 ~ 合并出现错误！ defHttp.post ~ err:`, err);
+                  onError(err, err, file);
+                });
+            })
+            .catch((err) => {
               console.error(`🚀 ~ 全部完成后，其中有错误limitPromise ~ err:`, err);
               //有错误，，
               onError(err, err, file);
             });
-
-          }
-          //return
-        })
-
-      })
-
-
-    }
-
-
-    // Promise.all(uploadPromiseList).then(resList => {
-
-    // });
+        }
+        //return
+      });
+    });
   }
 
-  defineExpose({
-    addActionsListener,
-  });
+  // Promise.all(uploadPromiseList).then(resList => {
+
+  // });
+}
+
+defineExpose({
+  addActionsListener,
+});
 </script>
 
 <style lang="less">
-  //noinspection LessUnresolvedVariable
-  @prefix-cls: ~'@{namespace}-j-upload';
+//noinspection LessUnresolvedVariable
+@prefix-cls: ~'@{namespace}-j-upload';
 
-  .@{prefix-cls} {
-    &-container {
-      position: relative;
+.@{prefix-cls} {
+  &-container {
+    position: relative;
 
-      .upload-disabled {
-        .ant-upload-list-item {
-          .anticon-close {
-            display: none;
-          }
-
-          .anticon-delete {
-            display: none;
-          }
+    .upload-disabled {
+      .ant-upload-list-item {
+        .anticon-close {
+          display: none;
         }
 
-        /* update-begin-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
-        .upload-download-handler {
-          right: 6px !important;
+        .anticon-delete {
+          display: none;
         }
-        /* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
       }
 
-      .ant-upload-list-item {
-        .upload-actions-container {
+      /* update-begin-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
+      .upload-download-handler {
+        right: 6px !important;
+      }
+      /* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
+    }
+
+    .ant-upload-list-item {
+      .upload-actions-container {
+        position: absolute;
+        top: -31px;
+        left: -18px;
+        z-index: 11;
+        width: 84px;
+        height: 84px;
+        line-height: 28px;
+        text-align: center;
+        pointer-events: none;
+
+        a {
+          opacity: 0.9;
+          margin: 0 5px;
+          cursor: pointer;
+          transition: opacity 0.3s;
+
+          .anticon {
+            color: #fff;
+            font-size: 16px;
+          }
+
+          &:hover {
+            opacity: 1;
+          }
+        }
+
+        .upload-mover-handler,
+        .upload-download-handler {
           position: absolute;
-          top: -31px;
-          left: -18px;
-          z-index: 11;
-          width: 84px;
-          height: 84px;
-          line-height: 28px;
-          text-align: center;
-          pointer-events: none;
+          pointer-events: auto;
+        }
 
-          a {
-            opacity: 0.9;
-            margin: 0 5px;
-            cursor: pointer;
-            transition: opacity 0.3s;
+        .upload-mover-handler {
+          width: 100%;
+          bottom: 0;
+        }
 
-            .anticon {
-              color: #fff;
-              font-size: 16px;
-            }
-
-            &:hover {
-              opacity: 1;
-            }
-          }
-
-          .upload-mover-handler,
-          .upload-download-handler {
-            position: absolute;
-            pointer-events: auto;
-          }
-
-          .upload-mover-handler {
-            width: 100%;
-            bottom: 0;
-          }
-
-          .upload-download-handler {
-            top: -4px;
-            right: -4px;
-          }
+        .upload-download-handler {
+          top: -4px;
+          right: -4px;
         }
       }
     }
   }
+}
 
-  .example {
-    text-align: center;
-    background: rgba(0, 0, 0, 0);
-    border-radius: 4px;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-  }
+.example {
+  text-align: center;
+  background: rgba(0, 0, 0, 0);
+  border-radius: 4px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+}
 </style>
diff --git a/src/views/site/studentWdkc/teacherDbtx.vue b/src/views/site/studentWdkc/teacherDbtx.vue
index 76a08c0..dbaa4bb 100644
--- a/src/views/site/studentWdkc/teacherDbtx.vue
+++ b/src/views/site/studentWdkc/teacherDbtx.vue
@@ -6,7 +6,7 @@
     <a-tabs v-model:activeKey="activeKey" style="padding: 10px">
       <a-tab-pane key="1" tab="未读">
         <div style="width: 100%; text-align: right; ">
-          <RouterLink target='_blank' to="/site/teacherYiyueMore">查看更多</RouterLink>
+          <RouterLink target='_blank' to="/site/teacherWeiduMore">查看更多</RouterLink>
         </div>
         <div style="min-height: 70px">
           <a-row>
diff --git a/src/views/site/studentWdkc/teacherWeiduMore.vue b/src/views/site/studentWdkc/teacherWeiduMore.vue
index 6ee6a4f..d83248b 100644
--- a/src/views/site/studentWdkc/teacherWeiduMore.vue
+++ b/src/views/site/studentWdkc/teacherWeiduMore.vue
@@ -8,7 +8,7 @@
         <a-layout-content>
           <a-card class="rowGutter" id="jcgkkDom">
             <template #title>
-              <div style="font-size: 24px; font-weight: bold">已读信息</div>
+              <div style="font-size: 24px; font-weight: bold">未读信息</div>
             </template>
             <a-row :gutter="[16, 16]" style="margin-top: 20px">
               <a-col v-for="(item, index) in listData" :key="index" :span="24">
@@ -17,7 +17,7 @@
                     <div style="margin-top: 5px">{{ index + 1 }}、{{ item.content }}</div>
                   </a-col>
                   <a-col :span="2" style="text-align: right">
-                    <a-button type="primary" @click="openKecheng(item)" style="margin-left: 10px">已读</a-button>
+                    <a-button type="primary" @click="openKecheng(item)" style="margin-left: 10px">查看</a-button>
                   </a-col>
                 </a-row>
               </a-col>
diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/index.vue b/src/views/zy/jiaoXueDanYuanNeiRong/index.vue
index c312143..338ef68 100644
--- a/src/views/zy/jiaoXueDanYuanNeiRong/index.vue
+++ b/src/views/zy/jiaoXueDanYuanNeiRong/index.vue
@@ -380,7 +380,7 @@ import { Input, Popover, Pagination, Empty, Affix as aAffix } from 'ant-design-v
 import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useRouter } from 'vue-router';
-import { randomString, simpleDebounce, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+import { randomString, simpleDebounce, getFileAccessHttpUrl, baseApiUrl } from '/@/utils/common/compUtils';
 import { useFileList } from '/@/components/jeecg/comment/useComment';
 
 import draggable from 'vuedraggable';
@@ -391,6 +391,11 @@ import stuIndex from './stuIndex.vue';
 import { downloadFile as ajaxDownloadFileFn } from '/@/api/common/api';
 import zykYylistPage from '/@/views/zyk/ZykInfoYinyongModal.vue';
 
+import Base64 from 'crypto-js/enc-base64';
+import { dataURLtoBlob, urlToBase64 } from '/@/utils/file/base64Conver';
+import UTF8 from 'crypto-js/enc-utf8';
+import { encryptByBase64 } from '/@/utils/cipher';
+
 const spinning = ref<boolean>(false);
 //当前路由信息
 const { currentRoute } = useRouter();
@@ -416,6 +421,8 @@ const videoOpen = ref<boolean>(false);
 const controls = ref(true);
 const autoplay = ref(false);
 const loop = ref(false);
+// 文件预览地址的domain 在后台配置的
+let onlinePreviewDomain = '';
 
 const playVideoInFullscreen = async () => {
   console.log('💋', videoPlayer);
@@ -472,7 +479,7 @@ enum Api {
   delThree = '/teachingunitcontent/kcTeachingUnitContentThree/delete',
 }
 
-function handleView(urlPath){
+function handleView(urlPath) {
   // var url = 'http://127.0.0.1:8080/file/test.txt'; //要预览文件的访问地址
   // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(base64Encode(url)));
 }
@@ -801,20 +808,47 @@ function editThreePage(two, three, threeIndex) {
   threePageData.value = { two, three, threeIndex };
 }
 
-function viewThreePage(three) {
+async function viewThreePage(three) {
   console.log('🙇‍♂️', three);
 
-  if (three.value.type == 'video') {
+  if (three.type == 'video') {
     handleVideo(three);
-  } else if (three.value.type == 'document') {
+  } else if (three.type == 'document') {
+    // var file = 'https://kczxcs.nenu.edu.cn/jeecg-boot/temp/0731课程作业问题汇总_1722673666833.docx';
+    // var file = baseApiUrl + "/"+three.filePath;
+    // console.log('🤬', file);
+    // let url = getFileAccessHttpUrl(encodeURIComponent(file));
+    // var t2 = encryptByBase64(url);
+    // window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(t2));
 
-  } else if (three.value.type == 'richText') {
+    // var file = 'https://kczxcs.nenu.edu.cn/jeecg-boot/temp/ylhpsf.pdf';
+    var file = baseApiUrl + "/"+three.filePath;
+    console.log('🤬', file);
+    // let url = getFileAccessHttpUrl(encodeURIComponent(file));
+    // var t2 = encryptByBase64(url);
+    window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file))); 
+
+
+  } else if (three.type == 'richText') {
     threePageOpen.value = true;
     threePageDisableSubmit.value = true;
     threePageData.value = { three };
   }
 }
 
+const getViewFileDomain = () => defHttp.get({ url: '/sys/comment/getFileViewDomain' });
+/**
+ * 初始化domain
+ */
+async function initViewDomain() {
+  if (!onlinePreviewDomain) {
+    onlinePreviewDomain = await getViewFileDomain();
+  }
+  if (!onlinePreviewDomain.startsWith('http')) {
+    onlinePreviewDomain = 'http://' + onlinePreviewDomain;
+  }
+}
+
 function delThree(e, two, three) {
   stop(e);
   delThreeFetch({ id: three.id }).then((res) => {
diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue b/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue
index 34b219c..989a66e 100644
--- a/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue
+++ b/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue
@@ -213,12 +213,13 @@
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from "/@/hooks/web/useMessage";
   import { useRouter } from 'vue-router';
-  import { randomString, simpleDebounce, getFileAccessHttpUrl } from '/@/utils/common/compUtils'
+  import { randomString, simpleDebounce, getFileAccessHttpUrl, baseApiUrl } from '/@/utils/common/compUtils'
 
   import draggable from 'vuedraggable';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
   import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
   import downloadAssembly from '/@/views/zy/jiaoXueDanYuanNeiRong/downloadAssembly.vue';
+  import { encryptByBase64 } from '/@/utils/cipher';
 
   //当前路由信息
   const { currentRoute } = useRouter();
@@ -550,9 +551,17 @@ function handleVideo(three){
   }
 
   function viewThreePage(three) {
-    threePageOpen.value = true;
-    threePageDisableSubmit.value = true;
-    threePageData.value = { three };
+    if (three.type == 'video') {
+      handleVideo(three);
+    } else if (three.type == 'document') {
+      var file = baseApiUrl + "/"+three.filePath;
+      window.open('https://fileview.jeecg.com/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file))); 
+    } else if (three.type == 'richText') {
+      threePageOpen.value = true;
+      threePageDisableSubmit.value = true;
+      threePageData.value = { three };
+    }
+
   }
 
   function threePageHandleOk(){
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 52f1259..54b8c90 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -35,7 +35,7 @@
             <a-col :span="24" class="zyCon">
               <span style="text-align: left;width:50%;display: block;float:left;">作业得分：{{  item.stuscore ? item.stuscore : '未评' }}分</span>
               <span style="text-align: right;width:50%;display: block;float:left;" class="wpopen" v-if="handleSfkshp(item)" @click="handleHpfs(item)">互评分数:{{ item.xshpfs ? item.xshpfs : '未评' }}分</span>
-              <span style="text-align: left;width:50%;display: block;float:left;" v-if="handleSfkshp(item)">绩效分数：{{  item.jxfs ? item.jxfs : '未评' }}分</span>
+              <span style="text-align: left;width:50%;display: block;float:left;" v-if="handleSfkshp(item)">互评奖励：{{  item.jxfs ? item.jxfs : '未评' }}分</span>
               <span style="text-align: right;width:50%;display: block;float:left;">总分:{{ item.zzdf ? item.zzdf : '未评' }}分</span>
             </a-col>
             <a-col :span="24" class="zyCon">
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index 76c630e..5415274 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -113,7 +113,8 @@ d<template>
                       <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 @click="handleZyyqShow(1)"><span style="cursor: pointer; color: #18a689">温馨提示：点击可编辑作业要求</span></div>
+                        <div @click="handleZyyqShow(1)" class="tishi" v-if="zyInfo.xshpkg == '1'">温馨提示：点击可编辑作业要求</div>
+                        <!-- <div @click="handleZyyqShow(1)"><span style="cursor: pointer; color: #18a689">温馨提示：点击可编辑作业要求</span></div> -->
                       </a-form-item>
                     </a-col>
                     <a-col :span="24">
@@ -143,6 +144,7 @@ d<template>
                 <a-col :span="24">
                   <div class="region">
                     <div class="region-title">学生互评</div>
+                    <div style="float:right;margin-right:8px;" v-if="zyInfo.xshpkg == '1'"><span style="color:#18a689; cursor: pointer;" @click="handleHpsf">预览互评算法</span></div>
                     <a-form-item label="学生互评">
                       <div class="tishi" v-if="zyInfo.xshpkg == '1'">温馨提示：每份作业至少互评3次，每个学生互评5份作业</div>
                       <j-dict-select-tag
@@ -183,7 +185,7 @@ d<template>
                           style="margin-top: 15px"
                         /> -->
                         </a-form-item>
-                        <a-form-item label="互评开始时间" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+                        <a-form-item label="互评开始时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
                           <a-date-picker
                             placeholder="请选择互评开始时间"
                             v-model:value="zyInfo.xshpkssj"
@@ -194,7 +196,7 @@ d<template>
                             style="width: 100%"
                           />
                         </a-form-item>
-                        <a-form-item label="互评结束时间" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+                        <a-form-item label="互评结束时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
                           <a-date-picker
                             placeholder="请选择互评结束时间"
                             v-model:value="zyInfo.xshpjssj"
@@ -249,7 +251,7 @@ d<template>
                     </a-form-item>
                   </div>
                 </a-col>
-                <a-col :span="24" style="text-align: left; margin-top: 10px; margin-bottom: 40px; margin-left: 140px">
+                <a-col :span="24" style="text-align: center; margin-top: 10px; margin-bottom: 40px; ">
                   <a-button type="primary" @click="submitForm">保存</a-button>
                   <a-button type="primary" @click="reloadZy" style="margin-left: 15px">返回</a-button>
                 </a-col>
@@ -1154,7 +1156,7 @@ const columnsCcjg = [
     },
   },
   {
-    title: '查重率',
+    title: '查重率（%）',
     dataIndex: 'percentage',
     key: 'percentage',
   },
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index 067833a..781cf7e 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -94,7 +94,7 @@ export const newcolumns: BasicColumn[] = [
     slots: { customRender: 'xshpfsaction' },
   },
   {
-    title: '绩效分',
+    title: '互评奖励',
     align: "center",
     dataIndex: 'jxzf',
   },
diff --git a/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue b/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue
index 6b4798c..99831a9 100644
--- a/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue
+++ b/src/views/zy/zyInfoStudentHp/ZyhpMainList.vue
@@ -1,6 +1,11 @@
 <template>
   <div style="background: #fff;  margin: 10px 0;padding:10px;">
-    <div style="text-align: right;width:100%;"><a-button type="primary" @click="handleback">返回</a-button></div>
+    <div style="width:100%;">
+      <a-row>
+        <a-col :span="12" style="text-align: left;"><span style="color:#18a689; cursor: pointer;" @click="handleHpsf">预览互评算法</span></a-col>
+        <a-col :span="12" style="text-align: right;"><a-button type="primary" @click="handleback">返回</a-button></a-col>
+      </a-row>
+    </div>
     <a-tabs v-model:activeKey="activeKey" @change="handleChange">
       <a-tab-pane key="1" tab="待互评">
         <ZyInfoStudentHpList ref="dhpPage"/>
@@ -20,9 +25,12 @@ import { ref, reactive, onMounted, unref } from 'vue';
 import ZyInfoStudentHpList from '/@/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue'
 import ZyInfoStudentHpYpyList from '/@/views/zy/zyInfoStudentHp/ZyInfoStudentHpYpyList.vue'
 import ZyInfoStudentHpMyhpfsList from '/@/views/zy/zyInfoStudentHp/ZyInfoStudentHpMyhpfsList.vue'
+import { useGlobSetting } from '/@/hooks/setting';
 
 import { useRouter } from 'vue-router';
 import { defHttp } from '/@/utils/http/axios';
+const globSetting = useGlobSetting();
+const baseApiUrl = globSetting.domainUrl;
 var activeKey = ref('1');
 const dhpPage = ref();
 const yhpPage = ref();
@@ -42,6 +50,14 @@ function handleChange(record) {
     wdhpPage.value.reload();
   }
 }
+
+//预览互评算法
+function handleHpsf(){
+  // openByUrl({url:'/downPath/ylhpsf.pdf',target: '_blank',fileName:'算法说明.pdf'})
+  // window.open(pdfUrl.value, '_blank');
+  // window.open(require('../../../downPath/ylhpsf.pdf'), '_blank');
+  window.open(baseApiUrl+'/temp/ylhpsf.pdf');
+}
 function handleback(){
   var href = "/stuzy/studentDqzy";
   router.push({path:href,query: {rwbh,xqxn,type,teano}});