@@ -137,7 +185,7 @@
},
showPanel: {
name: '',
- type: 'model',
+ type: this.from,
id: ''
},
panelId: 0,
@@ -170,6 +218,10 @@
this.$refs.addChartModal.show(true);
this.$refs.addChartModal.createData(this.panelId); //初始化创建图表需要的初始数据
},
+ // 切换tab
+ changeTab(tab) {
+ this.$emit('changeTab', tab);
+ },
scrollbarHeightHandler() {
setTimeout(() => {
let top = '';
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 0d5ea5c2f..f1f4b57cc 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -115,6 +115,7 @@ const cn = {
type: "类型",
url: "URL",
statistics:'Statistics',
+ sync: '同步到设备',
typeVal: {
line: {
label: "曲线图"
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index f78676049..9b5e78c75 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -126,6 +126,7 @@ const en = {
legend:'Legend',
statistics:'Statistics',
legendTip:'Controls the name of the time series, using name or pattern. For example {{hostname}} will be replaced with label value for the label hostname.',
+ sync: 'Sync to assets',
typeVal:{
line:{
label:'Line Chart' //"曲线图"
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index fcb29fc6a..e21a83c2f 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -247,6 +247,7 @@
endpointTouch: false,
endpointForm: {projectId: '', moduleId: '', endpointList: []},
currentModuleCopy: {},
+ currentProjectCopy: {id: ''},
tempParamObj: [],
tempEndpoint: {},
tempEndpoint2: {},
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index e4c516301..cf56bca73 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -292,6 +292,7 @@
label: this.$t("alert.list.labels"),
prop: 'labels',
show: true,
+ width: 200
}, {
label: this.$t("alert.severity"),
prop: 'severity',
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 3a68d1934..951b6e874 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -796,7 +796,7 @@
}
if (data === 'showView') {
this.alertMsgAsset = Object.assign({}, id);
- this.targetTab = "detail";
+ this.targetTab = "panel";
this.showSubList = true;
/*this.editUnitShow = true
this.$refs['assetEditUnit'].getAssetData(id)
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 2bb417f37..8412438b7 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -74,7 +74,7 @@
-
+
-
+
+
+
{{$t('dashboard.panel.chartForm.metric')}}
@@ -236,7 +238,6 @@
-
@@ -268,7 +269,7 @@
name: "chartBox",
props: {
panelData: Array,
- showPanel:{}
+ showPanel: Object
},
data() {
return {
@@ -293,7 +294,8 @@
type: '',
legend:'',
},
- panel: ''
+ panel: '',
+ sync: 0
},
isUrl:false,
isSingleStat:false,
@@ -572,7 +574,7 @@
addCharts(params) {
let panelId;
//先处理panel
- if (this.showPanel.type == 'model') {
+ if (this.showPanel.type) {
panelId = this.panelData[0].id;
} else {
panelId = this.autocompleteExist(this.panelName2);
@@ -655,8 +657,9 @@
type: this.chart.type,
unit:this.chart.unit,
param:{
- statistics:target.statistics
- }
+ statistics:target.statistics
+ },
+ sync: this.chart.sync
};
//生成指标数组
@@ -1020,7 +1023,7 @@
deep: true,
immediate: true,
handler(n, o) {
- if (this.showPanel.type != 'model') {
+ if (!this.showPanel.type) {
if (this.selectFirstPanel) {
this.selectFirstPanel = false;
this.panelId = n[0].id;
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 8d0481512..ec22bb6b7 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -174,11 +174,9 @@
:from="'endpoint'" :targetTab.sync="targetTab" :detail="endpointDetail" :obj="curEndpoint" :assetDetail="assetDetail"
@closeSubList="showSubList = false" @fullScreen="fullScreen" @exitFullScreen="exitFullScreen" @listResize="listResize" >
-