gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.5' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6

Browse Source 
# Conflicts:
#	nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
#	nezha-fronted/src/components/common/mixin/routerPathParams.js
This commit is contained in:
zhangyu
2022-11-15 13:57:25 +08:00
parent c6082adbce 6d72a5f703
commit c9d1e27fd3
61 changed files with 810 additions and 4093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/mixin/routerPathParams.js
View File

@@ -70,6 +70,7 @@ export default {
clientState: this.$refs[detailType].bottomBox.object.clientState || '',
protocol: this.$refs[detailType].bottomBox.object.protocol || '',
uuid: this.$refs[detailType].bottomBox.object.uuid || '',
startTime: this.$refs[detailType].bottomBox.object.startTime || '',
model: {
tsgAppliance: this.$refs[detailType].bottomBox.object.model ? this.$refs[detailType].bottomBox.object.model.tsgAppliance : ''
}
@@ -84,6 +85,7 @@ export default {
clientState: this.$refs[detailType].detailViewRightObj.clientState || '',
protocol: this.$refs[detailType].detailViewRightObj.protocol || '',
uuid: this.$refs[detailType].detailViewRightObj.uuid || '',
startTime: this.$refs[detailType].detailViewRightObj.startTime || '',
model: {
tsgAppliance: this.$refs[detailType].detailViewRightObj.model ? this.$refs[detailType].detailViewRightObj.model.tsgAppliance : ''
}
@@ -102,6 +104,7 @@ export default {
clientState: this.bottomBox.object.clientState || '',
protocol: this.bottomBox.object.protocol || '',
uuid: this.bottomBox.object.uuid || '',
startTime: this.bottomBox.object.startTime || '',
model: {
tsgAppliance: this.bottomBox.object.model ? this.bottomBox.object.model.tsgAppliance : ''
}
@@ -117,6 +120,7 @@ export default {
clientState: this.detailViewRightObj.clientState || '',
protocol: this.detailViewRightObj.protocol || '',
uuid: this.detailViewRightObj.uuid || '',
startTime: this.detailViewRightObj.startTime || '',
model: {
tsgAppliance: this.detailViewRightObj.model ? this.detailViewRightObj.model.tsgAppliance : ''
}