TRKJ/profitManage
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

图形分析下拉搜索修改、各列表字段宽度以及搜索条件修改

Browse Source
This commit is contained in:
康冉冉
2025-09-05 18:51:20 +08:00
parent d1787207ec
commit 223834134e
14 changed files with 511 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/assets/styles/index.scss
View File

@@ -139,7 +139,7 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
padding: 20px; padding: 8px 20px 20px;
} }
.components-container { .components-container {
@@ -253,11 +253,31 @@ aside {
.textAlignCenter { .textAlignCenter {
text-align: center; text-align: center;
} }
.pageTopForm .el-form-item--medium .el-form-item__label { // form属性下边距
width: 80px; .el-form-item--small.el-form-item{
margin-bottom: 8px;
}
// table列表上方 form搜索条件 label
.pageTopForm .el-form-item__label {
width: 68px!important;
overflow: hidden; overflow: hidden;
height: 36px; height: 36px;
} }
.pageTopForm .el-form-item { // table列表上方 form搜索条件 label后面的选项框
margin-left: 10px!important; .pageTopForm .el-form-item__content {
margin-left: 68px!important;
}
// table列表上方 form搜索条件 选项框后设置距离
.pageTopForm .el-form-item {
margin-left: 0px!important;
margin-right: 10px;
}
// 多选下拉 为选中后 选中图标设置到最前面留空间
.el-select-dropdown.is-multiple .el-select-dropdown__item {
padding-left: 30px;
}
// 多选下拉 选中后 选中图标设置到最前面
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
left: 10px;
right: 0px;
} }

8
src/components/table/index.vue
View File

@@ -13,7 +13,7 @@
<el-table v-loading="loading" :data="tableList" ref="selChangeList" highlight-selection-row @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="tableList" ref="selChangeList" highlight-selection-row @selection-change="handleSelectionChange">
<el-table-column v-if="!(config && config.colHiddenCheck)" fixed type="selection" width="55" align="center" /> <el-table-column v-if="!(config && config.colHiddenCheck)" fixed type="selection" width="55" align="center" />
<template v-for="(column, key, index) of columns"> <template v-for="(column, key, index) of columns">
<el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :width="column.width" :min-width="column.minWidth || '100px'" align="center" :show-overflow-tooltip="true"> <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :width="column.width" :min-width="column.minWidth || '100px'" align="left" :show-overflow-tooltip="true">
<!-- 插槽 自定义列表表头数据格式 --> <!-- 插槽 自定义列表表头数据格式 -->
<template #header v-if="column && column.slotHeaderName"> <template #header v-if="column && column.slotHeaderName">
<span>{{column.label}}</span> <span>{{column.label}}</span>
@@ -40,9 +40,9 @@
<el-table-column v-if="config && config.tableButton && config.tableButton.line" :width="config.tableButton.line.length * 60 + `px`" label="操作" fixed="right" align="center" class-name="small-padding fixed-width"> <el-table-column v-if="config && config.tableButton && config.tableButton.line" :width="config.tableButton.line.length * 60 + `px`" label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<template v-for="item of config.tableButton.line"> <template v-for="item of config.tableButton.line">
<el-tooltip v-if="item && item.content" :content="item.content" placement="top"> <!-- <el-tooltip v-if="item && item.content" :content="item.content" placement="top">-->
<el-button size="mini" link :type="item.type" :icon="item.icon" v-show="scope.row[item.showName] === item.showVal" @click="handleClick(item, scope.row)" :hasPermi="[item.hasPermi]">{{item.content}}</el-button> <el-button v-if="item && item.content" size="mini" link :type="item.type" :icon="item.icon" v-show="scope.row[item.showName] === item.showVal" @click="handleClick(item, scope.row)" :hasPermi="[item.hasPermi]">{{item.content}}</el-button>
</el-tooltip> <!-- </el-tooltip>-->
</template> </template>
</template> </template>
</el-table-column> </el-table-column>

20
src/views/disRevenue/earnManage/business/index.vue
View File

@@ -1,20 +1,21 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="68px" class="demo-ruleForm">
<el-col :span="6">
<el-form-item label="业务名称" prop="businessName"> <el-form-item label="业务名称" prop="businessName">
<el-col :span="4">
<el-input <el-input
v-model="queryParams.businessName" v-model="queryParams.businessName"
placeholder="请输入业务名称" placeholder="请输入业务名称"
clearable clearable
style="width: 220px"
@keyup.enter="handleQuery"/> @keyup.enter="handleQuery"/>
</el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item class="lastBtnSty">
<el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
<TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"> <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
<template #tempBusinessName="{ row, column }"> <template #tempBusinessName="{ row, column }">
@@ -175,3 +176,8 @@
} }
} }
</script> </script>
<style scoped>
::v-deep .lastBtnSty .el-form-item__content{
margin-left: 10px!important;
}
</style>

32
src/views/disRevenue/earnManage/revenueMethod/index.vue
View File

