From 89b24e8ac8377c8f438eae301845cd1e44f0a4ef Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 10 五月 2022 08:38:04 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/contingencyplan/index.vue | 186 +++++++++++++++++++++++++++++++++-------------
1 files changed, 133 insertions(+), 53 deletions(-)
diff --git a/src/views/contingencyplan/index.vue b/src/views/contingencyplan/index.vue
index 621c963..ae5a316 100644
--- a/src/views/contingencyplan/index.vue
+++ b/src/views/contingencyplan/index.vue
@@ -7,7 +7,7 @@
<el-input v-model="listQuery.filter.name"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4" style="text-align: center">
+ <el-col :span="5" style="text-align: center">
<el-button type="primary" class="btns" icon="el-icon-search" @click="find()"
>搜索</el-button
>
@@ -18,13 +18,40 @@
class="btns"
>新增</el-button
>
+ <el-button
+ type="primary"
+ class="btns"
+ @click="reset()"
+ >重置</el-button
+ >
</el-col>
</el-row>
</el-form>
<el-table :data="list" border style="width: 100%">
<el-table-column prop="name" align="center" label="预案名称" width="150">
</el-table-column>
- <el-table-column prop="name" align="center" label="文件链接"> </el-table-column>
+ <el-table-column prop="fileType" align="center" label="文件类型">
+ <template slot-scope="scope">
+ <span v-if="scope.row.fileType==0">图片</span>
+ <span v-if="scope.row.fileType==1">文件</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="附件">
+ <template slot-scope="scope">
+ <div v-if="scope.row.fileType==0">
+ <img :src="envUrl+scope.row.fileList[0].fileUrl" @click="showViewer=true" style="max-width: 100px;height: auto"/>
+ <el-image-viewer
+ v-if="showViewer"
+ :on-close="()=>showViewer=false"
+ :url-list="scope.row.viewerList"
+ />
+ </div>
+ <div v-if="scope.row.fileType==1">
+ <span @click="downLoadFile(scope.row.fileList[0].fileUrl)" style="color: #3A71A8 ; cursor: pointer;">{{ scope.row.fileList[0].fileName }}</span>
+ </div>
+ </template>
+ </el-table-column>
+
<el-table-column prop="remark" align="center" label="备注"> </el-table-column>
<el-table-column prop="createTime" align="center" label="创建时间"> </el-table-column>
<el-table-column prop="updateTime" align="center" label="更新时间"> </el-table-column>
@@ -54,24 +81,25 @@
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="recordTotal"
+ style="text-align: right;margin-top: 20px;"
>
</el-pagination>
- <el-dialog :title="title" :visible.sync="dialogVisible" width="40%">
+ <el-dialog :title="title" :visible.sync="dialogVisible" :close-on-click-modal="false" 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-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="图片上传">
- <upload-img v-bind:imgList="form.fileList" @uploadImgSuccess="uploadImgSuccess" @removeImgSuccess="removeImgSuccess"></upload-img>
+ <upload-img :imgList="fileList" @uploadImgSuccess="uploadImgSuccess" @removeImgSuccess="removeImgSuccess"></upload-img>
</el-form-item>
<el-form-item label="文件链接" v-if="form.fileType==1">
- <upload-file v-bind:url="fileUrl" v-bind:name="fileName" @uploadFileSuccess="uploadFileSuccess" ></upload-file>
+ <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>
@@ -79,7 +107,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" class="btns" @click="addemergencyPlan()">确 定</el-button>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -87,6 +115,7 @@
<script>
import uploadImg from "@/views/contingencyplan/uploadImg.vue";
import uploadFile from "@/views/contingencyplan/uploadFile.vue";
+import elImageViewer from "element-ui/packages/image/src/image-viewer";
import {
emergencyPlanList,
emergencyPlanAdd,
@@ -94,14 +123,13 @@
emergencyPlanDel,
} from "@/api/emergencyplan.js";
export default {
- components: { uploadImg , uploadFile},
+ components: { uploadImg , uploadFile ,elImageViewer},
data() {
return {
- name:"111",
- url:"222",
- path:"emergencyPlan",
+ uploadDisabled:false,
dialogVisible: false,
+
title: "",
pageSize: 10,
recordTotal: 0,
@@ -121,15 +149,17 @@
},
fileName:"",
fileUrl:"",
+ fileList:[],
list: [],
rules: {
name: [
{ required: true, message: "预案名称不能为空", trigger: "change" },
],
- remark: [
- { required: true, message: "责任人不能为空", trigger: "blur" },
- ],
},
+
+ showViewer:false,
+ viewerList:[],
+ envUrl:process.env.IMG_API
};
},
created() {
@@ -137,28 +167,47 @@
},
methods: {
+ reset(){
+ this.listQuery.filter={}
+ this.listQuery.pageIndex=1
+ this.listQuery.pageSize=10
+ this.emergencyPlan();
+ },
+
+ downLoadFile(fileUrl){
+ return this.$confirm(`确定下载该文件？`,'提示',{
+ confirmButtonText:'确定',
+ cancelButtonText:'取消',
+ type:'warning',
+ }).then(() =>{
+ let a = document.createElement('a')
+ a.href = process.env.BASE_API + '/upload/'+fileUrl
+ a.click();
+ })
+ },
+
+ changeFileType(){
+ this.fileUrl=""
+ this.fileName=""
+ this.fileList=[]
+ },
+
uploadFileSuccess(res){
this.fileName=res.fileName
this.fileUrl=res.fileUrl
- if (this.fileName=="" || this.fileUrl==""){
- this.form.fileList=[]
- }
- this.form.fileList=[{
- fileName: this.fileName,
- fileUrl:this.fileUrl
- }]
},
uploadImgSuccess(res){
let file = {
fileUrl : res.fileUrl,
- fileName : res.fileName
+ fileName : res.fileName,
+ url:res.url
}
- this.form.fileList.push(file)
+ this.fileList.push(file)
},
removeImgSuccess(res){
- this.form.fileList=res.fileList
+ this.fileList=res.fileList
},
async emergencyPlan() {
@@ -168,6 +217,15 @@
this.recordTotal = res.data.result.total
this.pageSize=res.data.result.size;
this.currentPage = res.data.result.current
+ for (let i = 0 ; i < this.list.length ; i++){
+ if (this.list[i].fileList!=null && this.list[i].fileList.length>0){
+ let viewerList = []
+ for (let j = 0 ; j<this.list[i].fileList.length ; j++){
+ viewerList.push(this.envUrl+this.list[i].fileList[j].fileUrl)
+ }
+ this.list[i].viewerList=viewerList
+ }
+ }
}
},
emergencyPlanC(value, type) {
@@ -177,23 +235,38 @@
});
if (type === "新增") {
this.title = "新增";
- this.form = {
- name: "",
- fileType: 0,
- fileList: [],
- remark: "",
- };
+ this.form = {};
+ this.fileUrl="";
+ this.fileName="";
+ this.fileList=[]
} else {
this.title = "编辑";
- this.form = value;
- this.fileUrl=value.fileList[0].fileUrl;
- this.fileName=value.fileList[0].fileName
+ this.form=JSON.parse(JSON.stringify(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) {
- console.log(132,this.form)
+ if (this.form.fileType==0){
+ this.form.fileList=this.fileList
+ }
+ if (this.form.fileType==1){
+ let fileList = []
+ if (this.fileUrl!=""){
+ let file={
+ fileUrl:this.fileUrl,
+ fileName:this.fileName
+ }
+ fileList.push(file)
+ }
+ this.form.fileList=fileList
+ }
if (this.title === "新增") {
emergencyPlanAdd(this.form).then((res) => {
if (res.data.code === "200") {
@@ -205,11 +278,8 @@
message: "新增成功",
title: "成功",
});
- } else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
+ }else{
+ this.$message.error(res.data.message);
}
});
}
@@ -224,11 +294,8 @@
message: "编辑成功",
title: "成功",
});
- } else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
+ }else{
+ this.$message.error(res.data.message);
}
});
}
@@ -236,16 +303,29 @@
});
},
deleteById(val) {
- emergencyPlanDel({ id: val }).then(() => {
- this.emergencyPlan();
- this.$notify({
- title: "成功",
- message: "删除成功",
- type: "success",
- duration: 2000,
- });
- });
+ this.$confirm('确认删除吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(()=>{
+ emergencyPlanDel({ id: val }).then(() => {
+ this.emergencyPlan();
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ })
+ .catch(error =>{
+ });
},
+ cancel(){
+ this.emergencyPlan();
+ this.dialogVisible = false;
+ },
find() {
this.emergencyPlan();
},
--
Gitblit v1.9.2