|
|
|
@ -3,39 +3,23 @@
|
|
|
|
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
|
|
|
|
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
|
|
|
|
<el-form-item label="产线编码" prop="lineNode">
|
|
|
|
<el-form-item label="产线编码" prop="lineNode">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="queryParams.lineNode"
|
|
|
|
v-model="queryParams.lineNode" placeholder="请输入产线编码" clearable @keyup.enter="handleQuery"
|
|
|
|
placeholder="请输入产线编码"
|
|
|
|
class="!w-240px" />
|
|
|
|
clearable
|
|
|
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="产线名称" prop="lineName">
|
|
|
|
<el-form-item label="产线名称" prop="lineName">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="queryParams.lineName"
|
|
|
|
v-model="queryParams.lineName" placeholder="请输入产线名称" clearable @keyup.enter="handleQuery"
|
|
|
|
placeholder="请输入产线名称"
|
|
|
|
class="!w-240px" />
|
|
|
|
clearable
|
|
|
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="设备编码" prop="deviceCode">
|
|
|
|
<el-form-item label="设备编码" prop="deviceCode">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="queryParams.deviceCode"
|
|
|
|
v-model="queryParams.deviceCode" placeholder="请输入设备编码" clearable @keyup.enter="handleQuery"
|
|
|
|
placeholder="请输入设备编码"
|
|
|
|
class="!w-240px" />
|
|
|
|
clearable
|
|
|
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="设备名称" prop="deviceName">
|
|
|
|
<el-form-item label="设备名称" prop="deviceName">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="queryParams.deviceName"
|
|
|
|
v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery"
|
|
|
|
placeholder="请输入设备名称"
|
|
|
|
class="!w-240px" />
|
|
|
|
clearable
|
|
|
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button @click="handleQuery">
|
|
|
|
<el-button @click="handleQuery">
|
|
|
|
@ -49,13 +33,7 @@
|
|
|
|
</ContentWrap>
|
|
|
|
</ContentWrap>
|
|
|
|
|
|
|
|
|
|
|
|
<ContentWrap>
|
|
|
|
<ContentWrap>
|
|
|
|
<el-table
|
|
|
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id">
|
|
|
|
v-loading="loading"
|
|
|
|
|
|
|
|
:data="list"
|
|
|
|
|
|
|
|
:stripe="true"
|
|
|
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
|
|
|
row-key="id"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<el-table-column label="产线编码" align="left" prop="lineNode" min-width="140px" />
|
|
|
|
<el-table-column label="产线编码" align="left" prop="lineNode" min-width="140px" />
|
|
|
|
<el-table-column label="产线名称" align="left" prop="lineName" min-width="160px" />
|
|
|
|
<el-table-column label="产线名称" align="left" prop="lineName" min-width="160px" />
|
|
|
|
<el-table-column label="设备编码" align="left" prop="deviceCode" min-width="140px" />
|
|
|
|
<el-table-column label="设备编码" align="left" prop="deviceCode" min-width="140px" />
|
|
|
|
@ -65,13 +43,7 @@
|
|
|
|
<dict-tag :type="DICT_TYPE.IOT_GATEWAY_STATUS" :value="scope.row.status" />
|
|
|
|
<dict-tag :type="DICT_TYPE.IOT_GATEWAY_STATUS" :value="scope.row.status" />
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column label="最新采集时间" align="center" prop="collectionTime" :formatter="dateFormatter" width="180px" />
|
|
|
|
label="最新采集时间"
|
|
|
|
|
|
|
|
align="center"
|
|
|
|
|
|
|
|
prop="collectionTime"
|
|
|
|
|
|
|
|
:formatter="dateFormatter"
|
|
|
|
|
|
|
|
width="180px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
<el-table-column label="操作" align="center" fixed="right" width="150px">
|
|
|
|
<el-table-column label="操作" align="center" fixed="right" width="150px">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<el-button link type="primary" @click="handleSingleMonitor(scope.row)">单设备监控</el-button>
|
|
|
|
<el-button link type="primary" @click="handleSingleMonitor(scope.row)">单设备监控</el-button>
|
|
|
|
@ -79,22 +51,15 @@
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
<Pagination
|
|
|
|
<Pagination
|
|
|
|
:total="total"
|
|
|
|
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
|
|
|
|
v-model:page="queryParams.pageNo"
|
|
|
|
@pagination="getList" />
|
|
|
|
v-model:limit="queryParams.pageSize"
|
|
|
|
|
|
|
|
@pagination="getList"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</ContentWrap>
|
|
|
|
</ContentWrap>
|
|
|
|
|
|
|
|
|
|
|
|
<Dialog v-model="monitorDialogVisible" :title="monitorDialogTitle" width="900">
|
|
|
|
<Dialog v-model="monitorDialogVisible" :title="monitorDialogTitle" width="900">
|
|
|
|
<ContentWrap>
|
|
|
|
<ContentWrap>
|
|
|
|
<el-table
|
|
|
|
<el-table
|
|
|
|
v-loading="monitorLoading"
|
|
|
|
v-loading="monitorLoading" :data="monitorList" :stripe="true" :show-overflow-tooltip="true"
|
|
|
|
:data="monitorList"
|
|
|
|
row-key="pointCode">
|
|
|
|
:stripe="true"
|
|
|
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
|
|
|
row-key="pointCode"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<el-table-column label="点位编码" align="left" prop="pointCode" min-width="140px" />
|
|
|
|
<el-table-column label="点位编码" align="left" prop="pointCode" min-width="140px" />
|
|
|
|
<el-table-column label="点位名称" align="left" prop="pointName" min-width="160px" />
|
|
|
|
<el-table-column label="点位名称" align="left" prop="pointName" min-width="160px" />
|
|
|
|
<el-table-column label="数据类型" align="center" prop="dataType" width="120px" />
|
|
|
|
<el-table-column label="数据类型" align="center" prop="dataType" width="120px" />
|
|
|
|
@ -105,12 +70,8 @@
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="单位" align="center" prop="unit" width="100px" />
|
|
|
|
<el-table-column label="单位" align="center" prop="unit" width="100px" />
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="最新采集时间"
|
|
|
|
label="最新采集时间" align="center" prop="latestCollectTime" :formatter="dateFormatter"
|
|
|
|
align="center"
|
|
|
|
width="180px" />
|
|
|
|
prop="latestCollectTime"
|
|
|
|
|
|
|
|
:formatter="dateFormatter"
|
|
|
|
|
|
|
|
width="180px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
</ContentWrap>
|
|
|
|
</ContentWrap>
|
|
|
|
</Dialog>
|
|
|
|
</Dialog>
|
|
|
|
@ -221,18 +182,18 @@ const buildMockMonitorList = () => {
|
|
|
|
] as MonitorRow[]
|
|
|
|
] as MonitorRow[]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const buildQueryParams = () => {
|
|
|
|
const buildQueryParams = (): Parameters<typeof DeviceApi.getLineDevicePage>[0] => {
|
|
|
|
const params: Record<string, any> = {
|
|
|
|
const params: Parameters<typeof DeviceApi.getLineDevicePage>[0] = {
|
|
|
|
pageNo: queryParams.pageNo,
|
|
|
|
pageNo: queryParams.pageNo,
|
|
|
|
pageSize: queryParams.pageSize
|
|
|
|
pageSize: queryParams.pageSize
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const keys = ['id', 'lineNode', 'lineName', 'deviceCode', 'deviceName', 'status', 'collectionTime']
|
|
|
|
const keys = ['id', 'lineNode', 'lineName', 'deviceCode', 'deviceName', 'status', 'collectionTime'] as const
|
|
|
|
for (const key of keys) {
|
|
|
|
for (const key of keys) {
|
|
|
|
const value = (queryParams as any)[key]
|
|
|
|
const value = queryParams[key]
|
|
|
|
if (value === undefined || value === null || value === '') {
|
|
|
|
if (value === undefined || value === null || value === '') {
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
params[key] = value
|
|
|
|
(params as any)[key] = value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return params
|
|
|
|
return params
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -278,7 +239,7 @@ onMounted(() => {
|
|
|
|
const data = await DeviceApi.getLineDevicePage(buildQueryParams())
|
|
|
|
const data = await DeviceApi.getLineDevicePage(buildQueryParams())
|
|
|
|
list.value = data.list
|
|
|
|
list.value = data.list
|
|
|
|
total.value = data.total
|
|
|
|
total.value = data.total
|
|
|
|
} catch {}
|
|
|
|
} catch { }
|
|
|
|
}, 5000)
|
|
|
|
}, 5000)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|