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 | 1632 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 1,012 insertions(+), 620 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index 5d2415f..5393a40 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -1,38 +1,17 @@
<template>
<basic-main-content>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- v-model:page="page"
- ref="crud"
- @row-del="rowDel"
- v-model="form"
- :permission="permissionList"
- @row-update="rowUpdate"
- @row-save="rowSave"
- :before-open="beforeOpen"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- @tree-load="treeLoad"
- >
+ <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" ref="crud" @row-del="rowDel"
+ v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+ @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+ @tree-load="treeLoad">
<template #menu-left>
- <el-button
- type="danger"
- icon="el-icon-delete"
- plain
- v-if="permission.device_delete"
- @click="handleDelete"
- >删 除
+ <el-button type="danger" icon="el-icon-delete" plain v-if="permission.device_delete" @click="handleDelete">删 除
</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">
@@ -47,76 +26,133 @@
<template #firmware_status="{ row }">
<div v-if="row.firmware_status == 1" class="onlineStatus1">
<el-tag type="info">无需升级</el-tag>
- <el-tag type="primary" effect="dark" class="active-element" @click="rollFirmware(row)"
- >版本管理</el-tag
- >
+ <el-tag type="primary" effect="dark" class="active-element" @click="rollFirmware(row)">版本管理</el-tag>
<!-- <div style="background-color: #f1f1f1; border-radius: 4px">无需升级</div> -->
</div>
<div v-if="row.firmware_status == 2" class="onlineStatus1">
<!-- <el-tag type="success" effect="dark" class="active-element" @click="updateFirmware(row)"
>升级固件</el-tag
> -->
- <el-tag type="primary" effect="dark" class="active-element" @click="rollFirmware(row)"
- >版本管理</el-tag
- >
+ <el-tag type="primary" effect="dark" class="active-element" @click="rollFirmware(row)">版本管理</el-tag>
<!-- <div @click="updateFirmware(row)" class="firmware_status">升级固件</div> -->
</div>
<div v-if="row.firmware_status == 3" class="onlineStatus">
- <el-tag type="success" effect="dark" class="active-element" @click="updateFirmware(row)"
- >一致性升级</el-tag
- >
+ <el-tag type="success" effect="dark" class="active-element" @click="updateFirmware(row)">一致性升级</el-tag>
<!-- <div @click="updateFirmware(row)" class="firmware_status">一致性升级</div> -->
</div>
<div v-if="row.firmware_status == 4" class="onlineStatus">
<el-tag effect="dark" class="active-element" @click="updateFirmware(row)">升级中</el-tag>
- <el-progress
- v-if="row.firmware_progress > 0 && row.firmware_progress < 100"
- :percentage="row.firmware_progress"
- ></el-progress>
+ <el-progress v-if="row.firmware_progress > 0 && row.firmware_progress < 100"
+ :percentage="row.firmware_progress"></el-progress>
</div>
</template>
+ <template #domain="{ row }">
+ <span class="text">
+ {{ row.domain == 3 ? '机巢' : row.domain == 0 ? '无人机' : '其他' }}
+ </span>
+ </template>
<template #mode_code="{ row }">
- <span
- class="text"
- v-if="row.domain == 3"
- :style="row.mode_code != '-1' ? 'color: #00ee8b' : 'color: #de5e5e'"
- >
- {{ getDockModeText(row.mode_code) }}
+ <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-button
- type="primary"
- text
- icon="el-icon-paperclip"
- v-if="permission.oss_set"
- @click.stop="handleOpenOssSet(scope.row, scope.index)"
- >存储配置
- </el-button>
- <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-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>
+ <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-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-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>
</template>
</avue-crud>
+
+ <el-dialog title="操控密码设置" append-to-body v-model="operatePasswordSetBox" width="450px">
+ <el-form :model="passwordForm" ref="passwordForm" label-width="80px" :rules="rules" v-loading="loadingForm">
+ <el-form-item label="密码" prop="password">
+ <el-input type="password" v-model="passwordForm.password" placeholder="请输入密码" show-password></el-input>
+ </el-form-item>
+ <el-form-item label="确认密码" prop="password2">
+ <el-input type="password" v-model="passwordForm.password2" placeholder="请输入确认密码" show-password></el-input>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="operatePasswordSetBox = false">取 消</el-button>
+ <el-button type="primary" @click="setOperatePasswordConfirm">确 定</el-button>
+ </span>
+ </template>
+ </el-dialog>
+
+ <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">
<div>升级固件版本：{{ firmwareVersion }}</div>
@@ -128,22 +164,11 @@
</template>
</el-dialog>
- <el-dialog
- title="存储配置"
- append-to-body
- v-model="ossSetBox"
- @close="handleOssSetClose"
- width="600px"
- >
+ <el-dialog title="存储配置" append-to-body v-model="ossSetBox" @close="handleOssSetClose" width="600px">
<div class="onlineStatus">
存储对象配置：
<el-select v-model="ossEnd" clearable placeholder="请选择存储对象" style="width: 450px">
- <el-option
- v-for="item in ossList"
- :key="item.id"
- :label="item.name + ': ' + item.endpoint"
- :value="item.id"
- >
+ <el-option v-for="item in ossList" :key="item.id" :label="item.name + ': ' + item.endpoint" :value="item.id">
<span style="float: left">{{ item.name + ': ' + item.endpoint }}</span>
<span v-if="item.status == 1" class="status1">{{ item.categoryName }}</span>
<span v-if="item.status == 2" class="status2">{{ item.categoryName }}</span>
@@ -162,18 +187,9 @@
<el-dialog title="固件版本管理" append-to-body v-model="rollFirmwareBox" width="455px">
<div class="onlineStatus">
固件版本升级/回退：
- <el-select
- v-model="rollFirmVersion"
- clearable
- placeholder="请选择固件版本"
- style="width: 240px"
- >
- <el-option
- v-for="item in firmList"
- :key="item.firmware_version"
- :label="item.firmware_version"
- :value="item.firmware_version"
- />
+ <el-select v-model="rollFirmVersion" clearable placeholder="请选择固件版本" style="width: 240px">
+ <el-option v-for="item in firmList" :key="item.firmware_version" :label="item.firmware_version"
+ :value="item.firmware_version" />
</el-select>
</div>
<template #footer>
@@ -184,29 +200,22 @@
</template>
</el-dialog>
- <el-drawer
- class="ztzf-drawer-body-basic-container"
- title="机场授权管理"
- size="60%"
- append-to-body
- v-model="devicePerShareVisible"
- :direction="'rtl'"
- >
+ <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>
<el-drawer :title="operateTitle" append-to-body v-model="remoteDebuggingShow" size="40%">
- <DockControlPanel
- v-if="remoteDebuggingShow"
- :sn="curDeviceInfo.device_sn"
- :deviceInfo="curDeviceInfo"
- >
+ <DockControlPanel v-if="remoteDebuggingShow" :sn="curDeviceInfo.device_sn" :deviceInfo="curDeviceInfo">
</DockControlPanel>
</el-drawer>
</basic-main-content>
</template>
<script>
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getRegionTreeAll } from '@/api/job/task'
+import { pxToRem } from '@/utils/rem'
import {
getList,
remove,
@@ -217,17 +226,24 @@
ota,
getDeviceFirmwareList,
getDevices,
-} from '@/api/device/device';
-import { deleteByOssId, addOrUpdate as addOrUpdateOssBind } from '@/api/device/ossBind';
-import { getListPage as getOssList } from '@/api/resource/oss';
-import { getLazyTree } from '@/api/base/region';
-import { EDockModeText, EDockModeCode } from '@/types/device';
-import { mapGetters } from 'vuex';
-import FirmwareManage from './components/firmwareManage.vue';
-import DevicePerShare from './components/devicePerShare.vue';
-import DockControlPanel from './components/DockControlPanel.vue';
-import { getWebsocketUrl } from '@/websocket/util/config';
-import ConnectWebSocket from '@/websocket';
+ deviceOffline,
+ 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'
+import { getLazyTree } from '@/api/base/region'
+import { EDockModeText, EDockModeCode } from '@/types/device'
+import { mapGetters } from 'vuex'
+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 warnSvg from '@/assets/images/warn.svg'
+
export default {
components: {
FirmwareManage,
@@ -235,7 +251,43 @@
DockControlPanel,
},
data() {
+ // const self = this
+
+ const validatePass = (rule, value, callback) => {
+ if (value === '') {
+ callback(new Error('请输入密码'))
+ } else {
+ callback()
+ }
+ }
+ const validatePass2 = (rule, value, callback) => {
+ if (value === '') {
+ callback(new Error('请再次输入密码'))
+ } else if (value !== this.passwordForm.password) {
+ callback(new Error('两次输入密码不一致!'))
+ } else {
+ callback()
+ }
+ }
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: '',
+ password2: '',
+ },
+ operatePasswordSetBox: false,
+ operatePasswordViewBox: false,
+ operate_password: '',
bindOssId: null,
deviceSn: '',
ossSetBox: false,
@@ -273,12 +325,19 @@
tree: true,
dialogWidth: 1050,
+ searchGutter: 30,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
+ // searchMenuSpan: 16,
+ searchMenuPosition: 'left',
+ searchMenuSpan: 4,
+
border: true,
index: true,
+ indexLabel: '序号',
+ indexWidth: 60,
viewBtn: true,
+ delBtn: false,
selection: true,
excelBtn: false,
addBtn: false,
@@ -286,283 +345,142 @@
grid: false,
height: 'auto',
- calcHeight: 180,
+ calcHeight: 20,
column: [
{
- label: '设备型号',
- prop: 'device_name',
- editDisabled: true,
- search: true,
+ label: '设备类型',
+ prop: 'domain',
+ editDisabled: false,
+ editDisplay: false, //编辑显示
+ viewDisplay: false, //查看显示
+ search: false,
+ slot: true,
searchSpan: 4,
- labelWidth: 130,
- rules: [
- {
- required: true,
- message: '请输入设备型号',
- trigger: 'blur',
- },
- ],
+ labelWidth: 145,
+ width: 120,
+ // formatter: (row) => row.domain == 3 ? '机巢' : '无人机'
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入设备类型',
+ // trigger: 'blur',
+ // },
+ // ],
},
{
- label: '设备SN',
- prop: 'device_sn',
- labelWidth: 130,
- search: true,
- searchSpan: 4,
- editDisabled: true,
- rules: [
- {
- required: true,
- message: '请输入设备SN',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '机巢编号',
- prop: 'machine_nest_sn',
- labelWidth: 130,
- editDisabled: true,
- rules: [
- {
- required: false,
- message: '请输入机巢编号',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '设备组织名称',
- prop: 'nickname',
- labelWidth: 130,
- rules: [
- {
- required: true,
- message: '请输入设备组织名称',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '固件版本',
- prop: 'firmware_version',
- labelWidth: 130,
- width: 100,
- editDisabled: true,
- rules: [
- {
- required: true,
- message: '请输入固件版本',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '固件升级',
- prop: 'firmware_status',
- labelWidth: 130,
- width: 100,
- viewDisabled: true,
- addDisabled: true,
- 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,
- rules: [
- {
- required: true,
- message: '请输入所属单位',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '所属单位',
- prop: 'dept_id',
- hide: true,
- type: 'tree',
- defaultExpandAll: true,
- 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: '行政区划',
- prop: 'area_name',
- hide: true,
+ label: '设备类型',
+ prop: 'domainTxt',
+ // editDisabled: true,
editDisplay: false, //编辑显示
viewDisplay: true, //查看显示
- labelWidth: 130,
+ labelWidth: 145,
+ width: 120,
+ hide: true
},
{
- label: '行政区划',
- prop: 'area_code',
- type: 'cascader',
- labelWidth: 130,
- hide: true,
- editDisplay: true,
- viewDisplay: false,
- props: {
- label: 'title',
- value: 'value',
- emitPath: false,
- checkStrictly: true,
- multiple: false,
- expandTrigger: 'hover',
- },
- dataType: 'string',
- rules: [
- {
- required: true,
- message: '请选择行政区划',
- trigger: 'change',
- },
- ],
- change: ({ value }) => {
- if (!value) {
- this.form.area_code = null;
- } else {
- if (typeof value === 'string' && value.includes(',')) {
- const codes = value.split(',');
- this.form.area_code = codes[codes.length - 1];
- } else {
- this.form.area_code = value;
- }
- }
- },
- 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: 'device_name',
+ // editDisabled: true,
+ editDisplay: false, //编辑显示
+ viewDisplay: true, //查看显示
+ search: false,
+ searchSpan: 4,
+ labelWidth: 145,
+ width: 120,
},
{
- hide: true,
- label: '保险有效期',
- prop: 'duration_of_insurance',
- labelWidth: 130,
- type: 'daterange',
- format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- startPlaceholder: '保险开始日期',
- endPlaceholder: '保险结束日期',
- rules: [
- {
- required: true,
- message: '请选择保险有效期',
- trigger: 'blur',
- },
- ],
- },
-
- {
- label: '在线时间',
- prop: 'login_time',
- type: 'date',
- addDisplay: false,
- editDisplay: false,
- labelWidth: 130,
+ label: '设备名称',
+ prop: 'nickname',
+ labelWidth: 145,
width: 160,
- format: 'YYYY-MM-DD HH:mm:ss',
- // valueFormat: 'YYYY-MM-DD HH:mm:ss',
- startPlaceholder: '任务开始时间',
+ searchSpan: 4,
+ search: true,
+ overHidden: true,
+ editDisplay: true, //编辑显示
rules: [
{
required: true,
- message: '请输入在线时间',
+ message: '请输入设备名称',
trigger: 'blur',
},
],
},
- {
- label: '在线状态',
+
+ {
+ 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: 145,
+ width: 160,
+ overHidden: true,
+ editDisplay: false, //编辑显示
+
+ },
+
+ {
+ label: '流量剩余(GB)',
+ prop: 'traffic_remaining',
+ labelWidth: 145,
+ width: 120,
+ // editDisabled: true,
+ editDisplay: false, //编辑显示
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入流量剩余',
+ // trigger: 'blur',
+ // },
+ // ],
+ },
+
+ {
+ label: '流量到期时间',
+ prop: 'traffic_expire_time',
+ labelWidth: 145,
+ width: 120,
+ type: 'date',
+ format: 'YYYY-MM-DD',
+ editDisplay: false, //编辑显示
+ },
+
+ {
+ label: '设备状态',
prop: 'cnstatus',
hide: true,
addDisplay: false,
editDisplay: false,
- viewDisplay: true,
- labelWidth: 130,
+ viewDisplay: false,
+ labelWidth: 145,
},
{
- label: '在线状态',
+ label: '设备状态',
prop: 'status',
addDisplay: false,
editDisplay: false,
- viewDisplay: false,
- labelWidth: 130,
+ viewDisplay: false,
+ labelWidth: 100,
+ hide: true,
+ // searchSpan: 4,
+ // search: true,
slot: true,
width: 100,
@@ -575,24 +493,34 @@
],
},
{
- label: '机场状态',
+ label: '设备状态',
prop: 'cnmode_code',
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: true,
- labelWidth: 130,
+ labelWidth: 145,
+ width: 110,
},
{
- label: '机场状态',
+ label: '设备状态',
prop: 'mode_code',
-
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- labelWidth: 130,
+ labelWidth: 145,
+ searchSpan: 4,
+ search: true,
+ type: 'select',
+ dicData: [
+ { label: '在线', value: 0 },
+ { label: '离线', value: -1 },
+ { label: '远程调试', value: 2 },
+ { label: '现场调试', value: 1 },
+ { label: '固件升级中', value: 3 }
+ ],
slot: true,
- width: 100,
+ width: 110,
rules: [
{
@@ -601,6 +529,243 @@
trigger: 'blur',
},
],
+ },
+
+ {
+ 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',
},
],
},
@@ -617,91 +782,112 @@
ConsistencyUpgrade: 3, // 一致性升级
DuringUpgrade: 4, // 升级中
},
- };
+ }
},
+
computed: {
- ...mapGetters(['permission']),
+ ...mapGetters(['permission', 'userInfo']),
permissionList() {
return {
addBtn: this.validData(this.permission.air_add, true),
viewBtn: this.validData(this.permission.air_view, true),
delBtn: this.validData(this.permission.air_delete, true),
editBtn: this.validData(this.permission.air_edit, true),
- };
+ }
},
ids() {
- let ids = [];
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(',');
+ ids.push(ele.id)
+ })
+ return ids.join(',')
},
},
destroyed() {
+ this.treeResolveMap.clear()
this.websocketMap.forEach((k, v) => {
if (null != v) {
- v.close();
- this.websocketMap.delete(k);
- this.webSocketIdSet.delete(k);
+ v.close()
+ this.websocketMap.delete(k)
+ this.webSocketIdSet.delete(k)
}
- });
+ })
+ },
+ 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) {
- return EDockModeText[value] || '';
+ return EDockModeText[value] || ''
+ },
+ getModelText(value) {
+ let txt = '离线'
+ if (value === 0 || value === 4) {
+ txt = '在线'
+ } else if (value === 1) {
+ txt = '现场调试'
+ } else if (value === 2) {
+ txt = '远程调试'
+ } else if (value === 3) {
+ txt = '固件升级中'
+ }
+ return txt
},
// 关闭所有的webscoket
closeAllWebsoket() {
this.websocketMap.forEach((k, v) => {
if (null != v) {
- v.close();
- this.websocketMap.delete(k);
- this.webSocketIdSet.delete(k);
+ v.close()
+ this.websocketMap.delete(k)
+ this.webSocketIdSet.delete(k)
}
- });
+ })
},
// 连接webSocket
connectWebSocket(data) {
- const webSocketId = data.workspace_id;
+ const webSocketId = data.workspace_id
if (!this.webSocketIdSet.has(webSocketId)) {
// 防止重复连接
- this.webSocketIdSet.add(webSocketId);
- const webSorketUrl = getWebsocketUrl() + '&workspace-id=' + data.workspace_id;
+ this.webSocketIdSet.add(webSocketId)
+ const webSorketUrl = getWebsocketUrl() + '&workspace-id=' + data.workspace_id
// 监听ws 消息
- this.useConnectWebSocket(webSocketId, webSorketUrl);
+ this.useConnectWebSocket1(webSocketId, webSorketUrl)
}
},
- useConnectWebSocket(webSocketId, url) {
- const websocket = new ConnectWebSocket(url);
+ useConnectWebSocket1(webSocketId, url) {
+ const websocket = new ConnectWebSocket(url)
// 加入 webscoket map
- this.websocketMap.set(webSocketId, websocket);
- websocket?.registerMessageHandler(this.messageHandler);
- websocket?.initSocket();
+ this.websocketMap.set(webSocketId, websocket)
+ websocket?.registerMessageHandler(this.messageHandler)
+ websocket?.initSocket()
},
async messageHandler(payload) {
if (!payload) {
- return;
+ return
}
if (payload.biz_code != 'ota_progress') {
- return;
+ return
}
- var data = payload.data;
+ var data = payload.data
this.data.forEach(e => {
if (e.device_sn == data.sn && data.output.status == 'in_progress') {
- e.firmware_progress = data.output.progress.percent;
+ e.firmware_progress = data.output.progress.percent
}
if (e.device_sn == data.sn && data.output.status == 'ok') {
// 升级完成修改状态
- e.firmware_status = 1;
- const webscoket = this.websocketMap.get(e.workspace_id);
+ e.firmware_status = 1
+ const webscoket = this.websocketMap.get(e.workspace_id)
// 关闭
- webscoket?.close();
+ webscoket?.close()
//删除对应的webscoket
- this.websocketMap.delete(e.workspace_id);
- this.webSocketIdSet.delete(e.workspace_id);
+ this.websocketMap.delete(e.workspace_id)
+ this.webSocketIdSet.delete(e.workspace_id)
}
- });
+ })
},
init() {
(this.page = {
@@ -709,45 +895,104 @@
currentPage: 1,
total: 0,
}),
- this.onLoad(this.page);
+ this.onLoad(this.page)
},
// 打开权限分享页面
handleOpenDevicePerShare(row) {
- var that = this;
- this.devicePerShareVisible = true;
+ var that = this
+ this.devicePerShareVisible = true
this.$nextTick(() => {
- that.$refs.devicePerShare.init(row);
- });
+ that.$refs.devicePerShare.init(row)
+ })
},
// 打开远程调试
handleOpenRemoteDebugging(row) {
- this.curDeviceInfo = row;
- this.remoteDebuggingShow = true;
- this.operateTitle = row.nickname + ' - ' + row.device_sn;
+ this.curDeviceInfo = row
+ this.remoteDebuggingShow = true
+ this.operateTitle = row.nickname + ' - ' + row.device_sn
},
+
+ // 设备注销
+ handleDeviceOffline(row) {
+ this.cancenOperate = true
+ this.cancelSNName = row.nickname
+ this.cancenOperateRow = row
+ },
+
+ // 设备
+ 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()
+ })
+ })
+ } 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) {
- var that = this;
- this.deviceSn = row.device_sn;
- this.ossSetBox = true;
- this.bindOssId = row.oss_id;
- this.ossEnd = row.oss_id;
+ var that = this
+ this.deviceSn = row.device_sn
+ this.ossSetBox = true
+ this.bindOssId = row.oss_id
+ this.ossEnd = row.oss_id
// 查询下拉列表
const param = {
categoryKeys: '1,3,6',
- };
+ }
getOssList(1, 50, param).then(res => {
- const data = res.data.data;
- that.ossList = data.records;
- });
+ const data = res.data.data
+ that.ossList = data.records
+ })
},
// 打开固件管理页面
handleOpenFirmwarm(row) {
- var that = this;
- this.firmwareManageVisible = true;
+ var that = this
+ this.firmwareManageVisible = true
this.$nextTick(() => {
- that.$refs.firmwareManage.init(row);
- });
+ that.$refs.firmwareManage.init(row)
+ })
+ },
+ // 设备下线
+ dockNotLine(row) {
+ let txt = row.hidden_flag === 1 ? '上线' : '下线'
+ ElMessageBox.confirm(`确定${txt}该设备吗?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ let hidden_flag = row.hidden_flag === 1 ? 0 : 1
+ devicesUpAndDown({ id: row.id, hidden_flag: hidden_flag })
+ .then(res => {
+ ElMessage.success(`${txt}成功`)
+ this.init()
+ })
+ .catch(error => {
+ ElMessage.error('下线失败')
+ })
+ })
+ .catch(() => { })
},
// 版本回退点击事件
rollFirmware(row) {
@@ -755,62 +1000,62 @@
this.$message({
type: 'warning',
message: '设备不在线!',
- });
- return;
+ })
+ return
}
// 如果是机场，查询飞机对应的信息
if (row.domain === 3) {
// 查询子设备名称
getDevices(row.workspace_id, row.child_sn).then(res => {
- const data = res.data.data;
- that.firmwareInfo['child_device_name'] = data.device_name;
- that.firmwareInfo['child_version'] = data.firmware_version;
- that.firmwareInfo['child_status'] = data.status;
- });
+ const data = res.data.data
+ that.firmwareInfo['child_device_name'] = data.device_name
+ that.firmwareInfo['child_version'] = data.firmware_version
+ that.firmwareInfo['child_status'] = data.status
+ })
}
- var that = this;
- this.rollFirmwareBox = true;
+ var that = this
+ this.rollFirmwareBox = true
const param = {
device_name: row.device_name,
- };
+ }
// 获取固件最新版本信息
getDeviceFirmwareList(1, 20, param).then(res => {
- that.firmList = [];
- const data = res.data.data.records;
+ that.firmList = []
+ const data = res.data.data.records
if (data.length === 0) {
- return;
+ return
}
data.forEach(e => {
if (e.firmware_version != row.firmware_version) {
- that.firmList.push(e);
+ that.firmList.push(e)
}
- });
- that.firmwareInfo['device_name'] = row.device_name;
- that.firmwareInfo['sn'] = row.device_sn;
+ })
+ that.firmwareInfo['device_name'] = row.device_name
+ that.firmwareInfo['sn'] = row.device_sn
// 3-普通升级，2-一致性升级;
- that.firmwareInfo['firmware_upgrade_type'] = 3;
- that.firmwareInfo['workspaceId'] = row.workspace_id;
- that.firmwareInfo['firmware_version'] = row.firmware_version;
- that.firmwareInfo['status'] = row.status;
+ that.firmwareInfo['firmware_upgrade_type'] = 3
+ that.firmwareInfo['workspaceId'] = row.workspace_id
+ that.firmwareInfo['firmware_version'] = row.firmware_version
+ that.firmwareInfo['status'] = row.status
// domain 0:飞机 3：机场
- that.firmwareInfo['domain'] = row.domain;
- that.firmwareInfo['child_sn'] = row.child_sn;
- that.firmwareInfo['now_version'] = row.firmware_version;
- });
+ that.firmwareInfo['domain'] = row.domain
+ that.firmwareInfo['child_sn'] = row.child_sn
+ that.firmwareInfo['now_version'] = row.firmware_version
+ })
},
// 比较版本大小
compare(version1, version2) {
- let arr1 = version1.split('.');
- let arr2 = version2.split('.');
- let length = Math.max(arr1.length, arr2.length);
+ let arr1 = version1.split('.')
+ let arr2 = version2.split('.')
+ let length = Math.max(arr1.length, arr2.length)
for (let i = 0; i < length; i++) {
- const n1 = Number(arr1[i] || 0);
- const n2 = Number(arr2[i] || 0);
+ const n1 = Number(arr1[i] || 0)
+ const n2 = Number(arr2[i] || 0)
// version1 > version2 返回1，如果 version1 < version2 返回-1，不然返回0
- if (n1 > n2) return 1;
- if (n1 < n2) return -1;
+ if (n1 > n2) return 1
+ if (n1 < n2) return -1
}
- return 0;
+ return 0
},
// 版本回退
rollFirmwareConfirm() {
@@ -819,39 +1064,39 @@
this.$message({
type: 'warning',
message: '请先选择回退的固件版本!',
- });
- return;
+ })
+ return
}
- var that = this;
- var arr = [];
- that.firmwareInfo['product_version'] = this.rollFirmVersion;
+ var that = this
+ var arr = []
+ that.firmwareInfo['product_version'] = this.rollFirmVersion
// 机场信息设置
- arr.push(that.firmwareInfo);
+ arr.push(that.firmwareInfo)
// 判断是机场升级还是飞机升级，如果是机场升级则把无人机信息一起带过去
if (that.firmwareInfo.domain === 3) {
// 判断当前机场和无人机固件版本是否一致
var dockFlag = this.compare(
this.firmwareInfo.firmware_version,
this.firmwareInfo.child_version
- );
+ )
// 机场和无人机版本一致情况
if (dockFlag == 0) {
if (!this.firmwareInfo.status || !this.firmwareInfo.child_status) {
this.$message({
type: 'warning',
message: '请先更新无人机固件版本后再进行机场固件版本更新!',
- });
- return;
+ })
+ return
}
// 只有同时在线并且是升级才能操作
// 判断升级还是降级，不能降级
- var upDownFlag = this.compare(this.rollFirmVersion, this.firmwareInfo.firmware_version);
+ var upDownFlag = this.compare(this.rollFirmVersion, this.firmwareInfo.firmware_version)
if (upDownFlag == -1) {
this.$message({
type: 'warning',
message: '请先回滚无人机固件版本后再进行机场固件版本更新!',
- });
- return;
+ })
+ return
}
// 同时升级操作
// 无人机信息设置
@@ -860,32 +1105,32 @@
sn: that.firmwareInfo.child_sn,
product_version: this.rollFirmVersion,
firmware_upgrade_type: 3,
- });
+ })
} else {
// 版本不一致情况
// 比对需要改变的版本号和无人机版本号是否一致，不一致提示不能操作
- var verFlag = this.compare(this.rollFirmVersion, this.firmwareInfo.child_version);
+ var verFlag = this.compare(this.rollFirmVersion, this.firmwareInfo.child_version)
if (verFlag == -1 || verFlag == 1) {
this.$message({
type: 'warning',
message: '更新版本与当前无人机固件版本不一致，请更新和无人机一致的版本!',
- });
- return;
+ })
+ return
}
// 需要改变的版本号和无人机版本号如果是一致，进行单独的机场升级/回滚操作
}
}
ota(that.firmwareInfo.workspaceId, arr).then(res => {
- that.firmwareVersion = '';
- that.firmwareInfo = {};
- that.rollFirmwareBox = false;
+ that.firmwareVersion = ''
+ that.firmwareInfo = {}
+ that.rollFirmwareBox = false
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.onLoad(this.page);
- done();
- });
+ })
+ this.onLoad(this.page)
+ done()
+ })
},
// 升级固件按钮事件
updateFirmware(row) {
@@ -893,157 +1138,179 @@
this.$message({
type: 'warning',
message: '设备不在线!',
- });
- return;
+ })
+ return
}
- var that = this;
- this.firmwareBox = true;
+ var that = this
+ this.firmwareBox = true
const param = {
device_name: row.device_name,
- };
+ }
// 获取固件最新版本信息
getDeviceUpgradeInfo(param).then(res => {
- const data = res.data.data;
+ const data = res.data.data
if (data.length === 0) {
- return;
+ return
}
- that.firmwareVersion = data[0].product_version;
- that.firmwareInfo['device_name'] = row.device_name;
- that.firmwareInfo['sn'] = row.device_sn;
- that.firmwareInfo['product_version'] = data[0].product_version;
+ that.firmwareVersion = data[0].product_version
+ that.firmwareInfo['device_name'] = row.device_name
+ that.firmwareInfo['sn'] = row.device_sn
+ that.firmwareInfo['product_version'] = data[0].product_version
// 3-普通升级，2-一致性升级;
that.firmwareInfo['firmware_upgrade_type'] =
row.firmware_status === that.DeviceFirmwareStatusEnum.ToUpgraded
? that.DeviceFirmwareTypeEnum.ToUpgraded
- : that.DeviceFirmwareTypeEnum.ConsistencyUpgrade;
- that.firmwareInfo['workspaceId'] = row.workspace_id;
- });
+ : that.DeviceFirmwareTypeEnum.ConsistencyUpgrade
+ that.firmwareInfo['workspaceId'] = row.workspace_id
+ })
},
// 确定升级固件版本
updateFirmwareConfirm() {
- var that = this;
- var arr = [];
- arr.push(that.firmwareInfo);
+ var that = this
+ var arr = []
+ arr.push(that.firmwareInfo)
ota(that.firmwareInfo.workspaceId, arr).then(res => {
- that.firmwareVersion = '';
- that.firmwareInfo = {};
- that.firmwareBox = false;
+ that.firmwareVersion = ''
+ that.firmwareInfo = {}
+ that.firmwareBox = false
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.onLoad(this.page);
- done();
- });
+ })
+ this.onLoad(this.page)
+ done()
+ })
},
handleOssSetClose() {
- this.ossEnd = '';
- this.deviceSn = '';
- this.bindOssId = null;
+ this.ossEnd = ''
+ this.deviceSn = ''
+ this.bindOssId = null
},
// 存储对象配置确定
ossSetConfirm() {
- var that = this;
+ var that = this
// 判断是否已选择
if (!this.ossEnd) {
this.$message({
type: 'warning',
message: '请选择对于的存储对象!',
- });
- return;
+ })
+ return
}
// 新增或者修改操作
const data = {
oss_id: this.ossEnd,
sn: this.deviceSn,
- };
+ }
// 新增
addOrUpdateOssBind(data).then(res => {
this.$message({
type: 'success',
message: '操作成功!',
- });
- that.ossSetBox = false;
- this.onLoad(this.page);
- done();
- });
+ })
+ that.ossSetBox = false
+ this.onLoad(this.page)
+ done()
+ })
},
// 取消配置
cancelOssSetConfirm() {
- var that = this;
+ var that = this
// 判断是否已有配置
if (!this.bindOssId) {
this.$message({
type: 'warning',
message: '当前机场尚未配置存储对象信息!',
- });
- return;
+ })
+ return
}
deleteByOssId(this.bindOssId).then(() => {
- that.ossSetBox = false;
- this.onLoad(this.page);
+ that.ossSetBox = false
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- });
+ })
+ })
},
// 取消按钮 oss
cancelOssSet() {
- this.ossEnd = '';
- this.deviceSn = '';
- this.bindOssId = null;
- this.ossSetBox = false;
+ this.ossEnd = ''
+ this.deviceSn = ''
+ this.bindOssId = null
+ this.ossSetBox = false
},
rowSave(row, done, loading) {
- let areaCode = row.area_code;
+ let areaCode = row.area_code
if (Array.isArray(areaCode)) {
- areaCode = areaCode[areaCode.length - 1];
+ areaCode = areaCode[areaCode.length - 1]
} else if (typeof areaCode === 'string' && areaCode.includes(',')) {
- const codes = areaCode.split(',');
- areaCode = codes[codes.length - 1];
+ const codes = areaCode.split(',')
+ areaCode = codes[codes.length - 1]
}
- row.area_code = areaCode || null;
+ row.area_code = areaCode || null
add(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- done();
+ })
+ done()
},
error => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ 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],
- };
-
- delete submitData.duration_of_insurance;
+ 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
+ }
+ delete submitData.duration_of_insurance
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: '操作成功!',
- });
- done();
+ })
+ done()
},
error => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
@@ -1052,37 +1319,37 @@
type: 'warning',
})
.then(() => {
- return remove(row.id);
+ return remove(row.id)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- });
+ })
+ })
},
searchReset() {
- this.query = {};
- this.onLoad(this.page);
+ this.query = {}
+ this.onLoad(this.page)
},
searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
selectionChange(list) {
- this.selectionList = list;
+ this.selectionList = list
},
selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
handleDelete() {
if (this.selectionList.length === 0) {
- this.$message.warning('请选择至少一条数据');
- return;
+ this.$message.warning('请选择至少一条数据')
+ return
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
@@ -1090,104 +1357,163 @@
type: 'warning',
})
.then(() => {
- return remove(this.ids);
+ return remove(this.ids)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
- getFullAreaCode(areaCode) {
- if (!areaCode) return '';
+ async getFullAreaCode(areaCode) {
+ console.log('getFullAreaCode', areaCode)
+ if (!areaCode) return ''
- const code = areaCode.toString();
+ const code = areaCode.toString()
- if (code.includes(',')) return code;
+ if (code.includes(',')) return code
if (code.endsWith('0000000000')) {
- return code;
+ return code
} else if (code.endsWith('00000000') && !code.endsWith('0000000000')) {
- const provinceCode = code.substring(0, 2) + '0000000000';
- return `${provinceCode},${code}`;
+ const provinceCode = code.substring(0, 2) + '0000000000'
+ return `${provinceCode},${code}`
} else {
- const provinceCode = code.substring(0, 2) + '0000000000';
- const cityCode = code.substring(0, 4) + '00000000';
- return `${provinceCode},${cityCode},${code}`;
+ const provinceCode = code.substring(0, 2) + '0000000000'
+ const cityCode = code.substring(0, 4) + '00000000'
+ return `${provinceCode},${cityCode},${code}`
}
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
- getDetail(this.form.id).then(res => {
- const data = res.data.data;
+ getDetail(this.form.id).then(async res => {
+ const data = res.data.data
this.form = {
...data,
- area_code: 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),
- cnstatus:this.form.status === false ? '离线':'在线',
- duration_of_insurance: [data?.insure_start_time || '', data?.insure_expired_time || ''],
- };
- console.log('this.form', this.form);
+ domainTxt: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
+ cnstatus: this.form.status === false ? '离线' : '在线',
+ duration_of_insurance: [data?.insure_start_time?.slice(0, 10) || '', data?.insure_expired_time?.slice(0, 10) || ''],
+ }
- done();
- });
+ done()
+ })
}
},
currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ this.page.currentPage = currentPage
},
sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ this.page.pageSize = pageSize
},
refreshChange() {
- this.onLoad(this.page, this.query);
+ this.onLoad(this.page, this.query)
},
onLoad(page, params = {}) {
// this.closeAllWebsoket();
- const { releaseTimeRange } = this.query;
+ const { releaseTimeRange } = this.query
let values = {
...params,
...this.query,
- };
+ }
if (releaseTimeRange) {
values = {
...values,
releaseTime_datege: releaseTimeRange[0],
releaseTime_datelt: releaseTimeRange[1],
- };
- values.releaseTimeRange = null;
+ }
+ values.releaseTimeRange = null
}
- values['type'] = 1;
- this.loading = true;
+ values['type'] = 1
+ if (values.area_code) {
+ values['area_code'] = values.area_code.split(',').pop()
+ }
+ this.loading = true
getList(page.currentPage, page.pageSize, values).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
+ const data = res.data.data
+ this.page.total = data.total
data.records.forEach(e => {
- e['hasChildren'] = e.has_children;
+ e['hasChildren'] = e.has_children
if (e.firmware_status == 4) {
- this.connectWebSocket(e);
+ this.connectWebSocket(e)
}
- });
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
+ 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) {
+ // 保存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;
- resolve(data);
- });
+ 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: '操作成功!',
+ // })
+ // })
+ // },
+ // 设置无人机操作密码
+ setOperatePasswordConfirm() {
+ var that = this
+ this.$refs.passwordForm.validate(valid => {
+ if (valid) {
+ this.loadingForm = true
+ const data = {
+ id: this.passwordForm.id,
+ operate_password: this.passwordForm.password,
+ }
+ // 提交
+ operatePasswordUpdate(data).then(res => {
+ this.loadingForm = false
+ this.operatePasswordSetBox = false
+ that.passwordForm = {}
+ this.onLoad(this.page)
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ })
+ })
+ } else {
+ console.log('error submit!!')
+ return false
+ }
+ })
+ },
+ // 操作密码设置
+ handleOperatePassword(row) {
+ this.operatePasswordSetBox = true
+ this.passwordForm.id = row.id
},
},
-};
+}
</script>
<style lang="scss" scoped>
@@ -1211,6 +1537,10 @@
display: flex;
flex-direction: column;
align-items: center;
+
+ .el-tag:first-child {
+ margin-bottom: 5px;
+ }
}
.onlineStatus {
@@ -1251,4 +1581,66 @@
border-color: #409eff;
}
}
+
+:deep(.avue-crud__menu) {
+ display: flex;
+}
+
+.more-container {
+ position: relative;
+}
+
+.show-more-do {
+ position: absolute;
+ background-color: #ffffff;
+ // border: 1px solid #409eff;
+ z-index: 9999;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+ width: 140px;
+ font-size: 12px;
+ // height: 140px;
+ height: 190px;
+ 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