+
Upload custom picture
@@ -119,7 +119,7 @@
@@ -330,1248 +330,1235 @@
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index d182c6e0e..c90a8a4a7 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -91,6 +91,7 @@
+
@@ -107,6 +108,9 @@
+
+
+
@@ -121,6 +125,7 @@ import pickTime from '../../common/pickTime'
import exportXLSX from '../../common/exportXLSX'
import selectPanel from '../../common/popBox/selectPanel'
import panelBox from '@/components/common/rightBox/panelBox'
+import chartTempBox from '@/components/common/rightBox/chartTempBox'
export default {
name: 'panel',
@@ -131,6 +136,7 @@ export default {
visible: false,
rightBox: { // 面板弹出框相关
chart: { show: false },
+ chartTemp: { show: false },
panel: { show: false }
},
tableHover: false,
@@ -166,6 +172,12 @@ export default {
pageSize: -1, // 此处获取所有数据，所以设置一个较大的值
total: 0
},
+ blankChartTemp: {
+ varType: 1,
+ pid: '',
+ panelId: '',
+ varIds: []
+ },
chartsData: [], // 中间部分图表相关数据
panelData: [],
panelDataDragTmp: [],
@@ -204,7 +216,8 @@ export default {
'pick-time': pickTime,
'export-excel': exportXLSX,
selectPanel,
- 'panel-box': panelBox
+ 'panel-box': panelBox,
+ chartTempBox
},
methods: {
// 刷新
@@ -290,6 +303,11 @@ export default {
this.chart.panelName = this.showPanel.name
this.rightBox.chart.show = true
},
+ addChartByTemp () {
+ this.chart = Object.assign({},this.blankChartTemp)
+ this.chart.panelId = this.showPanel.id
+ this.rightBox.chartTemp.show = true
+ },
addGroupItem (groupId) {
this.chart = this.newChart()
this.chart.groupId = groupId
@@ -317,6 +335,12 @@ export default {
} */
},
+ closeChartTempBox () {
+ this.rightBox.chartTemp.show = false
+ /* if (refresh) {
+
+ } */
+ },
closePanelBox (refresh) {
this.rightBox.panel.show = false
/* if (refresh) {
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 81666cfa8..64c00eb0f 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -44,7 +44,7 @@
v-loading="slotProps.loading"
:api="url"
:custom-table-title="tools.customTableTitle"
- :height="mainTableHeight"
+ :height="searchTableHeight"
:table-data="tableData"
:tableId="tableId"
@del="del"
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index b982d3007..81332b1bd 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -89,10 +89,49 @@ export default {
}
},
methods: {
+ getTableData (params) {
+ if (params && Object.keys(params).length > 0) {
+ for (const key in params) {
+ this.$set(this.searchLabel, key, params[key])
+ }
+ }
+ this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
+ this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
+ this.tools.loading = true
+ this.$get(this.url, { ...this.searchLabel, ...this.searchCheckBox }).then(response => {
+ this.tools.loading = false
+ if (response.code === 200) {
+ for (let i = 0; i < response.data.list.length; i++) {
+ response.data.list[i].status = response.data.list[i].status + ''
+ }
+ if (!this.$store.state.currentProject.id) {
+ this.$store.commit('currentProjectChange', response.data.list[0])
+ }
+ this.tableData = response.data.list
+ this.pageObj.total = response.data.total
+ if (!this.scrollbarWrap) {
+ this.$nextTick(() => {
+ this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
+ this.toTopBtnHandler(this.scrollbarWrap)
+ })
+ }
+ }
+ })
+ }
},
computed: {
},
+ created () {
+ console.log(this.$store.state.currentProject)
+ },
mounted () {
+ },
+ destroyed () {
+ this.$store.commit('currentProjectChange', {
+ id: '',
+ name: '',
+ remark: ''
+ })
}
}
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index 8e3ffafd1..d4d22406a 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -52,6 +52,7 @@ Vue.prototype.$chartResizeTool = chartResizeTool
Vue.prototype.$tableSet = tableSet
Vue.prototype.$tableHeight = { // 列表页表格的高度
normal: 'calc(100% - 48px)', // 常规高度，特例在下方定义
+ search: 'calc(100% - 240px)', // 常规高度，特例在下方定义
openSubList: { // 打开二级列表后的高度
mainList: 'calc(100% - 60px)',
subList: 'calc(100% - 38px)',