Authored by 王涛

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

告警消除页面增加审核意见



See merge request !487
... ... @@ -48,7 +48,6 @@ export default {
},
repositoryInfo:{
handler(val){
console.log("%%%%%%%%%",val)
this.setValue(val);
},
deep:true
... ...
... ... @@ -42,13 +42,13 @@
<div class="info-item">
最后一次时间:{{alarmInfo.updateTime}}
</div>
<div class="info-item" v-if="alarmInfo.alarmType!=active">
<div class="info-item" v-if="alarmInfo.alarmTypeCustom!='active'">
消除人:{{alarmInfo.clearUserId}}
</div>
<div class="info-item" v-if="alarmInfo.alarmType!=active">
<div class="info-item" v-if="alarmInfo.alarmTypeCustom!='active'">
消除原因:{{alarmInfo.clearReason}}
</div>
<div class="info-item" v-if="alarmInfo.alarmType!=active">
<div class="info-item" v-if="alarmInfo.alarmTypeCustom!='active'">
消除时间:{{alarmInfo.clearTime}}
</div>
<div class="info-item">
... ... @@ -64,7 +64,7 @@
<!--通知统计信息组件-->
<cm-notice-statistics :alarmId="alarmInfo.id"></cm-notice-statistics>
</div>
<div class="alarmsRadio" v-if="!isExamine">
<div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active'">
<div class="alarmNotice-title">消除原因</div>
<div class="alarmsNotice">
<div class="alarmsDes"><el-input v-model="reason" placeholder="消除原因" /></div>
... ... @@ -119,7 +119,7 @@
<div class="detail_comments_title">审核意见</div>
<el-input
v-model="textarea1"
v-model="opinion"
type="textarea"
:rows="5"
placeholder="此处输入审核意见"
... ... @@ -155,7 +155,7 @@
</div>
<div class="alarmsCover" v-if="repositoryInto==1 && !isExamine">
<div class="alarmsCover" v-if="repositoryId && repositoryInto==1 && !isExamine">
<span class="radioLabel">引用是否覆盖:</span>
<el-radio-group v-model="citeCover">
<el-radio :label="true"></el-radio>
... ...
... ... @@ -38,9 +38,10 @@ export default {
//保存富文本内容
let repositoryInto=Vue.ref('1');//是否入知识库
let repositoryId=Vue.ref('');//知识库id
let citeCover=Vue.ref(true);//是否覆盖
let citeCover=Vue.ref(false);//是否覆盖
let reason=Vue.ref('');//简要说明
let alarmType=Vue.ref('active');//告警类型
let opinion=Vue.ref('');//审核意见
let saveDetail=(val)=>{
let dynamicTagsStr=dynamicTags.value.join(',');
let pcontent=detail.value;
... ... @@ -49,10 +50,11 @@ export default {
detailText.value=''
}
let params={
alarmId:alarmInfo.id,
pcontent:pcontent,//富文本详情
status:val,//存储状态 0 草稿,1 审批中
status:val,//存储状态 0 草稿,1 审批中 2已审批 3驳回
approver:approverName.value,//审批人
dateTime:dateTime.value,//当前时间
// dateTime:dateTime.value,//当前时间
keyword:dynamicTagsStr,//关键字
aralmid:alarmInfo.id,//告警id
// manageTime:dateTime.value,//处理时间
... ... @@ -61,10 +63,13 @@ export default {
repositoryInto:repositoryInto.value,//是否入知识库 1入,0不入
citeCover:citeCover.value?1:0,//引用是否覆盖 0 未覆盖 1已覆盖
reason:reason.value,//消除原因
noticeFlag:noticeFlag.value,//是否通知
alarmType:alarmInfo.alarmType,//告警类型,active活动告警,his历史告警
noticeFlag:noticeFlag.value?1:0,//是否通知
alarmType:alarmInfo.alarmTypeCustom,//告警类型,active活动告警,his历史告警
}
if(opinion.value){
params.opinion=opinion.value;//审批意见
}
proxy.$http.post(`/api-web/bAlarmManage/clearAlarm`, params, function (res) {
if (res && res.code == 0) {
proxy.$global.showMsg(res.msg, 'success');
... ... @@ -156,13 +161,13 @@ export default {
let selectionChange=(val)=>{
dynamicTagsAppend.value=val;
}
// 用户授权
// 审批人列表
let titles=['选择列表','已选择列表'];
let showUserDialogVisible = Vue.ref(false);
let userFileRight = Vue.ref([]);//已选择的用户
//获取用户
//获取所有审批人
let userList = Vue.ref([]);
//获取用户数据
//获取所有审批人数据
let getUserList=()=>{
proxy.userList = [];
... ... @@ -303,7 +308,8 @@ export default {
let repositoryInfo=Vue.ref('');
const handleChange = (value) => {
cascaderValue.value=value;
if(cascaderValue.value.length>1){
if(cascaderValue.value && cascaderValue.value.length>1){
repositoryId.value=cascaderValue.value[1];
let arr=cascaderOptions.value;
arr.map(item=>{
if(item.value==cascaderValue.value[1]){
... ... @@ -311,8 +317,9 @@ export default {
}
})
}else{
repositoryId.value=''
}
// repositoryId
}
const cascaderOptions = [
... ... @@ -383,11 +390,11 @@ export default {
}
//获取告警负责人-默认审批人
let getUser=()=>{
proxy.$http.get(`/api-web/bAlarmManage/alarm/userName`, {alarmNo:alarmInfo.alarmNo}, function (res) {
proxy.$http.get(`/api-web/bAlarmManage/alarm/userName`, {alarmNo:alarmInfo.value.alarmNo}, function (res) {
if (res && res.code == 0) {
let data=res.object;
if(data){
approverName.value=data.adminName;x
approverName.value=data.adminName;
}
}
})
... ... @@ -410,7 +417,7 @@ export default {
title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,
showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles,
getAlarmInfo,alarmInfo,cascaderValue,propsTrigger,handleChange,cascaderOptions,noticeFlag,
getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId
getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion
}
}
... ...
... ... @@ -276,7 +276,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
urlParams+=key+'='+params[key]+'&'
}
}
urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmType=active';
urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmTypeCustom=active';
layer.open({
title: ['告警消除', 'font-size:18px;'],
type: 2,
... ...
... ... @@ -375,7 +375,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
urlParams+=key+'='+params[key]+'&'
}
}
urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmType=his';
urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmTypeCustom=his';
layer.open({
title: ['告警消除', 'font-size:18px;'],
type: 2,
... ...