From 99be59a23a1350a4c8a9fd4cd18a998025209bd1 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Mon, 27 Feb 2023 00:48:03 +0800
Subject: [PATCH 1/3] update

---
 src/components/img/UploadImg2HomeWork.vue | 123 ++++++++++++++++++++++
 src/views/homework/HomeworkPage.vue       |   4 +-
 2 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 src/components/img/UploadImg2HomeWork.vue

diff --git a/src/components/img/UploadImg2HomeWork.vue b/src/components/img/UploadImg2HomeWork.vue
new file mode 100644
index 0000000..60f292b
--- /dev/null
+++ b/src/components/img/UploadImg2HomeWork.vue
@@ -0,0 +1,123 @@
+<template>
+  <el-upload :file-list="files" :show-file-list="false" :limit="max" ref="imageRef" :before-upload="beforeUpload">
+    <template #trigger>
+      <div>
+        <slot></slot>
+      </div>
+    </template>
+  </el-upload>
+</template>
+<script setup>
+import { defineProps, ref, watch } from "vue";
+import { ElMessage } from "element-plus";
+import { computed } from "vue";
+import { useStore } from "vuex";
+import { request,fileUp } from "@/api/request";
+
+const store = useStore();
+const userInfo = computed(() => store.state.userInfo);
+
+const props = defineProps({
+  value: [],
+  max: {
+    type: Number,
+    default: 1
+  }
+})
+
+const emit = defineEmits()
+
+const files = ref([])
+const imageRef = ref()
+
+watch(props.value, () => {
+  props.value.length || (files.value = props.value)
+})
+
+function exceed() {
+  ElMessage.error(`只能上传${props.max}个附件`);
+}
+
+function beforeUpload(file) {
+  //2023-02-26增加文件名格式：文件名称_学生名_时间戳+资源地址
+  let dt = new Date();
+  let nowtime = dt.getFullYear() + (dt.getMonth() + 1).toString().padStart(2, '0')
+    + dt.getDate().toString().padStart(2, '0') + dt.getHours().toString().padStart(2, '0')
+    + dt.getMinutes().toString().padStart(2, '0') + dt.getSeconds().toString().padStart(2, '0');
+  console.log("用户姓名：" + userInfo.value.realName);
+  console.log("源文件名称：" + file.name);
+  let fileNewName = file.name.split(".")[0] + "_" + userInfo.value.realName + "_" + nowtime + "." + file.name.split(".")[1];
+  console.log("新文件名称：" + fileNewName);
+  const copyFile = new File([file], fileNewName);
+  console.log("新拷贝的文件名称：" + JSON.stringify(copyFile));
+  uploadFile(copyFile);
+  return false;
+}
+
+function uploadFile(file) {
+  const formdata = new FormData();
+  formdata.append('file', file)
+  console.log("formdata:" + JSON.stringify(formdata));
+  postForm(formdata)
+}
+
+function postForm(formdata) {
+  console.log("postForm:" + JSON.stringify(formdata));
+  fileUp(formdata).then((e) => {
+    console.log(JSON.stringify(e))
+    if (e.response && e.response.code === 200) {
+      e.url = e.response.data
+    }
+    const index = files.value.findIndex(f => f.uid === e.uid)
+    if (index === -1) {
+      files.value.unshift(e)
+    } else {
+      files.value[index] = e
+    }
+    emit('update:value', files.value)
+  }).catch((err) => {
+    ElMessage.error(`文件上传失败` + err);
+  })
+}
+
+function handleChange(e) {
+  if (e.response && e.response.code === 200) {
+    e.url = e.response.data
+  }
+
+  const index = files.value.findIndex(f => f.uid === e.uid)
+  if (index === -1) {
+    files.value.unshift(e)
+  } else {
+    files.value[index] = e
+  }
+  emit('update:value', files.value)
+}
+
+function remove(i) {
+  files.value.splice(i, 1)
+  console.log(imageRef)
+}
+
+function clearFiles() {
+  imageRef.value.clearFiles();
+}
+
+function reUpload(i) {
+  if (files.value[i].status === 'ready' || files.value[i].status === 'uploading') {
+    imageRef.value.abort(files.value[i].raw)
+    files.value[i].status = 'abort';
+  } else if (files.value[i].status === 'fail' || files.value[i].status === 'abort') {
+    imageRef.value.handleStart(files.value[i].raw)
+    imageRef.value.submit()
+  }
+}
+
+function abort(i) {
+  imageRef.value.abort(files.value[i].raw)
+}
+
+
+defineExpose({ reUpload, remove, clearFiles })
+
+</script>
diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 93725f8..1d04052 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -450,7 +450,8 @@ import {
 } from "@/api/api";
 import dayjs from "dayjs";
 import { useRouter } from "vue-router";
