diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue
index 0214956..80b19a8 100644
--- a/src/views/components/TaskForm.vue
+++ b/src/views/components/TaskForm.vue
@@ -94,8 +94,6 @@
           maxlength="200"
           placeholder="请输入问题描述"
           show-word-limit
-          required
-          :rules="[{ required: true, message: '请输入问题描述' }]"
         />
 
         <div class="mediumList">
@@ -200,7 +198,6 @@
 
 // 提交上报
 const onSubmitData = async () => {
-  console.log(AllData.formData, 'AllData.formData');
   patrolProblemadd(AllData.formData).then((response) => {
     proxy.showSuccessToast('上报成功');
     closeDaKa();

diff --git a/src/views/components/TaskForm.vue b/src/views/components/TaskForm.vue
index 0214956..80b19a8 100644
--- a/src/views/components/TaskForm.vue
+++ b/src/views/components/TaskForm.vue
@@ -94,8 +94,6 @@
           maxlength="200"
           placeholder="请输入问题描述"
           show-word-limit
-          required
-          :rules="[{ required: true, message: '请输入问题描述' }]"
         />
 
         <div class="mediumList">
@@ -200,7 +198,6 @@
 
 // 提交上报
 const onSubmitData = async () => {
-  console.log(AllData.formData, 'AllData.formData');
   patrolProblemadd(AllData.formData).then((response) => {
     proxy.showSuccessToast('上报成功');
     closeDaKa();
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index db4eca8..d10133a 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -4,21 +4,40 @@
     <!-- 上传图片 -->
     <van-uploader
       v-model="fileList"
-      :before-read="beforeRead"
-      @delete="deletePic"
+      :after-read="afterRead"
       :max-count="maxCount"
       :max-size="50 * 1024 * 1024"
       @oversize="onOversize"
       :accept="acceptFormat"
       :disabled="isDisabled"
+      :before-delete="deleBrfore"
+      @delete="deleteFile"
+      multiple
     >
     </van-uploader>
+    <div v-if="acceptFormat == 'video/*'">
+      <!-- 显示视频列表 -->
+      <div v-if="fileList.length > 0">
+        <p v-for="(item, index) in fileList" :key="index" class="van-ellipsis blueFont" @click="checkVideo(item.url)">
+          {{ item.file ? item.file.name : item.name }}
+        </p>
+      </div>
+      <!-- 查看视频弹窗 -->
+      <van-popup v-model:show="showVideo" class="uploadVideo">
+        <video
+          v-if="showVideo"
+          style="width: 100vw; height: auto"
+          title="视频"
+          :src="videoUrl"
+          :autoPlay="true"
+        ></video>
+      </van-popup>
+    </div>
   </div>
 </template>
 
 <script setup name="uploaderPage">
-import { onMounted, ref, onBeforeUnmount } from 'vue';
-import { fileUpload, fileDelete } from '@/api/publicApi.js';
+import { fileUpload } from '@/api/publicApi.js';
 import { useStore } from '@/pinia/store.js';
 import { getCurrentInstance } from 'vue';
 
@@ -48,66 +67,73 @@
 const { proxy } = getCurrentInstance();
 const emit = defineEmits();
 const fileList = ref([]); //文件列表
-const uploadList = ref([]);
 const maxCount = props.maxCount; //最大上传数
+const acceptFormat = props.acceptFormat; //文件格式
+const showVideo = ref(false);
+const videoUrl = ref('');
 
-// 开始上传图片
-const beforeRead = async (file) => {
-  console.log(file, '原本上传的文件--');
-  // 压缩图片,大于500kb就压缩
-  let imgFile = null;
-  if (file.size / 1024 > 500 && file.type.includes('image')) {
-    imgFile = await blobToBase64(file, file.name);
+// 查看视频弹窗
+function checkVideo(url) {
+  videoUrl.value = url;
+  showVideo.value = true;
+}
+
+// 上传图片2
+const afterRead = (file) => {
+  // console.log('file---', Array.isArray(file));
+  let fileArr = [];
+  if (Array.isArray(file) == true) {
+    // 多个上传
+    fileArr = file;
   } else {
-    imgFile = file;
+    // 单个上传
+    fileArr.push(file);
   }
-  // console.log(imgFile, '压缩后的图片文件获取');
-  pinias.showLoading();
-  let formData = new FormData();
-  let config = {
-    headers: { 'Content-Type': 'multipart/form-data' },
-  };
-  formData.append('file', imgFile);
-  let res = await fileUpload(formData, config);
-  if (res && res.code == 200) {
-    uploadList.value.push(res.data);
-    console.log(uploadList.value, '  uploadList.value');
-    emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
-    proxy.showSuccessToast('上传成功');
-  } else {
-    fileList.value = [];
-    let param = {
-      id: imgFile.id,
-      name: imgFile.name,
-      status: 'error',
-    };
-    fileList.value.push(param);
-    proxy.showFailToast('上传失败');
-  }
-  pinias.hideLoading();
+  uploadFileFun(fileArr);
 };
-// 图片删除
-const deletePic = (file) => {
-  console.log('图片删除--', file);
-  let fileIndex = null;
-  uploadList.value.map((item, index) => {
-    if (file.file.name == (item.originalName || item.name)) {
-      fileIndex = index;
+
+// 图片上传到服务器
+function uploadFileFun(fileArr) {
+  fileArr.map((fileOBJ) => {
+    fileOBJ.status = 'uploading';
+    fileOBJ.message = '上传中...';
+    let imgFile = null;
+    if (fileOBJ.file.size / 1024 > 500 && fileOBJ.file.type.includes('image')) {
+      blobToBase64(fileOBJ.file, fileOBJ.file.name).then((res) => {
+        imgFile = res;
+      });
+    } else {
+      imgFile = fileOBJ.file;
     }
-  });
-  // id为空时做逻辑删除，不调用删除接口
-  let id = uploadList.value[fileIndex].id;
-  if (!!!id) {
-    uploadList.value.splice(fileIndex, 1);
-  } else {
-    let ids = [];
-    ids.push(id);
-    fileDelete(ids).then((res) => {
-      uploadList.value.splice(fileIndex, 1);
-      proxy.showSuccessToast('删除成功');
+    // 配置表单
+    let formData = new FormData();
+    let config = {
+      headers: { 'Content-Type': 'multipart/form-data' },
+    };
+    formData.append('file', imgFile);
+    fileUpload(formData, config).then((res) => {
+      if (res && res.code == 200) {
+        fileOBJ.status = 'done';
+        fileOBJ.message = '上传成功';
+        // 业务参数赋值
+        fileOBJ.url = res.data.url;
+        fileOBJ.fileCloundInfo = res.data;
+        emit('update:saveFileArr', fileList.value); //绑定的传值赋值
+      } else {
+        fileOBJ.status = 'failed';
+        fileOBJ.message = '上传失败';
+      }
     });
-  }
-  emit('update:saveFileArr', uploadList.value); //绑定的传值赋值
+  });
+}
+
+// 图片删除
+const deleBrfore = async (file) => {
+  return true;
+};
+
+const deleteFile = () => {
+  emit('update:saveFileArr', fileList.value);
 };
 const blobToBase64 = async (blob, fileName) => {
   const reader = await new FileReader(); // 实例化一个reader文件
@@ -154,22 +180,16 @@
   proxy.showFailToast('上传的文件最大为50M');
 }
 onMounted(() => {
-  console.log('修改时图片回显--', props.saveFileArr);
+  // console.log('修改时图片回显--', props.saveFileArr);
   // 修改时图片回显
   fileList.value = [];
-  uploadList.value = [];
   props.saveFileArr.map((item) => {
     let params = {
-      id: item.id,
       name: item.name,
-      originalName: item.originalName,
-      file: { name: item.originalName },
       status: 'success',
       url: item.url,
     };
     fileList.value.push(params);
-    uploadList.value.push(params);
-    console.log(uploadList.value, '  uploadList.value1111');
   });
 });
 onBeforeUnmount(() => {
@@ -177,10 +197,22 @@
 });
 </script>
 <style lang="less">
+/* 添加这段样式后，Primary Button 会变成红色 */
+:root:root {
+  --van-uploader-size: 150px;
+}
+.van-uploader__file-name {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 .uploaderPage {
   width: 100%;
   .blueFont {
     color: #0c60e1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }
 </style>