ソースを参照

文件上传调整

lipenghui 4 ヶ月 前
コミット
8891483c05

+ 1 - 1
src/components/UploadFile/src/UploadFile.vue

@@ -73,7 +73,7 @@ import { isString } from '@/utils/is'
 import { useUpload } from '@/components/UploadFile/src/useUpload'
 import { UploadFile } from 'element-plus/es/components/upload/src/upload'
 
-defineOptions({ name: 'UploadFile' })
+defineOptions({ name: 'UploadFileAll' })
 
 const message = useMessage() // 消息弹窗
 const emit = defineEmits(['update:modelValue'])

+ 231 - 0
src/components/UploadFile/src/UploadFileAll.vue

@@ -0,0 +1,231 @@
+<template>
+  <div v-if="!disabled" class="upload-file">
+    <el-upload
+      ref="uploadRef"
+      v-model:file-list="fileList"
+      :action="uploadUrl"
+      :auto-upload="autoUpload"
+      :before-upload="beforeUpload"
+      :disabled="disabled"
+      :drag="drag"
+      :http-request="httpRequest"
+      :limit="props.limit"
+      :multiple="props.limit > 1"
+      :on-error="excelUploadError"
+      :on-exceed="handleExceed"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleFileSuccess"
+      :show-file-list="true"
+      class="upload-file-uploader"
+      name="file"
+    >
+      <el-button type="primary">
+        <Icon icon="ep:upload-filled" />
+        选取文件
+      </el-button>
+      <template v-if="isShowTip" #tip>
+        <div style="font-size: 8px">
+          大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        </div>
+        <div style="font-size: 8px">
+          格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
+        </div>
+      </template>
+      <template #file="row">
+        <div class="flex items-center">
+          <span>{{ row.file.name }}</span>
+          <div class="ml-10px">
+            <el-link
+              :href="row.file.url"
+              :underline="false"
+              download
+              target="_blank"
+              type="primary"
+            >
+              下载
+            </el-link>
+          </div>
+          <div class="ml-10px">
+            <el-button link type="danger" @click="handleRemove(row.file)"> 删除</el-button>
+          </div>
+        </div>
+      </template>
+    </el-upload>
+  </div>
+
+  <!-- 上传操作禁用时 -->
+  <div v-if="disabled" class="upload-file">
+    <div v-for="(file, index) in fileList" :key="index" class="flex items-center file-list-item">
+      <span>{{ file.name }}</span>
+      <div class="ml-10px">
+        <el-link :href="file.url" :underline="false" download target="_blank" type="primary">
+          下载
+        </el-link>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import { isString } from '@/utils/is'
+import { useUpload } from '@/components/UploadFile/src/useUpload'
+import { UploadFile } from 'element-plus/es/components/upload/src/upload'
+
+defineOptions({ name: 'UploadFileAll' })
+
+const message = useMessage() // 消息弹窗
+const emit = defineEmits(['update:modelValue'])
+
+const props = defineProps({
+  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
+  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf','png','jpg','jpeg','sql','pptx','mp4']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileSize: propTypes.number.def(50), // 大小限制(MB)
+  limit: propTypes.number.def(5), // 数量限制
+  autoUpload: propTypes.bool.def(true), // 自动上传
+  drag: propTypes.bool.def(false), // 拖拽上传
+  isShowTip: propTypes.bool.def(true), // 是否显示提示
+  disabled: propTypes.bool.def(false) // 是否禁用上传组件 ==> 非必传(默认为 false)
+})
+
+// ========== 上传相关 ==========
+const uploadRef = ref<UploadInstance>()
+const uploadList = ref<UploadUserFile[]>([])
+const fileList = ref<UploadUserFile[]>([])
+const uploadNumber = ref<number>(0)
+
+const { uploadUrl, httpRequest } = useUpload()
+
+// 文件上传之前判断
+const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
+  if (fileList.value.length >= props.limit) {
+    message.error(`上传文件数量不能超过${props.limit}个!`)
+    return false
+  }
+  let fileExtension = ''
+  if (file.name.lastIndexOf('.') > -1) {
+    fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
+  }
+  const isImg = props.fileType.some((type: string) => {
+    if (file.type.indexOf(type) > -1) return true
+    return !!(fileExtension && fileExtension.indexOf(type) > -1)
+  })
+  const isLimit = file.size < props.fileSize * 1024 * 1024
+  if (!isImg) {
+    message.error(`文件格式不正确, 请上传${props.fileType.join('/')}格式!`)
+    return false
+  }
+  if (!isLimit) {
+    message.error(`上传文件大小不能超过${props.fileSize}MB!`)
+    return false
+  }
+  message.success('正在上传文件,请稍候...')
+  uploadNumber.value++
+}
+// 处理上传的文件发生变化
+// const handleFileChange = (uploadFile: UploadFile): void => {
+//   uploadRef.value.data.path = uploadFile.name
+// }
+// 文件上传成功
+const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => {
+  message.success('上传成功')
+  // 删除自身
+  const index = fileList.value.findIndex((item) => item.response?.data === res.data)
+  fileList.value.splice(index, 1)
+  console.log(JSON.stringify(res))
+  uploadList.value.push({ name: res.data.path, url: res.data.path,size:res.data.size })
+  if (uploadList.value.length == uploadNumber.value) {
+    fileList.value.push(...uploadList.value)
+    uploadList.value = []
+    uploadNumber.value = 0
+    emitUpdateModelValue()
+  }
+}
+// 文件数超出提示
+const handleExceed: UploadProps['onExceed'] = (): void => {
+  message.error(`上传文件数量不能超过${props.limit}个!`)
+}
+// 上传错误提示
+const excelUploadError: UploadProps['onError'] = (): void => {
+  message.error('导入数据失败,请您重新上传!')
+}
+// 删除上传文件
+const handleRemove = (file: UploadFile) => {
+  const index = fileList.value.map((f) => f.name).indexOf(file.name)
+  if (index > -1) {
+    fileList.value.splice(index, 1)
+    emitUpdateModelValue()
+  }
+}
+const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
+  console.log(uploadFile)
+}
+
+// 监听模型绑定值变动
+watch(
+  () => props.modelValue,
+  (val: string | string[]) => {
+    if (!val) {
+      fileList.value = [] // fix:处理掉缓存,表单重置后上传组件的内容并没有重置
+      return
+    }
+
+    fileList.value = [] // 保障数据为空
+    // 情况1:字符串
+    if (isString(val)) {
+      fileList.value.push(
+        ...val.split(',').map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
+      )
+      return
+    }
+    // 情况2:数组
+    fileList.value.push(
+      ...(val as string[]).map((url) => ({ name: url.url.substring(url.url.lastIndexOf('/') + 1), url }))
+    )
+  },
+  { immediate: true, deep: true }
+)
+// 发送文件链接列表更新
+const emitUpdateModelValue = () => {
+  // 情况1:数组结果
+  let result: string | string[] = fileList.value.map((file) => file)
+  // 情况2:逗号分隔的字符串
+  if (props.limit === 1 || isString(props.modelValue)) {
+    result = result.join(',')
+  }
+  emit('update:modelValue', result)
+}
+</script>
+<style lang="scss" scoped>
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+:deep(.upload-file-list .el-upload-list__item) {
+  position: relative;
+  margin-bottom: 10px;
+  line-height: 2;
+  border: 1px solid #e4e7ed;
+}
+
+:deep(.el-upload-list__item-file-name) {
+  max-width: 250px;
+}
+
+:deep(.upload-file-list .ele-upload-list__item-content) {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+:deep(.ele-upload-list__item-content-action .el-link) {
+  margin-right: 10px;
+}
+
+.file-list-item {
+  border: 1px dashed var(--el-border-color-darker);
+  border-radius: 8px;
+}
+</style>

+ 1 - 0
src/views/pms/device/DeviceUpload.vue

@@ -45,6 +45,7 @@
             <!--          <el-table-column label="资料分类" align="center" prop="classId" />-->
             <el-table-column label="文件名称" align="center" prop="filename" />
             <el-table-column label="文件类型" align="center" prop="fileType" />
+            <el-table-column label="文件大小" align="center" prop="fileSize" />
             <el-table-column label="查看预览" align="center" prop="filePath" >
               <template #default="scope">
                 <el-button link type="primary" @click="openWeb(scope.row.filePath)"> <Icon size="19" icon="ep:view"  /> </el-button>

+ 18 - 9
src/views/pms/iotinfo/IotInfoForm.vue

@@ -7,9 +7,9 @@
       label-width="100px"
       v-loading="formLoading"
     >
-<!--      <el-form-item label="文件名称" prop="filename">-->
-<!--        <el-input v-model="formData.filename" placeholder="请输入文件名称" />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="文件名称" prop="filename">-->
+      <!--        <el-input v-model="formData.filename" placeholder="请输入文件名称" />-->
+      <!--      </el-form-item>-->
       <el-form-item label="文件类型" prop="fileType">
         <el-select v-model="formData.fileType" placeholder="请选择">
           <el-option
@@ -21,7 +21,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="附件" prop="filePath">
-        <UploadFile :is-show-tip="false" v-model="formData.filePath" :multiple="formType.value==='create'" />
+        <UploadFileAll style="vertical-align: middle"
+          :is-show-tip="false"
+          v-model="formData.filePath"
+          :multiple="formType === 'create'"
+          :limit="formType === 'create' ? 5 : 1"
+        />
+        <span style="vertical-align:middle;color: red;margin-left: 10px;margin-bottom: 10px">文件最大不超过30M</span>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
@@ -35,7 +41,7 @@
 </template>
 <script setup lang="ts">
 import { IotInfoApi, IotInfoVO } from '@/api/pms/iotinfo'
-import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 /** 资料 表单 */
 defineOptions({ name: 'IotInfoForm' })
@@ -55,13 +61,14 @@ const formData = ref({
   fileType: undefined,
   filePath: undefined,
   remark: undefined,
+  fileList: []
 })
 const formRules = reactive({
   // deviceId: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
   // orgId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
   // filename: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }],
   // fileType: [{ required: true, message: '文件类型不能为空', trigger: 'change' }],
-  filePath: [{ required: true, message: '文件不能为空', trigger: 'blur' }],
+  filePath: [{ required: true, message: '文件不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const props = defineProps<{
@@ -94,12 +101,14 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    formData.value.fileList = formData.value.filePath
+    formData.value.filePath = ''
     const data = formData.value as unknown as IotInfoVO
-    debugger
+
     if (formType.value === 'create') {
       data.classId = props.classId
       data.deviceId = props.deviceId
-      data.filePath = data.filePath.join(',')
+      // data.filePath = data.filePath.join(',')
       await IotInfoApi.createIotInfo(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -123,7 +132,7 @@ const resetForm = () => {
     filename: undefined,
     fileType: undefined,
     filePath: undefined,
-    remark: undefined,
+    remark: undefined
   }
   formRef.value?.resetFields()
 }

+ 2 - 2
src/views/pms/iotinfo/index.vue

@@ -152,7 +152,7 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { IotInfoApi, IotInfoVO } from '@/api/rq/iotinfo'
+import { IotInfoApi, IotInfoVO } from '@/api/pms/iotinfo'
 import IotInfoForm from './IotInfoForm.vue'
 
 /** 资料 列表 */
@@ -240,4 +240,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>

+ 2 - 2
src/views/system/tree/IotTreeForm.vue

@@ -40,7 +40,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { IotTreeApi, IotTreeVO } from '@/api/rq/iottree'
+import { IotTreeApi, IotTreeVO } from '@/api/system/tree'
 
 /** pms树 表单 */
 defineOptions({ name: 'IotTreeForm' })
@@ -126,4 +126,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>

+ 1 - 1
src/views/system/tree/PmsTree.vue

@@ -28,7 +28,7 @@
             <Icon
               style="vertical-align: middle"
               v-if="node.data.type === 'dept'"
-              icon="ep:operation"
+              icon="ep:postcard"
             />
             <Icon
               style="vertical-align: middle"