-
+
-
+
@@ -95,15 +105,6 @@
-
-
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index dce1278cb..eb2ff5370 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -20,6 +20,16 @@
+
+
+
+
+
-
+
@@ -160,16 +169,6 @@
-
@@ -208,10 +207,9 @@
loading: false, //是否显示table加载动画
toTopBtnTop: this.$tableHeight.toTopBtnTop, //to-top按钮的top属性
tableHover: false, //控制滚动条和top按钮同时出现
- showElementSet: false, //自定义列弹框是否显示
showTopBtn: false, //显示To top按钮
- tablelable: [], //从缓存中加载的table header
- dropCol: [], //自定义列工具的数据
+ showCustomTableTitle: false, //自定义列弹框是否显示
+ customTableTitle: [], //自定义列工具的数据
},
asset: {},
blankAsset: {
@@ -362,14 +360,6 @@
}
},
watch: {
- currentDcListChange: {
- deep: true,
- immediate: true,
- handler(n) {
- this.pageObj.idcIds = n.join(",");
- this.getTableData();
- }
- },
'bottomBox.showSubList': function(n) {
let vm = this;
this.$bottomBoxWindow.showSubListWatch(vm, n);
@@ -399,51 +389,6 @@
let vm = this;
this.$bottomBoxWindow.listResize(vm, e);
},
- dcSelectAll(val) { //DC全选
- if (this.checkListData.length > 0) {
- this.checkList = [];
- if (val) {
- for (let i = 0; i < this.checkListData.length; i++) {
- this.checkList.push(this.checkListData[i].id);
- this.$store.commit('assetItemIdChange',this.checkListData[i].id)
- }
- this.$store.commit('assetAllIdChange',this.checkListData)
- }
- }
- },
- elementsetShow(s, e) {
- this.tools.showElementSet = true;
- this.$nextTick(() => {
- var eventfixed = {
- shezhi: 0,
- screen: 0
- };
- eventfixed[s] = 1;
- e.preventDefault();
- this.$store.commit('setHeaderTable', this.tools.tablelable);
- this.$store.commit('setEventfixed', eventfixed);
- const h = document.documentElement.clientHeight;
- const w = document.documentElement.clientWidth;
- const dw = this.$refs.elementset.$el.offsetWidth;
- const dh = this.$refs.elementset.$el.offsetHeight;
- let positionx =
- e.clientX + dw <= w - 10 ? e.clientX + 14 : e.clientX + 14 - dw;
- let positiony =
- e.clientY + dh <= h - 10
- ? e.clientY + 20
- : e.clientY + 20 - (e.clientY + dh - h);
- this.$store.commit('setPosition', { positionx, positiony });
- });
- },
- elementsetHide() {
- //悬浮点击空白隐藏
- this.tools.showElementSet = false;
- },
- tablelabelEmit(data) {
- //获取子组件传过来的参数
- this.$store.commit('setHeaderTable', data);
- this.tools.tablelable = data;
- },
cli([id,host,account]){
const consoleParam = {
id: id,
@@ -718,13 +663,22 @@
});
}
},
- computed: {
- currentDcListChange() {
- return this.$store.state.currentDcList;
- }
- },
mounted() {
+ //初始化表头
+ let tableTitle = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
+ ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
+ : this.tableTitle;
+ if (this.assetPingSwitch == 'off') {
+ for (let i in tableTitle) {
+ let label = tableTitle[i];
+ if (label.prop == 'pingStatus') {
+ tableTitle.splice(i, 1);
+ break;
+ }
+ }
+ }
+ this.tools.customTableTitle = tableTitle;
//初始化数据
this.getUserData();
this.getTableData();
@@ -759,23 +713,6 @@
el._ps_.update();
};
});
- let localStorageTitle = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path);
- this.tools.tablelable = localStorageTitle ? JSON.parse(localStorageTitle) : this.tableTitle;
-
- if (this.assetPingSwitch == 'off') {
-
- for (let i in this.tools.tablelable) {
- let label = this.tools.tablelable[i];
-
- if (label.prop == 'pingStatus') {
- this.tools.tablelable.splice(i, 1);
- //console.log(this.tools.tablelable)
- break;
- }
- }
- }
-
- this.tools.dropCol = localStorageTitle ? JSON.parse(localStorageTitle) : this.tableTitle;
},
destroyed() {
window.onresize = null;
diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index feaa20f97..fa14bcf97 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -22,6 +22,16 @@
+
@@ -100,7 +100,7 @@
import chartDataFormat from "../../charts/chartDataFormat";
import alertRuleInfo from '../../common/alert/alertRuleInfo'
import alertLabel from '../../common/alert/alertLabel'
- import alertMessageTable from '@/components/common/alert/alertMessageTable.vue'
+ import alertMessageTable from '../../common/alert/alertMessageTable.vue'
export default {
name: "alertList",
components: {
@@ -112,20 +112,28 @@
},
data() {
return {
- loading: false,
/*二级列表相关*/
- tabList: [], //二级列表的标签
- tabDetailList: [], //多个详情
- targetTab: '', //展示二级列表中的哪个页签
- inTransform: false, //搜索框相关，搜索条件下拉框是否在transform里
- mainResizeShow: true, //dom高度改变时部分内容是否展示
- subResizeShow: true,
- isFullScreen: false,
- showSubList: false, //是否展示二级列表
mainTableHeight: this.$tableHeight.normal, //主列表table高度
-
- toTopBtnTop: this.$tableHeight.toTopBtnTop, //to-top按钮的top属性
- tableHover: false, //控制滚动条和top按钮同时出现
+ /*二级页面相关*/
+ bottomBox: {
+ tabList: [], //二级列表的标签
+ tabDetailList: [], //多个详情
+ mainResizeShow: true, //dom高度改变时是否展示|隐藏
+ subResizeShow: true,
+ isFullScreen: false, //全屏状态
+ showSubList: false, //是否显示二级列表
+ targetTab: '', //显示二级列表中的哪个页签
+ inTransform: false, //搜索框相关，搜索条件下拉框是否在transform里
+ },
+ /*工具参数*/
+ tools: {
+ loading: false, //是否显示table加载动画
+ toTopBtnTop: this.$tableHeight.toTopBtnTop, //to-top按钮的top属性
+ tableHover: false, //控制滚动条和top按钮同时出现
+ showTopBtn: false, //显示To top按钮
+ showCustomTableTitle: false, //自定义列弹框是否显示
+ customTableTitle: [], //自定义列工具的数据
+ },
//导出相关
importBox: {show: false, title:this.$t('overall.exportExcel')},
@@ -141,7 +149,6 @@
chartUnit: 5,
tableId: 'alertListTable', //需要分页的table的id，用于记录每页数量
- showTopBtn: false,
pageObj: {
pageNo: 1,
pageSize: 50,
@@ -258,8 +265,6 @@
searchLabel: { //搜索参数
},
- tablelable: [],
- dropCol: [],
tableData: [],
requestIndex:0,
viewRuleData: {
@@ -321,11 +326,6 @@
})
return result;
},
- tablelabelEmit(data) {
- //获取子组件传过来的参数
- this.$store.commit('setHeaderTable', data);
- this.tablelable = data;
- },
chartUnitChange:function(unit){
this.chartUnit=unit;
this.$nextTick(()=>{
@@ -481,9 +481,9 @@
getAlertList: function () {
this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo);
this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize);
- this.loading = true;
+ this.tools.loading = true;
this.$get('alert/message', this.searchLabel).then(response => {
- this.loading = false;
+ this.tools.loading = false;
if (response.code == 200) {
this.tableData = response.data.list;
this.tableData.forEach((item) => {
@@ -638,14 +638,17 @@
},
// 全屏
fullScreen() {
+ let vm = this;
this.$bottomBoxWindow.fullScreen(vm);
},
// 退出全屏
exitFullScreen() {
+ let vm = this;
this.$bottomBoxWindow.exitFullScreen(vm);
},
// 鼠标拖动二级列表
listResize(e) {
+ let vm = this;
this.$bottomBoxWindow.listResize(vm, e);
},
showTagDetail(data, key) {
@@ -662,10 +665,10 @@
detailList.push(data[item]);
}
}
- this.showSubList = true;
+ this.bottomBox.showSubList = true;
this.tabList = labelList;
/*this.tabDetailList = detailList;
- this.targetTab = key;*/
+ this.bottomBox.targetTab = key;*/
}
},
labelsClassName(row) {
@@ -675,17 +678,6 @@
return "";
}
},
- jumpTo(data, id) {
- bus.$emit("menu-change", data);
- this.$store.state.assetData.moduleData = data
- this.$store.state.assetData.selectedData = id
- this.$router.push({
- path: "/" + data,
- query: {
- t: +new Date()
- }
- });
- },
pageNo(val) {
this.pageObj.pageNo = val;
this.getAlertList();
@@ -695,7 +687,7 @@
localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val);
this.getAlertList();
},
- search: function (searchObj) {
+ search(searchObj) {
let orderBy='';
if(this.searchLabel.orderBy){
orderBy=this.searchLabel.orderBy
@@ -831,6 +823,10 @@
},
},
mounted() {
+ //初始化表头
+ this.tools.customTableTitle = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
+ ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
+ : this.tableTitle;
//是否存在分页缓存
let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId);
if (pageSize != 'undefined' && pageSize != null) {
@@ -844,25 +840,19 @@
if (el._ps_) {
el.addEventListener("ps-scroll-y", () => {
if (el._ps_.scrollbarYTop > 50) {
- this.showTopBtn = true;
+ this.tools.showTopBtn = true;
} else {
- this.showTopBtn = false;
+ this.tools.showTopBtn = false;
}
});
el.addEventListener("mouseenter", () => {
- this.tableHover = true;
+ this.tools.tableHover = true;
});
el.addEventListener("mouseleave", () => {
- this.tableHover = false;
+ this.tools.tableHover = false;
});
}
});
- this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
- ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
- : this.tableTitle;
- this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
- ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
- : this.tableTitle;
}
}
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 7463f4f59..227f4316b 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -20,7 +20,16 @@
-
+
+
-
+
-