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

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

Browse Source
This commit is contained in:
zhangyu
2023-06-26 10:38:11 +08:00
parent ed1b97b8d2 4ebea0b205
commit 966de386da
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue
View File

@@ -37,9 +37,9 @@
</template>
<template slot-scope="scope" :column="item">
<span v-if="item.prop==='varType'">
<template v-if="scope.row[item.prop] == 0 ">None</template>
<template v-if="scope.row[item.prop] == 1 ">Asset</template>
<template v-if="scope.row[item.prop] == 2 ">Endpoint</template>
<template v-if="scope.row[item.prop] == 0 ">{{$t('project.topology.none')}}</template>
<template v-if="scope.row[item.prop] == 1 ">{{$t('asset.asset')}}</template>
<template v-if="scope.row[item.prop] == 2 ">{{$t('asset.endpoint')}}</template>
</span>
<template v-else-if="item.prop === 'name'">
<copy :copyData='scope.row[item.prop]' :showInfo='scope.row[item.prop]'>

3
nezha-fronted/src/components/page/tool/ping.vue
View File

@@ -281,6 +281,9 @@ export default {
event.cancelBubble = true
}
this.checked = this.checked.filter(dcId => dcId !== id)
const checkedCount = this.checked.length
this.checkAll = checkedCount === this.dataCenter.length
this.isIndeterminate = checkedCount > 0 && checkedCount < this.dataCenter.length
},
// 开始任务
startTask () {

3
nezha-fronted/src/components/page/tool/trace.vue
View File

@@ -272,6 +272,9 @@ export default {
event.cancelBubble = true
}
this.checked = this.checked.filter(dcId => dcId !== id)
const checkedCount = this.checked.length
this.checkAll = checkedCount === this.dataCenter.length
this.isIndeterminate = checkedCount > 0 && checkedCount < this.dataCenter.length
},
// 开始任务
startTask () {