From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 30 Mar 2022 16:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/contingencyplan/index.vue | 70 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/src/views/contingencyplan/index.vue b/src/views/contingencyplan/index.vue
index bb27234..9e07de8 100644
--- a/src/views/contingencyplan/index.vue
+++ b/src/views/contingencyplan/index.vue
@@ -56,22 +56,22 @@
:total="recordTotal"
>
</el-pagination>
- <el-dialog :title="title" :visible.sync="dialogVisible" width="30%">
+ <el-dialog :title="title" :visible.sync="dialogVisible" width="40%">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="预案名称" prop="name">
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="文件类型">
- <el-radio-group v-model="form.fileType">
- <el-radio label="0">图片</el-radio>
- <el-radio label="1">文件</el-radio>
+ <el-radio-group v-model="form.fileType" @change="changeFileType">
+ <el-radio :label=0 >图片</el-radio>
+ <el-radio :label=1 >文件</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.fileType==0" label="图片上传">
- <el-input ></el-input>
+ <upload-img :imgList="fileList" @uploadImgSuccess="uploadImgSuccess" @removeImgSuccess="removeImgSuccess"></upload-img>
</el-form-item>
<el-form-item label="文件链接" v-if="form.fileType==1">
- <SingleImageUpload></SingleImageUpload>
+ <upload-file v-bind:url="fileUrl" v-bind:name="fileName" @uploadFileSuccess="uploadFileSuccess" ></upload-file>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" :rows="5" type="textarea"></el-input>
@@ -85,7 +85,8 @@
</div>
</template>
<script>
-import SingleImageUpload from "@/components/Upload/singleImage.vue";
+import uploadImg from "@/views/contingencyplan/uploadImg.vue";
+import uploadFile from "@/views/contingencyplan/uploadFile.vue";
import {
emergencyPlanList,
emergencyPlanAdd,
@@ -93,9 +94,11 @@
emergencyPlanDel,
} from "@/api/emergencyplan.js";
export default {
- components: { SingleImageUpload },
+ components: { uploadImg , uploadFile},
data() {
return {
+ uploadDisabled:false,
+
dialogVisible: false,
title: "",
pageSize: 10,
@@ -104,7 +107,7 @@
form: {
name: "",
fileType: 0,
- fileList: [{ fileName: "", fileUrl: "" }],
+ fileList: [],
remark: "",
},
listQuery: {
@@ -114,6 +117,9 @@
name: "",
},
},
+ fileName:"",
+ fileUrl:"",
+ fileList:[],
list: [],
rules: {
name: [
@@ -129,9 +135,31 @@
this.emergencyPlan();
},
methods: {
+ changeFileType(){
+ this.fileUrl=""
+ this.fileName=""
+ this.fileList=[]
+ },
+
+ uploadFileSuccess(res){
+ this.fileName=res.fileName
+ this.fileUrl=res.fileUrl
+ },
+
+ uploadImgSuccess(res){
+ let file = {
+ fileUrl : res.fileUrl,
+ fileName : res.fileName
+ }
+ this.fileList.push(file)
+ },
+
+ removeImgSuccess(res){
+ this.fileList=res.fileList
+ },
+
async emergencyPlan() {
var res = await emergencyPlanList(this.listQuery);
- console.log(res);
if (res.data.code === "200") {
this.list = res.data.result.records;
this.recordTotal = res.data.result.total
@@ -148,18 +176,34 @@
this.title = "新增";
this.form = {
name: "",
- fileType: "0",
- fileList: [{ fileName: "", fileUrl: "" }],
+ fileType: 0,
+ fileList: [],
remark: "",
};
} else {
this.title = "编辑";
this.form = value;
+ if (this.form.fileType==0){
+ this.fileList=value.fileList
+ } else{
+ this.fileUrl=value.fileList[0].fileUrl;
+ this.fileName=value.fileList[0].fileName
+ }
}
},
addemergencyPlan() {
this.$refs["form"].validate((valid) => {
if (valid) {
+ if (this.form.fileType==0){
+ this.form.fileList=this.fileList
+ }
+ if (this.form.fileType==1){
+ let file={
+ fileUrl:this.fileUrl,
+ fileName:this.fileName
+ }
+ this.form.fileList=[file]
+ }
if (this.title === "新增") {
emergencyPlanAdd(this.form).then((res) => {
if (res.data.code === "200") {
@@ -231,4 +275,4 @@
background-color: #034EA2;
border: 1px solid #034EA2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2