monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit f76410e8618535b87c83fbde53aa411ca8cc7730 2 parents eb415f1f 9f64c30d

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 9 changed files with 67 additions and 20 deletions
... ... @@ -4017,13 +4017,16 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
menubox += '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>';
if (canCA) {
if (inCAing) {
menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';
} else {
menubox += '<li type="ca-add"><i class="layui-icon">&#xe64c;</i>纳入容量预测</li>';
}
}
// Start Wang 2022/3/28 14:06 833:屏蔽纳入容量预测按钮 https://hgkj.zentaopm.com/task-view-833.html
// 后面计划将功能作为配置项
// if (canCA) {
// if (inCAing) {
// menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';
// } else {
// menubox += '<li type="ca-add"><i class="layui-icon">&#xe64c;</i>纳入容量预测</li>';
// }
// }
// End Wang 2022/3/28 14:06
menubox += '</ul></div>';
var cX = e.clientX + 10;
var cY = e.clientY - 10;
... ...
... ... @@ -52,7 +52,7 @@
<!--新增编辑弹框-->
<cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false">
<template v-slot>
<alarmsClearEditor :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" />
<alarmsClearEditor v-if="dialog.show" :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/>
</template>
</cm-dialog>
... ...
... ... @@ -23,7 +23,8 @@ export default {
title : "处理审批",
show:false,
amId : '',
amStatus:0
amStatus:0,
alarmId:'',
});
//表格字段
... ... @@ -116,6 +117,7 @@ export default {
hideDialog(true);
dialog.value.amId = row.id;
dialog.value.amStatus = row.status;
dialog.value.alarmId = row.alarmId;
}
//审核保存后关闭弹框
let saveback=(val)=>{
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ No newline at end of file
... ...
export default {
name: 'alarmsClearEditorDetail',
template: '',
components: {
},
props: [],
setup(props, {attrs, slots, emit}) {
const {proxy} = Vue.getCurrentInstance();
// 挂载完
Vue.onMounted(() => {
})
return {
}
}
}
... ...
... ... @@ -62,7 +62,7 @@
</div>
</div>
<!--通知统计信息组件-->
<cm-notice-statistics :alarmId="alarmId" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics>
<cm-notice-statistics v-if="alarmIdVal" :alarmId="alarmIdVal" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics>
</div>
<div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active' || status==0 || status==3">
<div class="alarmNotice-title">消除原因</div>
... ... @@ -178,7 +178,7 @@
<el-button type="primary" @click="saveDetail(3)" v-if="isExamine && status==1 && approverName==loginName" size="small">不通过</el-button>
<el-button @click="cancleBtn(0)" size="small">取消</el-button>
</div>
<cm-userright title="审批人(不支持多人，多选默认取第一个人)" :titles="titles" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser"
<cm-userright title="审批人(不支持多人，多选默认取第一个人)" :titles="titles" :buttonTexts="buttonTexts" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser"
@hideDialog="showUserDialog"></cm-userright>
<!--关键字提取列表-->
<cm-dialog :title="title" width="60%" :showDialogVisible="dialogVisible" :showFooter="true" @okfunc="okfunc" @hidedialog="closeDetail" :showOkBtn="true">
... ...
... ... @@ -15,6 +15,11 @@ export default {
status:{
type:Number,
default:1
},
//告警id
alarmId:{
type:String,
default:''
}
},
data () {
... ... @@ -29,7 +34,7 @@ export default {
let detail=Vue.ref('');
let detailText=Vue.ref('');
//统计信息及同类型告警的alarmId
let alarmId=props.amId?Vue.ref(props.amId):'';
let alarmIdVal=Vue.ref('');
//审批人
let approver=Vue.ref('');
let approverName=Vue.ref('admin');
... ... @@ -197,6 +202,7 @@ export default {
}
// 审批人列表
let titles=['选择列表','已选择列表'];
let buttonTexts=['取消', '选择'];
let showUserDialogVisible = Vue.ref(false);
let userFileRight = Vue.ref([]);//已选择的用户
//获取所有审批人
... ... @@ -284,10 +290,12 @@ export default {
}else{
// getAlarmStatis();
}
alarmIdVal.value=props.alarmId;
getAlarmStatis();
// }
}else {
alarmInfo.value=proxy.$route.query;
alarmIdVal.value=alarmInfo.value.primaryKey;
getUser();
}
getUserByToken();
... ... @@ -403,9 +411,6 @@ export default {
let data=res.object;
if(data){
alarmInfo.value=data;
if(alarmInfo.value.id){
alarmId.value=alarmInfo.value.id;
}
if( alarmInfo.value.approver){
approverName.value=alarmInfo.value.approver;
userList.value.map(item=>{
... ... @@ -448,9 +453,9 @@ export default {
options,inputValue,dynamicTags,inputVisible,handleClose,showInput,handleInputConfirm,
getKeyword, timer,dateTime,getDateTime,timeFormat,
title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,
showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles,
showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles,buttonTexts,
getAlarmInfo,alarmInfo,cascaderValue,propsTrigger,handleChange,cascaderOptions,noticeFlag,
getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj,alarmId
getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj,alarmIdVal
}
}
... ...
... ... @@ -31,7 +31,8 @@
<template #tools="{scope}">
<div class="list-handle">
<span class="icon-bg">
<i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i>
<!-- <i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i>-->
<i class="el-icon-view" title="查看" @click="handleView(scope.row)"></i>
</span>
</div>
</template>
... ...
... ... @@ -119,7 +119,10 @@ export default {
dialog.value.amId = row.amId;
}
//查看详情
let handleView = (row) =>{
handle(row);
}
// 挂载完
Vue.onMounted(() => {
getDataList();
... ... @@ -134,7 +137,8 @@ export default {
handle,
loaddata,
tableData,
getDataList
getDataList,
handleView
}
}
... ...