-import UploadImg from "@/components/img/UploadImg.vue";
+// import store from "@/store";
+import UploadImg from "@/components/img/UploadImg2HomeWork.vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { useRoute } from "vue-router/dist/vue-router";
 import { ElMessage } from "element-plus";
@@ -482,7 +483,6 @@ const {
     infoId,
   },
 } = useRoute();
-
 const { data } =
   taskId && taskId !== "undefined"
     ? useRequest(TASK_WORK_DETAIL, { workId, taskId })

From 2bd9cee5a3ec86c7e63f59d660cda9ceabfc9dff Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 27 Feb 2023 02:05:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=89=8D=E7=AB=AF=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=90=8D=E7=A7=B0=E3=80=81=E5=B7=A5=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BD=9C=E4=B8=9A=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/img/UploadImg2HomeWork.vue | 72 ++++++++---------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/src/components/img/UploadImg2HomeWork.vue b/src/components/img/UploadImg2HomeWork.vue
index 60f292b..b4bc430 100644
--- a/src/components/img/UploadImg2HomeWork.vue
+++ b/src/components/img/UploadImg2HomeWork.vue
@@ -1,5 +1,13 @@
 <template>
-  <el-upload :file-list="files" :show-file-list="false" :limit="max" ref="imageRef" :before-upload="beforeUpload">
+  <el-upload 
+    :file-list="files" 
+    :show-file-list="false" 
+    :limit="max" 
+    action="/file/upload"
+    ref="imageRef" 
+    :auto-upload="false"
+    :on-exceed="exceed"
+    :on-change="handleChange">
     <template #trigger>
       <div>
         <slot></slot>
@@ -17,6 +25,7 @@ import { request,fileUp } from "@/api/request";
 const store = useStore();
 const userInfo = computed(() => store.state.userInfo);
 