@@ -1,12 +1,11 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
<el-col :span="6">
<el-form-item label="节点名称" prop="nodeName"> <el-form-item label="节点名称" prop="nodeName">
<el-col :span="4">
<el-select <el-select
v-model="queryParams.nodeName" v-model="queryParams.nodeName"
placeholder="请选择节点名称" placeholder="请选择节点名称"
style="width: 220px"
clearable> clearable>
<el-option <el-option
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
@@ -14,23 +13,23 @@
:label="dict.label" :label="dict.label"
:value="dict.value"/> :value="dict.value"/>
</el-select> </el-select>
</el-col>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="硬件SN" prop="hardwareSn"> <el-form-item label="硬件SN" prop="hardwareSn">
<el-col :span="4">
<el-input <el-input
v-model="queryParams.hardwareSn" v-model="queryParams.hardwareSn"
placeholder="请输入硬件SN" placeholder="请输入硬件SN"
clearable clearable
style="width: 220px" @keyup.enter="handleQuery"/>
@keyup.enter="handleQuery" </el-form-item>
/>
</el-col> </el-col>
<el-col :span="6">
<el-form-item class="lastBtnSty">
<el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
<!-- 表格数据 --> <!-- 表格数据 -->
<TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"></TableList> <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"></TableList>
@@ -57,10 +56,10 @@
columns: { columns: {
id: {label: `ID`, visible: false}, id: {label: `ID`, visible: false},
createTime: {label: `修改时间`, visible: true}, createTime: {label: `修改时间`, visible: true},
nodeName: {label: `节点名称`, visible: true}, nodeName: {label: `节点名称`, minWidth: '130', visible: true},
hardwareSn: {label: `硬件SN`}, hardwareSn: {label: `硬件SN`},
changeContent: {label: `修改内容`, visible: true}, changeContent: {label: `修改内容`, minWidth: '350', visible: true},
creatBy: {label: `修改人`, visible: true}, creatBy: {label: `修改人`, width: '80', visible: true},
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
@@ -131,4 +130,7 @@
</script> </script>
<style scoped> <style scoped>
::v-deep .lastBtnSty .el-form-item__content {
margin-left: 10px!important;
}
</style> </style>

15
src/views/disRevenue/earnManage/server/dialogView.vue
View File

@@ -3,7 +3,8 @@
<div style="height: 90px;"> <div style="height: 90px;">
<el-form ref="noticeRef" :model="form" label-width="80px"> <el-form ref="noticeRef" :model="form" label-width="80px">
<el-form-item label="节点名称" prop="noticeType"> <el-form-item label="节点名称" prop="noticeType">
<el-select v-model="form.noticeType" multiple filterable allow-create default-first-option placeholder="请选择节点名称" @change="handleChange"> <!-- allow-create default-first-option： 搜索下拉框中没有的数据并展示查询 -->
<el-select v-model="form.noticeType" multiple filterable placeholder="请选择节点名称" @change="handleChange">
<el-option <el-option
v-for="item in selectChangeList" v-for="item in selectChangeList"
:key="item.value" :key="item.value"
@@ -35,6 +36,7 @@
import EchartsLine from "@/components/echartsList/line.vue"; import EchartsLine from "@/components/echartsList/line.vue";
import EchartsBar from "@/components/echartsList/bar.vue"; import EchartsBar from "@/components/echartsList/bar.vue";
import {graPackage, graMonthly, graEffectiveMonthly, graEffectiveDaily, graEffectiveAvgMonthly, graDaily, graAvgMonthly} from "@/api/disRevenue/earnManage" import {graPackage, graMonthly, graEffectiveMonthly, graEffectiveDaily, graEffectiveAvgMonthly, graDaily, graAvgMonthly} from "@/api/disRevenue/earnManage"
import {listAllResourList} from "@/api/disRevenue/resource";
export default { export default {
name: 'DialogView', name: 'DialogView',
components: {Form, EchartsLine, EchartsBar}, components: {Form, EchartsLine, EchartsBar},
@@ -77,12 +79,22 @@
if (this.paramsData && this.paramsData.list) { if (this.paramsData && this.paramsData.list) {
this.processData(this.paramsData.list); this.processData(this.paramsData.list);
} }
if (this.paramsData && this.paramsData.resourceType) {
this.fnNodeName(this.paramsData.resourceType);
}
} }
}, },
destroyed() { destroyed() {
localStorage.removeItem(this.storageKey); localStorage.removeItem(this.storageKey);
}, },
methods: { methods: {
fnNodeName(type){
listAllResourList({resourceType: type}).then(val => {
this.selectChangeList = val && val.map(item => {
return Object.assign({label: item.resourceName, value: item.resourceName});
});
});
},
// 下拉数据改变时触发 // 下拉数据改变时触发
handleChange(eventVal) { handleChange(eventVal) {
if (this.resourceType === '1') { if (this.resourceType === '1') {
@@ -120,7 +132,6 @@
} }
}); });
if (nameArr && nameArr.length > 0) { if (nameArr && nameArr.length > 0) {
this.selectChangeList = nameListArr;
if (nameListArr.length >=2) { if (nameListArr.length >=2) {
this.form.noticeType = [nameListArr[0].label, nameListArr[1].label]; this.form.noticeType = [nameListArr[0].label, nameListArr[1].label];
} else { } else {

126
src/views/disRevenue/earnManage/server/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="80px" class="demo-ruleForm"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px" class="demo-ruleForm">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="节点名称" prop="nodeName"> <el-form-item label="节点名称" prop="nodeName">
<el-input <el-input
@@ -25,8 +25,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-show="queryParams.bandwidthType === '1'"> <el-col :span="8" v-if="queryParams.bandwidthType === '1'">
<el-form-item label="95宽带值Mbps/日" title="95宽带值Mbps/日" prop="bandwidth95Daily"> <el-form-item label="95宽带值Mbps/日" title="95宽带值Mbps/日" prop="bandwidth95Daily" :rules="[{ required: true, message: `95宽带值Mbps/日为必填项`, trigger: 'change' }]">
<el-date-picker <el-date-picker
v-model="queryParams.bandwidth95Daily" v-model="queryParams.bandwidth95Daily"
type="daterange" type="daterange"
@@ -37,8 +37,8 @@
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-show="queryParams.bandwidthType === '2'"> <el-col :span="8" v-if="queryParams.bandwidthType === '2'">
<el-form-item label="95宽带值Mbps/月" prop="bandwidth95Monthly"> <el-form-item label="95宽带值Mbps/月" title="95宽带值Mbps/月" prop="bandwidth95Monthly" :rules="[{ required: true, message: `95宽带值Mbps/月为必填项`, trigger: 'change' }]">
<el-date-picker <el-date-picker
v-model="queryParams.bandwidth95Monthly" v-model="queryParams.bandwidth95Monthly"
type="monthrange" type="monthrange"
@@ -48,8 +48,8 @@
end-placeholder="结束月份"/> end-placeholder="结束月份"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-show="queryParams.bandwidthType === '3'"> <el-col :span="8" v-if="queryParams.bandwidthType === '3'">
<el-form-item label="包端带宽值Mbps/日" prop="packageBandwidthDaily"> <el-form-item label="包端带宽值Mbps/日" title="包端带宽值Mbps/日" prop="packageBandwidthDaily" :rules="[{ required: true, message: `包端带宽值Mbps/日为必填项`, trigger: 'change' }]">
<el-date-picker <el-date-picker
v-model="queryParams.packageBandwidthDaily" v-model="queryParams.packageBandwidthDaily"
type="daterange" type="daterange"
@@ -60,6 +60,54 @@
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '4'">
<el-form-item label="月均日95值Mbps" title="月均日95值Mbps" prop="avgMonthlyBandwidth95" :rules="[{ required: true, message: `月均日95值Mbps为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.avgMonthlyBandwidth95"
type="monthrange"
format="yyyy-MM"
value-format="yyyy-MM"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '5'">
<el-form-item label="有效95带宽值Mbps/日" title="有效95带宽值Mbps/日" prop="effectiveBandwidth95Daily" :rules="[{ required: true, message: `有效95带宽值Mbps/日为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.effectiveBandwidth95Daily"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '6'">
<el-form-item label="有效95带宽值Mbps/月" title="有效95带宽值Mbps/月" prop="effectiveBandwidth95Monthly" :rules="[{ required: true, message: `有效95带宽值Mbps/月为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.effectiveBandwidth95Monthly"
type="monthrange"
format="yyyy-MM"
value-format="yyyy-MM"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '7'">
<el-form-item label="有效月均日95值Mbps" title="有效月均日95值Mbps" prop="effectiveAvgMonthlyBandwidth95" :rules="[{ required: true, message: `有效月均日95值Mbps为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.effectiveAvgMonthlyBandwidth95"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="硬件SN" prop="hardwareSn"> <el-form-item label="硬件SN" prop="hardwareSn">
<el-input <el-input
@@ -106,20 +154,20 @@
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: {label: `ID`}, id: {label: `ID`},
nodeName: {label: `节点名称`, minWidth: '200', visible: true}, nodeName: {label: `节点名称`, minWidth: '250', visible: true},
hardwareSn: {label: `硬件SN`, minWidth: '200'}, hardwareSn: {label: `硬件SN`, minWidth: '200'},
uplinkSwitch: {label: `上联交换机`, minWidth: '150'}, uplinkSwitch: {label: `上联交换机`, minWidth: '150'},
businessId: {label: `业务代码`, minWidth: '150'}, businessId: {label: `业务代码`, minWidth: '150'},
businessName: {label: `业务名称`, minWidth: '150'}, businessName: {label: `业务名称`, minWidth: '150'},
bandwidth95Daily: {label: `95宽带值Mbps/日`, minWidth: '200', slotName: 'tempDay', slotHeaderName: '使用服务器的发送流量，发送流量值除以1000000', visible: true}, bandwidth95Daily: {label: `95宽带值Mbps/日`, minWidth: '200', slotName: 'tempDay', slotHeaderName: '使用服务器的发送流量，发送流量值除以1000000'},
bandwidth95Monthly: {label: `95宽带值Mbps/月`, minWidth: '200', visible: true, slotName: 'tempMonth', bandwidth95Monthly: {label: `95宽带值Mbps/月`, minWidth: '200', slotName: 'tempMonth',
slotHeaderName: '使用服务器的发送流量，发送流量值除以1000000；若服务器在一个自然月内有收益方式的变更，以最后一次变更的时间为开始到月末，进行该值的统计；若服务器收益方式为包端，则月底不用进行该值的计算。'}, slotHeaderName: '使用服务器的发送流量，发送流量值除以1000000；若服务器在一个自然月内有收益方式的变更，以最后一次变更的时间为开始到月末，进行该值的统计；若服务器收益方式为包端，则月底不用进行该值的计算。'},
packageBandwidthDaily: {label: `包端带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true}, packageBandwidthDaily: {label: `包端带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay'},
// customerName: {label: `设备业务客户`,visible: true}, // customerName: {label: `设备业务客户`,visible: true},
avgMonthlyBandwidth95: {label: `月均日95值Mbps`, minWidth: '200',slotName: 'tempDay'}, avgMonthlyBandwidth95: {label: `月均日95值Mbps`, minWidth: '200',slotName: 'tempDay'},
effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay'}, effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true},
effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth'}, effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth', visible: true},
effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'}, effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay', visible: true},
createDatetime: {label: `创建时间`, minWidth: '150'}, createDatetime: {label: `创建时间`, minWidth: '150'},
}, },
config: { config: {
@@ -148,20 +196,29 @@
bandwidth95Daily: undefined, bandwidth95Daily: undefined,
bandwidth95Monthly: undefined, bandwidth95Monthly: undefined,
packageBandwidthDaily: undefined, packageBandwidthDaily: undefined,
avgMonthlyBandwidth95: undefined,
effectiveBandwidth95Daily: undefined,
effectiveBandwidth95Monthly: undefined,
effectiveAvgMonthlyBandwidth95: undefined,
} }
} }
}, },
created() { created() {
// this.getList(); this.$nextTick(() => {
this.getList(1);
});
}, },
activated() { activated() {
this.$nextTick(() => {
this.getList(); this.getList();
});
}, },
methods: { methods: {
/** 查询角色列表 */ /** 查询角色列表 */
getList() { getList(num) {
this.loading = true; this.loading = true;
let newParams = {...this.queryParams}; let newParams = {...this.queryParams};
delete newParams['total'];
newParams['resourceType'] = 1; newParams['resourceType'] = 1;
if (newParams['bandwidth95Daily']) { if (newParams['bandwidth95Daily']) {
newParams['startTime'] = newParams['bandwidth95Daily'][0]; newParams['startTime'] = newParams['bandwidth95Daily'][0];
@@ -178,6 +235,34 @@
newParams['endTime'] = newParams['packageBandwidthDaily'][1]; newParams['endTime'] = newParams['packageBandwidthDaily'][1];
delete newParams['packageBandwidthDaily']; delete newParams['packageBandwidthDaily'];
} }
if (newParams['avgMonthlyBandwidth95']) {
newParams['startTime'] = newParams['avgMonthlyBandwidth95'][0];
newParams['endTime'] = newParams['avgMonthlyBandwidth95'][1];
delete newParams['avgMonthlyBandwidth95'];
}
if (newParams['effectiveBandwidth95Daily']) {
newParams['startTime'] = newParams['effectiveBandwidth95Daily'][0];
newParams['endTime'] = newParams['effectiveBandwidth95Daily'][1];
delete newParams['effectiveBandwidth95Daily'];
}
if (newParams['effectiveBandwidth95Monthly']) {
newParams['startTime'] = newParams['effectiveBandwidth95Monthly'][0];
newParams['endTime'] = newParams['effectiveBandwidth95Monthly'][1];
delete newParams['effectiveBandwidth95Monthly'];
}
if (newParams['effectiveAvgMonthlyBandwidth95']) {
newParams['startTime'] = newParams['effectiveAvgMonthlyBandwidth95'][0];
newParams['endTime'] = newParams['effectiveAvgMonthlyBandwidth95'][1];
delete newParams['effectiveAvgMonthlyBandwidth95'];
}
if (newParams && newParams.bandwidthType && !newParams['startTime']) {
this.$refs['queryRef'].validate((valid) => {
if (!valid) {
return false;
}
});
return;
}
listBandWidth(newParams).then(response => { listBandWidth(newParams).then(response => {
this.tableList = response.rows; this.tableList = response.rows;
this.queryParams.total = response.total; this.queryParams.total = response.total;
@@ -187,6 +272,11 @@
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.$refs['queryRef'].validate((valid) => {
if (!valid) {
return false;
}
});
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
@@ -203,7 +293,7 @@
// 生成唯一 key（避免数据冲突） // 生成唯一 key（避免数据冲突）
const storageKey = `temp_data_${Date.now()}`; const storageKey = `temp_data_${Date.now()}`;
// 1. 将数据存入 localStorage（需序列化） // 1. 将数据存入 localStorage（需序列化）
localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr})); localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr, resourceType: 1}));
// 1. 用 Vue Router 解析目标路由的完整 URL // 1. 用 Vue Router 解析目标路由的完整 URL
const routeLocation = this.$router.resolve({ const routeLocation = this.$router.resolve({
name: 'DialogView', name: 'DialogView',
@@ -280,6 +370,6 @@
<style scoped> <style scoped>
::v-deep .lastBtnSty .el-form-item__content{ ::v-deep .lastBtnSty .el-form-item__content{
margin-left: unset!important; margin-left: 10px!important;
} }
</style> </style>

36
src/views/disRevenue/earnManage/serverRevenue/index.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="auto" class="demo-ruleForm"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="auto" class="demo-ruleForm">
<!-- <el-col :span="7">--> <el-col :span="7">
<el-form-item label="节点名称" prop="nodeName"> <el-form-item label="节点名称" prop="nodeName">
<el-select <el-select
v-model="queryParams.nodeName" v-model="queryParams.nodeName"
@@ -14,8 +14,8 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="7">--> <el-col :span="7">
<el-form-item label="硬件SN" prop="hardwareSn"> <el-form-item label="硬件SN" prop="hardwareSn">
<el-input <el-input
v-model="queryParams.hardwareSn" v-model="queryParams.hardwareSn"
@@ -24,13 +24,13 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="7">--> <el-col :span="7">
<el-form-item class="lastBtnSty"> <el-form-item class="lastBtnSty">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<!-- </el-col>--> </el-col>
</el-form> </el-form>
<!-- 表格数据 --> <!-- 表格数据 -->
<TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"> <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
@@ -103,13 +103,15 @@
profitTypeList: [], profitTypeList: [],
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: { label: `id`, visible: false }, id: { label: `id`, width: '50', visible: false },
nodeName: { label: `节点名称`, minWidth: '200', visible: true }, nodeName: { label: `节点名称`, minWidth: '200', visible: true },
hardwareSn: { label: `硬件SN`, visible: false}, hardwareSn: { label: `硬件SN`, minWidth: '200', visible: false},
revenueMethod: { label: `收益方式`, slotName: 'tempRevenue', visible: true }, businessName: { label: `业务名称`, minWidth: '150', visible: true},
businessCode: { label: `业务编码`, minWidth: '150', visible: false},
revenueMethod: { label: `收益方式`, slotName: 'tempRevenue',minWidth: '100', visible: true },
trafficPort: { label: `流量网口`, minWidth: '250', visible: true }, trafficPort: { label: `流量网口`, minWidth: '250', visible: true },
bandwidth95: { label: `包端带宽值（Mbps）`, visible: true }, bandwidth95: { label: `包端带宽值（Mbps）`, minWidth: '150', visible: true },
lastModifyTime: { label: `修改时间`, visible: true } lastModifyTime: { label: `修改时间`, minWidth: '160', visible: true }
}, },
config: { config: {
// searcherForm: [ // searcherForm: [
@@ -187,7 +189,8 @@
businessName: row.businessCode, businessName: row.businessCode,
revenueMethod: row.revenueMethod || '1', revenueMethod: row.revenueMethod || '1',
serverIp: row.serverIp, serverIp: row.serverIp,
packageBandwidth: row.packageBandwidth packageBandwidth: row.packageBandwidth,
trafficPort: row.trafficPort
}; };
this.busiName(); this.busiName();
this.interFaceNameList(); this.interFaceNameList();
@@ -226,6 +229,7 @@
} }
updateRevenueConfig(this.formList).then(res => { updateRevenueConfig(this.formList).then(res => {
this.open = false; this.open = false;
this.getList();
this.$modal.msgSuccess("操作成功！"); this.$modal.msgSuccess("操作成功！");
}); });
}, },
@@ -267,6 +271,6 @@
<style scoped> <style scoped>
::v-deep .lastBtnSty .el-form-item__content{ ::v-deep .lastBtnSty .el-form-item__content{
margin-left: unset!important; margin-left: 10px!important;
} }
</style> </style>

