monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit e35073804eb1f2a0e1781bd017d95fbfce853c9a 2 parents 7084d017 8f56e0dc

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 21 changed files with 374 additions and 67 deletions
... ... @@ -661,7 +661,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
if(res.data && res.data.length > 0){
$.each(res.data,function (i,v){
trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
<td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
<td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
});
}
... ... @@ -677,7 +677,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
var trs = '';
$.each(res.data,function (i,v){
trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
<td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
<td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
});
var tb = `
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">
... ... @@ -685,7 +685,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="condition-resType-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人"
lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人</br>采集协议"
class="layui-input">
</div>
<div class="layui-input-inline layui-input-inline--long multi-query" id="dyglResListBusType">
... ... @@ -699,7 +699,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
<table class="layui-table">
<thead>
<tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>操作</th></tr>
<tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>采集协议</th><th>操作</th></tr>
</thead>
<tbody> ${trs} </tbody>
</table>
... ...
... ... @@ -375,7 +375,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
grid: [{
top: 20,
bottom: 45,
left: 30,
left: 40,
right: 5
}],
xAxis: [{
... ... @@ -439,7 +439,121 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
});
});
}
/********************单独加载更多****************************/
function loadNoticeMoreChart(echartObject,xData,yData) {
var series = [{
name: '通知次数',
data: yData,
barWidth: 20,
type: 'bar',
label: {
show: true,
position: 'top',
textStyle: {
color: '#555'
},
},
itemStyle: {
normal: {
color: (params) => {
var colors = ['#b6c2ff', '#96edc1', '#fcb75b'];
return colors[params.dataIndex % 3]
}
}
},
emphasis: {
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#2378f7' },
{ offset: 0.7, color: '#2378f7' },
{ offset: 1, color: '#83bff6' }
])
}
},
}]
var option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
grid: [{
top: 20,
bottom: 70,
left: 30,
right: 5
}],
xAxis: [{
type: 'category',
data: xData,
axisLabel: {
color: '#333',
show: true,
interval:0,
rotate:15
},
axisLine: {
lineStyle: {
color: '#e7e7e7'
}
},
axisTick: {
lineStyle: {
color: '#e7e7e7'
}
},
zlevel: 1
}],
yAxis: [{
type: 'value',
gridIndex: 0,
axisLabel: {
color: '#333'
},
splitLine: {
lineStyle: {
type: 'dashed'
}
},
axisLine: {
lineStyle: {
color: '#ccc'
}
},
axisTick: {
lineStyle: {
color: '#ccc'
}
}
}],
series: series,
dataZoom: [
{ type: 'slider',
show: true,
xAxisIndex: [0],
left: '1%',
bottom: -5,
start: 0,
end: 50 //初始化滚动条
}
],
}
echartObject.setOption(option)
window.onresize=function(){
echartObject.resize();
}
// const zoomSize = 6;
// echartObject.on('click', function (params) {
// echartObject.dispatchAction({
// type: 'dataZoom',
// startValue: xData[Math.max(params.dataIndex - zoomSize / 2, 0)],
// endValue:
// xData[Math.min(params.dataIndex + zoomSize / 2, yData.length - 1)]
// });
// });
}
//获取图表数据
function getChartData() {
var where = {
... ... @@ -522,7 +636,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
var yData = res.map.countList;
var xData = res.map.userList;
//展示前20条数据 @Editor LH
loadNoticeChart(noticeTypeChartNew,xData, yData);
loadNoticeMoreChart(noticeTypeChartNew,xData, yData);
}
}
})
... ...
... ... @@ -458,20 +458,16 @@ layui.extend({
imgUrl="/src/style/img/fault.png";
}
if(toastType=='faultprogress'){
imgUrl="/src/style/img/faultprogress.png";
imgUrl="/src/style/img/faultover.png";
}
if(toastType=='faultover'){
imgUrl="/src/style/img/faultover.png";
imgUrl="/src/style/img/faultprogress.png";
}
setTimeout(function () {
new msgTips({
dom: ".right-bottom-tips",
title: title,
message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;padding: 10px;background-position-x: right;padding-left: 29px;padding-top: 145px;">
<span class="title closeFault" style="position: relative;top: -75px;left: 170px;">X</span>
<span style="position: relative;left: 35px;top: -21px; font-weight: bold;">${title}</span>
${content}
</p>`,
message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding-left: 25px;padding-top: 145px;"><span >${content}</span><span class="title closeFault" style="position: relative;top: -126px;left: 22px;">X</span><span style="position: relative;left: -89px;top: -96px; font-weight: bold;float: right;">${title}</span></p>`,
duration: 10000,
space: 10,
firstSpace: 8,
... ... @@ -489,7 +485,6 @@ layui.extend({
//}
}
})
}, delay);
}else{
setTimeout(function () {
... ...
... ... @@ -98,7 +98,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
$(options.dom).append(newContainer);
} else if(options.toastType=='faultinfo'||options.toastType=='faultprogress'||options.toastType=='faultover'){
var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%);width: 226px;bottom: 8px !important; ></div>"
var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%); ></div>"
// var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
var head = "";
... ... @@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
'transition-timing-function':options.timingFun,
// 'width':options.width,
'width':'226px',
'bottom':'8px'
'bottom':'620px'
});
var height = $(newContainer).outerHeight(true);
var len = $('.fault_ez_tips').size();
... ...
... ... @@ -103,9 +103,9 @@
</article>
<!--上传弹框-->
<script id="more_info" type="text/html">
<div style="align:center;">
<div class="lay-row-title" > 人员分组统计 <div style=" float:right;"></div></div>
<div class="pie-chart" style="height: 350px" id="notice_chart_type_new"></div>
<div style="align:center;padding: 20px;height: 330px">
<div class="lay-row-title" lay-tips="灰色拖动条可以左右拉缩并拖动展示其它数据"> 人员分组统计 </div>
<div class="pie-chart" style="height: 100%" id="notice_chart_type_new"></div>
</div>
</script>
<script>
... ...
... ... @@ -57,7 +57,7 @@
<i class="iconfont icon-icon--shangchuan"></i>
上传
</el-button>
<el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')" v-if="!isView">
<el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')">
<i class="iconfont icon-shanchuwenjianjia"></i>
删除
</el-button>
... ...
... ... @@ -337,7 +337,6 @@ export default {
setTimeout(function () {
let id = currentNodeData.value.id;
if (loadTree && loadTree == true) {
getTree();
} else {
... ... @@ -674,6 +673,7 @@ export default {
}
let uploadCallBack = ({document, fileInfo}) => {
reload(false);
props.fileIds.push(document.id)
// 执行回调
emit('callback', {document, fileInfo});
}
... ...
... ... @@ -18,8 +18,17 @@
<div v-else-if="typeof(item.render) == 'function'" >
<span v-html="item.render(scope.row)">{{scope.row[item.prop]}}</span>
</div>
<span v-else>
<el-tooltip placement="top">
<template #content>
<div v-html="getTextContent(scope.row[item.prop])">
</div>
</template>
<div style="overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical;">
{{scope.row[item.prop]}}
</div>
</el-tooltip>
</span>
</slot>
</template>
... ...
... ... @@ -199,6 +199,14 @@ export default {
}
})
}
let getTextContent = (val) =>{
if(val && val != '' && val != null){
val = val.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,"");
}
return val;
}
// 挂载完
Vue.onMounted(() => {
//callback();
... ... @@ -224,7 +232,8 @@ export default {
handleCurrentChange,
prePage,
nextPage,
getWidth
getWidth,
getTextContent
}
}
}
... ...
... ... @@ -10,6 +10,16 @@ var global = {};
global.layui = window.parent.layui;
global.common = {
getUserName : function (){
return localStorage.getItem('lgn');
},
getUserRole : function (){
let roleStr = sessionStorage.getItem('roles');
if(roleStr){
return roleStr.split(",");
}
return [];
}
};
... ...
... ... @@ -46,7 +46,7 @@
<!--判定是否有daping角色，如果有则显示该菜单 joke add 20211203-->
<script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/checkHasRole?roleCode=daping">
{{# if(d.count > 0){ }}
<li class="layui-nav-item" lay-tips="监控一体化视图">
<li class="layui-nav-item" lay-tips="展示大屏">
<a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>
</li>
{{# } }}
... ...
... ... @@ -5,11 +5,17 @@
/* 属性配置 -- end */
.yfyw-user {
padding-top: 6px;
width: 99%;
}
.yfyw-user .el-avatar img{
width: 80px!important;
height: 80px!important;
}
.yfyw-user .title{
font-weight: bold;text-align: left;padding-left: 40px;margin-bottom: 6px
}
... ...
<div>
<div style="font-weight: bold;text-align: left;">故障相关处理意见</div>
<cm-table-page v-if="list.columns.length > 0" :columns="list.columns"
:dataList="list.dataList"
@loaddata="getPageInfo"
:showIndex="true"
:showBorder="true"
:showPage="false"
:showTools="showTools"
:maxWidth="width"
size="mini"
:height="200">
<template #tools="{scope}">
<el-button type="text" size="small" @click.prevent="handleClick(scope.row,scope.$index)">
引用
</el-button>
</template>
</cm-table-page>
</div>
... ...
export default {
name: 'faultHisIndex',
template: '',
components: {
'echarts-line': Vue.defineAsyncComponent(
() => myImport('components/common/echarts/line/index')
)
},
data() {
return {}
},
props: {
targetType: {
type: String,
default: ''
},
faultNo: {
type: String,
default: ''
},
itemName: {
type: String,
default: ''
},
itemInfo: {
type: Object,
default: {}
},
// 展示详情页
showDetail: {
type: String,
default: ''
},
// 数据转行方式
colType: {
type: String,
default: 'kpi'
},
width:{
type:Number,
default: window.innerWidth * 0.8 - 160
},
showTools: {
type: Boolean,
default: false
},
},
setup(props, {attrs, slots, emit}) {
const {proxy} = Vue.getCurrentInstance();
// 列表展示结果
let list = Vue.ref({
columns: [{
prop: 'faultNo',
width:90,
label: '故障编号',
},{
prop: 'faultBody',
width:150,
label: '故障主体',
}, {
prop: 'createTime',
width:100,
label: '发生时间',
}, {
prop: 'duration',
width:80,
label: '持续时长',
},{
prop: 'solution',
width:200,
label: '处理方案'
}],
dataList: [],
total: 0
});
/**
* 获取表格数据
* <p>
* 作者： Wang
* 时间：2021/12/15 17:26
*/
let getPage = () => {
let params = {
configId: props.itemInfo.configId,
}
proxy.$http.get('/api-web/fault/result/findFaultListByConfigId', params, function (res) {
if (res && res.success) {
list.value.dataList = res.data;
} else {
proxy.$global.showMsg(res.msg, "warning");
}
});
}
let handleClick = (row,index) =>{
console.log(row,index);
emit('callback',row);
}
// // 监听编辑状态
// Vue.watch(() => props.itemInfo, (newValue, oldVlaue) => {
// getPage();
// });
// 挂载完
Vue.onMounted(() => {
getPage();
})
return {
list,
getPage,
handleClick
}
}
}
... ...
... ... @@ -61,8 +61,9 @@ export default {
sortable: true,
click: function (row) {
// 点击弹框展示人员信息
title.value = "人员信息";
title.value = "个人信息";
componentName.value = "USER";
props.parentNode.id = row.id;
showDialog(true);
}
}, {
... ...
<div class="yfyw-user">
<div>
<el-avatar :size="80" :src="imageUrl">
<el-avatar :size="80" :src="imageUrl" shape="circle">
<i class="iconfont icon-yonghu" style="font-size: 80px;"/>
</el-avatar>
<el-upload
... ... @@ -21,7 +21,7 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="姓名" prop="nickname" class="form-class">
<el-input v-model="ruleForm.nickname" :readonly="isAdmin()"></el-input>
<el-input v-model="ruleForm.nickname" :readonly="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -34,7 +34,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="年龄" prop="age" class="form-class">
<el-input v-model="ruleForm.age" type="number"></el-input>
<el-input v-model="ruleForm.age" type="number" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -43,7 +43,7 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="座机号码" prop="tel" class="form-class">
<el-input v-model="ruleForm.tel"></el-input>
<el-input v-model="ruleForm.tel" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -53,7 +53,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="电子邮箱" prop="email" class="form-class">
<el-input v-model="ruleForm.email" id="email"></el-input>
<el-input v-model="ruleForm.email" id="email" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -67,7 +67,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="学历" prop="education" class="form-class">
<el-input v-model="ruleForm.education"></el-input>
<el-input v-model="ruleForm.education" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -80,7 +80,7 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="身份证" prop="idcard" class="form-class">
<el-input v-model="ruleForm.idcard"></el-input>
<el-input v-model="ruleForm.idcard" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -108,12 +108,12 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="政治面貌" prop="politicsStatus" class="form-class">
<el-input v-model="ruleForm.politicsStatus"></el-input>
<el-input v-model="ruleForm.politicsStatus" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="在职状态" prop="certificate" :readonly="isAdmin()" class="form-class">
<el-radio-group v-model="ruleForm.state">
<el-form-item label="在职状态" prop="certificate" :readonly="true" class="form-class">
<el-radio-group v-model="ruleForm.state" :disabled="true">
<el-radio :label="1">在职</el-radio>
<el-radio :label="2">离职</el-radio>
</el-radio-group>
... ... @@ -124,18 +124,18 @@
<el-row :gutter="5">
<el-col :span="24">
<el-form-item label="获得证书" prop="post" class="form-textarea">
<el-input v-model="ruleForm.certificate" type="textarea"></el-input>
<el-input v-model="ruleForm.certificate" type="textarea" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="24">
<el-form-item label="家庭住址" prop="post" class="form-textarea">
<el-input v-model="ruleForm.post" type="textarea"></el-input>
<el-input v-model="ruleForm.post" type="textarea" :readonly="isAdmin()"></el-input>
</el-form-item>
</el-col>
</el-row>
<div style="text-align: center;padding-top: 10px">
<div style="text-align: center;padding-top: 10px" v-if="!isAdmin()">
<el-button type="primary" size="mini" @click="saveUser()">保存基本信息</el-button>
</div>
</el-form>
... ... @@ -143,8 +143,7 @@
<!--资产信息-->
<div class="title">
<i class="iconfont icon-liebiaomoshi"/> 资产信息
<el-dropdown v-if="Object.keys(icon).length > 0" size="mini" split-button @click="assetsAdd('bastion',`新建${icon['bastion'].name}资产`)" style="margin-left: 20px">
<el-dropdown v-if="Object.keys(icon).length > 0 && !isAdmin()" size="mini" split-button @click="assetsAdd('bastion',`新建${icon['bastion'].name}资产`)" style="margin-left: 20px">
<i class="icon el-icon-plus"/>添加{{icon['bastion'].name}}
<template #dropdown>
<div style="max-height: 300px;overflow-y: auto">
... ... @@ -173,13 +172,10 @@
</div>
</div>
<div class="zc-item-tools">
<el-button-group size="mini">
<el-button-group size="mini" v-if="!isAdmin()">
<el-button @click="btnClick('add',arr,`新建${icon[k].name}资产`)">
<i class="el-icon-plus"/>
</el-button>
<!--<el-button @click="btnClick('save',arr,`保存${icon[k].name}资产`)">
<i class="el-icon-check"/>
</el-button>-->
<el-button @click="btnClick('edit',arr,`编辑${icon[k].name}资产`)">
<i class="el-icon-edit"/>
</el-button>
... ...
... ... @@ -421,7 +421,9 @@ export default {
}
let isAdmin = () => {
return localStorage.getItem('lgn') != 'admin';
let userRoleArr = proxy.$global.common.getUserRole();
let userName = proxy.$global.common.getUserName();
return userName != 'admin' && userName != 'root' && !userRoleArr.includes('pmp');
}
const {
... ...
... ... @@ -94,15 +94,19 @@ export default {
proxy.$global.showMsg("资源编号不存在，请确认！", "warning")
return;
}
if (favIds.value != '' && favIds.value != null) {
proxy.$http.post(`/api-web/favorites/save/res?favId=${favIds.value}&resIds=${props.resId}`, {}, function (res) {
if (res && res.code ==0) {
if (res && res.code == 0) {
let msg = !res.msg ? '收藏成功！' : res.msg;
let type = !res.success ? 'warning' : 'success';
proxy.$global.showMsg(msg,type);
proxy.$global.showMsg(msg, type);
showDialog(false);
}
});
}else {
proxy.$global.showMsg('请选择收藏夹', 'warning');
}
}
... ...
... ... @@ -26,6 +26,8 @@
<cm-table-page :columns="list.columns"
:dataList="list.dataList"
:total="list.total"
:pageSizes="[10,20,50,100, 200, 300, 400]"
:pageSize="searchForm.pageSize"
@loaddata="getPageInfo"
:showIndex="true"
:showBorder="true"
... ... @@ -72,7 +74,7 @@
<!-- 处理弹框 -->
<cm-dialog title="故障处理" width="60%" :showDialogVisible="handleInfoDialog"
@hidedialog="showHandelInfoDialog" :showFooter="false">
@hidedialog="showHandleInfoDialog" :showFooter="false">
<template v-slot>
<el-form ref="handleForm" :model="handleInfoForm" :rules="handleInfoRules" label-width="120px">
... ... @@ -132,6 +134,14 @@
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="24">
<faultHis :itemInfo="{'configId':handleInfoForm.faultconfid}"
:width="handleInfoDialogWidth"
:showTools="true" @callback="setSolution"></faultHis>
</el-col>
</el-row>
<el-form-item>
<el-button @click="showHandleInfoDialog(false)">取消</el-button>
<el-button v-if="handleInfoForm.solveTime == null || handleInfoForm.solveTime == ''" type="primary" @click="saveHandleInfo('handleForm',getPage)">保存</el-button>
... ...
... ... @@ -48,6 +48,14 @@ const faultDetail = () => {
itemName: '检测指标',
detail: true,
colType: 'flag'
}, {
faultType: 'faultHis',
faultTypeName: '知识库',
components: 'faultHis',
color: '#8a9718',
itemName: '知识库',
detail: true,
colType: 'flag'
}]
});
... ... @@ -91,6 +99,7 @@ const faultDetail = () => {
const handleInfo = () => {
const {proxy} = Vue.getCurrentInstance();
let handleInfoDialog = Vue.ref(false);
let handleInfoDialogWidth = Vue.ref(window.innerWidth * 0.6 - 80);;
let handleInfoForm = Vue.ref({
faulttype: '',
createTime: '',
... ... @@ -114,8 +123,8 @@ const handleInfo = () => {
},
{
min: 5,
max: 100,
message: '处理方案内容在5到100个字符之间',
max: 500,
message: '处理方案内容在5到500个字符之间',
trigger: 'blur',
}
]
... ... @@ -125,8 +134,12 @@ const handleInfo = () => {
let handleClick = (row, index) => {
// 点击弹框
showHandleInfoDialog(true);
handleInfoForm.value = row;
//Object.assign(handleInfoForm.value,row);
handleInfoForm.value = Object.assign(handleInfoForm.value,row);
}
let setSolution = (row) =>{
handleInfoForm.value.solution = row.solution;
}
/**
... ... @@ -138,16 +151,6 @@ const handleInfo = () => {
let saveHandleInfo = (key, callback) => {
proxy.$refs[key].validate((valid) => {
if (valid) {
// proxy.$http.post('/api-web/fault/solve', handleInfoForm.value, function (res) {
// if (res && res.success) {
// proxy.$global.showMsg("处理成功！");
// showHandleInfoDialog(false);
// } else {
// proxy.$global.showMsg("处理失败，请联系管理员！");
// }
// callback();
// });
proxy.$http.post('/api-web/fault/faultHandle', {
faultId: handleInfoForm.value.id,
label: handleInfoForm.value.label,
... ... @@ -180,10 +183,12 @@ const handleInfo = () => {
return {
handleInfoForm,
handleInfoRules,
setSolution,
handleClick,
handleInfoDialog,
showHandleInfoDialog,
saveHandleInfo
saveHandleInfo,
handleInfoDialogWidth
}
}
export default {
... ... @@ -195,6 +200,9 @@ export default {
),
'netLinks': Vue.defineAsyncComponent(
() => myImport('components/page/faultDiagnosis/result/netLinks/index')
),
'faultHis': Vue.defineAsyncComponent(
() => myImport('components/page/faultDiagnosis/result/faultHis/index')
)
},
data() {
... ... @@ -213,7 +221,7 @@ export default {
let searchForm = Vue.ref({
keyword: '',
page: 1,
pageSize: 10
pageSize: 20
});
// 获取URL参数
... ... @@ -327,10 +335,12 @@ export default {
const {
handleInfoForm,
handleInfoRules,
setSolution,
handleClick,
handleInfoDialog,
showHandleInfoDialog,
saveHandleInfo
saveHandleInfo,
handleInfoDialogWidth
} = handleInfo();
// 挂载完
... ... @@ -356,11 +366,12 @@ export default {
// 处理弹框
handleInfoForm,
handleInfoRules,
setSolution,
handleClick,
handleInfoDialog,
showHandleInfoDialog,
saveHandleInfo
saveHandleInfo,
handleInfoDialogWidth
}
}
}
... ...
... ... @@ -59,7 +59,7 @@ export default {
setInterval(function(){
getDateTime();
},1000);
document.title = '监控一体化视图'
document.title = '展示大屏'
})
let getDateTime=()=>{
... ...