From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整

---
 applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue |  215 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 153 insertions(+), 62 deletions(-)

diff --git a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
index 164ef22..c5635fb 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/index.vue
@@ -1,98 +1,160 @@
-<template>
+<template>
 	<basic-container>
-		<el-form ref="queryParamsRef" :model="searchParams">
-			<el-row :gutter="16">
-				<el-col :span="4">
-					<el-form-item label="设备名称" prop="deviceName">
-						<el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="handleSearch" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="设备类型" prop="deviceType">
-						<el-select v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
-							<el-option
-								v-for="item in dictObj.deviceType"
-								:key="item.dictKey"
-								:label="item.dictValue"
-								:value="item.dictKey"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="4">
-					<el-form-item>
-						<el-button @click="resetForm">重置</el-button>
-						<el-button type="primary" @click="handleSearch">查询</el-button>
-					</el-form-item>
-				</el-col>
-			</el-row>
+		<el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
+			<el-form-item label="设备名称" prop="deviceName">
+				<el-input
+					class="command-input"
+					v-model="searchParams.deviceName"
+					placeholder="请输入"
+					clearable
+					@clear="handleSearch"
+				/>
+			</el-form-item>
+
+			<el-form-item label="设备类型" prop="deviceType">
+				<el-select
+					class="command-select"
+					popper-class="command-select-popper"
+					v-model="searchParams.deviceType"
+					placeholder="请选择"
+					clearable
+					@change="handleSearch"
+				>
+					<el-option
+						v-for="item in dictObj.deviceType"
+						:key="item.dictKey"
+						:label="item.dictValue"
+						:value="item.dictKey"
+					/>
+				</el-select>
+			</el-form-item>
+
+			<el-form-item label="设备状态" prop="status">
+				<el-select
+					class="command-select"
+					popper-class="command-select-popper"
+					v-model="searchParams.status"
+					placeholder="请选择"
+					clearable
+					@change="handleSearch"
+				>
+					<el-option
+						v-for="item in dictObj.deviceStatus"
+						:key="item.dictKey"
+						:label="item.dictValue"
+						:value="item.dictKey"
+					/>
+				</el-select>
+			</el-form-item>
+
+			<el-form-item class="history-search-actions">
+				<el-button :icon="RefreshRight" @click="resetForm"></el-button>
+				<el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
+			</el-form-item>
 		</el-form>
