From b274738442b2214c018e9b55f96a226a33c18cbe Mon Sep 17 00:00:00 2001 From: shj <1790240199@qq.com> Date: 星期三, 06 四月 2022 16:56:43 +0800 Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf --- /dev/null | 6 -- src/views/safetyproduction/checklistself.vue | 23 ++++++- src/views/safetyproduction/feature.vue | 32 ++++++++++ src/views/contingencyplan/index.vue | 72 ++++++++++++++++++++++- 4 files changed, 116 insertions(+), 17 deletions(-) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <profile version="1.0"> - <option name="myName" value="Project Default" /> - <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" /> - </profile> -</component> \ No newline at end of file diff --git a/src/views/contingencyplan/index.vue b/src/views/contingencyplan/index.vue index 8caf0b3..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> @@ -57,7 +84,7 @@ style="text-align: right;margin-top: 20px;" > </el-pagination> - <el-dialog :title="title" :visible.sync="dialogVisible":close-on-click-modal="false" 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> @@ -88,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, @@ -95,12 +123,13 @@ emergencyPlanDel, } from "@/api/emergencyplan.js"; export default { - components: { uploadImg , uploadFile}, + components: { uploadImg , uploadFile ,elImageViewer}, data() { return { uploadDisabled:false, dialogVisible: false, + title: "", pageSize: 10, recordTotal: 0, @@ -127,12 +156,36 @@ { required: true, message: "预案名称不能为空", trigger: "change" }, ], }, + + showViewer:false, + viewerList:[], + envUrl:process.env.IMG_API }; }, created() { this.emergencyPlan(); }, 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="" @@ -164,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) { @@ -179,7 +241,7 @@ this.fileList=[] } else { this.title = "编辑"; - this.form = value; + this.form=JSON.parse(JSON.stringify(value)); if (this.form.fileType==0){ this.fileList=value.fileList } else{ diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue index 1c02df8..47fa993 100644 --- a/src/views/safetyproduction/checklistself.vue +++ b/src/views/safetyproduction/checklistself.vue @@ -9,13 +9,13 @@ </el-col> <el-col :span="9"> <el-form-item label="检查时间"> - + <el-col :span="11"> <el-date-picker style="width:100%" v-model="listQuery.filter.inspectionStartTime" type="date" - format="yyyy-MM-dd" + format="yyyy-MM-dd" placeholder="选择开始日期" > </el-date-picker> @@ -26,7 +26,7 @@ v-model="listQuery.filter.inspectionEndTime" style="width:100%" type="date" - format="yyyy-MM-dd" + format="yyyy-MM-dd" placeholder="选择结束日期" > </el-date-picker> @@ -38,7 +38,7 @@ <el-input v-model="listQuery.filter.inspectorName"></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" icon="el-icon-search" @@ -53,6 +53,12 @@ @click="jump()" >新增</el-button > + <el-button + type="primary" + class="btns" + @click="reset()" + >重置</el-button + > </el-col> </el-row> </el-form> @@ -132,6 +138,13 @@ this.safetySelfInspectionL(); }, methods: { + reset(){ + this.listQuery.filter={} + this.listQuery.pageIndex=1 + this.listQuery.pageSize=10 + this.safetySelfInspectionL(); + }, + async safetySelfInspectionL() { var res = await safetySelfInspectionList(this.listQuery).then((res) => { if (res.data.code == 200) { @@ -206,4 +219,4 @@ background-color: #034ea2; border: 1px solid #034ea2; } -</style> \ No newline at end of file +</style> diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue index eee259b..09b4b5b 100644 --- a/src/views/safetyproduction/feature.vue +++ b/src/views/safetyproduction/feature.vue @@ -7,7 +7,24 @@ <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"> + <el-form-item label="要素类型"> + <el-select + v-model="listQuery.filter.type" + placeholder="请选择" + style="width: 100%" + > + <el-option + v-for="item in options" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="6" style="text-align: center"> <el-button type="primary" icon="el-icon-search" @click="find()" class="btns" >搜索</el-button > @@ -18,6 +35,12 @@ @click="handleClick('', '新增')" >新增</el-button > + <el-button + type="primary" + class="btns" + @click="reset()" + >重置</el-button + > </el-col> </el-row> </el-form> @@ -208,6 +231,13 @@ this.elementManagementL(); }, methods: { + reset(){ + this.listQuery.filter={} + this.listQuery.pageIndex=1 + this.listQuery.pageSize=10 + this.elementManagementL(); + }, + async elementManagementL() { var res = await elementManagementList(this.listQuery); if (res.data.code == 200) { -- Gitblit v1.9.2