From 6c6e0514283c7ff3016b845b600186b464e616c4 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 16:44:56 +0800
Subject: [PATCH] 项目
---
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue | 151 ++++++++++++++++++++
src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue | 1
config/dev.env.js | 8
src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue | 7 +
src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue | 7 +
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue | 93 ++++++++++++-
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue | 104 +++++++++++++-
7 files changed, 342 insertions(+), 29 deletions(-)
diff --git a/config/dev.env.js b/config/dev.env.js
index 17b1d1e..463910d 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -22,11 +22,11 @@
// BASE_API: '"http://192.168.0.8:8006"',
// IMG_API: '"http://192.168.0.8:8006/upload/"',
//
- // BASE_API: '"http://192.168.0.69:8006"',
- // IMG_API: '"http://192.168.0.69:8006/upload/"',
+ BASE_API: '"http://192.168.0.69:8006"',
+ IMG_API: '"http://192.168.0.69:8006/upload/"',
- BASE_API: '"http://192.168.0.35:8006"',
- IMG_API: '"http://192.168.0.35:8006/upload/"',
+ // BASE_API: '"http://192.168.0.35:8006"',
+ // IMG_API: '"http://192.168.0.35:8006/upload/"',
// BASE_API: '"http://192.168.0.62:8006"',
// IMG_API: '"http://192.168.0.62:8006/upload/"',
// BASE_API: '"http://222.92.213.22:8006/zhongtai"',
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue
index 03c4ebd..0767b4f 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/accept/components/acceptDialog.vue
@@ -7,6 +7,47 @@
<el-input class="input-add" type="textarea" :rows="2" v-model.trim="checkForm.checkAcceptDesc" placeholder="请输入验收意见" 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="img">
+ <el-upload
+ accept=".pdf,.jpg,.png"
+ :action="fileRoad"
+ class="upload-demo"
+ ref="upload"
+ :headers="header"
+ :data="uploadForm"
+ list-type="picture-card"
+ :file-list="fileList"
+ v-model="dataForm.paths"
+ :on-change="handleChangeFile"
+ :on-success="onFileSuccess"
+ :multiple="false"
+ :auto-upload="true">
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url" alt=""
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ class="el-upload-list__item-preview"
+ @click="handleFile(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file,file.$index)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+ </div>
+ </el-upload>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<div align="right" class="dialog-footer">
@@ -21,15 +62,17 @@
import { hiddenDangerAccept,hiddenDangerReject} from '@/api/hiddenDanger';
import { getToken} from "@/utils/auth";
import {checkHiddenDangerReport, submitHiddenDangerReport} from "../../../../../../api/hiddenDanger";
+ import Cookies from "_js-cookie@2.2.0@js-cookie";
export default {
name: "acceptDialog",
data(){
return {
- headers: {
- 'Authorization': getToken()
+ disabled:false,
+ fileRoad:process.env.BASE_API + '/task/web/upload',
+ uploadForm:{
},
- baseUrl: process.env.BASE_API + 'hiddenDanger/report',
+ header:{Authorization:''},
imgUrls:[],
imgUrls2:[],
fileList:[],
@@ -67,7 +110,8 @@
},
checkInfoForm: {
rectifyDepId: null,
- liablePersonId: null
+ liablePersonId: null,
+ acceptImages:[]
},
checkFormRules: {
checkAcceptDesc: [{ required: true, message: '请填写整改说明', trigger: 'blur' }]
@@ -85,11 +129,14 @@
submitCheck() {
this.$refs['checkFormRef'].validate(async (valid) => {
if (valid) {
+ this.checkForm.acceptImages = this.fileList.map(item => {
+ return item.url.substring(process.env.IMG_API.length)
+ })
let res = await checkHiddenDangerReport(this.checkForm);
if (res.data.code === '200') {
this.$message({
type: 'success',
- message: '整改提交成功',
+ message: '验收成功',
duration: 2000
});
this.isShowCheckDialog = false;
@@ -137,8 +184,40 @@
this.submiting = false
})
},
- handleChange(file, fileList) {
- this.fileList = fileList
+ handleChangeFile(){
+ this.header.Authorization = Cookies.get('token')
+ },
+ onFileSuccess(response){
+ if(response.code === '200'){
+ this.fileList.push({url:process.env.IMG_API + response.result.path})
+ this.$notify({
+ type:'success',
+ duration:2000,
+ message:'上传成功',
+ title:'成功',
+ })
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ },
+ handleFile(file){
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+ showImg(file){
+ window.open(file, '_blank')
+ },
+ handleRemove(file,value){
+ return this.$confirm(`确定移除 ${ file.uid }？`,'提示',{
+ confirmButtonText:'确定',
+ cancelButtonText:'取消',
+ type:'warning',
+ }).then(()=> {
+ this.fileList.splice(value,1)
+ })
},
}
}
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue
index 77dd094..182a98b 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/rectify/components/rectifyDialog.vue
@@ -44,6 +44,42 @@
<el-input class="analyseUnit_input" type="number" v-model="dataForm.cost" readonly> </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="img">
+ <el-image
+ class="upload-img img-wrapper"
+ v-for='item in fileOneList'
+ :key='item.$index'
+ :src="item"
+ :preview-src-list="fileOneList"
+ >
+ </el-image>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="隐患整改图" prop="img">
+ <el-image
+ class="upload-img img-wrapper"
+ v-for='item in fileTwoList'
+ :key='item.$index'
+ :src="item"
+ :preview-src-list="fileTwoList"
+ >
+ </el-image>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="隐患验收图" prop="img">
+ <el-image
+ class="upload-img img-wrapper"
+ v-for='item in fileThreeList'
+ :key='item.$index'
+ :src="item"
+ :preview-src-list="fileThreeList"
+ >
+ </el-image>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
@@ -60,6 +96,47 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="整改时间" prop="applyTime">
<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" class="analyseUnit_input" v-model="rectifyForm.applyTime" placeholder="请选择整改时间" clearable> </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="隐患整改图" prop="img">
+ <el-upload
+ accept=".pdf,.jpg,.png"
+ :action="fileRoad"
+ class="upload-demo"
+ ref="upload"
+ :headers="header"
+ :data="uploadForm"
+ list-type="picture-card"
+ :file-list="fileList"
+ v-model="dataForm.paths"
+ :on-change="handleChangeFile"
+ :on-success="onFileSuccess"
+ :multiple="false"
+ :auto-upload="true">
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url" alt=""
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ class="el-upload-list__item-preview"
+ @click="handleFile(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file,file.$index)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+ </div>
+ </el-upload>
</el-form-item>
</el-col>
</el-row>
@@ -99,16 +176,18 @@
import {getDepartmentList} from "../../../../../../api/departmentManage";
import {safetyInspectionItemName} from "../../../../../../api/safetySelfInspection";
import {delayHiddenDangerReport, submitHiddenDangerReport} from "../../../../../../api/hiddenDanger";
+ import Cookies from "_js-cookie@2.2.0@js-cookie";
export default {
name: "rectifyDialog",
data(){
return {
+ disabled:false,
dialogFormVisible:false,
- baseUrl: process.env.BASE_API + 'hiddenDanger/report',
- headers: {
- 'Authorization': getToken()
+ fileRoad:process.env.BASE_API + '/task/web/upload',
+ uploadForm:{
},
+ header:{Authorization:''},
userList:[],
departmentList:[],
rectifyTypeList: [
@@ -118,6 +197,9 @@
imgPreviewUrls:[],
imgPreviewUrls2:[],
fileList:[],
+ fileOneList:[],
+ fileTwoList:[],
+ fileThreeList:[],
isView:false,
submiting:false,
dataFormRules:{},
@@ -144,7 +226,8 @@
id: null,
dangerManagerId: null,
rectifyInfo: null,
- applyTime: null
+ applyTime: null,
+ rectifyImages:[]
},
delayForm: {
id: null,
@@ -199,6 +282,16 @@
}else{
this.dialogFormVisible = true
this.dataForm = row
+ debugger
+ this.fileOneList = row.reportImages.map(item => {
+ return process.env.IMG_API + item
+ })
+ this.fileTwoList = row.rectifyImages.map(item => {
+ return process.env.IMG_API + item
+ })
+ this.fileThreeList = row.acceptImages.map(item => {
+ return process.env.IMG_API + item
+ })
}
},
@@ -206,6 +299,9 @@
submitRectify () {
this.$refs['rectifyFormRef'].validate( async(valid) => {
if (valid) {
+ this.rectifyForm.rectifyImages = this.fileList.map(item => {
+ return item.url.substring(process.env.IMG_API.length)
+ })
let res = await submitHiddenDangerReport(this.rectifyForm);
if (res.data.code === '200') {
this.$message({
@@ -313,8 +409,40 @@
}
},
- handleChange(file, fileList) {
- this.fileList = fileList
+ handleChangeFile(){
+ this.header.Authorization = Cookies.get('token')
+ },
+ onFileSuccess(response){
+ if(response.code === '200'){
+ this.fileList.push({url:process.env.IMG_API + response.result.path})
+ this.$notify({
+ type:'success',
+ duration:2000,
+ message:'上传成功',
+ title:'成功',
+ })
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ },
+ handleFile(file){
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+ showImg(file){
+ window.open(file, '_blank')
+ },
+ handleRemove(file,value){
+ return this.$confirm(`确定移除 ${ file.uid }？`,'提示',{
+ confirmButtonText:'确定',
+ cancelButtonText:'取消',
+ type:'warning',
+ }).then(()=> {
+ this.fileList.splice(value,1)
+ })
},
}
}
@@ -331,4 +459,15 @@
.analyseUnit_box{
width:200px;
}
+
+.img-wrapper{
+ width:100px;
+ height: 100px;
+ margin: 10px;
+ border-radius: 2px
+}
+.img-wrapper:first-child{
+ margin-left: unset !important;
+}
+
</style>
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
index fac85d8..c4d2bf2 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
@@ -114,6 +114,47 @@
<el-input class="analyseUnit_input" type="textarea" :rows="2" style="padding-bottom: 10px" v-model.trim="dataForm.rectifyDesc" placeholder="请输入整改措施"></el-input>
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+ <el-form-item label="隐患上报图" prop="img">
+ <el-upload
+ accept=".pdf,.jpg,.png"
+ :action="fileRoad"
+ class="upload-demo"
+ ref="upload"
+ :headers="header"
+ :data="uploadForm"
+ list-type="picture-card"
+ :file-list="fileList"
+ v-model="dataForm.paths"
+ :on-change="handleChangeFile"
+ :on-success="onFileSuccess"
+ :multiple="false"
+ :auto-upload="true">
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url" alt=""
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ class="el-upload-list__item-preview"
+ @click="handleFile(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file,file.$index)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+ </div>
+ </el-upload>
+ </el-form-item>
+ </el-col>
</el-row>
@@ -132,15 +173,17 @@
import { hiddenDangerReport } from '@/api/hiddenDanger';
import {getToken} from "@/utils/auth";
import {modHiddenDangerReport} from "../../../../../../api/hiddenDanger";
+ import Cookies from "_js-cookie@2.2.0@js-cookie";
export default {
name: "reportDialog",
data(){
return {
+ disabled:false,
title:'',
- baseUrl: process.env.BASE_API + 'hiddenDanger/report',
- headers: {
- 'Authorization': getToken()
+ fileRoad:process.env.BASE_API + '/task/web/upload',
+ uploadForm:{
},
+ header:{Authorization:''},
submiting:false,
departmentList: [],
userList: [],
@@ -206,7 +249,8 @@
liablePersonId: null,
rectifyTime: null,
cost: null,
- rectifyDesc: null
+ rectifyDesc: null,
+ reportImage:[]
},
dataFormRules:{
dangerDesc: [{ required: true, message: '请填写隐患情况描述', trigger: 'blur' }],
@@ -278,19 +322,29 @@
liablePersonId: null,
rectifyTime: null,
cost: null,
- rectifyDesc: null
+ rectifyDesc: null,
+ reportImages:[]
}
}else if(type === '修改'){
+ console.log(value)
for( let key in this.dataForm){
this.dataForm[key] = JSON.parse(JSON.stringify(value))[key]
}
this.dataForm.id = JSON.parse(JSON.stringify(value)).id
+ this.fileList = value.reportImages.map(item => {
+ return {
+ url : process.env.IMG_API + item
+ }
+ })
}
},
trigger2Submit(){
this.$refs["dataForm"].validate(valid =>{
if(valid){
+ this.dataForm.reportImages = this.fileList.map(item => {
+ return item.url.substring(process.env.IMG_API.length)
+ })
if(this.title === '新增'){
this.submiting = true
hiddenDangerReport(this.dataForm).then(res=>{
@@ -307,7 +361,6 @@
type: 'warning'
});
}
- this.fileList = []
}).catch(err=>{
console.log(err)
this.$message({
@@ -333,7 +386,6 @@
type: 'warning'
});
}
- this.fileList = []
}).catch(err=>{
console.log(err)
this.$message({
@@ -352,7 +404,6 @@
})
}
})
-
},
changeUnit() {
@@ -377,10 +428,41 @@
},
- handleChange(file, fileList) {
- this.fileList = fileList
+ handleChangeFile(){
+ this.header.Authorization = Cookies.get('token')
},
-
+ onFileSuccess(response){
+ if(response.code === '200'){
+ this.fileList.push({url:process.env.IMG_API + response.result.path})
+ this.$notify({
+ type:'success',
+ duration:2000,
+ message:'上传成功',
+ title:'成功',
+ })
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ },
+ handleFile(file){
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+ showImg(file){
+ window.open(file, '_blank')
+ },
+ handleRemove(file,value){
+ return this.$confirm(`确定移除 ${ file.uid }？`,'提示',{
+ confirmButtonText:'确定',
+ cancelButtonText:'取消',
+ type:'warning',
+ }).then(()=> {
+ this.fileList.splice(value,1)
+ })
+ },
}
}
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
index 3338837..d154d2c 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
@@ -19,6 +19,12 @@
<el-option v-for="item in taskTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</div>
+ <div class="basic_search">
+ <span>部门名称：</span>
+ <el-select class="analyseUnit_box" v-model="listQuery.execDepId" placeholder="部门名称" filterable clearable>
+ <el-option v-for="item in departmentList" :key="item.id" :label="item.department" :value="item.id"></el-option>
+ </el-select>
+ </div>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
</div>
<div class="table_content">
@@ -184,6 +190,7 @@
pageSize: 10,
result: null,
taskStatus: null,
+ execDepId: null,
taskType: null
},
}
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index a845051..30c40c5 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -14,6 +14,12 @@
</el-select>
</div>
<div class="basic_search">
+ <span>部门名称：</span>
+ <el-select class="analyseUnit_box" v-model="listQuery.execDepId" placeholder="部门名称" filterable clearable>
+ <el-option v-for="item in departmentList" :key="item.id" :label="item.department" :value="item.id"></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
<span>排查作业名称：</span>
<el-input class="analyseUnit_box" v-model="listQuery.checkWorkName" placeholder="排查作业名称" clearable> </el-input>
</div>
@@ -295,6 +301,7 @@
checkWorkType: null,
checkWorkStatus: null,
checkWorkName: null,
+ execDepId: null,
pageIndex: 1,
pageSize: 10,
diff --git a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
index fc5e20c..1484256 100644
--- a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
@@ -222,7 +222,6 @@
}
},
downloadPic(val){
- debugger
window.open( val.img, '_blank')
},
showSafetyRiskSpace(value,type){
--
Gitblit v1.9.2