From 5a1616f169d75ece07d2d12a8edac3e5f660a920 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 09:36:16 +0800
Subject: [PATCH] 合并
---
src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue | 164 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 101 insertions(+), 63 deletions(-)
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
index e6a4162..a54d140 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
@@ -15,23 +15,10 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="上传图片" prop="rfidImage">
- <el-upload
- v-model:file-list="fileList"
- class="upload-demo"
- accept="image/*"
- :action="uploadUrl"
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :before-upload ="getUploadUrl"
- :before-remove="beforeRemove"
- :limit="1"
- :on-exceed="handleExceed"
- >
- <el-button type="primary">点击上传</el-button>
+ <el-upload accept="image/*" :on-preview="handlePictureCardPreview" :limits="1" v-model:file-list="fileList" :http-request="upload" :action="uploadUrl" list-type="picture-card" :on-remove="handleRemove" :before-remove="beforeRemove" :before-upload="getUploadUrl">
+ <el-icon><Plus /></el-icon>
<template #tip>
- <div class="el-upload__tip">
- 上传 jpg/png 图片尺寸小于500KB
- </div>
+ <div class="el-upload__tip">上传 jpg/png 图片尺寸小于500KB</div>
</template>
</el-upload>
</el-form-item>
@@ -45,6 +32,9 @@
</span>
</template>
</el-dialog>
+ <el-dialog v-model="dialogVisible">
+ <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ </el-dialog>
</div>
</template>
@@ -54,18 +44,23 @@
RFIDForm: {
rfid: string;
rfidName: string;
- rfidImage: string
-
+ rfidImage: string | null;
};
title: string;
+ dialogVisible: Boolean;
+ dialogImageUrl: string | null;
RFIDFormRules: {};
- uploadUrl: string
+ uploadUrl: string;
+ fileList: Array<file>;
}
-interface levelListState {}
+interface file {
+ url: string;
+}
import { reactive, toRefs, ref } from 'vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { ElMessage, ElMessageBox } from 'element-plus';
-import type { UploadProps, UploadUserFile } from 'element-plus'
+import type { UploadProps, UploadUserFile } from 'element-plus';
+import axios from 'axios';
export default {
name: 'RFIDDialog',
setup(props: any, context: any) {
@@ -76,18 +71,23 @@
RFIDForm: {
rfid: '',
rfidName: '',
- rfidImage: ''
+ rfidImage: null
},
uploadUrl: '',
+ dialogVisible: false,
+ dialogImageUrl: null,
RFIDFormRules: {
rfid: [{ required: true, message: '请填写RFID编码', trigger: 'blur' }],
rfidName: [{ required: true, message: '请填写RFID名称', trigger: 'change' }],
riskLevel: [{ required: true, message: '请选择风险等级', trigger: 'change' }],
location: [{ required: true, message: '请填写区域位置', trigger: 'blur' }]
- }
+ },
+
+ fileList: []
});
//打开模态框
const openRFIDDialog = (type: string, value: object) => {
+ state.fileList = [];
state.isShowRFIDDialog = true;
setTimeout(() => {
RFIDFormRef.value.clearValidate();
@@ -102,48 +102,81 @@
} else {
state.title = '修改RFID';
state.RFIDForm = JSON.parse(JSON.stringify(value));
+ if (state.RFIDForm.rfidImage === null) return;
+ state.fileList = [{ url: state.RFIDForm.rfidImage }];
}
};
- // 图片上传
- const fileList = ref<UploadUserFile[]>([])
-
- const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
- console.log(file, uploadFiles)
- }
+ // // 图片上传
+ // const fileList = ref<UploadUserFile[]>([]);
+ //
+ // const handleRemove = () => {
+ // ElMessageBox.confirm(`此操作将永久删除该图片，是否继续?`, '提示', {
+ // confirmButtonText: '确认',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // })
+ // .then(() => {
+ // state.RFIDForm.rfidImage = null;
+ // state.fileList = [];
+ // })
+ // .catch(() => {});
+ // };
const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
- console.log(uploadFile)
- }
+ console.log(uploadFile);
+ };
- const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
- ElMessage.warning(
- `您选择的图片数量超出要求`
- )
- }
- const getUploadUrl = async (rawFile: UploadRawFile)=>{
- const res = await RFIDApi().getUploadUrl()
- if(res.data.code === '200') {
- console.log(res.data, '1111111111')
- state.RFIDForm.rfidImage = res.data.fileName
- console.log(res.data.uploadUrl,'33')
- // state.uploadUrl = res.data.uploadUrl
- console.log(state.uploadUrl,'222222222222')
- } else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
- }
- }
- const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
- return ElMessageBox.confirm(
- `Cancel the transfert of ${uploadFile.name} ?`
- ).then(
- () => true,
- () => false
- )
- }
+ const getUploadUrl = async (rawFile: any) => {
+ const res = await RFIDApi().getUploadUrl(rawFile.name);
+ state.RFIDForm.rfidImage = res.data.rfidImage;
+ state.uploadUrl = res.data.uploadUrl;
+ };
+
+ const upload = async (params: any) => {
+ // const formData = new FormData();
+ // formData.append('file', state.fileList[0].raw);
+ let reader = new FileReader();
+ reader.readAsArrayBuffer(params.file);
+ reader.onload = async () => {
+ axios
+ .put(state.uploadUrl, reader.result, {
+ header: { 'Content-Type': 'multipart/form-data' }
+ })
+ .then(() => {
+ if (state.fileList.length === 2) {
+ state.fileList.splice(0, 1);
+ }
+ });
+ // let res = await RFIDApi().uploadFile(state.uploadUrl, reader.result);
+ // if (res.data.code === '200') {
+ // } else {
+ // ElMessage({
+ // type: 'warning',
+ // message: res.data.msg
+ // });
+ // }
+ };
+ };
+
+ const beforeRemove = (file: {}, fileList: []) => {
+ const result = new Promise((resolve, reject) => {
+ ElMessageBox.confirm('此操作将删除该图片, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ state.RFIDForm.rfidImage = null;
+ state.fileList = [];
+ // 请求删除接口
+ })
+ .catch(() => {
+ reject(false);
+ });
+ });
+ return result;
+ };
//新增修改提交
const submitRFID = async () => {
@@ -191,17 +224,22 @@
});
};
+ const handlePictureCardPreview = (uploadFile: { url: string }) => {
+ state.dialogImageUrl = uploadFile.url!;
+ state.dialogVisible = true;
+ };
+
return {
...toRefs(state),
RFIDFormRef,
- fileList,
+ // fileList,
+ upload,
getUploadUrl,
- handleRemove,
handlePreview,
- handleExceed,
beforeRemove,
submitRFID,
- openRFIDDialog
+ openRFIDDialog,
+ handlePictureCardPreview
};
}
};
--
Gitblit v1.9.2