187
src/views/disRevenue/earnManage/switch/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="80px" class="demo-ruleForm"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px" class="demo-ruleForm">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="交换机名称" prop="uplinkSwitch"> <el-form-item label="交换机名称" prop="uplinkSwitch">
<el-select <el-select
@@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="服务器节点名称" prop="nodeName"> <el-form-item label="服务器节点名称" title="服务器节点名称" prop="nodeName">
<el-select <el-select
v-model="queryParams.nodeName" v-model="queryParams.nodeName"
placeholder="请输入服务器节点名称" placeholder="请输入服务器节点名称"
@@ -68,8 +68,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-show="queryParams.bandwidthType === '1'"> <el-col :span="6" v-if="queryParams.bandwidthType === '1'">
<el-form-item label="95宽带值Mbps/日" prop="bandwidth95Daily"> <el-form-item label="95宽带值Mbps/日" title="95宽带值Mbps/日" prop="bandwidth95Daily" :rules="[{ required: true, message: `95宽带值Mbps/日为必填项`, trigger: 'change' }]">
<el-date-picker <el-date-picker
v-model="queryParams.bandwidth95Daily" v-model="queryParams.bandwidth95Daily"
type="daterange" type="daterange"
@@ -80,8 +80,8 @@
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-show="queryParams.bandwidthType === '2'"> <el-col :span="6" v-if="queryParams.bandwidthType === '2'">
<el-form-item label="95宽带值Mbps/月" prop="bandwidth95Monthly"> <el-form-item label="95宽带值Mbps/月" title="95宽带值Mbps/月" prop="bandwidth95Monthly" :rules="[{ required: true, message: `95宽带值Mbps/月为必填项`, trigger: 'change' }]">
<el-date-picker <el-date-picker
v-model="queryParams.bandwidth95Monthly" v-model="queryParams.bandwidth95Monthly"
type="monthrange" type="monthrange"
@@ -90,11 +90,71 @@
start-placeholder="开始月份" start-placeholder="开始月份"
end-placeholder="结束月份"/> end-placeholder="结束月份"/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '3'">
<el-form-item label="包端带宽值Mbps/日" title="包端带宽值Mbps/日" prop="packageBandwidthDaily" :rules="[{ required: true, message: `包端带宽值Mbps/日为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.packageBandwidthDaily"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '4'">
<el-form-item label="月均日95值Mbps" title="月均日95值Mbps" prop="avgMonthlyBandwidth95" :rules="[{ required: true, message: `月均日95值Mbps为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.avgMonthlyBandwidth95"
type="monthrange"
format="yyyy-MM"
value-format="yyyy-MM"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '5'">
<el-form-item label="有效95带宽值Mbps/日" title="有效95带宽值Mbps/日" prop="effectiveBandwidth95Daily" :rules="[{ required: true, message: `有效95带宽值Mbps/日为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.effectiveBandwidth95Daily"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '6'">
<el-form-item label="有效95带宽值Mbps/月" title="有效95带宽值Mbps/月" prop="effectiveBandwidth95Monthly" :rules="[{ required: true, message: `有效95带宽值Mbps/月为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.effectiveBandwidth95Monthly"
type="monthrange"
format="yyyy-MM"
value-format="yyyy-MM"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="queryParams.bandwidthType === '7'">
<el-form-item label="有效月均日95值Mbps" title="有效月均日95值Mbps" prop="effectiveAvgMonthlyBandwidth95" :rules="[{ required: true, message: `有效月均日95值Mbps为必填项`, trigger: 'change' }]">
<el-date-picker
v-model="queryParams.effectiveAvgMonthlyBandwidth95"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
</el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="lastBtnSty"> <el-form-item class="lastBtnSty">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@@ -115,13 +175,13 @@
</div> </div>
</template> </template>
<script setup> <script>
import {listBandWidth, recalBandWidth} from "@/api/disRevenue/earnManage" import {listBandWidth, recalBandWidth} from "@/api/disRevenue/earnManage"
import {listAllResourList,resNameBtType, postInterFaceName} from "@/api/disRevenue/resource" import {listAllResourList,resNameBtType, postInterFaceName} from "@/api/disRevenue/resource"
import EchartsLine from "@/components/echartsList/line.vue"; import EchartsLine from "@/components/echartsList/line.vue";
import TableList from "@/components/table/index.vue"; import TableList from "@/components/table/index.vue";
export default { export default {
name: 'SwitchIndex', name: 'Switch',
dicts: ['sys_normal_disable','eps_bandwidth_type','rm_topology_type'], dicts: ['sys_normal_disable','eps_bandwidth_type','rm_topology_type'],
components: {TableList,EchartsLine}, components: {TableList,EchartsLine},
data() { data() {
@@ -134,23 +194,23 @@
nodeNameList:[], // 服务器节点名称 nodeNameList:[], // 服务器节点名称
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: { label: `ID`, visible: false }, id: { label: `ID`,width: '50', visible: false },
uplinkSwitch: { label: `交换机名称`, visible: true }, uplinkSwitch: { label: `交换机名称`, minWidth: '200', visible: true },
hardwareSn: { label: `硬件SN`, visible: false }, hardwareSn: { label: `硬件SN`, minWidth: '200', visible: false },
interfaceName: { label: `接口名称`, visible: true }, interfaceName: { label: `接口名称`, minWidth: '120',visible: true },
interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType', interfaceLinkDeviceType: { label: `接口连接设备类型`, slotName: 'tempType',minWidth: '180',
slotHeaderName: '不同的类型统计方式不一样，当类型是服务器时，使用的是接口的接收流量，95带宽值Mbs/日和95带宽值Mbs/月统计的是交换机接口的接收流量；当类型是机房出口的时候，95带宽值Mbs/日和95带宽值Mbs/月统计的是交换机接口的发送流量', visible: true }, slotHeaderName: '不同的类型统计方式不一样，当类型是服务器时，使用的是接口的接收流量，95带宽值Mbs/日和95带宽值Mbs/月统计的是交换机接口的接收流量；当类型是机房出口的时候，95带宽值Mbs/日和95带宽值Mbs/月统计的是交换机接口的发送流量', visible: true },
businessId: {label: `业务代码`}, businessId: {label: `业务代码`,minWidth: '150'},
businessName: {label: `业务名称`}, businessName: {label: `业务名称`,minWidth: '100'},
bandwidth95Daily: { label: `95宽带值Mbps/日`, width: '200', slotName: 'tempDay', visible: true }, bandwidth95Daily: { label: `95宽带值Mbps/日`, minWidth: '200', slotName: 'tempDay', visible: true },
bandwidth95Monthly: { label: `95宽带值Mbps/月`, width: '200', slotName: 'tempMonth', visible: true }, bandwidth95Monthly: { label: `95宽带值Mbps/月`, minWidth: '200', slotName: 'tempMonth', visible: true },
nodeName: { label: `服务器节点名称`}, nodeName: { label: `服务器节点名称`, minWidth: '200'},
avgMonthlyBandwidth95: {label: `月均日95值Mbps`, width: '200', slotName: 'tempDay'}, avgMonthlyBandwidth95: {label: `月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'},
effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, width: '200', slotName: 'tempDay'}, effectiveBandwidth95Daily: {label: `有效95带宽值Mbps/日`, minWidth: '200', slotName: 'tempDay'},
effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, width: '200', slotName: 'tempMonth',}, effectiveBandwidth95Monthly: {label: `有效95带宽值Mbps/月`, minWidth: '200', slotName: 'tempMonth',},
effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, width: '200', slotName: 'tempDay'}, effectiveAvgMonthlyBandwidth95: {label: `有效月均日95值Mbps`, minWidth: '200', slotName: 'tempDay'},
createTime: { label: `创建时间`, width: '150'}, createTime: { label: `创建时间`, minWidth: '160'},
lastModifyTime: { label: `修改时间`, width: '150'} lastModifyTime: { label: `修改时间`, minWidth: '160'}
}, },
config: { config: {
// searcherForm: [ // searcherForm: [
@@ -180,11 +240,16 @@
bandwidthType:undefined, bandwidthType:undefined,
bandwidth95Daily:undefined, bandwidth95Daily:undefined,
bandwidth95Monthly:undefined, bandwidth95Monthly:undefined,
packageBandwidthDaily: undefined,
avgMonthlyBandwidth95: undefined,
effectiveBandwidth95Daily: undefined,
effectiveBandwidth95Monthly: undefined,
effectiveAvgMonthlyBandwidth95: undefined,
} }
} }
}, },
created() { created() {
this.getList(); this.getList(1);
this.fnSelectAllName(); this.fnSelectAllName();
}, },
activated() { activated() {
@@ -192,12 +257,54 @@
}, },
methods: { methods: {
/** 查询角色列表 */ /** 查询角色列表 */
getList() { getList(num) {
this.loading = true; this.loading = true;
let newParams = {...this.queryParams}; let newParams = {...this.queryParams};
delete newParams['total'];
newParams['resourceType'] = 2; newParams['resourceType'] = 2;
newParams['bandwidth95Daily'] = newParams['bandwidth95Daily'] && newParams['bandwidth95Daily'].length >1 ? newParams['bandwidth95Daily'] : null; if (newParams['bandwidth95Daily']) {
newParams['bandwidth95Monthly'] = newParams['bandwidth95Monthly'] && newParams['bandwidth95Monthly'].length >1 ? newParams['bandwidth95Monthly'] : null; newParams['startTime'] = newParams['bandwidth95Daily'][0];
newParams['endTime'] = newParams['bandwidth95Daily'][1];
delete newParams['bandwidth95Daily'];
}
if (newParams['bandwidth95Monthly']) {
newParams['startTime'] = newParams['bandwidth95Monthly'][0];
newParams['endTime'] = newParams['bandwidth95Monthly'][1];
delete newParams['bandwidth95Monthly'];
}
if (newParams['packageBandwidthDaily']) {
newParams['startTime'] = newParams['packageBandwidthDaily'][0];
newParams['endTime'] = newParams['packageBandwidthDaily'][1];
delete newParams['packageBandwidthDaily'];
}
if (newParams['avgMonthlyBandwidth95']) {
newParams['startTime'] = newParams['avgMonthlyBandwidth95'][0];
newParams['endTime'] = newParams['avgMonthlyBandwidth95'][1];
delete newParams['avgMonthlyBandwidth95'];
}
if (newParams['effectiveBandwidth95Daily']) {
newParams['startTime'] = newParams['effectiveBandwidth95Daily'][0];
newParams['endTime'] = newParams['effectiveBandwidth95Daily'][1];
delete newParams['effectiveBandwidth95Daily'];
}
if (newParams['effectiveBandwidth95Monthly']) {
newParams['startTime'] = newParams['effectiveBandwidth95Monthly'][0];
newParams['endTime'] = newParams['effectiveBandwidth95Monthly'][1];
delete newParams['effectiveBandwidth95Monthly'];
}
if (newParams['effectiveAvgMonthlyBandwidth95']) {
newParams['startTime'] = newParams['effectiveAvgMonthlyBandwidth95'][0];
newParams['endTime'] = newParams['effectiveAvgMonthlyBandwidth95'][1];
delete newParams['effectiveAvgMonthlyBandwidth95'];
}
if (newParams && newParams.bandwidthType && !newParams['startTime']) {
this.$refs['queryRef'].validate((valid) => {
if (!valid) {
return false;
}
});
return;
}
listBandWidth(newParams).then(response => { listBandWidth(newParams).then(response => {
this.tableList = response.rows; this.tableList = response.rows;
this.queryParams.total = response.total; this.queryParams.total = response.total;
@@ -231,6 +338,11 @@
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.$refs['queryRef'].validate((valid) => {
if (!valid) {
return false;
}
});
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList() this.getList()
}, },
@@ -247,7 +359,7 @@
// 生成唯一 key（避免数据冲突） // 生成唯一 key（避免数据冲突）
const storageKey = `temp_data_${Date.now()}`; const storageKey = `temp_data_${Date.now()}`;
// 1. 将数据存入 localStorage（需序列化） // 1. 将数据存入 localStorage（需序列化）
localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr})); localStorage.setItem(storageKey, JSON.stringify({list: list, dictList: dictTypeArr, resourceType: 2}));
// 1. 用 Vue Router 解析目标路由的完整 URL // 1. 用 Vue Router 解析目标路由的完整 URL
const routeLocation = this.$router.resolve({ const routeLocation = this.$router.resolve({
name: 'DialogView', name: 'DialogView',
@@ -323,9 +435,14 @@
} }
} }
</script> </script>
<style>
<style scoped> ::v-deep .el-tooltip__popper.is-dark{
::v-deep .lastBtnSty .el-form-item__content{ width: 350px!important; /* 固定宽度 */
margin-left: unset!important; white-space: normal!important; /* 允许换行（默认不换行） */
}
</style>
<style scoped>
::v-deep .lastBtnSty .el-form-item__content{
margin-left: 10px!important;
} }
</style> </style>

20
src/views/disRevenue/resource/group/index.vue
View File

@@ -1,20 +1,21 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
<el-col :span="6">
<el-form-item label="资源组名称" prop="groupName"> <el-form-item label="资源组名称" prop="groupName">
<el-col :span="4">
<el-input <el-input
v-model="queryParams.groupName" v-model="queryParams.groupName"
placeholder="请输入资源组名称" placeholder="请输入资源组名称"
clearable clearable
style="width: 220px"
@keyup.enter="handleQuery"/> @keyup.enter="handleQuery"/>
</el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item class="lastBtnSty">
<el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
<TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"> <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
<!-- <template #tempTooltip="{ row, column }">--> <!-- <template #tempTooltip="{ row, column }">-->
@@ -144,3 +145,8 @@
} }
} }
</script> </script>
<style scoped>
::v-deep .lastBtnSty .el-form-item__content{
margin-left: 10px!important;
}
</style>

31
src/views/disRevenue/resource/monitorStategy/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="auto"> <el-form :model="queryParams" ref="queryRef" size="small" v-show="showSearch" label-width="auto">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="搜索" prop="switchName"> <el-form-item label="搜索" prop="switchName">
<el-input <el-input
@@ -26,7 +26,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item class="lastBtnSty">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
@@ -59,17 +59,17 @@
}, },
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: { label: `ID`,}, id: { label: `ID`,width: '50'},
switchName: { label: `策略名称`, visible: true }, switchName: { label: `策略名称`, minWidth: '250', visible: true },
switchSn: { label: `描述`,visible: false}, switchSn: { label: `描述`,minWidth: '200',visible: false},
interfaceName: { label: `监关联资源组控项`, visible: true }, interfaceName: { label: `监关联资源组控项`,minWidth: '150', visible: true },
serverName: { label: `包含设备`}, serverName: { label: `包含设备`,minWidth: '200'},
connectedDeviceType: { label: `关联监控模版`, visible: true }, connectedDeviceType: { label: `关联监控模版`,minWidth: '150', visible: true },
connected: { label: `策略内容`}, connected: { label: `策略内容`,minWidth: '200'},
type: { label: `策略状态`, visible: true }, type: { label: `策略状态`, minWidth: '100', visible: true },
conType: { label: `下发策略时间`}, conType: { label: `下发策略时间`,minWidth: '160'},
createTime: { label: `创建时间`}, createTime: { label: `创建时间`,minWidth: '160'},
updateTime:{ label: `修改时间`} updateTime:{ label: `修改时间`,minWidth: '160'}
}, },
config: { config: {
searcherForm: [ searcherForm: [
@@ -171,3 +171,8 @@
} }
} }
</script> </script>
<style scoped>
::v-deep .lastBtnSty .el-form-item__content{
margin-left: 10px!important;
}
</style>

39
src/views/disRevenue/resource/monitorTemp/index.vue
View File

@@ -1,21 +1,21 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
<el-col :span="6">
<el-form-item label="模版名称" prop="switchName"> <el-form-item label="模版名称" prop="switchName">
<el-col :span="4">
<el-input <el-input
v-model="queryParams.switchName" v-model="queryParams.switchName"
placeholder="请输入模版名称" placeholder="请输入模版名称"
clearable clearable
style="width: 220px" @keyup.enter="handleQuery"/>
@keyup.enter="handleQuery" </el-form-item>
/>
</el-col> </el-col>
<el-col :span="6">
<el-form-item class="lastBtnSty">
<el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
<TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"> <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
<template #tempType="{ row, column }"> <template #tempType="{ row, column }">
@@ -44,14 +44,14 @@
}, },
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: { label: `ID`,}, id: { label: `ID`,width: '50'},
switchName: { label: `模版名称`, visible: true }, switchName: { label: `模版名称`,minWidth: '150', visible: true },
switchSn: { label: `描述`,visible: false}, switchSn: { label: `描述`,visible: false, minWidth: '200'},
interfaceName: { label: `监控项`, visible: true }, interfaceName: { label: `监控项`, minWidth: '100', visible: true },
connectedDeviceType: { label: `自动发现项`, visible: true }, connectedDeviceType: { label: `自动发现项`, minWidth: '100', visible: true },
serverName: { label: `包含资源`,}, serverName: { label: `包含资源`, minWidth: '200'},
createTime: { label: `创建时间`,}, createTime: { label: `创建时间`, minWidth: '160'},
updateTime:{ label: `修改时间`} updateTime:{ label: `修改时间`, minWidth: '160'}
}, },
config: { config: {
searcherForm: [ searcherForm: [
@@ -152,3 +152,8 @@
} }
} }
</script> </script>
<style scoped>
::v-deep .lastBtnSty .el-form-item__content{
margin-left: 10px!important;
}
</style>

38
src/views/disRevenue/resource/register/index.vue
View File

@@ -1,22 +1,21 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="auto"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="auto">
<el-form-item label="名称" prop="nameKey"> <el-col :span="6">
<el-col> <el-form-item label="资源名称" prop="resourceName">
<el-input <el-input
v-model="queryParams.resourceName" v-model="queryParams.resourceName"
placeholder="请输入交换机名称/服务器名称" placeholder="请输入交换机名称/服务器名称"
clearable clearable
size="mini" @keyup.enter="handleQuery"/>
style="width: 220px"
@keyup.enter="handleQuery"
/>
</el-col>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-col :span="6">
<el-form-item class="lastBtnSty">
<el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-col>
</el-form> </el-form>
<!-- 表格数据 --> <!-- 表格数据 -->
@@ -62,15 +61,15 @@
meltiple: true, meltiple: true,
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: { label: `ID`}, id: { label: `ID`,width: '80'},
hardwareSn: { label: `硬件SN`,width: '120', visible: true }, hardwareSn: { label: `硬件SN`,minWidth: '250', visible: true },
resourceType: { label: `资源类型`, width: '120', slotName: 'tempType', visible: true }, resourceType: { label: `资源类型`, minWidth: '100', slotName: 'tempType', visible: true },
resourceName: { label: `资源名称`, visible: true }, resourceName: { label: `资源名称`, visible: true, minWidth: '200'},
ipAddress: { label: `IP地址`, visible: true }, ipAddress: { label: `IP地址`, minWidth: '200', visible: true },
resourcePort: { label: `端口`, slotName: 'tempPort', visible: true }, resourcePort: { label: `端口`, slotName: 'tempPort', minWidth: '80', visible: true },
protocol: { label: `协议`, width: '120', slotName: 'tempProtocol', visible: true }, protocol: { label: `协议`, minWidth: '80', slotName: 'tempProtocol', visible: true },
registrationStatus: { label: `注册状态`, slotName: 'tempStatus', visible: true }, registrationStatus: { label: `注册状态`, slotName: 'tempStatus', minWidth: '80', visible: true },
onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', visible: true } onlineStatus: { label: `在线状态`, slotName: 'tempOnlineStatus', minWidth: '80', visible: true }
}, },
config: { config: {
searcherForm: [ searcherForm: [
@@ -182,4 +181,7 @@
</script> </script>
<style scoped> <style scoped>
::v-deep .lastBtnSty .el-form-item__content{
margin-left: 10px!important;
}
</style> </style>

24
src/views/disRevenue/resource/resMonitor/index.vue
View File

@@ -31,7 +31,7 @@
</pane> </pane>
<!--用户数据--> <!--用户数据-->
<pane size="84"> <pane size="84">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="80px"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="80px">
<el-col :span="7"> <el-col :span="7">
<el-form-item label="搜索" prop="switchName"> <el-form-item label="搜索" prop="switchName">
<el-input <el-input
@@ -72,8 +72,8 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item class="lastBtnSty"> <el-form-item class="lastBtnSty">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@@ -120,14 +120,14 @@
}, },
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: { label: `ID`, visible: false }, id: { label: `ID`, width: '50', visible: false },
switchSn: { label: `硬件SN`,visible: true}, switchSn: { label: `硬件SN`, minWidth: '200', visible: true},
switchName: { label: `资源名称`, visible: true }, switchName: { label: `资源名称`, minWidth: '250', visible: true },
interfaceName: { label: `ip地址`, visible: true }, interfaceName: { label: `ip地址`, minWidth: '100', visible: true },
connectedDeviceType: { label: `监控项`, slotName: 'tempType', visible: true }, connectedDeviceType: { label: `监控项`, minWidth: '100', slotName: 'tempType', visible: true },
serverName: { label: `自动发现项`, visible: true}, serverName: { label: `自动发现项`, minWidth: '120', visible: true},
serverSn: { label: `CPU使用率%`,visible: true}, serverSn: { label: `CPU使用率%`, minWidth: '120', visible: true},
serverPort: { label: `内存使用率`, visible: true } serverPort: { label: `内存使用率`,minWidth: '120', visible: true }
}, },
config: { config: {
searcherForm: [ searcherForm: [
@@ -270,6 +270,6 @@
</script> </script>
<style scoped> <style scoped>
::v-deep .lastBtnSty .el-form-item__content{ ::v-deep .lastBtnSty .el-form-item__content{
margin-left: unset!important; margin-left: 10px!important;
} }
</style> </style>

43
src/views/disRevenue/resource/topology/index.vue
View File

@@ -1,21 +1,21 @@
<template> <template>
<div class="app-container pageTopForm"> <div class="app-container pageTopForm">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="130px"> <el-form :model="queryParams" ref="queryRef" v-show="showSearch" size="small" label-width="130px">
<el-col :span="6">
<el-form-item label="交换机名称" prop="switchName"> <el-form-item label="交换机名称" prop="switchName">
<el-col :span="4">
<el-input <el-input
v-model="queryParams.switchName" v-model="queryParams.switchName"
placeholder="请输入交互机名称" placeholder="请输入交互机名称"
clearable clearable
style="width: 220px" @keyup.enter="handleQuery"/>
@keyup.enter="handleQuery" </el-form-item>
/>
</el-col> </el-col>
<el-col :span="6">
<el-form-item class="lastBtnSty">
<el-button type="primary" size="mini" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
<TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange"> <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList" @value-change="handleValueChange">
<template #tempType="{ row, column }"> <template #tempType="{ row, column }">
@@ -44,16 +44,16 @@
}, },
// 列显隐信息 // 列显隐信息
columns: { columns: {
id: { label: `ID`, visible: false }, id: { label: `ID`, width: '50', visible: false },
switchName: { label: `交换机名称`, visible: true }, switchName: { label: `交换机名称`, minWidth: '150', visible: true },
switchSn: { label: `交换机硬件SN`,visible: false}, switchSn: { label: `交换机硬件SN`, minWidth: '200', visible: false},
interfaceName: { label: `接口名称`, visible: true }, interfaceName: { label: `接口名称`, minWidth: '100', visible: true },
connectedDeviceType: { label: `接口连接设备类型`, slotName: 'tempType', visible: true }, connectedDeviceType: { label: `接口连接设备类型`, slotName: 'tempType', minWidth: '150', visible: true },
serverName: { label: `服务器名称`, visible: true}, serverName: { label: `服务器名称`, minWidth: '200', visible: true},
serverSn: { label: `服务器硬件SN`,visible: false}, serverSn: { label: `服务器硬件SN`, minWidth: '200', visible: false},
serverPort: { label: `服务器网口`, visible: true }, serverPort: { label: `服务器网口`, minWidth: '250', visible: true },
createTime: { label: `创建时间`,visible: false}, createTime: { label: `创建时间`, minWidth: '150', visible: false},
updateTime:{ label: `修改时间`,visible: false} updateTime:{ label: `修改时间`, minWidth: '150', visible: false}
}, },
config: { config: {
searcherForm: [ searcherForm: [
@@ -144,3 +144,8 @@
} }
} }
</script> </script>
<style scoped>
::v-deep .lastBtnSty .el-form-item__content{
margin-left: 10px!important;
}
</style>