+
 const props = defineProps({
   value: [],
   max: {
@@ -38,58 +47,25 @@ function exceed() {
   ElMessage.error(`只能上传${props.max}个附件`);
 }
 
-function beforeUpload(file) {
-  //2023-02-26增加文件名格式：文件名称_学生名_时间戳+资源地址
-  let dt = new Date();
-  let nowtime = dt.getFullYear() + (dt.getMonth() + 1).toString().padStart(2, '0')
-    + dt.getDate().toString().padStart(2, '0') + dt.getHours().toString().padStart(2, '0')
-    + dt.getMinutes().toString().padStart(2, '0') + dt.getSeconds().toString().padStart(2, '0');
-  console.log("用户姓名：" + userInfo.value.realName);
-  console.log("源文件名称：" + file.name);
-  let fileNewName = file.name.split(".")[0] + "_" + userInfo.value.realName + "_" + nowtime + "." + file.name.split(".")[1];
-  console.log("新文件名称：" + fileNewName);
-  const copyFile = new File([file], fileNewName);
-  console.log("新拷贝的文件名称：" + JSON.stringify(copyFile));
-  uploadFile(copyFile);
-  return false;
-}
+function handleChange(file) {
+  console.log('111111',userInfo.value)
+  let fileName = userInfo.value.realName + '-' + userInfo.value.userNo + '-' + file.name; 
+  let f = new File([file.raw],fileName);
+  f.uid = file.uid; 
+  file.raw = f;  
+  console.log(file.raw)
+  // 手动触发上传
+  imageRef.value.submit();
 
-function uploadFile(file) {
-  const formdata = new FormData();
-  formdata.append('file', file)
-  console.log("formdata:" + JSON.stringify(formdata));
-  postForm(formdata)
-}
-
-function postForm(formdata) {
-  console.log("postForm:" + JSON.stringify(formdata));
-  fileUp(formdata).then((e) => {
-    console.log(JSON.stringify(e))
-    if (e.response && e.response.code === 200) {
-      e.url = e.response.data
-    }
-    const index = files.value.findIndex(f => f.uid === e.uid)
-    if (index === -1) {
-      files.value.unshift(e)
-    } else {
-      files.value[index] = e
-    }
-    emit('update:value', files.value)
-  }).catch((err) => {
-    ElMessage.error(`文件上传失败` + err);
-  })
-}
-
-function handleChange(e) {
-  if (e.response && e.response.code === 200) {
-    e.url = e.response.data
+  if (file.response && file.response.code === 200) {
+    file.url = file.response.data
   }
 
-  const index = files.value.findIndex(f => f.uid === e.uid)
+  const index = files.value.findIndex(f => f.uid === file.uid)
   if (index === -1) {
-    files.value.unshift(e)
+    files.value.unshift(file)
   } else {
-    files.value[index] = e
+    files.value[index] = file
   }
   emit('update:value', files.value)
 }

From 649b3bacd3c93ae3232001bcf0baa4ad2a853af9 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 27 Feb 2023 02:22:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...UploadImg2HomeWork.vue => UploadImgHomeWork.vue} | 13 ++++---------
 src/views/homework/HomeworkPage.vue                 |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename src/components/img/{UploadImg2HomeWork.vue => UploadImgHomeWork.vue} (92%)

diff --git a/src/components/img/UploadImg2HomeWork.vue b/src/components/img/UploadImgHomeWork.vue
similarity index 92%
rename from src/components/img/UploadImg2HomeWork.vue
rename to src/components/img/UploadImgHomeWork.vue
index b4bc430..4d0d827 100644
--- a/src/components/img/UploadImg2HomeWork.vue
+++ b/src/components/img/UploadImgHomeWork.vue
@@ -1,10 +1,10 @@
 <template>
   <el-upload 
+    ref="imageRef"
     :file-list="files" 
     :show-file-list="false" 
     :limit="max" 
-    action="/file/upload"
-    ref="imageRef" 
+    :action="FILE_UPLOAD_ANNEX"
     :auto-upload="false"
     :on-exceed="exceed"
     :on-change="handleChange">
@@ -20,12 +20,11 @@ import { defineProps, ref, watch } from "vue";
 import { ElMessage } from "element-plus";
 import { computed } from "vue";
 import { useStore } from "vuex";
-import { request,fileUp } from "@/api/request";
+import { FILE_UPLOAD_ANNEX } from "@/api/api";
 
 const store = useStore();
 const userInfo = computed(() => store.state.userInfo);
 
-
 const props = defineProps({
   value: [],
   max: {
@@ -35,7 +34,6 @@ const props = defineProps({
 })
 
 const emit = defineEmits()
-
 const files = ref([])
 const imageRef = ref()
 
@@ -48,25 +46,23 @@ function exceed() {
 }
 
 function handleChange(file) {
-  console.log('111111',userInfo.value)
   let fileName = userInfo.value.realName + '-' + userInfo.value.userNo + '-' + file.name; 
   let f = new File([file.raw],fileName);
   f.uid = file.uid; 
   file.raw = f;  
   console.log(file.raw)
-  // 手动触发上传
   imageRef.value.submit();
 
   if (file.response && file.response.code === 200) {
     file.url = file.response.data
   }
-
   const index = files.value.findIndex(f => f.uid === file.uid)
   if (index === -1) {
     files.value.unshift(file)
   } else {
     files.value[index] = file
   }
+
   emit('update:value', files.value)
 }
 
@@ -93,7 +89,6 @@ function abort(i) {
   imageRef.value.abort(files.value[i].raw)
 }
 
-
 defineExpose({ reUpload, remove, clearFiles })
 
 </script>
diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 1d04052..33c22ee 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -451,7 +451,7 @@ import {
 import dayjs from "dayjs";
 import { useRouter } from "vue-router";
 // import store from "@/store";
-import UploadImg from "@/components/img/UploadImg2HomeWork.vue";
+import UploadImg from "@/components/img/UploadImgHomeWork.vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { useRoute } from "vue-router/dist/vue-router";
 import { ElMessage } from "element-plus";