From 233e4fc4f35bd00a36ee34a7fbf5e47b41db26db Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 17 Nov 2025 09:54:44 +0800
Subject: [PATCH] feat：更新初始化地形
---
src/views/device/airport.vue | 1009 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 546 insertions(+), 463 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index 8411b2e..5393a40 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -10,7 +10,8 @@
</el-button>
</template>
<template #dept_name="{ row }">
- <el-tag>{{ row.dept_name }}</el-tag>
+ <el-tag v-if="row.dept_name">{{ row.dept_name }}</el-tag>
+ <span v-else>/</span>
</template>
<template #status="{ row }">
<div v-if="row.status == true" class="onlineStatus">
@@ -51,52 +52,65 @@
</span>
</template>
<template #mode_code="{ row }">
- <span class="text" v-if="row.domain == 3 || row.domain == 0" :style="row.mode_code != '-1' ? 'color: #00ee8b' : 'color: #de5e5e'">
+ <span class="text" v-if="row.domain == 3 || row.domain == 0"
+ :style="row.mode_code != '-1' ? 'color: #00ee8b' : 'color: #de5e5e'">
{{ getModelText(row.mode_code) }}
</span>
</template>
<template #menu="scope">
<el-dropdown>
- <el-button type="primary" text icon="el-icon-folder-opened" v-if="permission.oss_set">更 多</el-button>
- <template #dropdown v-if="scope.row.domain == 3">
- <el-dropdown-menu teleported>
- <el-dropdown-item command="a">
- <el-button type="primary" text icon="el-icon-paperclip" v-if="permission.oss_set" @click.stop="handleOpenOssSet(scope.row, scope.index)">存储配置</el-button>
- </el-dropdown-item>
- <el-dropdown-item command="b">
- <el-button type="primary" text icon="el-icon-share" v-if="permission.per_share && scope.row.domain == 3"
- @click.stop="handleOpenDevicePerShare(scope.row, scope.index)">机场授权</el-button>
- </el-dropdown-item>
- <el-dropdown-item command="c"> <el-button type="primary" text icon="el-icon-position" :disabled="!scope.row.status"
- v-if="permission.rang_con && scope.row.domain == 3"
- @click.stop="handleOpenRemoteDebugging(scope.row, scope.index)">远程调试</el-button>
- </el-dropdown-item>
- <el-dropdown-item command="d"><el-button type="primary" text icon="el-icon-collection" v-if="permission.fly_device_offline"
- @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
- </el-dropdown-item>
- <el-dropdown-item command="d">
- <el-button type="primary" text icon="el-icon-collection" v-if="!scope.row.status" @click.stop="dockNotLine(scope.row)">
- {{ scope.row.hidden_flag == 1 ? '设备上线' : '设备下线'}}
- </el-button>
- </el-dropdown-item>
- <el-dropdown-item command="e"><el-button type="primary" text icon="el-icon-document-delete" v-if="permission.fly_device_offline"
- @click.stop="handleDeviceOffline(scope.row)">注销</el-button>
- </el-dropdown-item>
- </el-dropdown-menu>
- </template>
- <template #dropdown v-else>
- <el-dropdown-menu teleported>
- <el-dropdown-item command="a">
+ <el-button type="primary" text v-if="permission.oss_set"><el-icon>
+ <MoreFilled />
+ </el-icon>更多</el-button>
+ <template #dropdown v-if="scope.row.domain == 3">
+ <el-dropdown-menu teleported>
+ <el-dropdown-item command="a">
+ <el-button type="primary" text icon="el-icon-paperclip" v-if="permission.oss_set"
+ @click.stop="handleOpenOssSet(scope.row, scope.index)">存储配置</el-button>
+ </el-dropdown-item>
+ <el-dropdown-item command="b">
+ <el-button type="primary" text icon="el-icon-share" v-if="permission.per_share && scope.row.domain == 3"
+ @click.stop="handleOpenDevicePerShare(scope.row, scope.index)">机场授权</el-button>
+ </el-dropdown-item>
+ <el-dropdown-item command="c"> <el-button type="primary" text icon="el-icon-position"
+ :disabled="!scope.row.status" v-if="permission.rang_con && scope.row.domain == 3"
+ @click.stop="handleOpenRemoteDebugging(scope.row, scope.index)">远程调试</el-button>
+ </el-dropdown-item>
+ <el-dropdown-item command="d"><el-button type="primary" text icon="el-icon-collection"
+ v-if="permission.fly_device_offline" @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
+ </el-dropdown-item>
+ <el-dropdown-item command="d" v-if="!scope.row.status">
+ <el-button type="primary" text icon="el-icon-collection" @click.stop="dockNotLine(scope.row)">
+ {{ scope.row.hidden_flag === 1 ? '设备上线' : '设备下线' }}
+ </el-button>
+ </el-dropdown-item>
+ <el-dropdown-item command="e"><el-button type="primary" text icon="el-icon-document-delete"
+ v-if="permission.fly_device_offline" @click.stop="handleDeviceOffline(scope.row)">注销</el-button>
+ </el-dropdown-item>
+ <el-dropdown-item command="e">
+ <el-button type="primary" text icon="el-icon-document-delete" v-if="permission.fly_device_offline"
+ :disabled="scope.row.dem_status === 1" @click.stop="handleStatus(scope.row)">
+ {{ scope.row.dem_status === 0 ? '初始化地形' : (scope.row.dem_status === 1 ? '初始化中' : '更新地形') }}
+ </el-button>
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ <template #dropdown v-else>
+ <el-dropdown-menu teleported>
+ <!-- <el-dropdown-item command="a">
<el-button type="primary" text icon="el-icon-circle-close" @click.stop="rowDel(scope.row, scope.index)">删除</el-button>
- </el-dropdown-item>
- <el-dropdown-item command="a">
+ </el-dropdown-item> -->
+ <!-- <el-dropdown-item command="a">
<el-button type="primary" text icon="el-icon-key" v-if="permission.operate_password_set" @click.stop="handleOperatePassword(scope.row, scope.index)">操控密码设置</el-button>
- </el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+ </el-dropdown-item> -->
+ <el-dropdown-item command="d"><el-button type="primary" text icon="el-icon-collection"
+ @click.stop="rollFirmware(scope.row)">固件版本管理</el-button>
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
</template>
-
+
<!-- 添加行政区划显示模板 -->
<template #area_code="{ row }">
<span>{{ row.area_name }}</span>
@@ -122,6 +136,22 @@
<el-dialog title="操控密码查看" append-to-body v-model="operatePasswordViewBox" width="455px">
<el-input v-model="operate_password" disabled></el-input>
+ </el-dialog>
+
+ <el-dialog title="注销" class="ztzf-dialog-mange zx-cancel" append-to-body v-model="cancenOperate" width="560px">
+ <div class="txt-contain">
+ <img :src="warnSvg" />注销
+ <span class="name">
+ {{ cancelSNName }}
+ </span> 设备可能会影响相关数据,确认注销吗?
+ </div>
+ <div class="delete-txt">*删除相关图片、视频、事件</div>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="cancenOperate = false">取 消</el-button>
+ <el-button type="primary" @click="cancenOperateDo">确 定</el-button>
+ </span>
+ </template>
</el-dialog>
<el-dialog title="固件升级" append-to-body v-model="firmwareBox" width="455px">
@@ -170,7 +200,7 @@
</template>
</el-dialog>
- <el-drawer class="ztzf-drawer-body-basic-container" title="机场授权管理" size="60%" append-to-body
+ <el-drawer class="ztzf-drawer-body-basic-container ztzf-el-card__body" title="机场授权管理" size="60%" append-to-body
v-model="devicePerShareVisible" :direction="'rtl'">
<DevicePerShare ref="devicePerShare" />
</el-drawer>
@@ -184,6 +214,7 @@
<script>
import { ElMessage, ElMessageBox } from 'element-plus'
+import { getRegionTreeAll } from '@/api/job/task'
import { pxToRem } from '@/utils/rem'
import {
getList,
@@ -196,7 +227,10 @@
getDeviceFirmwareList,
getDevices,
deviceOffline,
- devicesUpdate
+ devicesUpdate,
+ devicesUpAndDown,
+ initAirportTerrainHeight,
+ deleteAirportTerrainHeight
} from '@/api/device/device'
import { deleteByOssId, addOrUpdate as addOrUpdateOssBind } from '@/api/device/ossBind'
import { getListPage as getOssList } from '@/api/resource/oss'
@@ -206,15 +240,19 @@
import FirmwareManage from './components/firmwareManage.vue'
import DevicePerShare from './components/devicePerShare.vue'
import DockControlPanel from './components/DockControlPanel.vue'
-import { getWebsocketUrl } from '@/utils/websocket/config';
-import ConnectWebSocket from '@/utils/websocket';
+import { getWebsocketUrl } from '@/utils/websocket/config'
+import ConnectWebSocket from '@/utils/websocket'
+import warnSvg from '@/assets/images/warn.svg'
+
export default {
components: {
FirmwareManage,
DevicePerShare,
DockControlPanel,
},
- data () {
+ data() {
+ // const self = this
+
const validatePass = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入密码'))
@@ -232,10 +270,16 @@
}
}
return {
+ treeResolveMap: new Map(),
rules: {
password: [{ required: true, validator: validatePass, trigger: 'blur' }],
password2: [{ required: true, validator: validatePass2, trigger: 'blur' }],
},
+ warnSvg: warnSvg,
+ cancelSNName: '',
+ cancenOperate: false,
+ cancenOperateRow: {},
+ deleteFlag: false,
passwordForm: {
id: '',
password: '',
@@ -284,7 +328,10 @@
searchGutter: 30,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
+ // searchMenuSpan: 16,
+ searchMenuPosition: 'left',
+ searchMenuSpan: 4,
+
border: true,
index: true,
indexLabel: '序号',
@@ -298,7 +345,7 @@
grid: false,
height: 'auto',
- calcHeight: 180,
+ calcHeight: 20,
column: [
{
@@ -310,7 +357,7 @@
search: false,
slot: true,
searchSpan: 4,
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
// formatter: (row) => row.domain == 3 ? '机巢' : '无人机'
// rules: [
@@ -327,7 +374,7 @@
// editDisabled: true,
editDisplay: false, //编辑显示
viewDisplay: true, //查看显示
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
hide: true
},
@@ -339,121 +386,14 @@
viewDisplay: true, //查看显示
search: false,
searchSpan: 4,
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
- // rules: [
- // {
- // required: true,
- // message: '请输入设备型号',
- // trigger: 'blur',
- // },
- // ],
},
- {
- label: '设备SN',
- prop: 'device_sn',
- labelWidth: 130,
- width: 120,
- overHidden: true,
- searchSpan: 4,
- // editDisabled: true,
- editDisplay: false, //编辑显示
- // rules: [
- // {
- // required: true,
- // message: '请输入设备SN',
- // trigger: 'blur',
- // },
- // ],
- },
- // {
- // label: '机巢编号',
- // prop: 'machine_nest_sn',
- // labelWidth: 130,
- // editDisabled: true,
- // rules: [
- // {
- // required: false,
- // message: '请输入机巢编号',
- // trigger: 'blur',
- // },
- // ],
- // },
- {
- label: '设备位置',// '行政区划',
- prop: 'area_name',
- // hide: true,
- overHidden: true,
- editDisplay: false, //编辑显示
- viewDisplay: false, //查看显示
- labelWidth: 130,
- width: 200,
- },
- {
- label: '设备位置',
- prop: 'area_code',
- type: 'cascader',
- labelWidth: 130,
- searchSpan: 4,
- hide: true,
- search: true,
- // overHidden: true,
- editDisplay: true,
- viewDisplay: true,
- props: {
- label: 'title',
- value: 'value',
- emitPath: false,
- checkStrictly: true,
- multiple: false,
- expandTrigger: 'hover',
- },
- dataType: 'string',
- rules: [
- {
- required: true,
- message: '请选择设备位置',
- trigger: 'change',
- },
- ],
- lazy: true,
- lazyLoad (node, resolve) {
- let level = node.level
- let list = []
- let callback = () => {
- resolve(
- (list || []).map(ele => ({
- ...ele,
- value: ele.value,
- leaf: level >= 2,
- }))
- )
- }
- if (level === 0) {
- getLazyTree('000000000000').then(res => {
- list = res.data.data
- callback()
- })
- } else if (level === 1) {
- getLazyTree(node.value).then(res => {
- list = res.data.data
- callback()
- })
- } else if (level === 2) {
- getLazyTree(node.value).then(res => {
- list = res.data.data
- callback()
- })
- } else {
- callback()
- }
- },
- },
{
label: '设备名称',
prop: 'nickname',
- labelWidth: 130,
+ labelWidth: 145,
width: 160,
searchSpan: 4,
search: true,
@@ -467,75 +407,40 @@
},
],
},
-
- // {
- // label: '设备位置',
- // prop: 'address',
- // labelWidth: 130,
- // width: 100,
- // overHidden: true,
- // rules: [
- // {
- // required: true,
- // message: '请输入设备位置',
- // trigger: 'blur',
- // },
- // ],
- // },
+
+ {
+ label: '4G增强',
+ prop: 'link_workmode',
+ labelWidth: 145,
+ width: 160,
+ overHidden: true,
+ editDisplay: false, //编辑显示
+ viewDisplay: false,
+ align: 'center',
+ formatter: (row, column, cellValue) => {
+ const statusMap = {
+ 0: '关',
+ 1: '开',
+ }
+ return statusMap[cellValue] || '/'
+ }
+ },
{
label: '负载设备',
prop: 'payload_str',
- labelWidth: 130,
+ labelWidth: 145,
width: 160,
overHidden: true,
editDisplay: false, //编辑显示
- // editDisabled: true,
- // rules: [
- // {
- // required: true,
- // message: '请输入负载设备',
- // trigger: 'blur',
- // },
- // ],
+
},
+
{
- // hide: true,
- label: '保险有效期',
- prop: 'duration_of_insurance',
- labelWidth: 130,
- width: 200,
- type: 'daterange',
- format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- startPlaceholder: '保险开始日期',
- endPlaceholder: '保险结束日期',
- rules: [
- {
- required: true,
- message: '请选择保险有效期',
- trigger: 'blur',
- },
- ],
- },
- // {
- // label: '保险有效期',
- // prop: 'insureExpiredTime',
- // labelWidth: 130,
- // width: 110,
- // rules: [
- // {
- // required: true,
- // message: '请输入保险有效期',
- // trigger: 'blur',
- // },
- // ],
- // },
- {
- label: '流量剩余',
+ label: '流量剩余(GB)',
prop: 'traffic_remaining',
- labelWidth: 130,
- width: 100,
+ labelWidth: 145,
+ width: 120,
// editDisabled: true,
editDisplay: false, //编辑显示
// rules: [
@@ -546,165 +451,17 @@
// },
// ],
},
+
{
label: '流量到期时间',
prop: 'traffic_expire_time',
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
type: 'date',
format: 'YYYY-MM-DD',
editDisplay: false, //编辑显示
- // editDisabled: true,
- // rules: [
- // {
- // required: true,
- // message: '请输入流量到期时间',
- // trigger: 'blur',
- // },
- // ],
},
- {
- label: '固件版本',
- prop: 'firmware_version',
- labelWidth: 130,
- width: 110,
- editDisplay: false, //编辑显示
- // editDisabled: true,
- // rules: [
- // {
- // required: true,
- // message: '请输入固件版本',
- // trigger: 'blur',
- // },
- // ],
- },
- {
- label: '固件升级',
- prop: 'firmware_status',
- labelWidth: 130,
- width: 100,
- hide: true,
- viewDisabled: true,
- addDisabled: true,
- editDisplay: false, //编辑显示
- // editDisabled: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- // rules: [
- // {
- // required: true,
- // message: '请输入固件升级',
- // trigger: 'blur',
- // },
- // ],
- },
- {
- label: '所属单位',
- prop: 'dept_name',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- labelWidth: 130,
- width: 180,
- rules: [
- {
- required: true,
- message: '请输入所属单位',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '所属单位',
- prop: 'dept_id',
- hide: true,
- type: 'tree',
- defaultExpandAll: true,
- search: true,
- searchSpan: 4,
- labelWidth: 130,
- dicUrl: '/blade-system/dept/getTree',
- props: {
- label: 'name',
- value: 'id',
- },
- rules: [
- {
- required: true,
- message: '请输入所属单位',
- trigger: 'blur',
- },
- ],
- },
- // {
- // label: '加入组织时间',
- // prop: 'bound_time',
- // addDisplay: false,
- // editDisplay: false,
- // type: 'date',
- // labelWidth: 130,
- // width: 160,
- // format: 'YYYY-MM-DD HH:mm:ss',
- // // valueFormat: 'YYYY-MM-DD HH:mm:ss',
- // rules: [
- // {
- // required: true,
- // message: '请输入在线状态',
- // trigger: 'blur',
- // },
- // ],
- // },
-
-
-
- {
- label: '在线时间',
- hide: true,
- prop: 'login_time',
- type: 'date',
- editDisplay: false, //编辑显示
- // editDisabled: true,
- viewDisplay: true, //查看显示
- addDisplay: true,
- labelWidth: 130,
- width: 160,
- overHidden: true,
- format: 'YYYY-MM-DD HH:mm:ss',
- // valueFormat: 'YYYY-MM-DD HH:mm:ss',
- startPlaceholder: '任务开始时间',
- // rules: [
- // {
- // required: true,
- // message: '请输入在线时间',
- // trigger: 'blur',
- // },
- // ],
- },
- {
- label: '注册时间',
- prop: 'create_time',
- type: 'date',
- hide: true,
- editDisplay: false, //编辑显示
- // editDisabled: true,
- viewDisplay: true, //查看显示
- addDisplay: true,
- overHidden: true,
- labelWidth: 130,
- width: 160,
- format: 'YYYY-MM-DD HH:mm:ss',
- // valueFormat: 'YYYY-MM-DD HH:mm:ss',
- startPlaceholder: '创建时间',
- // rules: [
- // {
- // required: true,
- // message: '请输入创建时间',
- // trigger: 'blur',
- // },
- // ],
- },
{
label: '设备状态',
prop: 'cnstatus',
@@ -712,7 +469,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- labelWidth: 130,
+ labelWidth: 145,
},
{
label: '设备状态',
@@ -742,7 +499,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: true,
- labelWidth: 130,
+ labelWidth: 145,
width: 110,
},
{
@@ -751,7 +508,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- labelWidth: 130,
+ labelWidth: 145,
searchSpan: 4,
search: true,
type: 'select',
@@ -773,6 +530,243 @@
},
],
},
+
+ {
+ label: '设备SN',
+ prop: 'device_sn',
+ labelWidth: 145,
+ width: 120,
+ overHidden: true,
+ searchSpan: 4,
+ // editDisabled: true,
+ editDisplay: false, //编辑显示
+ },
+
+ {
+ label: '设备位置',// '行政区划',
+ prop: 'area_name',
+ // hide: true,
+ overHidden: true,
+ editDisplay: false, //编辑显示
+ viewDisplay: false, //查看显示
+ labelWidth: 145,
+ width: 200,
+ },
+ {
+ label: '设备位置',
+ prop: 'area_code',
+ // type: 'cascader',
+ type: 'tree',
+ labelWidth: 145,
+ searchSpan: 4,
+ hide: true,
+ search: true,
+ // overHidden: true,
+ editDisplay: true,
+ viewDisplay: true,
+ checkStrictly: true,
+ defaultExpandAll: true,
+ dicData: [],
+ props: {
+ label: 'name',
+ value: 'id',
+ children: 'childrens',
+ },
+ rules: [
+ {
+ required: true,
+ message: '请选择设备位置',
+ trigger: 'change',
+ },
+ ],
+ },
+
+ {
+ // hide: true,
+ label: '保险有效期',
+ prop: 'duration_of_insurance',
+ labelWidth: 145,
+ width: 200,
+ type: 'daterange',
+ format: 'YYYY-MM-DD ',
+ valueFormat: 'YYYY-MM-DD',
+ startPlaceholder: '保险开始日期',
+ endPlaceholder: '保险结束日期',
+ align: 'center',
+ rules: [
+ {
+ required: false,
+ message: '请选择保险有效期',
+ trigger: 'blur',
+ },
+ ],
+ formatter: (row, value) => {
+ return value[0] ? `${this.$dayjs(value[0]).format('YYYY-MM-DD')}~${this.$dayjs(value[1]).format('YYYY-MM-DD')}` : '/'
+ },
+ },
+ // {
+ // label: '保险有效期',
+ // prop: 'insureExpiredTime',
+ // labelWidth: 145,
+ // width: 110,
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入保险有效期',
+ // trigger: 'blur',
+ // },
+ // ],
+ // },
+
+
+ {
+ label: '固件版本',
+ prop: 'firmware_version',
+ labelWidth: 145,
+ width: 110,
+ editDisplay: false, //编辑显示
+ },
+ {
+ label: '固件升级',
+ prop: 'firmware_status',
+ labelWidth: 145,
+ width: 100,
+ hide: true,
+ viewDisabled: true,
+ addDisabled: true,
+ editDisplay: false, //编辑显示
+ addDisplay: false,
+ viewDisplay: false,
+ },
+ {
+ label: '所属部门',
+ prop: 'dept_name',
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ align: 'center',
+ labelWidth: 145,
+ width: 180,
+ rules: [
+ {
+ required: true,
+ message: '请输入所属部门',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '所属部门',
+ prop: 'dept_id',
+ hide: true,
+ type: 'tree',
+
+ search: true,
+ searchSpan: 4,
+ labelWidth: 145,
+ defaultExpandAll: true,
+ dicUrl: '/blade-system/dept/getTree',
+ props: {
+ label: 'name',
+ value: 'id',
+ },
+ rules: [
+ {
+ required: true,
+ message: '请输入所属部门',
+ trigger: 'blur',
+ },
+ ],
+ },
+ // {
+ // label: '加入组织时间',
+ // prop: 'bound_time',
+ // addDisplay: false,
+ // editDisplay: false,
+ // type: 'date',
+ // labelWidth: 145,
+ // width: 160,
+ // format: 'YYYY-MM-DD HH:mm:ss',
+ // // valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入在线状态',
+ // trigger: 'blur',
+ // },
+ // ],
+ // },
+
+
+
+
+ {
+ label: '在线时间',
+ hide: true,
+ prop: 'login_time',
+ type: 'date',
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
+ viewDisplay: false, //查看显示
+ addDisplay: true,
+ labelWidth: 145,
+ width: 160,
+ overHidden: true,
+ format: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ startPlaceholder: '任务开始时间',
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入在线时间',
+ // trigger: 'blur',
+ // },
+ // ],
+ },
+ {
+ label: '设备最新在线时间',
+ hide: true,
+ prop: 'login_time',
+ type: 'date',
+ viewDisplay: true, //查看显示
+ labelWidth: 145,
+ overHidden: true,
+ format: 'YYYY-MM-DD HH:mm:ss',
+ },
+ {
+ label: '注册时间',
+ prop: 'create_time',
+ type: 'date',
+ hide: true,
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
+ viewDisplay: false, //查看显示
+ addDisplay: true,
+ overHidden: true,
+ labelWidth: 145,
+ width: 160,
+ format: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ startPlaceholder: '创建时间',
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入创建时间',
+ // trigger: 'blur',
+ // },
+ // ],
+ },
+ {
+ label: '设备注册时间',
+ prop: 'create_time',
+ type: 'date',
+ hide: true,
+ viewDisplay: true, //查看显示
+ overHidden: true,
+ labelWidth: 145,
+ width: 160,
+ format: 'YYYY-MM-DD HH:mm:ss',
+ },
],
},
data: [],
@@ -790,9 +784,10 @@
},
}
},
+
computed: {
- ...mapGetters(['permission']),
- permissionList () {
+ ...mapGetters(['permission', 'userInfo']),
+ permissionList() {
return {
addBtn: this.validData(this.permission.air_add, true),
viewBtn: this.validData(this.permission.air_view, true),
@@ -800,7 +795,7 @@
editBtn: this.validData(this.permission.air_edit, true),
}
},
- ids () {
+ ids() {
let ids = []
this.selectionList.forEach(ele => {
ids.push(ele.id)
@@ -808,7 +803,8 @@
return ids.join(',')
},
},
- destroyed () {
+ destroyed() {
+ this.treeResolveMap.clear()
this.websocketMap.forEach((k, v) => {
if (null != v) {
v.close()
@@ -818,27 +814,30 @@
})
},
mounted() {
-
+ getRegionTreeAll({ parentCode: this.userInfo.detail.areaCode }).then(res => {
+ const column = this.findObject(this.option.column, 'area_code')
+ column.dicData = res.data.data ? [res.data.data] : []
+ })
},
methods: {
- getDockModeText (value) {
+ getDockModeText(value) {
return EDockModeText[value] || ''
},
- getModelText (value) {
+ getModelText(value) {
let txt = '离线'
if (value === 0 || value === 4) {
txt = '在线'
- } else if(value === 1) {
+ } else if (value === 1) {
txt = '现场调试'
- } else if(value === 2) {
+ } else if (value === 2) {
txt = '远程调试'
- } else if(value === 3) {
+ } else if (value === 3) {
txt = '固件升级中'
}
return txt
},
// 关闭所有的webscoket
- closeAllWebsoket () {
+ closeAllWebsoket() {
this.websocketMap.forEach((k, v) => {
if (null != v) {
v.close()
@@ -848,7 +847,7 @@
})
},
// 连接webSocket
- connectWebSocket (data) {
+ connectWebSocket(data) {
const webSocketId = data.workspace_id
if (!this.webSocketIdSet.has(webSocketId)) {
// 防止重复连接
@@ -858,14 +857,14 @@
this.useConnectWebSocket1(webSocketId, webSorketUrl)
}
},
- useConnectWebSocket1 (webSocketId, url) {
+ useConnectWebSocket1(webSocketId, url) {
const websocket = new ConnectWebSocket(url)
// 加入 webscoket map
this.websocketMap.set(webSocketId, websocket)
websocket?.registerMessageHandler(this.messageHandler)
websocket?.initSocket()
},
- async messageHandler (payload) {
+ async messageHandler(payload) {
if (!payload) {
return
}
@@ -890,7 +889,7 @@
}
})
},
- init () {
+ init() {
(this.page = {
pageSize: 10,
currentPage: 1,
@@ -899,7 +898,7 @@
this.onLoad(this.page)
},
// 打开权限分享页面
- handleOpenDevicePerShare (row) {
+ handleOpenDevicePerShare(row) {
var that = this
this.devicePerShareVisible = true
this.$nextTick(() => {
@@ -907,35 +906,51 @@
})
},
// 打开远程调试
- handleOpenRemoteDebugging (row) {
+ handleOpenRemoteDebugging(row) {
this.curDeviceInfo = row
this.remoteDebuggingShow = true
this.operateTitle = row.nickname + ' - ' + row.device_sn
},
- // 设备下线
- handleDeviceOffline (row) {
- ElMessageBox.confirm('确定注销该设备吗?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(() => {
- deviceOffline(row.device_sn)
- .then(res => {
- ElMessage.success('注销成功')
+ // 设备注销
+ handleDeviceOffline(row) {
+ this.cancenOperate = true
+ this.cancelSNName = row.nickname
+ this.cancenOperateRow = row
+ },
- this.init()
- })
- .catch(error => {
- ElMessage.error('注销失败')
- })
+ // 设备
+ handleStatus(row) {
+ // dem_status
+ if (row.dem_status === 2 || row.dem_status === 3) {
+ deleteAirportTerrainHeight({ dockSn: row.device_sn }).then(res => {
+ initAirportTerrainHeight({ dockSn: row.device_sn, centerLon: row.longitude, centerLat: row.latitude, }).then(res => {
+ ElMessage.success('操作成功')
+ this.init()
+ })
})
- .catch(() => { })
+ } else {
+ initAirportTerrainHeight({ dockSn: row.device_sn, centerLon: row.longitude, centerLat: row.latitude, }).then(res => {
+ ElMessage.success('操作成功')
+ this.init()
+ })
+ }
+ },
+
+ cancenOperateDo() {
+ this.cancenOperate = false
+ this.deleteFlag = false
+ deviceOffline(this.cancenOperateRow.device_sn, true).then(res => {
+ ElMessage.success('注销成功')
+
+ this.init()
+ }).catch(error => {
+ ElMessage.error('注销失败')
+ })
},
// 打开存储对象配置页面
- handleOpenOssSet (row) {
+ handleOpenOssSet(row) {
var that = this
this.deviceSn = row.device_sn
this.ossSetBox = true
@@ -951,7 +966,7 @@
})
},
// 打开固件管理页面
- handleOpenFirmwarm (row) {
+ handleOpenFirmwarm(row) {
var that = this
this.firmwareManageVisible = true
this.$nextTick(() => {
@@ -960,17 +975,17 @@
},
// 设备下线
dockNotLine(row) {
- let txt = row.hidden_flag === 1?'上线':'下线'
+ let txt = row.hidden_flag === 1 ? '上线' : '下线'
ElMessageBox.confirm(`确定${txt}该设备吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
- let hidden_flag = row.hidden_flag === 1?0:1
- devicesUpdate({id:row.id, hidden_flag:hidden_flag})
+ let hidden_flag = row.hidden_flag === 1 ? 0 : 1
+ devicesUpAndDown({ id: row.id, hidden_flag: hidden_flag })
.then(res => {
- ElMessage.success('下线成功')
+ ElMessage.success(`${txt}成功`)
this.init()
})
.catch(error => {
@@ -980,7 +995,7 @@
.catch(() => { })
},
// 版本回退点击事件
- rollFirmware (row) {
+ rollFirmware(row) {
if (row.status == 0) {
this.$message({
type: 'warning',
@@ -1029,7 +1044,7 @@
})
},
// 比较版本大小
- compare (version1, version2) {
+ compare(version1, version2) {
let arr1 = version1.split('.')
let arr2 = version2.split('.')
let length = Math.max(arr1.length, arr2.length)
@@ -1043,7 +1058,7 @@
return 0
},
// 版本回退
- rollFirmwareConfirm () {
+ rollFirmwareConfirm() {
// 无人机升级/回滚
if (this.rollFirmVersion == '') {
this.$message({
@@ -1118,7 +1133,7 @@
})
},
// 升级固件按钮事件
- updateFirmware (row) {
+ updateFirmware(row) {
if (row.status == 0) {
this.$message({
type: 'warning',
@@ -1150,7 +1165,7 @@
})
},
// 确定升级固件版本
- updateFirmwareConfirm () {
+ updateFirmwareConfirm() {
var that = this
var arr = []
arr.push(that.firmwareInfo)
@@ -1166,13 +1181,13 @@
done()
})
},
- handleOssSetClose () {
+ handleOssSetClose() {
this.ossEnd = ''
this.deviceSn = ''
this.bindOssId = null
},
// 存储对象配置确定
- ossSetConfirm () {
+ ossSetConfirm() {
var that = this
// 判断是否已选择
if (!this.ossEnd) {
@@ -1199,7 +1214,7 @@
})
},
// 取消配置
- cancelOssSetConfirm () {
+ cancelOssSetConfirm() {
var that = this
// 判断是否已有配置
if (!this.bindOssId) {
@@ -1219,13 +1234,13 @@
})
},
// 取消按钮 oss
- cancelOssSet () {
+ cancelOssSet() {
this.ossEnd = ''
this.deviceSn = ''
this.bindOssId = null
this.ossSetBox = false
},
- rowSave (row, done, loading) {
+ rowSave(row, done, loading) {
let areaCode = row.area_code
if (Array.isArray(areaCode)) {
areaCode = areaCode[areaCode.length - 1]
@@ -1250,12 +1265,14 @@
}
)
},
- rowUpdate (row, index, done, loading) {
+ rowUpdate(row, index, done, loading) {
const submitData = {
...row,
area_code: row.area_code.split(',').pop(),
- insure_start_time: row.duration_of_insurance[0],
- insure_expired_time: row.duration_of_insurance[1],
+ insure_start_time: row.duration_of_insurance[0] + ' 00:00:00' || null,
+ insure_expired_time: row.duration_of_insurance[1] + ' 23:59:59' || null,
+ deptId: row.dept_id,
+ areaCode: row.area_code.split(',').pop(),
}
if (submitData.traffic_expire_time === '') {
delete submitData.traffic_expire_time
@@ -1264,7 +1281,25 @@
update(submitData).then(
() => {
- this.onLoad(this.page)
+ if (row.domain === 0) {
+ // 获取保存的 resolve 函数
+ const resolve = this.treeResolveMap.get(row.device_sn)
+ if (resolve) {
+ // 重新加载子节点数据
+ var params = {
+ childSn: row.device_sn,
+ }
+ getList(1, 10, params).then(res => {
+ const data = res.data.data.records
+ data.forEach(e => {
+ e.duration_of_insurance = [e?.insure_start_time?.slice(0, 10) || '', e?.insure_expired_time?.slice(0, 10) || '']
+ })
+ resolve(data)
+ })
+ }
+ } else {
+ this.onLoad(this.page)
+ }
this.$message({
type: 'success',
message: '操作成功!',
@@ -1277,7 +1312,7 @@
}
)
},
- rowDel (row) {
+ rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -1294,24 +1329,24 @@
})
})
},
- searchReset () {
+ searchReset() {
this.query = {}
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange(params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
done()
},
- selectionChange (list) {
+ selectionChange(list) {
this.selectionList = list
},
- selectionClear () {
+ selectionClear() {
this.selectionList = []
this.$refs.crud.toggleSelection()
},
- handleDelete () {
+ handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据')
return
@@ -1333,7 +1368,8 @@
this.$refs.crud.toggleSelection()
})
},
- async getFullAreaCode (areaCode) {
+ async getFullAreaCode(areaCode) {
+ console.log('getFullAreaCode', areaCode)
if (!areaCode) return ''
const code = areaCode.toString()
@@ -1351,36 +1387,34 @@
return `${provinceCode},${cityCode},${code}`
}
},
- beforeOpen (done, type) {
+ beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(async res => {
const data = res.data.data
-
this.form = {
...data,
- area_code: await this.getFullAreaCode(data.area_code),
+ // area_code: await this.getFullAreaCode(data.area_code),
area_name: this.form.area_name,
cnmode_code: this.getDockModeText(this.form.mode_code),
- // domain: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
domainTxt: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
cnstatus: this.form.status === false ? '离线' : '在线',
- duration_of_insurance: [data?.insure_start_time || '', data?.insure_expired_time || ''],
+ duration_of_insurance: [data?.insure_start_time?.slice(0, 10) || '', data?.insure_expired_time?.slice(0, 10) || ''],
}
done()
})
}
},
- currentChange (currentPage) {
+ currentChange(currentPage) {
this.page.currentPage = currentPage
},
- sizeChange (pageSize) {
+ sizeChange(pageSize) {
this.page.pageSize = pageSize
},
- refreshChange () {
+ refreshChange() {
this.onLoad(this.page, this.query)
},
- onLoad (page, params = {}) {
+ onLoad(page, params = {}) {
// this.closeAllWebsoket();
const { releaseTimeRange } = this.query
let values = {
@@ -1397,7 +1431,7 @@
}
values['type'] = 1
if (values.area_code) {
- values['area_code'] = values.area_code.split(',').pop()
+ values['area_code'] = values.area_code.split(',').pop()
}
this.loading = true
getList(page.currentPage, page.pageSize, values).then(res => {
@@ -1408,41 +1442,46 @@
if (e.firmware_status == 4) {
this.connectWebSocket(e)
}
- e.duration_of_insurance = [e.insure_start_time || '', e.insure_expired_time || '']
+ e.duration_of_insurance = [e?.insure_start_time?.slice(0, 10) || '', e?.insure_expired_time?.slice(0, 10) || '']
})
this.data = data.records
this.loading = false
this.selectionClear()
})
},
- treeLoad (tree, treeNode, resolve) {
+ treeLoad(tree, treeNode, resolve) {
+ // 保存resolve
+ this.treeResolveMap.set(tree.child_sn, resolve)
var params = {
childSn: tree.child_sn,
}
getList(1, 10, params).then(res => {
const data = res.data.data.records
+ data.forEach(e => {
+ e.duration_of_insurance = [e?.insure_start_time?.slice(0, 10) || '', e?.insure_expired_time?.slice(0, 10) || '']
+ })
resolve(data)
})
},
- rowDel (row) {
- this.$confirm('确定将选择数据删除?', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(() => {
- return remove(row.id)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: 'success',
- message: '操作成功!',
- })
- })
- },
+ // rowDel (row) {
+ // this.$confirm('确定将选择数据删除?', {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning',
+ // })
+ // .then(() => {
+ // return remove(row.id)
+ // })
+ // .then(() => {
+ // this.onLoad(this.page)
+ // this.$message({
+ // type: 'success',
+ // message: '操作成功!',
+ // })
+ // })
+ // },
// 设置无人机操作密码
- setOperatePasswordConfirm () {
+ setOperatePasswordConfirm() {
var that = this
this.$refs.passwordForm.validate(valid => {
if (valid) {
@@ -1469,7 +1508,7 @@
})
},
// 操作密码设置
- handleOperatePassword (row) {
+ handleOperatePassword(row) {
this.operatePasswordSetBox = true
this.passwordForm.id = row.id
},
@@ -1498,8 +1537,10 @@
display: flex;
flex-direction: column;
align-items: center;
- .el-tag:first-child{
- margin-bottom: 5px;}
+
+ .el-tag:first-child {
+ margin-bottom: 5px;
+ }
}
.onlineStatus {
@@ -1540,12 +1581,15 @@
border-color: #409eff;
}
}
+
:deep(.avue-crud__menu) {
display: flex;
}
+
.more-container {
position: relative;
}
+
.show-more-do {
position: absolute;
background-color: #ffffff;
@@ -1559,5 +1603,44 @@
right: 0;
}
+:deep(.avue-crud__pagination) {
+ position: fixed;
+ bottom: 10px;
+ right: 30px;
+}
+.force-center-dialog .el-dialog {}
+
+.zx-cancel {
+ .txt-contain {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 20px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+
+ img {
+ width: 20px;
+ height: 20px;
+ }
+
+ .name {
+ color: #0E8BFF;
+ margin-left: 6px;
+ margin-right: 6px;
+ }
+
+ }
+
+ .delete-txt {
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ display: flex;
+ justify-content: center;
+ color: #FF0000;
+ font-size: 12px;
+ margin-bottom: 20px;
+ }
+}
</style>
--
Gitblit v1.9.3