From 324eed59a668758755219d5cd4e68463a9cc427d Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 14 九月 2022 15:22:36 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/workApply/components/ground.vue | 276 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 229 insertions(+), 47 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
index ba6e7c1..1716f56 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
<div class="home-container">
<div style="height: 100%">
<el-form :model="form" label-width="150px" :rules="applyRules" ref="ruleFormRef">
@@ -8,16 +8,14 @@
<el-form-item label="作业人" prop="operatorUids">
<el-select v-model="form.operatorUids" multiple>
<el-option
- v-for="item in workerList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in workerList"
+ :key="item.uid"
+ :label="item.username"
+ :value="item.uid"
/>
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -56,15 +54,27 @@
</el-row>
<el-row>
<el-col :span="12">
+ <el-form-item label="危害辨识" prop="hazardIdentification">
+ <el-input
+ v-model="form.hazardIdentification"
+ placeholder="请输入危害辨识"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-divider border-style="dashed"/>
+ <el-row>
+ <el-col :span="12">
<el-form-item label="作业单位" prop="workDetail.operationDepId">
- <el-select v-model="form.workDetail.operationDepId">
- <el-option
- v-for="item in csDepList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+<!-- <el-select v-model="form.workDetail.operationDepId">-->
+<!-- <el-option-->
+<!-- v-for="item in csDepList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- />-->
+<!-- </el-select>-->
+ <el-cascader v-model="form.workDetail.operationDepId" :options="departList" :props="casProps" :show-all-levels="false" @change="handleChange" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -97,12 +107,27 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="图片上传" prop="workDetail.gbPath">
+ <el-upload accept="image/*" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='imgLimit' 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,最多可上传3张</div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
</div>
</el-form>
<div class="applyBtn">
<el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">发起申请</el-button>
</div>
</div>
+ <el-dialog v-model="dialogVisible">
+ <img w-full :src="dialogImageUrl" alt="Preview Image" />
+ </el-dialog>
</div>
</template>
@@ -112,22 +137,33 @@
import { initBackEndControlRoutes } from '/@/router/backEnd';
import {useUserInfo} from "/@/stores/userInfo";
import { Session } from '/@/utils/storage';
- import { Search } from '@element-plus/icons-vue'
- import { ElMessage } from 'element-plus'
- import type { FormInstance, FormRules } from 'element-plus'
+ import { Search,Plus } from '@element-plus/icons-vue'
+ import { ElMessage, ElMessageBox } from 'element-plus'
+ import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
import { workApplyApi } from '/@/api/specialWorkSystem/workApply';
+ import axios from 'axios';
interface stateType {
form: Object,
- workerList: Array<any>,
csDepList: Array<any>,
- otherWorkList: Array<any>
+ otherWorkList: Array<any>,
+ fileList: Array<file>,
+ uploadUrl: string,
+ dialogVisible: Boolean,
+ dialogImageUrl: string | null,
+ imgLimit: number,
+ casProps: {},
+ isOverSize: Boolean
}
- export default defineComponent({
+ interface file {
+ url: string;
+ }
+ export default {
name: 'groundForm',
components: {},
- setup() {
+ props:['workerList','departList'],
+ setup(props: any, context: any) {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({
@@ -137,35 +173,24 @@
workLevel: 0,
workContent: '',
workLocation: '',
+ hazardIdentification: '',
workDetail:{
operationDepId: null,
gbScope: '',
gbMethod: '',
- gbPath: '',
+ gbPath: [],
otherSpecialWork: []
},
workTimeLine: [],
expStartTime: '',
expEndTime: ''
},
- workerList:[
- {
- label: "张三",
- value: 53
- },
- {
- label: "李四",
- value: 54
- },
- {
- label: "测试一",
- value: 55
- },
- {
- label: "测试二",
- value: 56
- }
- ],
+ isOverSize: false,
+ fileList: [],
+ imgLimit: 3,
+ uploadUrl: '',
+ dialogVisible: false,
+ dialogImageUrl: null,
csDepList: [
{
label: "单位一",
@@ -225,7 +250,15 @@
label: '盲板抽堵作业',
value: 8
}
- ]
+ ],
+ casProps: {
+ emitPath: false,
+ value: 'depId',
+ label: 'depName',
+ multiple: false,
+ expandTrigger: 'hover',
+ checkStrictly: true
+ }
});
const ruleFormRef = ref<FormInstance>()
const applyRules = reactive<FormRules>({
@@ -233,10 +266,12 @@
workType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ hazardIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
workTimeLine: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.operationDepId": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
"workDetail.gbScope": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
- "workDetail.gbMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
+ "workDetail.gbMethod": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
+ "workDetail.gbPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
});
const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return
@@ -246,7 +281,7 @@
state.form.expEndTime = JSON.parse(JSON.stringify(state.form.workTimeLine))[1]
let { workTimeLine, ...data } = JSON.parse(JSON.stringify(state.form))
data.workDetail.otherSpecialWork = data.workDetail.otherSpecialWork.join(',')
- console.log(data,'data')
+ data.workDetail.gbPath = data.workDetail.gbPath.join(',')
const res = await workApplyApi().postGroundApply(data)
if (res.data.code === '200') {
ElMessage({
@@ -254,6 +289,8 @@
message: '提交成功！'
});
formEl.resetFields()
+ state.form.workDetail.gbPath = []
+ state.fileList = []
} else {
ElMessage({
type: 'warning',
@@ -265,6 +302,117 @@
}
})
}
+
+ const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
+ console.log(uploadFile);
+ };
+
+ const handlePictureCardPreview = (uploadFile: { url: string }) => {
+ state.dialogImageUrl = uploadFile.url!;
+ state.dialogVisible = true;
+ };
+
+ const getUploadUrl = async (rawFile: any) => {
+ const fileSize = rawFile.size / 1024 < 500 ? '1' : '0'
+ if(fileSize === '0'){
+ ElMessage({
+ type: 'warning',
+ message: '文件大小不能超过500k。'
+ });
+ state.isOverSize = true
+ return false
+ }else{
+ const res = await workApplyApi().getUploadUrl(rawFile.name);
+ state.form.workDetail.gbPath.push(res.data.data.fileName)
+ state.uploadUrl = res.data.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);
+ // }
+ // console.log(state.form.workDetail.gbPath,'gbpath')
+ });
+ };
+ };
+
+ const beforeRemove = (file: {}, fileList: []) => {
+ const result = new Promise((resolve, reject) => {
+ if(!state.isOverSize){
+ ElMessageBox.confirm('此操作将删除该图片, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ // console.log(state.workDetail.gbPath,'path')
+ const list = JSON.parse(JSON.stringify(state.form.workDetail.gbPath))
+ fileList.map((item,index)=>{
+ if(item.uid === file.uid){
+ fileList.splice(index,1)
+ state.form.workDetail.gbPath.splice(index,1)
+ // 请求删除接口
+ deletePic(false,list[index])
+ }
+ })
+ })
+ .catch(() => {
+ reject(false);
+ });
+ }else{
+ const list = JSON.parse(JSON.stringify(state.form.workDetail.gbPath))
+ fileList.map((item,index)=>{
+ if(item.uid === file.uid){
+ fileList.splice(index,1)
+ state.form.workDetail.gbPath.splice(index,1)
+ deletePic(true,list[index])
+ }
+ })
+ state.isOverSize = false
+ }
+ });
+ return result;
+ };
+
+
+ // 删除图片接口
+ const deletePic = async(isOverSize:boolean,fileName:string)=>{
+ const res = await workApplyApi().deleteFile({fileName: fileName})
+ if (res.data.code === '200') {
+ ElMessage({
+ type: isOverSize ? 'error' : 'success',
+ message: isOverSize ? '上传失败':'删除成功！'
+ });
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ }
+
+ const showTip =()=>{
+ ElMessage({
+ type: 'warning',
+ message: '超出文件上传数量'
+ });
+ }
+
+ // const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+ // console.log('2111111111111')
+ // };
+
// 折线图
const renderMenu = async (value: string) => {
Session.set('projectId',value)
@@ -274,16 +422,28 @@
return {
renderMenu,
Search,
+ Plus,
ruleFormRef,
applyRules,
+ handlePreview,
+ getUploadUrl,
+ beforeRemove,
+ upload,
+ showTip,
submitForm,
+ handlePictureCardPreview,
...toRefs(state),
};
},
- });
+ };
</script>
<style scoped lang="scss">
+ .avatar-uploader .avatar {
+ width: 178px;
+ height: 178px;
+ display: block;
+ }
.home-container {
height: 100%;
overflow: hidden;
@@ -299,7 +459,7 @@
.applyBtn{
width: 100%;
background: #fff;
- height: 80px;
+ padding-top: 15px;
z-index: 5;
box-shadow: 0 -3px 8px rgba(150,150,150,.1);
display: flex;
@@ -321,8 +481,30 @@
.el-select{
width: 100%;
}
- .el-cascader{
+ :deep(.el-cascader){
width: 100% !important;
}
}
</style>
+<style>
+ .avatar-uploader .el-upload {
+ border: 1px dashed var(--el-border-color);
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ overflow: hidden;
+ transition: var(--el-transition-duration-fast);
+ }
+
+ .avatar-uploader .el-upload:hover {
+ border-color: var(--el-color-primary);
+ }
+
+ .el-icon.avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 178px;
+ height: 178px;
+ text-align: center;
+ }
+</style>
--
Gitblit v1.9.2