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 @@ -4017,13 +4017,16 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
4017 } 4017 }
4018 4018
4019 menubox += '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>'; 4019 menubox += '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>';
4020 - if (canCA) {  
4021 - if (inCAing) {  
4022 - menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';  
4023 - } else {  
4024 - menubox += '<li type="ca-add"><i class="layui-icon">&#xe64c;</i>纳入容量预测</li>';  
4025 - }  
4026 - } 4020 + // Start Wang 2022/3/28 14:06 833:屏蔽纳入容量预测按钮 https://hgkj.zentaopm.com/task-view-833.html
  4021 + // 后面计划将功能作为配置项
  4022 + // if (canCA) {
  4023 + // if (inCAing) {
  4024 + // menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';
  4025 + // } else {
  4026 + // menubox += '<li type="ca-add"><i class="layui-icon">&#xe64c;</i>纳入容量预测</li>';
  4027 + // }
  4028 + // }
  4029 + // End Wang 2022/3/28 14:06
4027 menubox += '</ul></div>'; 4030 menubox += '</ul></div>';
4028 var cX = e.clientX + 10; 4031 var cX = e.clientX + 10;
4029 var cY = e.clientY - 10; 4032 var cY = e.clientY - 10;
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <!--新增编辑弹框--> 52 <!--新增编辑弹框-->
53 <cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false"> 53 <cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false">
54 <template v-slot> 54 <template v-slot>
55 - <alarmsClearEditor :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" /> 55 + <alarmsClearEditor v-if="dialog.show" :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/>
56 </template> 56 </template>
57 </cm-dialog> 57 </cm-dialog>
58 58
@@ -23,7 +23,8 @@ export default { @@ -23,7 +23,8 @@ export default {
23 title : "处理审批", 23 title : "处理审批",
24 show:false, 24 show:false,
25 amId : '', 25 amId : '',
26 - amStatus:0 26 + amStatus:0,
  27 + alarmId:'',
27 }); 28 });
28 29
29 //表格字段 30 //表格字段
@@ -116,6 +117,7 @@ export default { @@ -116,6 +117,7 @@ export default {
116 hideDialog(true); 117 hideDialog(true);
117 dialog.value.amId = row.id; 118 dialog.value.amId = row.id;
118 dialog.value.amStatus = row.status; 119 dialog.value.amStatus = row.status;
  120 + dialog.value.alarmId = row.alarmId;
119 } 121 }
120 //审核保存后关闭弹框 122 //审核保存后关闭弹框
121 let saveback=(val)=>{ 123 let saveback=(val)=>{
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <title>Title</title>
  6 +</head>
  7 +<body>
  8 +
  9 +</body>
  10 +</html>
  1 +export default {
  2 + name: 'alarmsClearEditorDetail',
  3 + template: '',
  4 + components: {
  5 +
  6 + },
  7 + props: [],
  8 + setup(props, {attrs, slots, emit}) {
  9 + const {proxy} = Vue.getCurrentInstance();
  10 +
  11 +
  12 + // 挂载完
  13 + Vue.onMounted(() => {
  14 + })
  15 +
  16 +
  17 + return {
  18 +
  19 + }
  20 + }
  21 +
  22 +}
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 </div> 62 </div>
63 </div> 63 </div>
64 <!--通知统计信息组件--> 64 <!--通知统计信息组件-->
65 - <cm-notice-statistics :alarmId="alarmId" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics> 65 + <cm-notice-statistics v-if="alarmIdVal" :alarmId="alarmIdVal" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics>
66 </div> 66 </div>
67 <div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active' || status==0 || status==3"> 67 <div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active' || status==0 || status==3">
68 <div class="alarmNotice-title">消除原因</div> 68 <div class="alarmNotice-title">消除原因</div>
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 <el-button type="primary" @click="saveDetail(3)" v-if="isExamine && status==1 && approverName==loginName" size="small">不通过</el-button> 178 <el-button type="primary" @click="saveDetail(3)" v-if="isExamine && status==1 && approverName==loginName" size="small">不通过</el-button>
179 <el-button @click="cancleBtn(0)" size="small">取消</el-button> 179 <el-button @click="cancleBtn(0)" size="small">取消</el-button>
180 </div> 180 </div>
181 - <cm-userright title="审批人(不支持多人，多选默认取第一个人)" :titles="titles" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser" 181 + <cm-userright title="审批人(不支持多人，多选默认取第一个人)" :titles="titles" :buttonTexts="buttonTexts" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser"
182 @hideDialog="showUserDialog"></cm-userright> 182 @hideDialog="showUserDialog"></cm-userright>
183 <!--关键字提取列表--> 183 <!--关键字提取列表-->
184 <cm-dialog :title="title" width="60%" :showDialogVisible="dialogVisible" :showFooter="true" @okfunc="okfunc" @hidedialog="closeDetail" :showOkBtn="true"> 184 <cm-dialog :title="title" width="60%" :showDialogVisible="dialogVisible" :showFooter="true" @okfunc="okfunc" @hidedialog="closeDetail" :showOkBtn="true">
@@ -15,6 +15,11 @@ export default { @@ -15,6 +15,11 @@ export default {
15 status:{ 15 status:{
16 type:Number, 16 type:Number,
17 default:1 17 default:1
  18 + },
  19 + //告警id
  20 + alarmId:{
  21 + type:String,
  22 + default:''
18 } 23 }
19 }, 24 },
20 data () { 25 data () {
@@ -29,7 +34,7 @@ export default { @@ -29,7 +34,7 @@ export default {
29 let detail=Vue.ref(''); 34 let detail=Vue.ref('');
30 let detailText=Vue.ref(''); 35 let detailText=Vue.ref('');
31 //统计信息及同类型告警的alarmId 36 //统计信息及同类型告警的alarmId
32 - let alarmId=props.amId?Vue.ref(props.amId):''; 37 + let alarmIdVal=Vue.ref('');
33 //审批人 38 //审批人
34 let approver=Vue.ref(''); 39 let approver=Vue.ref('');
35 let approverName=Vue.ref('admin'); 40 let approverName=Vue.ref('admin');
@@ -197,6 +202,7 @@ export default { @@ -197,6 +202,7 @@ export default {
197 } 202 }
198 // 审批人列表 203 // 审批人列表
199 let titles=['选择列表','已选择列表']; 204 let titles=['选择列表','已选择列表'];
  205 + let buttonTexts=['取消', '选择'];
200 let showUserDialogVisible = Vue.ref(false); 206 let showUserDialogVisible = Vue.ref(false);
201 let userFileRight = Vue.ref([]);//已选择的用户 207 let userFileRight = Vue.ref([]);//已选择的用户
202 //获取所有审批人 208 //获取所有审批人
@@ -284,10 +290,12 @@ export default { @@ -284,10 +290,12 @@ export default {
284 }else{ 290 }else{
285 // getAlarmStatis(); 291 // getAlarmStatis();
286 } 292 }
  293 + alarmIdVal.value=props.alarmId;
287 getAlarmStatis(); 294 getAlarmStatis();
288 // } 295 // }
289 }else { 296 }else {
290 alarmInfo.value=proxy.$route.query; 297 alarmInfo.value=proxy.$route.query;
  298 + alarmIdVal.value=alarmInfo.value.primaryKey;
291 getUser(); 299 getUser();
292 } 300 }
293 getUserByToken(); 301 getUserByToken();
@@ -403,9 +411,6 @@ export default { @@ -403,9 +411,6 @@ export default {
403 let data=res.object; 411 let data=res.object;
404 if(data){ 412 if(data){
405 alarmInfo.value=data; 413 alarmInfo.value=data;
406 - if(alarmInfo.value.id){  
407 - alarmId.value=alarmInfo.value.id;  
408 - }  
409 if( alarmInfo.value.approver){ 414 if( alarmInfo.value.approver){
410 approverName.value=alarmInfo.value.approver; 415 approverName.value=alarmInfo.value.approver;
411 userList.value.map(item=>{ 416 userList.value.map(item=>{
@@ -448,9 +453,9 @@ export default { @@ -448,9 +453,9 @@ export default {
448 options,inputValue,dynamicTags,inputVisible,handleClose,showInput,handleInputConfirm, 453 options,inputValue,dynamicTags,inputVisible,handleClose,showInput,handleInputConfirm,
449 getKeyword, timer,dateTime,getDateTime,timeFormat, 454 getKeyword, timer,dateTime,getDateTime,timeFormat,
450 title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend, 455 title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,
451 - showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles, 456 + showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles,buttonTexts,
452 getAlarmInfo,alarmInfo,cascaderValue,propsTrigger,handleChange,cascaderOptions,noticeFlag, 457 getAlarmInfo,alarmInfo,cascaderValue,propsTrigger,handleChange,cascaderOptions,noticeFlag,
453 - getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj,alarmId 458 + getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj,alarmIdVal
454 } 459 }
455 } 460 }
456 461
@@ -31,7 +31,8 @@ @@ -31,7 +31,8 @@
31 <template #tools="{scope}"> 31 <template #tools="{scope}">
32 <div class="list-handle"> 32 <div class="list-handle">
33 <span class="icon-bg"> 33 <span class="icon-bg">
34 - <i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i> 34 +<!-- <i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i>-->
  35 + <i class="el-icon-view" title="查看" @click="handleView(scope.row)"></i>
35 </span> 36 </span>
36 </div> 37 </div>
37 </template> 38 </template>
@@ -119,7 +119,10 @@ export default { @@ -119,7 +119,10 @@ export default {
119 dialog.value.amId = row.amId; 119 dialog.value.amId = row.amId;
120 } 120 }
121 121
122 - 122 + //查看详情
  123 + let handleView = (row) =>{
  124 + handle(row);
  125 + }
123 // 挂载完 126 // 挂载完
124 Vue.onMounted(() => { 127 Vue.onMounted(() => {
125 getDataList(); 128 getDataList();
@@ -134,7 +137,8 @@ export default { @@ -134,7 +137,8 @@ export default {
134 handle, 137 handle,
135 loaddata, 138 loaddata,
136 tableData, 139 tableData,
137 - getDataList 140 + getDataList,
  141 + handleView
138 } 142 }
139 } 143 }
140 144