Authored by 王涛

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

…eb into master-500-dev
... ... @@ -141,6 +141,13 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
}
}
})
//lsq 数据加载完成前增加加载中显示 2022-03-31
alarmTrendChart.showLoading({
text: '数据正在加载...',
textStyle: { fontSize : 30 , color: '#444' },
color:'#1e9fff',
effectOption: {backgroundColor: 'rgba(0, 0, 0, 0)'}
});
//24小时告警趋势图
$.ajax({
url: domainName + `/api-web/bAlarm/overViewChartByType?access_token=${accessToken}&type=trend`,
... ... @@ -344,7 +351,9 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
}],
series: type === 'bar' ? barSeries : lineSeries
}
echartObject.setOption(option)
echartObject.setOption(option);
//lsq 数据加载完成后关闭加载中显示 2022-03-31
echartObject.hideLoading();
}
//12个月份的数据表格
... ...
<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">
<div class="keyword" style="padding-left: 10px">
<el-form-item >
<el-input v-model="search.keyword" placeholder="请输入关键字,回车搜索" @keydown.enter.native="getDataList"></el-input>
</el-form-item>
</div>
<div class="selectType" style="padding-left: 10px;width: 120px;">
<el-select v-model="couponSelected" class="m-2" placeholder="请选择" size="large" @change="onChangeStripe">
<el-option
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div class="adds" style="">
<el-form-item>
<el-button type="primary" @click="addAj()" style="margin-left: 10px">新增</el-button>
<el-button @click="addAj()" style="margin-left: 10px">新增</el-button>
</el-form-item>
</div>
<div class="design" style="float:right;padding-left: 1410px">
<div class="design" style="float:right;padding-left: 1200px">
<el-form-item>
<el-button type="primary" @click="handleView()" style="margin-left: 10px">设计</el-button>
</el-form-item>
... ... @@ -68,9 +83,11 @@
<el-form-item label="类型" prop="type">
<div style="width: 240px">
<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>
<!-- <div style="height: 15px; color: darkgrey">说明:参数中间用'&'拼接</div>-->
</el-form-item>
... ... @@ -96,7 +113,7 @@
<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-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>
... ...
... ... @@ -19,11 +19,31 @@ export default {
message: '请选择类型!',
trigger: 'blur',
}],
menuPid:[{
required: true,
message: '请选择父菜单!',
trigger: 'blur',
}],
menuName:[{
required: true,
message: '请填写菜单名称!',
trigger: 'blur',
}],
title:[{
required: true,
message: '请填写弹框标题!',
trigger: 'blur',
}],
designPage:[{
required: true,
message: '请选择设计页面!',
trigger: 'blur',
}],
resType:[{
required: true,
message: '请选择资源类型!',
trigger: 'blur',
}],
/*resource:[{
required: true,
message: '请填写绑定资源!',
... ... @@ -50,7 +70,8 @@ export default {
desc:'用户id'
}]);
//表格字段
let columns=Vue.ref([
let columns=Vue.ref([]);
let detailColumns=Vue.ref([
{
prop: 'id',
label: '编号',
... ... @@ -90,6 +111,88 @@ export default {
align: 'left'
}
])
let menuColumns=Vue.ref([
{
prop: 'id',
label: '编号',
sortable: true,
align: 'center',
width:'250'
},
{
prop: 'type',
label: '类型',
sortable: true,
align: 'center',
width:'250',
},
{
prop: 'menuName',
label: '菜单名称',
sortable: true,
align: 'center',
width:'250'
},
{
prop: 'designPage',
label: '设计器编码',
sortable: true,
align: 'center',
width:'250'
},{
prop: 'param',
label: '参数',
sortable: true,
align: 'center',
width:'300'
},{
prop: 'creatTime',
label: '创建时间',
sortable: true,
align: 'left'
}
])
let butColumns=Vue.ref([
{
prop: 'id',
label: '编号',
sortable: true,
align: 'center',
width:'250'
},
{
prop: 'type',
label: '类型',
sortable: true,
align: 'center',
width:'250',
},
{
prop: 'title',
label: '弹框标题',
sortable: true,
align: 'center',
width:'250'
},
{
prop: 'designPage',
label: '设计器编码',
sortable: true,
align: 'center',
width:'250'
},{
prop: 'param',
label: '参数',
sortable: true,
align: 'center',
width:'300'
},{
prop: 'creatTime',
label: '创建时间',
sortable: true,
align: 'left'
}
])
let currentPage=Vue.ref(1);
let pageSize=Vue.ref(10);
let keyword=Vue.ref();
... ... @@ -105,6 +208,27 @@ export default {
let options=Vue.ref([]);
//菜单下拉框
let menuOptions=Vue.ref([]);
let search = Vue.ref({
keyword:'',
type:'',
page:1,
limit:10,
});
//按钮下拉框
let typeOptions=Vue.ref([
{
value: '0',
label: '菜单',
},
{
value: '1',
label: '按钮',
},
{
value: '2',
label: '详情页',
}]);
let couponSelected = Vue.ref();
let ajConfigFrom = Vue.ref({
id:'',
type: 0,
... ... @@ -253,18 +377,39 @@ export default {
//重新加载表格数据
let loadTableDataList = ({page, limit}) => {
currentPage.value=page;
pageSize.value=limit;
search.value.page = page;
search.value.limit = limit;
getDataList()
}
let onChangeStripe = (e)=>{
if(e =='0'){
columns.value=menuColumns.value;
}
if (e =='1'){
columns.value=butColumns.value;
}
if (e =='2'){
columns.value=detailColumns.value;
}
search.value.type=e;
getDataList()
}
//获取aj配置信息
let getDataList=()=>{
proxy.$http.get(`/api-web/ajConfig/ajConfigList`,null, function (res) {
let params={
page:search.value.page,
limit:search.value.limit,
type:search.value.type,
keyword:search.value.keyword
}
proxy.$http.get(`/api-web/ajConfig/ajConfigList`,params, function (res) {
if (res && res.data) {
count.value = res.data.length;
count.value = res.count;
tableDataList.value = res.data;
}else{
count.value = 0;
tableDataList.value='暂无数据';
}
});
... ... @@ -277,8 +422,10 @@ export default {
}
// 挂载完
Vue.onMounted(() => {
couponSelected.value = typeOptions.value[0].label;
columns.value=menuColumns.value;
search.value.type=typeOptions.value[0].value;
getDataList();
})
... ... @@ -337,7 +484,13 @@ export default {
menuList,
menuOptions,
getResType,
configs
configs,
typeOptions,
onChangeStripe,
search,
butColumns,
detailColumns,
couponSelected
}
}
... ...