弹框修改、传参修改

Lvtianfang
吕天方 5 months ago
parent 3407340a06
commit 23170d465c

@ -599,6 +599,7 @@
.warning-list-search {
display: flex;
align-items: center;
margin-bottom: 5px;
.el-input__inner {
border-radius: 5px 0 0 5px;
}
@ -616,7 +617,7 @@
grid-template-columns: 1fr;
grid-row-gap: 10px;
margin: 5px;
height: calc(100vh - 250px);
height: calc(100vh - 300px);
overflow-y: scroll;
.lists {
border-radius: 10px;

@ -17,7 +17,9 @@
<div class="grid-content" v-if="auditStatus == 1">
<div class="grid-title">概括名称</div>
<div class="grid-value-btn">
<el-input class="grid-value-value" v-loading="InputLoading" @blur="titleBlur" v-model="audioInfo.title" placeholder="概括名称" :disabled="disabled"></el-input>
<el-tooltip class="item" effect="light" :content="audioInfo.title" placement="top">
<el-input class="grid-value-value" v-loading="InputLoading" @blur="titleBlur" v-model="audioInfo.title" placeholder="概括名称" :disabled="disabled"></el-input>
</el-tooltip>
<el-button size="mini" @click="changeTitle"><img src="@/assets/images/changeTitle.png" alt=""> 修改标题</el-button>
</div>
</div>
@ -28,13 +30,13 @@
<div class="grid-value">{{ audioInfo.title }}</div>
</el-tooltip>
</div>
<el-button size="mini" @click="lookTitleBefore"><img src="@/assets/images/changeTitle.png" alt=""> 查看原标题</el-button>
<el-button size="mini" v-if="audioInfo.titleBefore" @click="lookTitleBefore"><img src="@/assets/images/changeTitle.png" alt=""> </el-button>
</div>
</el-col>
<el-col :span="8">
<div class="grid-content">
<div class="grid-title">预警时间</div>
<div class="grid-value">{{ audioInfo.firstWarnTime }}</div>
<div class="grid-value">{{ audioInfo.firstWarnTime || audioInfo.caseDate }}</div>
</div>
</el-col>
<el-col :span="8">
@ -58,14 +60,6 @@
</div>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="14">
<div class="grid-content">
<div class="grid-title">事件数量</div>
<div class="grid-value">{{ audioInfo.number }}</div>
</div>
</el-col>
</el-row> -->
</div>
<div class="audit-table">
<section class="table-box">
@ -89,14 +83,14 @@
</el-table-column>
<el-table-column label="审核结果" v-if="auditStatus == 2" align="center" prop="isReport">
<template slot-scope="scope">
<span class="sign">不符</span>
<span class="unmark"></span>
<span class="sign" v-if="scope.row.isReport == 1 || scope.row.isReport == 2"></span>
<span class="unmark" v-else></span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="operation-box" >
<template slot-scope="scope">
<div class="operation" v-if="audioInfo.msgType == '1'">
<el-radio-group v-model="scope.row.radio" @change.native="changRadio(scope.row)">
<div class="operation">
<el-radio-group v-model="scope.row.radio" @change.native="changRadio(scope.row)" v-if="auditStatus == 1">
<el-radio v-removeAriaHiddent :label="1">符合</el-radio>
<el-radio v-removeAriaHiddent :label="2" value="13212">不符合</el-radio>
</el-radio-group>
@ -158,7 +152,7 @@ export default {
size: 10
},
disabled:true,
multipleSelection: {},
multipleSelection: [],
innerVisible:false,
auditStatusTwo: 1,
}
@ -186,25 +180,28 @@ export default {
this.showCK = false;
this.InputLoading = false;
this.loading = false;
this.multipleSelection = {};
this.$emit('closeDialog')
this.multipleSelection = [];
this.pages = {
current: 1,
size: 10
}
},
getList(id){
this.loading = true;
auditList(id,{...this.pages}).then(res=>{
this.tableData = [...res.data.records];
const deepCopy = JSON.parse(JSON.stringify(res.data.records));
this.tableData = deepCopy;
if(this.multipleSelection.length > 0) {
this.tableData.map(item=>{
this.multipleSelection.map(itemTwo=>{
if(item.caseSerial = itemTwo) {
// item.showTags = true;
this.tableData.forEach(item=>{
this.$set(item, 'radio', 1);
this.multipleSelection.forEach(itemTwo=>{
if(itemTwo == item.caseSerial) {
this.$set(item, 'radio', 2);
}
})
})
} else {
this.tableData.map(item=>{
// item.showTags = true;
this.$set(item, 'radio', 1);
})
}
@ -221,72 +218,30 @@ export default {
this.$refs.urgencyAudit.open(this.audioInfo,item);
},
changRadio(row){
console.log(row,"变化");
if(row.radio == 2) {
this.multipleSelection.push(row.caseSerial);
} else if(row.radio == 1){
this.multipleSelection = this.multipleSelection.filter((item)=> item !== row.caseSerial)
}
},
//
// sign(row){
// this.tableData.map(item=>{
// if(item.caseSerial == row.caseSerial) {
// item.showTags = !item.showTags;
// // console.log(item.showTags,"item.showTags");
// if(item.showTags) {
// //
// if(this.audioInfo.msgType == '2') {
// this.multipleSelection[row.caseSerial] = 2;
// } else {
// // //
// this.multipleSelection[row.caseSerial] = 1;
// }
// } else {
// // this.multipleSelection = this.multipleSelection.filter(itemTwo => itemTwo !== row.caseSerial);
// delete this.multipleSelection[row.caseSerial];
// }
// }
// })
// },
// signTwo(row) {
// this.tableData.map(item=>{
// if(item.caseSerial == row.caseSerial) {
// item.showTags = !item.showTags;
// // console.log(item.showTags,"item.showTags");
// if(item.showTags) {
// //
// this.multipleSelection[row.caseSerial] = 3;
// } else {
// // this.multipleSelection = this.multipleSelection.filter(itemTwo => itemTwo !== row.caseSerial);
// delete this.multipleSelection[row.caseSerial];
// }
// }
// })
// },
// /退
reported(id){
// console.log(this.audioInfo.innerEventId);
if(id == 1) {
//
eventChangeIsReport({isReport:1,caseSerial:this.multipleSelection,innerEventId:this.audioInfo.innerEventId,msgType:this.audioInfo.msgType}).then(res=>{
// console.log(res);
this.multipleSelection = {};
this.$message({
type: "success",
message: "已上报驾驶舱!",
});
this.close();
})
} else {
// 退
eventChangeIsReport({isReport:2,caseSerial:this.multipleSelection,innerEventId:this.audioInfo.innerEventId,msgType:this.audioInfo.msgType}).then(res=>{
this.$confirm(`确定要${id == 1 ? '重新上报驾驶仓' : '退回重训练'}吗?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
eventChangeIsReport({isReport:id,caseSerial:this.multipleSelection,innerEventId:this.audioInfo.innerEventId}).then(res=>{
// console.log(res);
this.multipleSelection = {};
this.multipleSelection = [];
this.$message({
type: "success",
message: "已退回重训练!",
message: id == 1 ? '已上报驾驶舱' : '已退回重训练' + "!",
});
this.$emit('closeDialog')
this.close();
})
}
})
},
//
lookTitleBefore(){
@ -299,8 +254,6 @@ export default {
//
titleBlur(){
this.disabled = true;
// console.log(this.backupsInfo.title);
// console.log(this.audioInfo.title);
if(this.backupsInfo.title !== this.audioInfo.title) {
this.InputLoading = true;
editTitle({title:this.audioInfo.title, innerEventId:this.audioInfo.innerEventId}).then(res=>{

@ -24,7 +24,9 @@
<div class="work-order-labelBox">事件名称</div>
<span></span>
</div>
<el-input class="work-order-value-value" @blur="titleBlur" v-model="eventInfo.title" placeholder="概括名称" :disabled="disabled"></el-input>
<el-tooltip class="item" effect="light" :content="eventInfo.title" placement="top">
<el-input class="work-order-value-value" @blur="titleBlur" v-model="eventInfo.title" :disabled="disabled"></el-input>
</el-tooltip>
</div>
<el-button size="mini" @click="disabled = false"><img src="@/assets/images/changeTitle.png" alt=""> 修改标题</el-button>
</div>
@ -38,9 +40,9 @@
<div class="work-order-value work-order-value-value">{{ eventInfo.title }}</div>
</el-tooltip>
</div>
<el-button size="mini" @click="innerVisible = true"><img src="@/assets/images/changeTitle.png" alt=""> 查看标题</el-button>
<el-button size="mini" v-if="eventInfo.titleBefore" @click="innerVisible = true"><img src="@/assets/images/changeTitle.png" alt=""> </el-button>
</div>
<div class="work-order-items">
<div class="work-order-items" v-if="eventInfo.auditTime">
<div class="work-order-label">
<div class="work-order-labelBox">审核时间</div>
<span></span>
@ -260,7 +262,7 @@ export default {
auditStatus:{
type:Number,
required: true
}
},
},
mounted(){
@ -273,15 +275,12 @@ export default {
this.backupsInfo = {...row}
if(item){
this.isTrue = true;
console.log("111");
this.getListTwo(item.caseSerial);
} else if(!item && this.eventInfo.msgType == '3'){
this.isTrue = false;
console.log("222");
this.getList(row.innerEventId);
} else {
this.isTrue = false;
console.log("333");
this.audioInfo = {...row}
}
this.$nextTick(() => {
@ -368,7 +367,7 @@ export default {
let center = bounds.getCenter();
this.map.setView(center, 12);
}
console.log(res,"res");
// console.log(res,"res");
this.loading = false;
}).catch(err=>{
this.loading = false;
@ -391,31 +390,21 @@ export default {
reported(id){
// console.log(this.multipleSelection);
// console.log(this.audioInfo.innerEventId);
if(id == 1) {
//
eventChangeIsReport({isReport:1,caseSerial:[this.audioInfo.caseSerial],innerEventId:this.eventInfo.innerEventId}).then(res=>{
this.$confirm(`确定要${id == 1 ? '重新上报驾驶仓' : '退回重训练'}吗?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
eventChangeIsReport({isReport:id,caseSerial:[this.audioInfo.caseSerial],innerEventId:this.eventInfo.innerEventId}).then(res=>{
// console.log(res);
this.multipleSelection = [];
this.$message({
type: "success",
message: "已上报驾驶舱!",
message: id == 1 ? '已上报驾驶舱' : '已退回重训练' + "!",
});
this.close();
this.$emit('closeDialog')
})
} else {
// 退
eventChangeIsReport({isReport:2,caseSerial:[this.audioInfo.caseSerial],innerEventId:this.eventInfo.innerEventId}).then(res=>{
// console.log(res);
this.multipleSelection = [];
this.$message({
type: "success",
message: "已退回重训练!",
});
this.close();
this.$emit('closeDialog')
})
}
})
},
//
addStyle({row, column, rowIndex, columnIndex}) {

@ -4,7 +4,7 @@
<div class="headerText">
<div class="searchP">
算法运行监测
<span>算法运行正常数据获取正常数据推送上一次时间 {{tableData[0].runningTime}}</span>
<span>算法运行正常数据获取正常数据推送上一次时间 <span v-if="tableData.length > 0">{{ tableData[0].runningTime }}</span></span>
</div>
</div>
<div class="arithmetic-query">
@ -92,6 +92,7 @@ export default {
window.removeEventListener('resize', this.cancalDebounce);
},
methods: {
//
resetQuery(){
this.formInline = {
time:[],

@ -10,32 +10,38 @@
<el-button type="primary" size="medium" @click="query" slot="append" icon="el-icon-search"></el-button>
</el-input>
</div>
<div class="warning-list-list">
<div class="lists" v-for="(item,index) in eventList" v-loading="loading">
<div class="hearder">
<!--群体事件1同人同诉2紧急事件3重点人员4一人多诉5 -->
<div class="anniu" :class="item.msgType == '1' ? 'qunti' : item.msgType == '2' ? 'tongren' : item.msgType == '3' ? 'jinji' : item.msgType == '4' ? 'zhongdian' : item.msgType == '5' ? 'yiren' : '' ">{{ item.msgTypeName }}</div>
<div class="warning-title">{{ item.title }}</div>
</div>
<div class="content">
<div class="content-top">
<img src="@/assets/images/address.png" alt="">
<span>{{ item.warnFactor }}</span>
<el-radio-group v-model="queryParams.isReport" @change="getList" class="years-select" size="small" fill="#1890FF">
<el-radio-button :label="3">全部</el-radio-button>
<el-radio-button :label="4">待审核</el-radio-button>
<el-radio-button :label="5">已审核</el-radio-button>
</el-radio-group>
<div class="warning-list-list" v-loading="loading">
<div v-if="eventList.length > 0">
<div class="lists" v-for="(item,index) in eventList">
<div class="hearder">
<!--群体事件1同人同诉2紧急事件3重点人员4一人多诉5 -->
<div class="anniu" :class="item.msgType == '1' ? 'qunti' : item.msgType == '2' ? 'tongren' : item.msgType == '3' ? 'jinji' : item.msgType == '4' ? 'zhongdian' : item.msgType == '5' ? 'yiren' : '' ">{{ item.msgTypeName }}</div>
<div class="warning-title">{{ item.title }}</div>
</div>
<div class="content-bottom">
<img src="@/assets/images/time.png" alt="">
<span>{{ item.eventTime }}</span>
<div class="content">
<div class="content-top">
<img src="@/assets/images/address.png" alt="">
<span>{{ item.address }}</span>
</div>
<div class="content-bottom">
<img src="@/assets/images/time.png" alt="">
<span>{{ item.eventTime }}</span>
</div>
</div>
</div>
<div class="foot">
<el-button v-if="!item.isReport" type="primary" size="mini" @click="audit(item)"></el-button>
<div v-else class="eventInfo">
<div class="audit" @click="auditPass"></div>
<span></span>
<div class="info" @click="detailInfo(item)"></div>
<div class="foot">
<el-button v-if="!item.isReport" type="primary" size="mini" @click="audit(item)"></el-button>
<el-button v-else size="mini" @click="detailInfo(item)"></el-button>
</div>
</div>
</div>
<div class="right-main" v-else>
<el-divider content-position="center">暂无</el-divider>
</div>
</div>
<div class="warning-list-footer">
<pagination
@ -60,8 +66,8 @@
</div>
</div>
<div id="newmap" v-loading="mapLoading"></div>
<event-audit title="事件审核" ref="eventAudit" :auditStatus="1" @closeDialog="getList"></event-audit>
<urgency-audit title="事件详情" ref="urgencyAudit" :auditStatus="auditStatus" @closeDialog="getList"></urgency-audit>
<event-audit :title="urgencyTitle" ref="eventAudit" :auditStatus="auditStatus" @closeDialog="mountedMethods"></event-audit>
<urgency-audit :title="urgencyTitle" ref="urgencyAudit" :auditStatus="auditStatus" @closeDialog="mountedMethods"></urgency-audit>
</div>
</template>
<script>
@ -113,7 +119,8 @@ export default {
queryParams:{
current: 1,
size: 10,
title:""
title:"",
isReport: 3,
},
total: 0,
eventList:[],
@ -129,6 +136,7 @@ export default {
mapLayer5: null,
},
auditStatus: 1,
urgencyTitle:'事件详情',
}
},
mounted() {
@ -138,6 +146,12 @@ export default {
this.getList();
},
methods:{
mountedMethods(){
this.$nextTick(() => {
this.initMap();
});
this.getList();
},
getList(){
this.loading = true;
colonyPage(this.queryParams).then(res=>{
@ -291,7 +305,7 @@ export default {
marker.bindPopup(
`<div class="markerDialog">
<div class="markerTitle">
<span class="marker-msgTitle">${item.caseTitle}</span>
<span class="marker-msgTitle">${item.title}</span>
<i class="el-icon-close markerClose" id="markerClose${index}"></i>
</div>
<div class="markerContent">
@ -300,7 +314,7 @@ export default {
<div class="labelBox">预警时间</div>
<span></span>
</div>
<div class="infoValue">${item.caseDate}</div>
<div class="infoValue">${item.firstWarnTime}</div>
</div>
<div class="contentInfo">
<div class="infoLabel">
@ -314,7 +328,7 @@ export default {
<div class="labelBox"> </div>
<span></span>
</div>
<div class="infoValue">${item.caseAddress}</div>
<div class="infoValue">${item.address}</div>
</div>
<div class="contentInfo">
<div class="infoLabel">
@ -340,18 +354,24 @@ export default {
});
//
document.querySelector(`#markerAudit` + index).addEventListener("click", function () {
that.urgencyTitle = "事件审核"
that.auditStatus = 1;
if(item.msgType == '3') {
that.auditStatus = 1;
that.$refs.urgencyAudit.open(item);
} else {
// console.log(item);
that.$refs.eventAudit.open(item);
}
});
//
document.querySelector(`#markerInfo` + index).addEventListener("click", function () {
that.auditStatus = 2;
that.$refs.urgencyAudit.open(item);
that.urgencyTitle = "事件详情"
if(item.msgType == '3') {
that.auditStatus = 2;
that.$refs.urgencyAudit.open(item);
} else {
that.auditStatus = 2;
that.$refs.eventAudit.open(item);
}
});
})
},
@ -363,10 +383,12 @@ export default {
},
//
audit(item){
this.urgencyTitle = "事件审核"
if(item.msgType == '3') {
this.auditStatus = 1;
this.$refs.urgencyAudit.open(item);
} else {
this.auditStatus = 1;
this.$refs.eventAudit.open(item);
}
},
@ -376,8 +398,14 @@ export default {
},
//
detailInfo(item){
this.auditStatus = 2;
this.$refs.urgencyAudit.open(item);
this.urgencyTitle = "事件详情"
if(item.msgType == '3') {
this.auditStatus = 2;
this.$refs.urgencyAudit.open(item);
} else {
this.auditStatus = 2;
this.$refs.eventAudit.open(item);
}
},
},
}

@ -55,10 +55,10 @@
<el-table-column type="index" label="序号" width="100px" class-name="table-operation" align="center"/>
<el-table-column label="事件标题" key="title" width="400px" prop="title" />
<el-table-column label="预警时间" key="firstWarnTime" width="300px" prop="firstWarnTime" />
<el-table-column label="预警因素" key="warnFactor" width="400px" prop="warnFactor" />
<el-table-column label="事件数量" key="nums" width="100px" prop="nums" align="center">
<el-table-column label="预警因素" key="warnFactor" width="350px" prop="warnFactor" />
<el-table-column label="审核时间" key="auditTime" v-if="activeName !== 'first'" width="180px" prop="auditTime" align="center">
<template slot-scope="scope">
<div style="text-align: center;">{{ scope.row.nums }}</div>
<div style="text-align: center;">{{ scope.row.auditTime }}</div>
</template>
</el-table-column>
<el-table-column label="操作" class-name="table-operation-anniu" align="center">
@ -122,9 +122,10 @@ export default {
current: 1,
size: 10,
msgType: '3',
isReport:null,
isReport:4,
},
auditStatus: 1,
auditMapStatus: 1,
dialogTitle: "事件审核",
}
},
@ -139,9 +140,10 @@ export default {
methods:{
handleClick(e) {
if (this.activeName == "first") {
this.pagination.isReport = null
this.pagination.isReport = 4
this.auditStatus = 1;
this.dialogTitle = "事件审核"
this.auditMapStatus = 1;
this.dialogTitle = "事件审核";
this.getList();
} else if (this.activeName == "second") {
this.pagination.isReport = 1
@ -151,6 +153,7 @@ export default {
this.formInline.title = "";
this.formInline.time = [];
this.auditStatus = 2;
this.auditMapStatus = 2;
this.dialogTitle = "事件详情"
this.getList();
} else if (this.activeName == "third") {
@ -161,6 +164,7 @@ export default {
this.formInline.title = "";
this.formInline.time = [];
this.auditStatus = 2;
this.auditMapStatus = 2;
this.dialogTitle = "事件详情"
this.getList();
}
@ -191,7 +195,7 @@ export default {
current: 1,
size: 10,
msgType: '3',
isReport: this.activeName == "first" ? null : this.activeName == "second" ? 1 : this.activeName == "third" ? 2 : null,
isReport: this.activeName == "first" ? 4 : this.activeName == "second" ? 1 : this.activeName == "third" ? 2 : null,
}
this.getList();
},

Loading…
Cancel
Save