monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 627fe5b069c68ff73a7a96985825dfe23a0ee1bb 2 parents 72f187c7 77d88b89 wangfeng-mj ... master-500-dev master-500-dev-0327 master-500-dev-LH master-500-dev-joke master-500-dev-lushangqing master-500-dev-lzc master-500-dev-xwx master-500-dev-yuanjinpeng master-500-dev-ztq master-500-dev-ztq1 master-500-log master-500-log-ztq master-500-prod master-500-prod-joke-new master-500-prod-lushangqing master-mj master-mj-610 master-mj-joke master-mj-yuanjinpeng master-mj-ztq master-prod-500-lushangqing wangfeng-500-dev

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

…eb into master-500-dev-lushangqing

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/vue3/src/router/index.js
Inline Side-by-side
Showing 18 changed files with 94 additions and 638 deletions
... ... @@ -50,10 +50,22 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
var getTpl = document.getElementById("biz_reslist_restype_tab_tpl").innerHTML;
laytpl(getTpl).render(res.data, function (html) {
$('#biz_reslist_restype_tab').html(html);
var active = '';
var activeItem = '';
var data = res.data;
for (let i = 0; i < data.length; i++) {
var v = data[i];
if(v.resNum > 0){
activeItem = v;
$('#biz_reslist_restype_tab').find('[data-id="'+v.resTypeCode+'"]').addClass('layui-this');
break;
}
}
// 默认加载第一个
if (res.data[0]) {
var resType = res.data[0]["resTypeCode"];
activeResType = res.data[0]["resTypeCode"];
if (activeItem) {
var resType = activeItem.resTypeCode;//res.data[0]["resTypeCode"];
activeResType = activeItem.resTypeCode;//res.data[0]["resTypeCode"];
if (resType && $.inArray(resType, treeTableResTypes) !== -1) {
renderTreeTable(bizId, resType);
} else {
... ... @@ -881,4 +893,4 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
$("#biz_reslist_server_state").val('');
};
});
});
\ No newline at end of file
});
... ...
... ... @@ -309,7 +309,7 @@
<script type="text/html" id="biz_reslist_restype_tab_tpl">
{{# layui.each(d, function(index, item){ }}
{{# var acive = '', hideCls = ''}}
{{# if(index==0){ acive = "layui-this" } }}
{{# if(index==0){ acive = "" } }}
{{# if(item.resNum == 0){ hideCls = "hide" } }}
<li class="{{acive}} {{hideCls}}" data-id="{{item.resTypeCode}}">
... ... @@ -323,4 +323,4 @@
layui.use('bizreslist', function (fn) {
fn();
});
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -69,9 +69,14 @@ const routes = [{
component: () => myImport('views/cacheData/index')
},
{
path: '/alarmsClearEditor',
name: 'alarmsClearEditor',
component: () => myImport('views/alarmsClearEditor/index'),
path: '/vue3/ajConfig',
name: 'ajConfig',
component: () => myImport('views/ajConfig/index')
},
{
path: '/ajConfig/view',
name: 'ajConfigView',
component: () => myImport('views/ajConfig/view/index')
},
];
... ...
... ... @@ -120,7 +120,29 @@
<el-form-item label="传递参数" prop="param">
<el-input :size="$global.elementSize" v-model="ajConfigFrom.param" clearable></el-input>
<div style="height: 15px;color: darkgrey">示例：&resId=#resId&access_token=#access_token</div>
<div style="color: darkgrey">
<div>
<el-collapse>
<el-collapse-item name="1">
<template #title>
示例：&resId=#resId&access_token=#access_token
</el-icon>
</template>
<div style="font-size: 12px;text-align: left">可配置字段:</div>
<el-descriptions :column="2" size="mini" border >
<el-descriptions-item v-for="item in configs">
<template #label>
<div class="cell-item">
{{ item.desc }}
</div>
</template>
{{ item.name }}
</el-descriptions-item>
</el-descriptions>
</el-collapse-item>
</el-collapse>
</div>
</div>
</el-form-item>
<el-form-item label="资源类型" prop="resType" v-if="ajConfigFrom.type==2" style="text-align: left">
... ...
... ... @@ -36,6 +36,20 @@ export default {
setup(props, {attrs, slots, emit}){
const {proxy} = Vue.getCurrentInstance();
let height = Vue.ref(window.innerHeight - 10);
let configs = Vue.ref([{
name:'resId',
desc:'资源ID(资源列表可用)'
},{
name:'access_token',
desc:'Token'
},{
name:'lgn',
desc:'登录账号'
},{
name:'user_id',
desc:'用户id'
}]);
//表格字段
let columns=Vue.ref([
{
... ... @@ -324,8 +338,8 @@ export default {
options,
menuList,
menuOptions,
getResType
}
getResType,
configs }
}
}
... ...
... ... @@ -2,34 +2,41 @@ export default {
name: 'ajConfigViewIndex',
template: '',
components: {},
data() {
return {
}
},
setup() {
const {proxy} = Vue.getCurrentInstance();
let getSrc = Vue.ref('');
let height = Vue.ref(window.innerHeight - 10);
var ajConfig = proxy.$global.getQueryVariable('ajConfig');
// let params = Vue.ref();
// let designPage = Vue.ref();
let ajConfig = proxy.$global.getQueryVariable('ajConfig');
let getUrl=()=>{
let param={
id:ajConfig
}
let params='';
let designPage='';
let params = '';
let designPage = '';
proxy.$http.get(`/api-web/ajConfig/findOneById`, param, function (res) {
if (res && res.success == true) {
params=res.object.param;
designPage=res.object.designPage;
if (res && res.success == true && res.object) {
// 参数替换
params = replaceParams(res.object.param);
designPage = res.object.designPage;
}
getSrc.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+designPage+params+'&access_token=' + localStorage.getItem("access_token");
})
}
const replaceParams = (params) => {
return params.replace(/#lgn/g,localStorage.getItem('lgn')).replace(/#user_id/g,sessionStorage.getItem('access_token')).replace(/#access_token/g,localStorage.getItem("access_token"))
}
const getParamValue = (code) => {
// 获取url参数
// 获取路由参数
// 获取sessionStorage
// 获取localStorage
}
// 挂载完
Vue.onMounted(() => {
getUrl();
... ... @@ -37,7 +44,7 @@ export default {
return {
height,
getSrc,
getSrc
}
}
}
... ...
<title>设计器配置信息</title>
<iframe src="/vue3/index.html#/vue3/ajConfig" class="layadmin-iframe" style="height: 99.5%!important;"/>
<title>设计器预览</title>
<script type="text/html" template>
{{#
var viewURL = window.location.origin + '/vue3/index.html#/ajConfig/view';
layui.use(['sessions','common','admin'], function () {
var $ = layui.$;
var common = layui.common;
var admin = layui.admin;
var arr = [];
window.location.hash.split('/').forEach(function (v, i) {
if (v.indexOf('=') != -1) {
arr.push(v);
}
});
if (arr.length > 0) {
viewURL += "?" + arr.join("&");
}
$('#actionListIframe').attr('src',viewURL);
});
}}
<iframe id="actionListIframe" src="{{viewURL}}" frameborder="0" class="layadmin-iframe" style="height: 99.5%!important;"></iframe>
</script>
<el-link type="info" :underline="false" @click="openCmdbAssets"> {{textString}}</el-link>
<el-link type="info" :underline="false" @click="openCmdbAssets"><div style="color: #1E9FFF;text-decoration: underline"> {{textString}}</div></el-link>
... ...
<div>
<span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
<span class="el-dropdown-link" @click="showMachineRoomDialog(true)" style="color: #1E9FFF;text-decoration: underline">
{{textString}}
</span>
... ...
<div>
<span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
<span class="el-dropdown-link" @click="showMachineRoomDialog(true)" style="color: #1E9FFF;text-decoration: underline">
{{textString}}
</span>
... ...
... ... @@ -5,7 +5,7 @@
:stroke-width="20"
:percentage="textString"
status="success">
<div style="color: black">{{textString == '' ? ' ' : textString + '%' }}</div>
<div style="color: #1E9FFF;text-decoration: underline">{{textString == '' ? ' ' : textString + '%' }}</div>
</el-progress>
</div>
<!-- <div style="width: 50px">{{textString == '' ? '' : textString }} </div>-->
... ...
<div style="display: flex">
<div @click="openCmdbAssets" style="cursor:pointer;width: calc(100% - 25px)">{{textString}}</div>
<div @click="openCmdbAssets" style="cursor:pointer;width: calc(100% - 25px);color: #1E9FFF;text-decoration: underline">{{textString}}</div>
<el-dropdown style="width: 25px">
<span class="el-dropdown-link" style="cursor:pointer;">
<i class="el-icon-more" style="color: blue;font-weight: bold;" />
... ...
<el-tag :type="type" checked effect="dark">
<div style="color: #1E9FFF;text-decoration: underline">
{{ textString == '' ? ' - ' : textString}}
</div>
</el-tag>
... ...
<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
<div class="search">
<div class="btns" style="justify-content: left;padding-left: 0px">
<el-form-item>
<el-button type="primary" @click="addAj()" style="margin-left: 10px">新增</el-button>
</el-form-item>
</div>
<div class="design" style="float:right;padding-left: 1410px">
<el-form-item>
<el-button type="primary" @click="handleView()" style="margin-left: 10px">设计</el-button>
</el-form-item>
</div>
</div>
<div class="search-table">
<cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
:showIndex="true" :total="count" :showSelection="true"
:showBorder="true" :loading="false" :pageSize="pageSize"
:showPage="true" :showTools="true" :height="(height - 130)" >
<template #default="{row,prop,column}">
<div v-if="prop == 'type'">
<div v-if="row.type == 0">
<el-tag>菜单</el-tag>
</div>
<div v-if="row.type == 1">
<el-tag>按钮</el-tag>
</div>
<div v-if="row.type == 2">
<el-tag>详情页</el-tag>
</div>
</div>
</template>
<template #tools="{scope}">
<div class="list-handle">
<span class="icon-bg">
<i class="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></i>
</span>
<span class="icon-bg">
<i class="el-icon-edit-outline" title="修改" @click="handleUpdate(scope.row)"></i>
</span>
<span class="icon-bg">
<i class="el-icon-view" title="预览" @click="preview(scope.row)"></i>
</span>
</div>
</template>
</cm-table-page>
</div>
</div>
</div>
<!--新增编辑弹框-->
<cm-dialog :title="titleName" width="40%" :showDialogVisible="cacheVisible" @hidedialog="cancelBtn" :showFooter="false">
<template v-slot>
<el-form
label-width="120px"
ref="ruleForm"
:model="ajConfigFrom"
:rules="docRulesForm"
label-position="right"
label-width="120px">
<el-form-item label="编号" prop="id">
<el-input :size="$global.elementSize" v-model="ajConfigFrom.id" clearable></el-input>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio>
<el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio>
<el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio>
<!-- <div style="height: 15px; color: darkgrey">说明：参数中间用'&'拼接</div>-->
</el-form-item>
<el-form-item label="父菜单" prop="menuPid" v-if="ajConfigFrom.type==0">
<el-select v-model="ajConfigFrom.menuPid"
filterable
allow-create
default-first-option
:reserve-keyword="false"
placeholder="请选择" style="width: 555px;">
<el-option
v-for="item in menuOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:disabled="item.disabled">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="菜单名称" prop="menuName" v-if="ajConfigFrom.type==0">
<el-input :size="$global.elementSize" v-model="ajConfigFrom.menuName" clearable></el-input>
</el-form-item>
<el-form-item label="菜单标题" prop="title" v-if="ajConfigFrom.type==1">
<el-input :size="$global.title" v-model="ajConfigFrom.title" clearable></el-input>
</el-form-item>
<el-form-item label="设计页面" prop="designPage">
<el-select v-model="ajConfigFrom.designPage"
filterable
allow-create
default-first-option
:reserve-keyword="false"
placeholder="请选择" style="width: 510px;">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
:disabled="item.disabled">
</el-option>
</el-select>
<el-tag @click="preview(ajConfigFrom.designPage)" style="padding-top:4px;height: 38px;">预览</el-tag>
</el-form-item>
<el-form-item label="传递参数" prop="param">
<el-input :size="$global.elementSize" v-model="ajConfigFrom.param" clearable></el-input>
<div style="height: 15px;color: darkgrey">示例：&resId=#resId&access_token=#access_token</div>
</el-form-item>
<el-form-item label="资源类型" prop="resType" v-if="ajConfigFrom.type==2" style="text-align: left">
<!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.resType" clearable></el-input>-->
<el-dropdown>
<cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
</el-dropdown>
</el-form-item>
<el-form-item label="厂商" prop="provider" v-if="ajConfigFrom.type==2" style="text-align: left">
<!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
<el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags placeholder="请选择厂商" style="width: 550px">
<el-option
v-for="item in ddicProvider"
:label="item.ddicName" :value="item.ddicCode"></el-option>
</el-select>
</el-form-item>
<el-form-item label="操作系统" prop="os" v-if="ajConfigFrom.type==2" style="text-align: left">
<!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
<el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags placeholder="请选择操作类型" style="width: 550px">
<el-option
v-for="item in ddicOS"
:label="item.ddicName" :value="item.ddicCode"></el-option>
</el-select>
</el-form-item>
<!--<el-form-item label="绑定资源" prop="resource" v-if="ajConfigFrom.type==2">
<el-input :size="$global.elementSize" v-model="ajConfigFrom.resource" clearable></el-input>
</el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input :size="$global.elementSize" v-model="ajConfigFrom.remark" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button :size="$global.elementSize" type="primary" @click="addAjConfig('ruleForm')">保存</el-button>
<el-button :size="$global.elementSize" @click="cancelBtn">取消</el-button>
</el-form-item>
</el-form>
</template>
</cm-dialog>
export default {
name: 'ajConfig',
template: '',
components: {},
props:[],
data () {
return {
radio:'0',
docRulesForm: {
id: [
{
required: true,
message: '请填写配置编号！',
trigger: 'blur',
}
],
type:[{
required: true,
message: '请选择类型！',
trigger: 'blur',
}],
designPage:[{
required: true,
message: '请选择设计页面！',
trigger: 'blur',
}],
/*resource:[{
required: true,
message: '请填写绑定资源！',
trigger: 'blur',
}],*/
}
}
},
setup(props, {attrs, slots, emit}){
const {proxy} = Vue.getCurrentInstance();
let height = Vue.ref(window.innerHeight - 10);
//表格字段
let columns=Vue.ref([
{
prop: 'id',
label: '编号',
sortable: true,
align: 'center',
width:'250'
},
{
prop: 'type',
label: '类型',
sortable: true,
align: 'center',
width:'250',
},
{
prop: 'resType',
label: '资源类型',
sortable: true,
align: 'center',
width:'250'
},{
prop: 'provider',
label: '品牌',
sortable: true,
align: 'center',
width:'250'
},{
prop: 'designPage',
label: '设计器编码',
sortable: true,
align: 'center',
width:'250'
},{
prop: 'param',
label: '参数',
sortable: true,
align: 'left'
}
])
let currentPage=Vue.ref(1);
let pageSize=Vue.ref(10);
let keyword=Vue.ref();
let count=Vue.ref(0);
let tableDataList=Vue.ref([]);
let checkedId = Vue.ref(0);
let titleName=Vue.ref('新增配置信息')
let cacheVisible=Vue.ref(false);
let viewData=Vue.ref();
let addOrUpdate=Vue.ref(false)
let radio=Vue.ref(0);
//下拉框
let options=Vue.ref([]);
//菜单下拉框
let menuOptions=Vue.ref([]);
let ajConfigFrom = Vue.ref({
id:'',
type: 0,
designPage: '',
param: '&resId=#resId&access_token=#access_token',
resType: '',
remark:'',
creatTime:'',
createName:'',
state:'',
title:'',
menuPid:'',
menuName:''
});
//新增弹框
const addAj=()=>{
clearForm();
cacheVisible.value=true;
pageList();
menuList();
}
//新增或修改aj配置信息
let addAjConfig=(ruleForm)=>{
let params={};
params= ajConfigFrom.value;
let msg = '';
if (addOrUpdate.value){
proxy.$http.post(`/api-web/ajConfig/updateAj`, params, function (res) {
if (res && res.success == true) {
msg = res.msg;
cacheVisible.value=false;
proxy.$global.showMsg(msg);
clearForm();
getDataList();
}
})
}else{
proxy.$http.post(`/api-web/ajConfig/addAj`, params, function (res) {
if (res && res.success == true) {
msg = res.msg;
cacheVisible.value=false;
proxy.$global.showMsg(msg);
if (params.type==0){
window.history.go(0);
}
clearForm();
getDataList();
}
})
}
}
//清理表单
let clearForm=()=>{
ajConfigFrom.value={
id:'',
type: '0',
designPage: '',
param: '',
resType: '',
remark:'',
creatTime:'',
createName:'',
state:'',
title:'',
menuPid:'',
menuName:''
}
addOrUpdate.value=false;
}
//删除
let handleDelete=(row)=>{
let param={
id:row.id
}
proxy.$http.get(`/api-web/ajConfig/deleteById`, param, function (res) {
if (res && res.success == true) {
let msg = res.msg;
if (!msg) {
msg = "删除失败";
}
if (row.type==0){
history.go(0);
}
proxy.$global.showMsg(msg);
getDataList();
}
})
}
let handleUpdate=(row)=>{
addOrUpdate.value =true;
ajConfigFrom.value=row;
cacheVisible.value=true;
pageList();
menuList();
}
//预览
let preview=(row)=>{
if (row!=undefined&&row!=''&&row.id==''){
proxy.$global.viewAjView(row,'80%','80%');
}else if (row.id!=''){
proxy.$global.viewAjView(row.id,'80%','80%');
}
}
//aj报表管理信息
let pageList=()=>{
proxy.$http.get(`/api-web/ajConfig/pageList`, null, function (res) {
if (res && res.success == true) {
let params=res.object.data.records;
params.forEach(function(e){
let report={}
report.label=e.reportName;
report.value=e.reportCode;
options.value.push(report)
});
}
})
}
//菜单
let menuList=()=>{
proxy.$http.get(`/api-user/menus/findAlls`, null, function (res) {
if (res && res.count>0) {
let params=res.data;
params.forEach(function(e){
let menu={}
menu.label=e.name;
menu.value=e.id;
menuOptions.value.push(menu)
});
}
})
}
//AJ设计登录
let handleView=()=>{
window.open(sessionStorage.getItem("ajWeb") + '/#/login?access_token=' + localStorage.getItem("access_token"));
}
//重新加载表格数据
let loadTableDataList = ({page, limit}) => {
currentPage.value=page;
pageSize.value=limit;
getDataList()
}
//获取aj配置信息
let getDataList=()=>{
proxy.$http.get(`/api-web/ajConfig/ajConfigList`,null, function (res) {
if (res && res.data) {
count.value = res.data.length;
tableDataList.value = res.data;
}else{
tableDataList.value='暂无数据';
}
});
}
//关闭弹框
let cancelBtn=()=>{
cacheVisible.value=false;
}
// 挂载完
Vue.onMounted(() => {
getDataList();
})
let getResType = (arr) => {
var types = arr.map(function (v) {
return v.id;
});
ajConfigFrom.value.resType = types[0];
}
// 加载字典项
let ddicProvider = Vue.ref([]);
let ddicOS = Vue.ref([]);
// let ddicProvider = Vue.ref([]);
proxy.$http.post(`/api-web/manage/ddic/findSucDdics/provider`, {}, function (res) {
if (res && res.data) {
ddicProvider.value = res.data;
}
});
proxy.$http.post(`/api-web/manage/ddic/findSucDdics/os`, {}, function (res) {
if (res && res.data) {
ddicOS.value = res.data;
}
});
return {
ddicProvider,
ddicOS,
height,
columns,
currentPage,
count,
pageSize,
keyword,
tableDataList,
checkedId,
addAj,
addAjConfig,
loadTableDataList,
getDataList,
cacheVisible,
titleName,
viewData,
cancelBtn,
ajConfigFrom,
handleDelete,
handleUpdate,
preview,
handleView,
pageList,
radio,
options,
menuList,
menuOptions,
getResType
}
}
}
<div class="container" :style="{'height':height+'px','max-height':height+'px','background':'#fff'}">
<iframe :src="getSrc" width="100%" height="100%" ></iframe>
</div>
export default {
name: 'ajConfigViewIndex',
template: '',
components: {},
data() {
return {
}
},
setup() {
const {proxy} = Vue.getCurrentInstance();
let getSrc = Vue.ref('');
let height = Vue.ref(window.innerHeight - 10);
var ajConfig = proxy.$global.getQueryVariable('ajConfig');
// let params = Vue.ref();
// let designPage = Vue.ref();
let getUrl=()=>{
let param={
id:ajConfig
}
let params='';
let designPage='';
proxy.$http.get(`/api-web/ajConfig/findOneById`, param, function (res) {
if (res && res.success == true) {
params=res.object.param;
designPage=res.object.designPage;
}
getSrc.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+designPage+params+'&access_token=' + localStorage.getItem("access_token");
})
}
// 获取资源详情 //start lsq 监听跨域iframe子页面向父页面发送数据(子页面点击名称进入详情页) 2022-03-15
let getResDetail=(resId)=>{
let editFlag = false;
let provider = '';
let name = '';
let ip = '';
let resTypeName = '';
let adminName = '';
let manageIp = '';
let collProtocol = '';
let resType='';
let lyaui=window.parent.layui;
proxy.$http.get(`/api-web/v32/res/detail/${resId}`, {}, function (res) {
if (res && res.map) {
let data = res.map;
provider = data.provider;
ip = data.ip;
resTypeName = data.resTypeName;
adminName = data.adminName;
manageIp = data.manageIp;
collProtocol = data.collProtocol;
name = data.resName;
if(resType == ''){
resType = data.resType;
}
lyaui.commonCols.detailPage(resId, resType, editFlag, provider, name, ip, resTypeName, adminName, manageIp, collProtocol);
}
});
}
//end lsq 2022-03-15
// 挂载完
Vue.onMounted(() => {
getUrl();
//start lsq 监听跨域iframe子页面向父页面发送数据(子页面点击名称进入详情页) 2022-03-15
window.addEventListener('message',function(e){
if(e.data.type=='detail'){
getResDetail(e.data.data.resId);
}else{
}
})
//end lsq 2022-03-15
})
return {
height,
getSrc,
}
}
}