|
|
@@ -78,7 +78,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column :label="t('ably')" align="center" fixed="right">
|
|
|
<template #default="{ row }">
|
|
|
- {{ row.ablyInfo || '-' }}
|
|
|
+ {{ row.ablyClientId }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column prop="status" :label="t('状态')" min-width="100" sortable="custom">
|
|
|
@@ -180,7 +180,7 @@
|
|
|
<el-input v-model="lssEditForm.address" placeholder="请输入地址" />
|
|
|
</el-form-item>
|
|
|
<el-form-item :label="t('IP') + ':'">
|
|
|
- <span class="form-value">{{ lssEditForm?.ip }}</span>
|
|
|
+ <span class="form-value">{{ currentLss?.ip }}</span>
|
|
|
</el-form-item>
|
|
|
<el-form-item :label="t('心跳') + ':'">
|
|
|
<span class="heartbeat-status" :class="getHeartbeatClass(currentLss?.heartbeat)">
|
|
|
@@ -203,12 +203,13 @@
|
|
|
</el-icon>
|
|
|
</el-tooltip>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="ably信息:" prop="ablyInfo">
|
|
|
+ <el-form-item :label="t('ably') + ':'" prop="ably">
|
|
|
<div class="textarea-wrapper">
|
|
|
<el-input
|
|
|
+ disabled
|
|
|
type="textarea"
|
|
|
:rows="8"
|
|
|
- v-model="lssEditForm.ablyInfo"
|
|
|
+ v-model="lssEditForm.ably"
|
|
|
placeholder="请输入ably信息"
|
|
|
maxlength="1000"
|
|
|
show-word-limit
|
|
|
@@ -248,8 +249,8 @@
|
|
|
<el-empty v-if="!cameraLoading && cameraList.length === 0" description="暂无关联设备" />
|
|
|
<el-table v-else :data="cameraList" stripe size="small" border>
|
|
|
<!-- <el-table-column prop="ip" label="本地IP" min-width="110" /> -->
|
|
|
- <el-table-column prop="cameraId" label="设备ID" min-width="100" show-overflow-tooltip />
|
|
|
- <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column prop="cameraId" :label="t('设备ID')" min-width="100" show-overflow-tooltip />
|
|
|
+ <el-table-column prop="cameraName" :label="t('名称')" min-width="100" show-overflow-tooltip />
|
|
|
<el-table-column :label="t('状态(心跳)')" min-width="140">
|
|
|
<template #default="{ row }">
|
|
|
<span :class="['status-text', row.status === 'ONLINE' ? 'status-active' : 'status-dead']">
|
|
|
@@ -267,7 +268,7 @@
|
|
|
<el-button type="primary" link @click="handleViewRunParams(row)">查看</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="brand" label="厂商" min-width="90">
|
|
|
+ <el-table-column prop="vendorName" :label="t('厂商')" min-width="90">
|
|
|
<template #default="{ row }">
|
|
|
{{ formatBrand(row.vendorName) }}
|
|
|
</template>
|
|
|
@@ -569,7 +570,8 @@ import type {
|
|
|
CameraInfoDTO,
|
|
|
CameraAddRequest,
|
|
|
CameraUpdateRequest,
|
|
|
- CameraVendorDTO
|
|
|
+ CameraVendorDTO,
|
|
|
+ IAbly
|
|
|
} from '@/types'
|
|
|
import type { FormInstance, FormRules } from 'element-plus'
|
|
|
import dayjs from 'dayjs'
|
|
|
@@ -757,7 +759,7 @@ const lssEditForm = reactive({
|
|
|
lssName: '',
|
|
|
address: '',
|
|
|
ip: '',
|
|
|
- ablyInfo: ''
|
|
|
+ ably: ''
|
|
|
})
|
|
|
|
|
|
// 根据当前 tab 计算抽屉宽度
|
|
|
@@ -927,8 +929,7 @@ function handleEdit(row: LssNodeDTO) {
|
|
|
currentLss.value = row
|
|
|
lssEditForm.lssName = row.lssName || ''
|
|
|
lssEditForm.address = row.address || ''
|
|
|
- lssEditForm.ip = row.ip || ''
|
|
|
- lssEditForm.ablyInfo = row.ablyInfo || ''
|
|
|
+ lssEditForm.ably = JSON.stringify(row.ably)
|
|
|
editActiveTab.value = 'detail'
|
|
|
lssEditDrawerVisible.value = true
|
|
|
}
|