From cd0ceed2fcec190559a3e83770376fc31ff1f3c2 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 16 八月 2022 13:39:24 +0800
Subject: [PATCH] Default Changelist
---
src/views/intellectInspect/inspectBasic/discriminate/index.vue | 3 +
src/api/intellectInspectSystem/RFID/index.ts | 8 ++++
src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue | 83 +++++++++++++++++++++++++++++++++++++++--
3 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/src/api/intellectInspectSystem/RFID/index.ts b/src/api/intellectInspectSystem/RFID/index.ts
index 3cbe317..b57e67e 100644
--- a/src/api/intellectInspectSystem/RFID/index.ts
+++ b/src/api/intellectInspectSystem/RFID/index.ts
@@ -40,6 +40,14 @@
url: import.meta.env.VITE_API_URL + `/SafeCheckRfid/select/listRfidName`,
method: 'get'
});
+ },
+
+ // 获取图片上传地址
+ getUploadUrl: () =>{
+ return request({
+ url: import.meta.env.VITE_API_URL + `/SafeCheck/minio/file/presign`,
+ method: 'get'
+ });
}
};
}
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
index 4540a29..e6a4162 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
@@ -13,6 +13,29 @@
<el-input class="input-add" v-model.trim="RFIDForm.rfid" placeholder="请输入RFID编码" clearable></el-input>
</el-form-item>
</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>
+ <template #tip>
+ <div class="el-upload__tip">
+ 上传 jpg/png 图片尺寸小于500KB
+ </div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -31,14 +54,18 @@
RFIDForm: {
rfid: string;
rfidName: string;
+ rfidImage: string
+
};
title: string;
RFIDFormRules: {};
+ uploadUrl: string
}
interface levelListState {}
import { reactive, toRefs, ref } from 'vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import type { UploadProps, UploadUserFile } from 'element-plus'
export default {
name: 'RFIDDialog',
setup(props: any, context: any) {
@@ -48,8 +75,10 @@
isShowRFIDDialog: false,
RFIDForm: {
rfid: '',
- rfidName: ''
+ rfidName: '',
+ rfidImage: ''
},
+ uploadUrl: '',
RFIDFormRules: {
rfid: [{ required: true, message: '请填写RFID编码', trigger: 'blur' }],
rfidName: [{ required: true, message: '请填写RFID名称', trigger: 'change' }],
@@ -57,7 +86,6 @@
location: [{ required: true, message: '请填写区域位置', trigger: 'blur' }]
}
});
-
//打开模态框
const openRFIDDialog = (type: string, value: object) => {
state.isShowRFIDDialog = true;
@@ -68,13 +96,54 @@
state.title = '新增RFID';
state.RFIDForm = {
rfid: '',
- rfidName: ''
+ rfidName: '',
+ rfidImage: ''
};
} else {
state.title = '修改RFID';
state.RFIDForm = JSON.parse(JSON.stringify(value));
}
};
+
+ // 图片上传
+ const fileList = ref<UploadUserFile[]>([])
+
+ const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
+ console.log(file, uploadFiles)
+ }
+
+ const handlePreview: UploadProps['onPreview'] = (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 submitRFID = async () => {
@@ -125,6 +194,12 @@
return {
...toRefs(state),
RFIDFormRef,
+ fileList,
+ getUploadUrl,
+ handleRemove,
+ handlePreview,
+ handleExceed,
+ beforeRemove,
submitRFID,
openRFIDDialog
};
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/index.vue b/src/views/intellectInspect/inspectBasic/discriminate/index.vue
index 79a7053..d857438 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/index.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/index.vue
@@ -53,7 +53,7 @@
import RFIDDialog from './components/RFIDDialog.vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
-
+import type { UploadProps, UploadUserFile } from 'element-plus'
// 定义接口来定义对象的类型
interface TableData {
quota: string;
@@ -96,6 +96,7 @@
}
}
});
+
// 初始化表格数据
const initRFIDTableData = async () => {
let res = await RFIDApi().getRFIDList(state.RFIDData.params);
--
Gitblit v1.9.2