-		<el-table v-loading="loading" :data="list">
-			<el-table-column type="index" width="60" label="序号" />
-			<el-table-column prop="deviceType" label="设备类型">
-				<template v-slot="{ row }">
-					{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
-				</template>
-			</el-table-column>
-			<el-table-column prop="deviceModel" label="设备型号" />
-			<el-table-column prop="deviceName" label="设备名称" />
-			<el-table-column prop="deviceCode" label="设备编码" />
-			<el-table-column prop="deployLocation" label="部署位置" />
-			<el-table-column prop="manufacturer" label="厂商" />
-			<el-table-column prop="contactPhone" label="联系方式" />
-			<el-table-column prop="sceneName" label="所属场景" />
-			<el-table-column label="操作">
-				<template v-slot="{ row }">
-					<el-link @click="openForm('edit', row)" type="warning">配置接口</el-link>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div>
-			<el-pagination
-				v-model:current-page="searchParams.current"
-				v-model:page-size="searchParams.size"
-				:total="total"
-				@change="getList"
-			/>
+
+		<div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+			<div class="command-table-content command-table-content-bg">
+				<el-table class="command-table" :data="list">
+					<el-table-column type="index" width="64" show-overflow-tooltip label="序号" />
+					<el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
+						<template v-slot="{ row }">
+							{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="deviceModel" show-overflow-tooltip label="设备型号" />
+					<el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
+					<el-table-column prop="deviceSn" show-overflow-tooltip label="设备编码" />
+					<el-table-column prop="deviceStatus" show-overflow-tooltip width="96" label="设备状态">
+						<template v-slot="{ row }">
+							{{ getDictLabel(row.status, dictObj.deviceStatus) }}
+						</template>
+					</el-table-column>
+					<el-table-column show-overflow-tooltip label="部署位置">
+						<template v-slot="{ row }">
+							{{ formatDeployLocation(row) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="manufacturer" show-overflow-tooltip label="厂商" />
+					<el-table-column prop="contactPhone" show-overflow-tooltip width="112" label="联系方式" />
+					<el-table-column prop="sceneName" show-overflow-tooltip label="所属场景" />
+					<el-table-column label="操作" class-name="operation-btns">
+						<template v-slot="{ row }">
+							<el-link @click="openForm('edit', row)" type="warning">配置接口</el-link>
+						</template>
+					</el-table-column>
+					<!--					<el-table-column label="操作" class-name="operation-btns">
+						<template v-slot="{ row }">
+							<el-link @click="handleEdit(row)">编辑</el-link>
+							<el-link @click="handleDelete(row)" type="danger">删除</el-link>
+						</template>
+					</el-table-column>-->
+				</el-table>
+			</div>
+
+			<div class="command-table-pagination">
+				<el-pagination
+					popper-class="command-select-popper"
+					v-model:current-page="searchParams.current"
+					v-model:page-size="searchParams.size"
+					layout="total, prev, pager, next, sizes"
+					:total="total"
+					@change="getList"
+				/>
+			</div>
 		</div>
 
-		<FormDiaLog v-if="dialogVisible" v-model="dialogVisible" ref="dialogRef" @success="getList" />
+		<ConfigFormDiaLog v-if="dialogVisible" v-model="dialogVisible" ref="configDialogRef" @success="getList" />
+		<DeviceFormDiaLog ref="deviceFormRef" @success="getList" />
 	</basic-container>
 </template>
 
 <script setup>
+import { RefreshRight, Search } from '@element-plus/icons-vue'
 import { nextTick, onMounted, provide, ref } from 'vue'
-import FormDiaLog from './FormDiaLog.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ConfigFormDiaLog from './FormDiaLog.vue'
+import DeviceFormDiaLog from '@/views/basicManage/deviceStock/FormDiaLog.vue'
 import { getDictionaryByCode } from '@/api/system/dictbiz'
 import { getDictLabel } from '@ztzf/utils'
-import { fwDevicePageApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { fwDevicePageApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { getDeptTree } from '@/api/system/dept'
 
 // 初始化查询参数
 const initSearchParams = () => ({
 	deviceName: '', // 设备名称
 	deviceType: '', // 设备类型
+	status: '', // 设备状态
 	current: 1, // 当前页
 	size: 10, // 每页大小
 })
 
 const searchParams = ref(initSearchParams()) // 查询参数
 const total = ref(0) // 总条数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
 const list = ref([]) // 列表数据
 const queryParamsRef = ref(null) // 查询表单实例
-const dialogRef = ref(null) // 弹框实例
+const configDialogRef = ref(null) // 弹框实例
+const deviceFormRef = ref(null) // 设备表单弹框实例
 const dialogVisible = ref(false)
+const deptTree = ref([])
 
 const dictObj = ref({
 	deviceType: [], //设备类型
+	deviceStatus: [], //设备状态
+	deviceAtt: [], //设备属性
 })
 provide('dictObj', dictObj)
+provide('deptTree', deptTree)
 
 // 获取列表
 async function getList() {
 	loading.value = true
 	try {
-		const res = await fwDevicePageApi(searchParams.value)
+		const res = await fwDevicePageApi({
+			...searchParams.value,
+			deviceStatusList: '0,1,2'
+		})
 		list.value = res?.data?.data?.records ?? []
 		total.value = res?.data?.data?.total ?? 0
 	} finally {
@@ -115,8 +177,15 @@
 
 // 获取字典
 function getDictList() {
-	getDictionaryByCode('deviceType').then(res => {
+	getDictionaryByCode('deviceType,deviceStatus,deviceAtt').then(res => {
 		dictObj.value = res.data.data
+		dictObj.value.deviceStatus = dictObj.value.deviceStatus.filter(item => item.dictKey != 3)
+	})
+}
+
+function getDeptTreeFun() {
+	getDeptTree().then(res => {
+		deptTree.value = res.data.data
 	})
 }
 
@@ -124,13 +193,35 @@
 function openForm(mode, row) {
 	dialogVisible.value = true
 	nextTick(() => {
-		dialogRef.value?.open({ mode, row })
+		configDialogRef.value?.open({ mode, row })
 	})
+}
+
+function handleEdit(row) {
+	deviceFormRef.value?.open({ mode: 'edit', row })
+}
+
+async function handleDelete(row) {
+	await ElMessageBox.confirm('确认删除该设备吗?', '提示', {
+		type: 'warning',
+		customClass: 'command-page-view-message-box',
+		confirmButtonClass: 'command-message-box-confirm',
+		cancelButtonClass: 'command-message-box-cancel',
+	})
+	await fwDeviceRemoveApi({ ids: row.id })
+	ElMessage.success('删除成功')
+	getList()
+}
+
+function formatDeployLocation(row) {
+	if (!row.longitude || !row.latitude) return ''
+	return `${row.longitude}, ${row.latitude}`
 }
 
 onMounted(() => {
 	getList()
 	getDictList()
+	getDeptTreeFun()
 })
 </script>
 <style scoped lang="scss"></style>

--
Gitblit v1.9.3