From 97d5e68152129193b5734ab5d4e895817a331c5a Mon Sep 17 00:00:00 2001
From: zhulongchuan <1624729110@qq.com>
Date: Wed, 17 Sep 2025 19:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 |    5 +-
 src/api/datamodel/metasploitable/equmodel.js |   24 +-
 src/api/datamodel/uavInformation/type.js     |   12 +-
 src/views/system/metasploitable/index.vue    | 1825 ++++++++++++------
 src/views/system/operator/data.vue           |    6 +-
 src/views/system/uavInformation/index.vue    |  543 ++++--
 6 files changed, 1702 insertions(+), 713 deletions(-)

diff --git a/package.json b/package.json
index ab3bdab..e366660 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.28.1",
     "clipboard": "2.0.8",
-    "core-js": "3.37.1",
+    "core-js": "^3.37.1",
     "echarts": "5.4.0",
     "element-ui": "2.15.14",
     "file-saver": "2.0.5",
@@ -36,6 +36,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "minimatch": "^10.0.3",
     "nprogress": "0.2.0",
     "quill": "2.0.2",
     "screenfull": "5.0.2",
@@ -55,7 +56,7 @@
     "chalk": "4.1.0",
     "compression-webpack-plugin": "6.1.2",
     "connect": "3.6.6",
-    "sass": "1.32.13",
+    "sass": "^1.92.1",
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",
diff --git a/src/api/datamodel/metasploitable/equmodel.js b/src/api/datamodel/metasploitable/equmodel.js
index a74a56d..45e01d2 100644
--- a/src/api/datamodel/metasploitable/equmodel.js
+++ b/src/api/datamodel/metasploitable/equmodel.js
@@ -10,7 +10,7 @@ export function list(query) {
 // 查询设备型号列表
 export function listEqumodel(query) {
   return request({
-    url: '/uav/metasploitable/list',
+    url: '/metasploitable/list',
     method: 'get',
     params: query
   })
@@ -23,7 +23,7 @@ export function listEqumodel(query) {
  */
 export function infoByUavTypeName(query) {
   return request({
-    url: '/uav/equmodel/infoByUavTypeName',
+    url: '/equmodel/infoByUavTypeName',
     method: 'get',
     params: query
   })
@@ -33,7 +33,7 @@ export function infoByUavTypeName(query) {
 // 查询设备型号详细
 export function getEqumodel(id) {
   return request({
-    url: '/uav/metasploitable/' + id,
+    url: '/metasploitable/' + id,
     method: 'get'
   })
 }
@@ -41,7 +41,7 @@ export function getEqumodel(id) {
 // 新增设备型号
 export function addEqumodel(data) {
   return request({
-    url: '/uav/metasploitable',
+    url: '/metasploitable',
     method: 'post',
     data: data
   })
@@ -50,7 +50,7 @@ export function addEqumodel(data) {
 // 修改设备型号
 export function updateEqumodel(data) {
   return request({
-    url: '/uav/metasploitable',
+    url: '/metasploitable',
     method: 'put',
     data: data
   })
@@ -59,7 +59,7 @@ export function updateEqumodel(data) {
 // 删除设备型号
 export function delEqumodel(id) {
   return request({
-    url: '/uav/metasploitable/' + id,
+    url: '/metasploitable/' + id,
     method: 'delete'
   })
 }
@@ -67,7 +67,7 @@ export function delEqumodel(id) {
 // 获取类别
 export function queryEquType() {
   return request({
-    url: '/uav/metasploitable/queryEquType',
+    url: '/metasploitable/queryEquType',
     method: 'get'
   })
 }
@@ -77,7 +77,7 @@ export function queryEquType() {
 // 修改设备参数
 // export function updateEqumodelParam(data) {
 //   return request({
-//     url: '/uav/equmodel/updateEqumodelParam',
+//     url: '/equmodel/updateEqumodelParam',
 //     method: 'post',
 //     data: data
 //   })
@@ -86,7 +86,7 @@ export function queryEquType() {
 //根据类型查询默认配置
 export function getEqumodelDefine(typeId) {
   return request({
-    url: '/uav/metasploitable/getEqumodelDefine/'+ typeId,
+    url: '/metasploitable/getEqumodelDefine/'+ typeId,
     method: 'get'
   })
 }
@@ -94,7 +94,7 @@ export function getEqumodelDefine(typeId) {
 export function getEqumodelParam(query) {
  
   return request({
-    url: '/uav/metasploitable/getEqumodelParam',
+    url: '/metasploitable/getEqumodelParam',
     method: 'post',
     data:query
   })
@@ -104,7 +104,7 @@ export function getEqumodelParam(query) {
 export function checkModelCode(modelCode) {
  
   return request({
-    url: '/uav/metasploitable/checkModelCode/'+ modelCode,
+    url: '/metasploitable/checkModelCode/'+ modelCode,
     method: 'get'
   })
 }
@@ -112,7 +112,7 @@ export function checkModelCode(modelCode) {
 // 设备型号导入
 export function API_POST_importExcel (data) {
 	return request({
-		url: '/uav/metasploitable/importData',
+		url: '/metasploitable/importData',
 		method: 'post',
 		data: data
 	})
diff --git a/src/api/datamodel/uavInformation/type.js b/src/api/datamodel/uavInformation/type.js
index 1e5431b..a326bd0 100644
--- a/src/api/datamodel/uavInformation/type.js
+++ b/src/api/datamodel/uavInformation/type.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询字典类型列表
 export function listType(query) {
   return request({
-    url: '/uav/information/list',
+    url: '/information/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listType(query) {
 // 查询字典类型详细
 export function getType(uavId) {
   return request({
-    url: '/uav/information/' + uavId,
+    url: '/information/' + uavId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getType(uavId) {
 // 新增字典类型
 export function addType(data) {
   return request({
-    url: '/uav/information',
+    url: '/information',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addType(data) {
 // 修改字典类型
 export function updateType(data) {
   return request({
-    url: '/uav/information',
+    url: '/information',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateType(data) {
 // 删除字典类型
 export function delType(uavId) {
   return request({
-    url: '/uav/information/' + uavId,
+    url: '/information/' + uavId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delType(uavId) {
 // 导出字典类型
 export function exportType(query) {
   return request({
-    url: '/uav/information/export',
+    url: '/information/export',
     method: 'get',
     params: query
   })
diff --git a/src/views/system/metasploitable/index.vue b/src/views/system/metasploitable/index.vue
index 14a0ab1..988bf2a 100644
--- a/src/views/system/metasploitable/index.vue
+++ b/src/views/system/metasploitable/index.vue
@@ -1,558 +1,1309 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
-        <!--部门数据-->
-        <pane size="16">
-          <el-col>
-            <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
-            </div>
-            <div class="head-container">
-              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
-            </div>
-          </el-col>
-        </pane>
-        <!--用户数据-->
-        <pane size="84">
-          <el-col>
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+  <div class="app-container" >
+
+  <el-tabs type="border-card">
+      <el-tab-pane label="多旋翼">
+          <el-form :model="queryParams"  ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+              <!-- <el-form-item label="类别标识" prop="typeId">
+                  <el-select v-model="queryParams.typeId" placeholder="请选择类别" clearable style="width: 240px">
+                      <el-option v-for="dict in slectEquTypeList"
+                              :key="dict.typeId"
+                              :label="dict.typeName"
+                              :value="dict.typeId"
+                      />
+                  </el-select>
+              </el-form-item> -->
+              <el-form-item label="品牌" prop="brand">
+                  <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
               </el-form-item>
-              <el-form-item label="手机号码" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
-              </el-form-item>
-              <el-form-item label="状态" prop="status">
-                <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+              <el-form-item label="名称" prop="uavName">
+                  <el-input v-model="queryParams.uavName" placeholder="请输入名称" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
               </el-form-item>
-            </el-form>
+          </el-form>
+          <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['uav:equmodel:add']">新增
+                  </el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                          v-hasPermi="['uav:equmodel:edit']">修改
+                  </el-button>
+              </el-col> -->
+              <!-- <el-button  @click="uploadHandle()" type="primary" plain icon="Upload">
+                                      导入
+                                      </el-button>
+                                  <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+                                      <el-upload class="upload-demo" :limit="1" accept=".xlsx" drag multiple :auto-upload="false" :on-change="uploadFile.handleChange">
+                                          <i class="el-icon-upload"></i>
+                                          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                                      </el-upload>
+                                      <span style="text-align: center; margin-bottom: 10px;">仅允许导入xlsx格式文件。</span>
+                                      <div slot="footer" class="dialog-footer" style="display: flex; justify-content: flex-end;">
+                                          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+                                          <el-button @click="upload.open = false">取 消</el-button>
+                                      </div>
+                                  </el-dialog> -->
+              <el-button type="primary" plain icon="download" @click="handleExport()"
+                                          >导出
+                                  </el-button>
+                                  <!-- <el-button type="primary" plain icon="tickets" @click="handleExcelDownload()"
+                                          >下载模板
+                                  </el-button> -->
+              <el-col :span="1.5">
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                          v-hasPermi="['uav:equmodel:remove']">删除
+                  </el-button>
+              </el-col>
+              <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="handleQuery" :columns="columns"></right-toolbar> -->
+          </el-row>
+          <el-table v-loading="loading" :data="equmodelList" @selection-change="handleSelectionChange"  >
+          <el-table-column type="selection" width="55" align="center"/>
+          <!-- /<el-table-column label="类别标识" align="center" prop="typeId" :formatter="typeFormatter"/> -->
+          <el-table-column label="品牌" align="center" prop="brand"/>
+          <el-table-column label="名称" align="center" prop="uavName"/>
+          <!-- <el-table-column label="图标" align="center" prop="photoFilePath" >
+            <template #default="scope">
+              <img :src= scope.row.photoFilePath  min-width="30" height="30" />
+            </template>
+          </el-table-column> -->
+          <el-table-column label="结构布局" align="center" prop="structure"/>
+          <el-table-column label="图传类型" align="center" prop="photoType"/>
+          <el-table-column label="通信链路" align="center" prop="infoLinks"/>
+          <el-table-column label="定位系统" align="center" prop="positionSys"/>
+          <el-table-column label="尺寸" align="center" prop="size"/>
+          <el-table-column label="重量" align="center" prop="weight"/>
+          <el-table-column label="能源" align="center" prop="energy"/>
+          <el-table-column label="产品定位" align="center" prop="product"/>
+          <el-table-column label="应用" align="center" prop="useType"/>
+          <el-table-column label="创建人" align="center" prop="createBy"/>
+          <!-- <el-table-column label="创建时间" align="center" prop="createTime"/> -->
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+              <template #default="scope">
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleParamUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >设备参数
+                  </el-button> -->
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >修改
+                  </el-button>
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Delete"
+                          @click="handleDelete(scope.row)"
+                          v-hasPermi="['uav:equmodel:remove']"
+                  >删除
+                  </el-button>
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="DArrowRight"
+                          @click="handleSelect(scope.row)"
+                  >更多
+                  </el-button> -->
+              </template>
+          </el-table-column>
+      </el-table>
 
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
-              </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-            </el-row>
-
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
-              <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
-                </template>
-              </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns.createTime.visible" width="160">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-                <template slot-scope="scope" v-if="scope.row.userId !== 1">
-                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
-                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                    <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-          </el-col>
-        </pane>
-      </splitpanes>
-    </el-row>
-
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1" ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+      <div >
+          <pagination
+          style="margin-top: 0px"
+              v-show="total>0"
+              :total="total"
+               :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+              @pagination="handleQuery"/>
       </div>
-    </el-dialog>
 
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-          </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
+      </el-tab-pane>
+      <el-tab-pane label="固定翼">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <!-- <el-form-item label="类别标识" prop="typeId">
+              <el-select v-model="queryParams.typeId" placeholder="请选择类别" clearable style="width: 240px">
+                  <el-option v-for="dict in slectEquTypeList"
+                             :key="dict.typeId"
+                             :label="dict.typeName"
+                             :value="dict.typeId"
+                  />
+              </el-select>
+          </el-form-item> -->
+              <el-form-item label="品牌" prop="brand">
+                  <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="名称" prop="uavName">
+                  <el-input v-model="queryParams.uavName" placeholder="请输入名称" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery2">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery2">重置</el-button>
+              </el-form-item>
+          </el-form>
+          <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd1" v-hasPermi="['uav:equmodel:add']">新增
+                  </el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                          v-hasPermi="['uav:equmodel:edit']">修改
+                  </el-button>
+              </el-col> -->
+              <!-- <el-button  @click="uploadHandle()" type="primary" plain icon="Upload">
+                                      导入
+                                      </el-button>
+                                  <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+                                      <el-upload class="upload-demo" :limit="1" accept=".xlsx" drag multiple :auto-upload="false" :on-change="uploadFile.handleChange">
+                                          <i class="el-icon-upload"></i>
+                                          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                                      </el-upload>
+                                      <span style="text-align: center; margin-bottom: 10px;">仅允许导入xlsx格式文件。</span>
+                                      <div slot="footer" class="dialog-footer" style="display: flex; justify-content: flex-end;">
+                                          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+                                          <el-button @click="upload.open = false">取 消</el-button>
+                                      </div>
+                                  </el-dialog> -->
+              <el-button type="primary" plain icon="download" @click="handleExport()"
+                                          >导出
+                                  </el-button>
+                                  <!-- <el-button type="primary" plain icon="tickets" @click="handleExcelDownload()"
+                                          >下载模板
+                                  </el-button> -->
+              <el-col :span="1.5">
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                          v-hasPermi="['uav:equmodel:remove']">删除
+                  </el-button>
+              </el-col>
+              <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="handleQuery2" :columns="columns"></right-toolbar> -->
+          </el-row>
+
+          <el-table v-loading="loading" :data="equmodelList1" @selection-change="handleSelectionChange"  >
+          <el-table-column type="selection" width="55" align="center"/>
+          <!-- /<el-table-column label="类别标识" align="center" prop="typeId" :formatter="typeFormatter"/> -->
+          <el-table-column label="品牌" align="center" prop="brand"/>
+          <el-table-column label="名称" align="center" prop="uavName"/>
+          <!-- <el-table-column label="图标" align="center" prop="photoFilePath" >
+            <template #default="scope">
+              <img :src= scope.row.photoFilePath  min-width="30" height="30" />
+            </template>
+          </el-table-column> -->
+          <el-table-column label="结构布局" align="center" prop="structure"/>
+          <el-table-column label="图传类型" align="center" prop="photoType"/>
+          <el-table-column label="通信链路" align="center" prop="infoLinks"/>
+          <el-table-column label="定位系统" align="center" prop="positionSys"/>
+          <el-table-column label="尺寸" align="center" prop="size"/>
+          <el-table-column label="重量" align="center" prop="weight"/>
+          <el-table-column label="能源" align="center" prop="energy"/>
+          <el-table-column label="产品定位" align="center" prop="product"/>
+          <el-table-column label="应用" align="center" prop="useType"/>
+          <el-table-column label="创建人" align="center" prop="createBy"/>
+          <!-- <el-table-column label="创建时间" align="center" prop="createTime"/> -->
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+              <template #default="scope">
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleParamUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >设备参数
+                  </el-button> -->
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >修改
+                  </el-button>
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Delete"
+                          @click="handleDelete(scope.row)"
+                          v-hasPermi="['uav:equmodel:remove']"
+                  >删除
+                  </el-button>
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="DArrowRight"
+                          @click="handleSelect(scope.row)"
+                  >更多
+                  </el-button> -->
+              </template>
+          </el-table-column>
+      </el-table>
+
+      <div >
+          <pagination
+          style="margin-top: 0px"
+              v-show="total>0"
+              :total="total"
+               :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+              @pagination="handleQuery2"/>
       </div>
-    </el-dialog>
+      </el-tab-pane>
+      <el-tab-pane label="直升机">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+              <!-- <el-form-item label="类别标识" prop="typeId">
+                  <el-select v-model="queryParams.typeId" placeholder="请选择类别" clearable style="width: 240px">
+                      <el-option v-for="dict in slectEquTypeList"
+                              :key="dict.typeId"
+                              :label="dict.typeName"
+                              :value="dict.typeId"
+                      />
+                  </el-select>
+              </el-form-item> -->
+              <el-form-item label="品牌" prop="brand">
+                  <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="名称" prop="uavName">
+                  <el-input v-model="queryParams.uavName" placeholder="请输入名称" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery3">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery3">重置</el-button>
+              </el-form-item>
+          </el-form>
+          <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd2" v-hasPermi="['uav:equmodel:add']">新增
+                  </el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                          v-hasPermi="['uav:equmodel:edit']">修改
+                  </el-button>
+              </el-col> -->
+              <!-- <el-button  @click="uploadHandle()" type="primary" plain icon="Upload">
+                                      导入
+                                      </el-button>
+                                  <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+                                      <el-upload class="upload-demo" :limit="1" accept=".xlsx" drag multiple :auto-upload="false" :on-change="uploadFile.handleChange">
+                                          <i class="el-icon-upload"></i>
+                                          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                                      </el-upload>
+                                      <span style="text-align: center; margin-bottom: 10px;">仅允许导入xlsx格式文件。</span>
+                                      <div slot="footer" class="dialog-footer" style="display: flex; justify-content: flex-end;">
+                                          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+                                          <el-button @click="upload.open = false">取 消</el-button>
+                                      </div>
+                                  </el-dialog> -->
+              <el-button type="primary" plain icon="download" @click="handleExport()"
+                                          >导出
+                                  </el-button>
+                                  <!-- <el-button type="primary" plain icon="tickets" @click="handleExcelDownload()"
+                                          >下载模板
+                                  </el-button> -->
+              <el-col :span="1.5">
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                          v-hasPermi="['uav:equmodel:remove']">删除
+                  </el-button>
+              </el-col>
+              <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="handleQuery3" :columns="columns"></right-toolbar> -->
+          </el-row>
+
+          <el-table v-loading="loading" :data="equmodelList2" @selection-change="handleSelectionChange"  >
+          <el-table-column type="selection" width="55" align="center"/>
+          <!-- /<el-table-column label="类别标识" align="center" prop="typeId" :formatter="typeFormatter"/> -->
+          <el-table-column label="品牌" align="center" prop="brand"/>
+          <el-table-column label="名称" align="center" prop="uavName"/>
+          <!-- <el-table-column label="图标" align="center" prop="photoFilePath" >
+            <template #default="scope">
+              <img :src= scope.row.photoFilePath  min-width="30" height="30" />
+            </template>
+          </el-table-column> -->
+          <el-table-column label="结构布局" align="center" prop="structure"/>
+          <el-table-column label="图传类型" align="center" prop="photoType"/>
+          <el-table-column label="通信链路" align="center" prop="infoLinks"/>
+          <el-table-column label="定位系统" align="center" prop="positionSys"/>
+          <el-table-column label="尺寸" align="center" prop="size"/>
+          <el-table-column label="重量" align="center" prop="weight"/>
+          <el-table-column label="能源" align="center" prop="energy"/>
+          <el-table-column label="产品定位" align="center" prop="product"/>
+          <el-table-column label="应用" align="center" prop="useType"/>
+          <el-table-column label="创建人" align="center" prop="createBy"/>
+          <!-- <el-table-column label="创建时间" align="center" prop="createTime"/> -->
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+              <template #default="scope">
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleParamUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >设备参数
+                  </el-button> -->
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >修改
+                  </el-button>
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Delete"
+                          @click="handleDelete(scope.row)"
+                          v-hasPermi="['uav:equmodel:remove']"
+                  >删除
+                  </el-button>
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="DArrowRight"
+                          @click="handleSelect(scope.row)"
+                  >更多
+                  </el-button> -->
+              </template>
+          </el-table-column>
+      </el-table>
+
+      <div >
+          <pagination
+          style="margin-top: 0px"
+              v-show="total>0"
+              :total="total"
+               :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+              @pagination="handleQuery3"/>
+      </div>
+      </el-tab-pane>
+      <el-tab-pane label="复合翼">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+              <!-- <el-form-item label="类别标识" prop="typeId">
+                  <el-select v-model="queryParams.typeId" placeholder="请选择类别" clearable style="width: 240px">
+                      <el-option v-for="dict in slectEquTypeList"
+                              :key="dict.typeId"
+                              :label="dict.typeName"
+                              :value="dict.typeId"
+                      />
+                  </el-select>
+              </el-form-item> -->
+              <el-form-item label="品牌" prop="brand">
+                  <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="名称" prop="uavName">
+                  <el-input v-model="queryParams.uavName" placeholder="请输入名称" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery4">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery4">重置</el-button>
+              </el-form-item>
+          </el-form>
+          <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd3" v-hasPermi="['uav:equmodel:add']">新增
+                  </el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                          v-hasPermi="['uav:equmodel:edit']">修改
+                  </el-button>
+              </el-col> -->
+              <!-- <el-button  @click="uploadHandle()" type="primary" plain icon="Upload">
+                                      导入
+                                      </el-button>
+                                  <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+                                      <el-upload class="upload-demo" :limit="1" accept=".xlsx" drag multiple :auto-upload="false" :on-change="uploadFile.handleChange">
+                                          <i class="el-icon-upload"></i>
+                                          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                                      </el-upload>
+                                      <span style="text-align: center; margin-bottom: 10px;">仅允许导入xlsx格式文件。</span>
+                                      <div slot="footer" class="dialog-footer" style="display: flex; justify-content: flex-end;">
+                                          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+                                          <el-button @click="upload.open = false">取 消</el-button>
+                                      </div>
+                                  </el-dialog> -->
+              <el-button type="primary" plain icon="download" @click="handleExport()"
+                                          >导出
+                                  </el-button>
+                                  <!-- <el-button type="primary" plain icon="tickets" @click="handleExcelDownload()"
+                                          >下载模板
+                                  </el-button> -->
+              <el-col :span="1.5">
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                          v-hasPermi="['uav:equmodel:remove']">删除
+                  </el-button>
+              </el-col>
+              <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="handleQuery4" :columns="columns"></right-toolbar> -->
+          </el-row>
+
+          <el-table v-loading="loading" :data="equmodelList3" @selection-change="handleSelectionChange"  >
+          <el-table-column type="selection" width="55" align="center"/>
+          <!-- /<el-table-column label="类别标识" align="center" prop="typeId" :formatter="typeFormatter"/> -->
+          <el-table-column label="品牌" align="center" prop="brand"/>
+          <el-table-column label="名称" align="center" prop="uavName"/>
+          <!-- <el-table-column label="图标" align="center" prop="photoFilePath" >
+            <template #default="scope">
+              <img :src= scope.row.photoFilePath  min-width="30" height="30" />
+            </template>
+          </el-table-column> -->
+          <el-table-column label="结构布局" align="center" prop="structure"/>
+          <el-table-column label="图传类型" align="center" prop="photoType"/>
+          <el-table-column label="通信链路" align="center" prop="infoLinks"/>
+          <el-table-column label="定位系统" align="center" prop="positionSys"/>
+          <el-table-column label="尺寸" align="center" prop="size"/>
+          <el-table-column label="重量" align="center" prop="weight"/>
+          <el-table-column label="能源" align="center" prop="energy"/>
+          <el-table-column label="产品定位" align="center" prop="product"/>
+          <el-table-column label="应用" align="center" prop="useType"/>
+          <el-table-column label="创建人" align="center" prop="createBy"/>
+          <!-- <el-table-column label="创建时间" align="center" prop="createTime"/> -->
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+              <template #default="scope">
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleParamUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >设备参数
+                  </el-button> -->
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Edit"
+                          @click="handleUpdate(scope.row)"
+                          v-hasPermi="['uav:equmodel:edit']"
+                  >修改
+                  </el-button>
+                  <el-button
+                          size="mini"
+                          type="text"
+                          icon="Delete"
+                          @click="handleDelete(scope.row)"
+                          v-hasPermi="['uav:equmodel:remove']"
+                  >删除
+                  </el-button>
+                  <!-- <el-button
+                          size="mini"
+                          type="text"
+                          icon="DArrowRight"
+                          @click="handleSelect(scope.row)"
+                  >更多
+                  </el-button> -->
+              </template>
+          </el-table-column>
+      </el-table>
+
+      <div >
+          <pagination
+          style="margin-top: 0px"
+              v-show="total>0"
+              :total="total"
+               :page.sync="queryParams.pageNum" 
+               :limit.sync="queryParams.pageSize"
+              @pagination="handleQuery4"/>
+      </div>
+      </el-tab-pane>
+  </el-tabs>
+
+      <!-- 添加或修改靶机对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body destroy-on-close>
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="mini">
+              <!-- <el-form-item label="类别" prop="typeId">
+                  <el-select v-model="form.typeId" placeholder="请选择类别" style="width: 480px">
+                      <el-option
+                              v-for="dict in slectEquTypeList"
+                              :key="dict.typeId"
+                              :label="dict.typeName"
+                              :value="dict.typeId"
+                      ></el-option>
+                  </el-select>
+              </el-form-item> -->
+              <el-form-item label="品牌" prop="brand">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.brand" placeholder="请输入品牌"/>
+              </el-form-item>
+              <el-form-item label="名称" prop="uavName">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="50" v-model="form.uavName" placeholder="请输入名称"/>
+              </el-form-item>
+              <el-form-item label="结构布局" prop="structure">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.structure" placeholder="请输入结构布局"/>
+              </el-form-item>
+              <el-form-item label="产品定位" prop="product">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.product" placeholder="请输入产品定位"/>
+              </el-form-item>
+              <el-form-item label="能源" prop="energy">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="50" v-model="form.energy" placeholder="请输入能源"/>
+              </el-form-item>
+              <el-form-item label="尺寸" prop="size">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.size" placeholder="请输入尺寸"/>
+              </el-form-item>
+              <el-form-item label="重量" prop="weight">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.weight" placeholder="请输入重量"/>
+              </el-form-item>
+              <el-form-item label="应用" prop="useType">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.useType" placeholder="请输入应用类型"/>
+              </el-form-item>
+              <el-form-item label="图传类型" prop="photoType">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="50" v-model="form.photoType" placeholder="请输入图传类型"/>
+              </el-form-item>
+              <el-form-item label="通信链路" prop="infoLinks">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.infoLinks" placeholder="请输入通信链路"/>
+              </el-form-item>
+              <el-form-item label="定位系统" prop="positionSys">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.positionSys" placeholder="请输入定位系统"/>
+              </el-form-item>
+              <el-form-item label="产品介绍" prop="productPre">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" type="textarea" rows="6" maxlength="1000" v-model="form.productPre" placeholder="请输入产品介绍"/>
+              </el-form-item>
+              <!-- <el-form-item label="价格" prop="price">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.price" placeholder="请输入价格"/>
+              </el-form-item> -->
+              <!-- <el-form-item label="图标" prop="photoFilePath">
+                  <FileUploadForEqu @input="fileInput" ref="ref_photoFilePath" :dataMap="{path: form.photoFilePath, name: form.photoFileName}" :limit=1
+                                :fileType="['png', 'jpg']"/>
+              </el-form-item> -->
+          </el-form>
+          <template #footer>
+              <div class="dialog-footer">
+                  <el-button type="primary"
+                             @click="submitForm">确 定
+                  </el-button>
+                  <el-button @click="cancel">取 消</el-button>
+              </div>
+          </template>
+      </el-dialog>
+
+      <!-- 详情靶机对话框 -->
+      <el-dialog :title="title" :visible.sync="open1" width="600px" append-to-body destroy-on-close>
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="mini">
+              <!-- <el-form-item label="类别" prop="typeId">
+                  <el-select v-model="form.typeId" placeholder="请选择类别" style="width: 480px">
+                      <el-option
+                              v-for="dict in slectEquTypeList"
+                              :key="dict.typeId"
+                              :label="dict.typeName"
+                              :value="dict.typeId"
+                      ></el-option>
+                  </el-select>
+              </el-form-item> -->
+              <el-form-item label="品牌" prop="brand">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.brand" placeholder="请输入品牌"/>
+              </el-form-item>
+              <el-form-item label="名称" prop="uavName">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="50" v-model="form.uavName" placeholder="请输入名称"/>
+              </el-form-item>
+              <el-form-item label="结构布局" prop="structure">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.structure" placeholder="请输入结构布局"/>
+              </el-form-item>
+              <el-form-item label="产品定位" prop="product">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.product" placeholder="请输入产品定位"/>
+              </el-form-item>
+              <el-form-item label="能源" prop="energy">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="50" v-model="form.energy" placeholder="请输入能源"/>
+              </el-form-item>
+              <el-form-item label="尺寸" prop="size">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.size" placeholder="请输入尺寸"/>
+              </el-form-item>
+              <el-form-item label="重量" prop="weight">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.weight" placeholder="请输入重量"/>
+              </el-form-item>
+              <el-form-item label="应用" prop="useType">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.useType" placeholder="请输入应用类型"/>
+              </el-form-item>
+              <el-form-item label="图传类型" prop="photoType">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="50" v-model="form.photoType" placeholder="请输入图传类型"/>
+              </el-form-item>
+              <el-form-item label="通信链路" prop="infoLinks">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.infoLinks" placeholder="请输入通信链路"/>
+              </el-form-item>
+              <el-form-item label="定位系统" prop="positionSys">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" maxlength="20" v-model="form.positionSys" placeholder="请输入定位系统"/>
+              </el-form-item>
+              <el-form-item label="产品介绍" prop="productPre">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" type="textarea" rows="6" maxlength="1000" v-model="form.productPre" placeholder="请输入产品介绍"/>
+              </el-form-item>
+              <!-- <el-form-item label="价格" prop="price">
+                  <el-input   onkeyup="this.value=this.value.replace(/\s+/g,'')" v-model="form.price" placeholder="请输入价格"/>
+              </el-form-item> -->
+              <!-- <el-form-item label="图标" prop="photoFilePath">
+                  <FileUploadForEqu @input="fileInput" ref="ref_photoFilePath" :dataMap="{path: form.photoFilePath, name: form.photoFileName}" :limit=1
+                                :fileType="['png', 'jpg']"/>
+              </el-form-item> -->
+          </el-form>
+          <template #footer>
+              <div class="dialog-footer">
+                  <el-button type="primary"
+                             @click="submitForm1">确 定
+                  </el-button>
+                  <el-button @click="cancel1">取 消</el-button>
+              </div>
+          </template>
+      </el-dialog>
+
+
+<!-- 
+      <el-dialog :title="paramTitle" :visible.sync="openParam" width="600px" append-to-body>
+          <el-form ref="form1" :model="form1"  :rules="rulesForCs" label-position="top"  label-width="80px" size="mini">
+              <el-form-item v-for="item in formParam" :label=item.param_name :prop="item.param_code">
+                  <el-select v-if="item.dataType=='3'" style="width: 100%" v-model="item.param_value" placeholder="请选择">
+                      <el-option label="是" value="1">是</el-option>
+                      <el-option label="否" value="0">否</el-option>
+                  </el-select>
+                  <el-input v-else  v-model="item.param_value"
+                             placeholder="请输入参数值" @change="handleInput(item)"/>
+              </el-form-item>
+          </el-form>
+          <template #footer>
+              <div class="dialog-footer">
+                  <el-button type="primary"
+                             @click="submitForm1">确 定
+                  </el-button>
+                  <el-button @click="cancel1">取 消</el-button>
+              </div>
+          </template>
+      </el-dialog> -->
+
+      <el-dialog :title="paramTitle" :visible.sync="openExcel" width="600px" append-to-body>
+          <el-form ref="form1" :model="form1"  :rules="rulesForCs" label-position="top"  label-width="80px" size="mini">
+             
+              <el-form-item label="导入失败信息">
+                  <el-input type="textarea" v-model="formData.errorMessage" :rows="20" resize="none"/>
+      </el-form-item>
+          </el-form>
+          <template #footer>
+              <div class="dialog-footer">
+                  <el-button type="primary"
+                             @click="confirmExcel">确 定
+                  </el-button>
+                  <el-button @click="cancelExcel">取 消</el-button>
+              </div>
+          </template>
+      </el-dialog>
   </div>
+
+
 </template>
-
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
-import { getToken } from "@/utils/auth"
-import Treeselect from "@riophae/vue-treeselect"
-import "@riophae/vue-treeselect/dist/vue-treeselect.css"
-import { Splitpanes, Pane } from "splitpanes"
-import "splitpanes/dist/splitpanes.css"
 
-export default {
-  name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect, Splitpanes, Pane },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: null,
-      // 弹出层标题
-      title: "",
-      // 所有部门树选项
-      deptOptions: undefined,
-      // 过滤掉已禁用部门树选项
-      enabledDeptOptions: undefined,
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
-      // 日期范围
-      dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
+
+  import {
+      listEqumodel,
+      getEqumodel,
+      delEqumodel,
+      addEqumodel,
+      updateEqumodel,
+      queryEquType,
+      // getEqumodelDefine,
+      // updateEqumodelParam,
+      // getEqumodelParam,
+      checkModelCode,
+      API_POST_importExcel
+  } from '../../../api/datamodel/metasploitable/equmodel';
+  // import FileUploadForEqu from './FileUploadForEqu'
+  // import {reactive, ref, onMounted, getCurrentInstance} from 'vue'
+ 
+
+  export default {
+      name: "Equmodel",
+      dicts: ['sys_normal_disable'],
+
+
+      data() {
+          const uploadFile = {
+              file: null,
+              handleChange: (file, fileList) => {
+                  if (fileList.length >= 2) {
+                      return;
+                  }
+                  uploadFile.file = file.raw; // 保存原始文件对象
+              }
+          };
+          // var validatorModelCode = (rule, value, callback) => {
+          //     let list = [];
+          //     checkModelCode(value).then(response => {
+          //         list = response.data;
+          //         if (list.length > 0 && list[0].modelId != this.form.modelId) {
+          //             callback(new Error('型号编码已存在'))
+          //         } else {
+          //             callback()
+          //         }
+          //     });
+          // };
+          return {
+              dialogTitle: "文件信息",
+              openExcel: false,
+              formData: {
+                  errorMessage: "" // 将错误信息放在表单数据中
+              },
+              upload :{
+                  // 是否显示弹出层（用户导入）
+                  open: false,
+                  // 弹出层标题（用户导入）
+                  title: "",
+              },
+              uploadFile: {
+                  file: null,
+                  handleChange: (file, fileList) => {
+                  if (fileList.length >= 2) {
+                      return;
+                  }
+                  this.uploadFile.file = file.raw; // 保存原始文件对象
+                  }
+              },
+              exportParams: {
+              createBy: '',
+              ids: [],
+              orgIds: []
+          },
+              //
+              isyanzhen:true,
+              // 遮罩层
+              loading: true,
+              // 选中数组
+              ids: [],
+              // 非单个禁用
+              single: true,
+              // 非多个禁用
+              multiple: true,
+              // 显示搜索条件
+              showSearch: true,
+              // 总条数
+              total: 0,
+              // 靶机表格数据
+              equmodelList: [],
+              equmodelList1: [],
+              equmodelList2: [],
+              equmodelList3: [],
+              slectEquTypeList: [],
+              equParamDefineList: [],
+              equmodelParamList: [],
+              // 弹出层标题
+              title: "",
+              // 是否显示弹出层
+              open: false,
+              open1: false,
+              openParam: false,
+              // paramModelId: '',
+              paramTitle: '',
+              // 查询参数
+              queryParams: {
+                  pageNum: 1,
+                  pageSize: 10,
+                  uavName: null,
+                  brand: null,
+                  structure:null
+              },
+
+              // 表单参数
+              form: {},
+              form1: {},
+              // 参数
+              formParam: [],
+              // 表单校验
+              rules: {
+                  // typeId: [
+                  //     {required: true, message: "类别不能为空", trigger: "change"}
+                  // ],
+                  uavName: [
+                      {required: true, transform: (value) => value && value.trim(), message: "靶机名称不能为空", trigger: "blur"},
+                      // {validator: validatorModelCode, trigger: 'blur'}
+                  ],
+                  // modelName: [
+                  //     {required: true, transform: (value) => value && value.trim(), message: "型号编码不能为空", trigger: "blur"},
+                  //     {required: true, message: "型号名称不能为空", trigger: "blur"}
+                  // ]
+              },
+              rulesForCs:{}
+          };
       },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+      components:{
+          // FileUploadForEqu,
       },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        status: undefined,
-        deptId: undefined
+      created() {
+          this.getList();
+          this.getList1();
+          this.getList2();
+          this.getList3();
+          this.getSelectEquTypeList();
       },
-      // 列信息
-      columns: {
-        userId: { label: '用户编号', visible: true },
-        userName: { label: '用户名称', visible: true },
-        nickName: { label: '用户昵称', visible: true },
-        deptName: { label: '部门', visible: true },
-        phonenumber: { label: '手机号码', visible: true },
-        status: { label: '状态', visible: true },
-        createTime: { label: '创建时间', visible: true }
+      onMounted() {
+
       },
-      // 表单校验
-      rules: {
-        userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
-    }
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  created() {
-    this.getList()
-    this.getDeptTree()
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg
-    })
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows
-          this.total = response.total
-          this.loading = false
-        }
-      )
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data
-        this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
-      })
-    },
-    // 过滤禁用的部门
-    filterDisabledDept(deptList) {
-      return deptList.filter(dept => {
-        if (dept.disabled) {
-          return false
-        }
-        if (dept.children && dept.children.length) {
-          dept.children = this.filterDisabledDept(dept.children)
-        }
-        return true
-      })
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id
-      this.handleQuery()
-    },
-    // 用户状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用"
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status)
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功")
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0"
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        nickName: undefined,
-        password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
-        remark: undefined,
-        postIds: [],
-        roleIds: []
-      }
-      this.resetForm("form")
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm("queryForm")
-      this.queryParams.deptId = undefined
-      this.$refs.tree.setCurrentKey(null)
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleResetPwd":
-          this.handleResetPwd(row)
-          break
-        case "handleAuthRole":
-          this.handleAuthRole(row)
-          break
-        default:
-          break
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      getUser().then(response => {
-        this.postOptions = response.posts
-        this.roleOptions = response.roles
-        this.open = true
-        this.title = "添加用户"
-        this.form.password = this.initPassword
-      })
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const userId = row.userId || this.ids
-      getUser(userId).then(response => {
-        this.form = response.data
-        this.postOptions = response.posts
-        this.roleOptions = response.roles
-        this.$set(this.form, "postIds", response.postIds)
-        this.$set(this.form, "roleIds", response.roleIds)
-        this.open = true
-        this.title = "修改用户"
-        this.form.password = ""
-      })
-    },
-    /** 重置密码按钮操作 */
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
-        inputValidator: (value) => {
-          if (/<|>|"|'|\||\\/.test(value)) {
-            return "不能包含非法字符：< > \" ' \\\ |"
-          }
-        },
-      }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value)
-          })
-        }).catch(() => {})
-    },
-    /** 分配角色操作 */
-    handleAuthRole: function(row) {
-      const userId = row.userId
-      this.$router.push("/system/user-auth/role/" + userId)
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
+      destroyed() {
+        console.log("销毁......")
+      },
+    methods: {
+      submitFileForm() {
+          // 检查是否选择了文件
+          if (this.uploadFile.file) {
+              const formData = new FormData();
+              formData.append("file", this.uploadFile.file);
+              this.$message.success("文件上传中...");
+              API_POST_importExcel(formData).then((res) => {
+                  if (res.code === 200) {
+                      this.upload.open = false;
+                      this.uploadFile.file = null;
+                      this.$message.success(res.msg);
+                      this.getList();
+                      this.getList1();
+                      this.getList2();
+                      this.getList3();
+                  } else {
+                      if(res.code === 10002){
+                          
+                          const infoArray = res.msg.split('：').map(error => error.trim());
+                          const errorArray = infoArray[1].split(',').map(error => error.trim());
+                          this.formData.errorMessage = infoArray[0]+": \n" + errorArray.join('\n'); 
+                          this.openExcel = true;
+                          this.upload.open = false;
+                      }else {
+                          this.$message.error(res.message);
+                      }
+                  }
+              });
           } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
+              // 处理未选择文件的情况
+              ElMessage({
+                  message: '未选择文件',
+                  type: 'error',
+              });
+              this.upload.open = false;
           }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const userIds = row.userId || this.ids
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入"
-      this.upload.open = true
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false
-      this.upload.isUploading = false
-      this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.getList()
-    },
-    // 提交上传文件
-    submitFileForm() {
-      const file = this.$refs.upload.uploadFiles
-      if (!file || file.length === 0 || !file[0].name.toLowerCase().endsWith('.xls') && !file[0].name.toLowerCase().endsWith('.xlsx')) {
-        this.$modal.msgError("请选择后缀为 “xls”或“xlsx”的文件。")
-        return
+      },
+      cancelExcel() {
+          this.openExcel = false;
+      },
+      confirmExcel() {
+          this.openExcel = false;
+      },
+      uploadHandle() {
+          console.log('导入');
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+
+      // 导出事件
+      handleExport() {
+          this.$confirm('是否确认导出所有靶机数据?', "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+          }).then(() => {
+              this.download('metasploitable/export', {
+                  // ...this.exportParams
+                  "createBy": "",
+              "ids": [],
+              "orgIds": [24]
+              }, `靶机${new Date().getTime()}.xlsx`);
+          }).catch(() => {
+              // 取消导出操作
+          });
+      },
+          // 下载模板
+          handleExcelDownload() {
+              this.$confirm('是否确认下载模板?', "提示", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+              }).then(() => {
+                  // 调用下载模板接口
+                  this.download('metasploitable/export', {
+                      "createBy": "0000000000000000000000",
+                  }, `靶机${new Date().getTime()}.xlsx`);
+              }).catch(() => {
+                  
+              });
+          },
+          fileInput(nval) {
+              console.log('=====>' + nval)
+          },
+          // typeFormatter(row) {
+          //     for (let i = 0; i < this.slectEquTypeList.length; i++) {
+          //         if (this.slectEquTypeList[i].typeId == row.typeId) {
+          //             return this.slectEquTypeList[i].typeName;
+          //         }
+          //     }
+          // },
+          /** 查询靶机列表 */
+          getList() {
+              this.loading = true;
+              console.log("参数的值为：",this.queryParams)
+              listEqumodel(this.queryParams).then(response => {
+                  this.equmodelList = response.rows;
+                  this.total = response.total;
+                  this.loading = false;
+              });
+          },
+          getList1() {
+              this.loading = true;
+              console.log("参数的值为：",this.queryParams)
+              listEqumodel(this.queryParams).then(response => {
+                  this.equmodelList1 = response.rows;
+                  this.total = response.total;
+                  this.loading = false;
+              });
+          },
+          getList2() {
+              this.loading = true;
+              console.log("参数的值为：",this.queryParams)
+              listEqumodel(this.queryParams).then(response => {
+                  this.equmodelList2 = response.rows;
+                  this.total = response.total;
+                  this.loading = false;
+              });
+          },
+          getList3() {
+              this.loading = true;
+              console.log("参数的值为：",this.queryParams)
+              listEqumodel(this.queryParams).then(response => {
+                  this.equmodelList3 = response.rows;
+                  this.total = response.total;
+                  this.loading = false;
+              });
+          },
+          getSelectEquTypeList() {
+              queryEquType().then((res) => {
+                  this.slectEquTypeList = res.data;
+              })
+          },
+          // 取消按钮
+          cancel() {
+              this.open = false;
+              this.reset();
+          },
+            // 取消按钮
+          cancel1() {
+              this.open1 = false;
+              this.reset();
+          },
+          // cancel1() {
+          //     this.openParam = false;
+          //     this.formParam = [];
+          // },
+          // 表单重置
+          reset() {
+              this.form = {
+                  brand: null,
+                  uavName: null,
+                  structure: null,
+                  product: null,
+                  energy: null,
+                  delMark: null,
+                  size: null,
+                  useType: null,
+                  photoType: null,
+                  infoLinks: null,
+                  positionSys: null,
+                  productPre: null,
+                  price: null,
+                  photo: null,
+                  createBy: null,
+                  createTime: null,
+                  updateBy: null,
+                  updateTime: null,
+                  photoFilePath: null
+              };
+              // this.$refs.form.resetFields()
+          },
+          /** 搜索按钮操作 */
+          handleQuery() {
+              // this.queryParams.pageNum = 1;
+              this.queryParams.structure  = "多旋翼";
+              this.getList();
+          },
+          handleQuery2() {
+              // this.queryParams.pageNum = 1;
+              this.queryParams.structure  = "固定翼";
+              this.getList1();
+          },
+          handleQuery3() {
+              // this.queryParams.pageNum = 1;
+              this.queryParams.structure  = "单旋翼";
+              this.getList2();
+          },
+          handleQuery4() {
+              // this.queryParams.pageNum = 1;
+              this.queryParams.structure  = "复合式固定翼";
+              this.getList3();
+          },
+          /** 重置按钮操作 */
+          resetQuery() {
+              this.queryParams.pageNum = 1;
+              this.$refs.queryForm.resetFields()
+              this.handleQuery();
+          },
+          resetQuery2() {
+              this.queryParams.pageNum = 1;
+              this.$refs.queryForm.resetFields()
+              this.handleQuery2();
+          },
+          resetQuery3() {
+              this.queryParams.pageNum = 1;
+              this.$refs.queryForm.resetFields()
+              this.handleQuery3();
+          },
+          resetQuery4() {
+              this.queryParams.pageNum = 1;
+              this.$refs.queryForm.resetFields()
+              this.handleQuery4();
+          },
+          // 多选框选中数据
+          handleSelectionChange(selection) {
+              this.ids = selection.map(item => item.id)
+              this.single = selection.length !== 1
+              this.multiple = !selection.length
+          },
+          /** 新增按钮操作 */
+          handleAdd() {
+              this.reset();
+              this.open = true;
+              this.title = "添加靶机";
+              this.form.structure = "多旋翼";
+          },
+           /** 新增按钮操作 */
+           handleAdd1() {
+              this.reset();
+              this.open = true;
+              this.title = "添加靶机";
+              this.form.structure = "固定翼";
+          },
+          /** 新增按钮操作 */
+          handleAdd2() {
+              this.reset();
+              this.open = true;
+              this.title = "添加靶机";
+              this.form.structure = "单旋翼";
+          },
+          /** 新增按钮操作 */
+          handleAdd3() {
+              this.reset();
+              this.open = true;
+              this.title = "添加靶机";
+              this.form.structure = "复合式固定翼";
+          },
+          /** 修改按钮操作 */
+          handleUpdate(row) {
+              this.reset();
+              const id = row.id || this.ids
+              getEqumodel(id).then(response => {
+                  this.form = response.data;
+                  this.open = true;
+                  this.title = "修改靶机";
+              });
+          },
+                      /** 修改按钮操作 */
+          handleSelect(row) {
+              this.reset();
+              const id = row.id || this.ids
+              getEqumodel(id).then(response => {
+                  this.form = response.data;
+                  this.open1 = true;
+                  this.title = "更多数据";
+              });
+          },
+          /** 修改设备参数 */
+          // handleParamUpdate(row) {
+          //     this.formParam = [];
+          //     this.equParamDefineList = null;
+          //     //根据modelId查询设备参数是否存在
+          //     var query={
+          //         modelId:row.modelId,
+          //         typeId:row.typeId
+          //     }
+          //     getEqumodelParam(query).then(response => {
+          //         if (response.data != null && response.data.length > 0) {
+          //             this.paramTitle = '修改设备参数'
+          //             response.data.forEach((item, index) => {
+          //                 var param = new Object();
+          //                 param.param_code = item.paramCode;
+          //                 param.param_name = item.paramName;
+          //                 param.param_value = item.paramValue;
+          //                 param.modelId = item.modelId;
+          //                 param.paramSeq = item.paramSeq;
+          //                 param.dataType = item.dataType;
+          //                 param.decCnt = item.decCnt;
+          //                 param.maxVal = item.maxVal;
+          //                 param.minVal = item.minVal;
+          //                 this.formParam.push(param);
+          //                 this.form1.param_code = item.paramValue;
+          //                 this.rulesForCs[param.param_code]=[
+          //                     {required: true, message: param.param_name+"不能为空", trigger: "change"}
+          //                 ]
+
+          //             });
+          //         } else {
+          //             getEqumodelDefine(row.typeId).then(response => {
+          //                 this.paramTitle = '维护设备参数'
+          //                 console.log(response.data);
+          //                 this.equParamDefineList = response.data;
+          //                 this.equParamDefineList.forEach((item, index) => {
+
+          //                     var param = new Object();
+          //                     param.param_code = item.paramCode;
+          //                     param.param_name = item.paramName;
+          //                     param.param_value = item.paramValue;
+          //                     param.modelId = row.modelId;
+          //                     this.paramModelId = row.modelId;
+          //                     param.dataType = item.dataType;
+          //                     param.decCnt = item.decCnt;
+          //                     param.maxVal = item.maxVal
+          //                     param.minVal = item.minVal;
+          //                     param.paramSeq = '';
+          //                     this.formParam.push(param);
+          //                     this.form1.param_code = item.paramValue;
+          //                     this.rulesForCs[param.param_code]=[
+          //                         {required: true, type:'text', message: param.param_name+"不能为空", trigger: "change"}
+          //                     ]
+          //                 });
+
+          //             });
+          //         }
+          //     });
+          //     this.openParam = true;
+          // },
+          /** 提交按钮 */
+          submitForm() {
+              this.$refs["form"].validate(valid => {
+                  if (valid) {
+                      if (this.form.id != null) {
+                          console.log("form的职为",this.form)
+                          // const fileContent = this.$refs['ref_photoFilePath'].fileList;
+                          // console.log("fileContent",fileContent)
+                          // if (fileContent.length) {
+                          //     console.log("fileContent1",fileContent)
+                          //     this.form.photo = fileContent[0].fileId;
+                          //     console.log("this.form.photo1",this.form.photo)
+                          //     console.log("form的职为2",this.form)
+                          // }
+                          console.log("this.form.photo2",this.form.photo)
+                          console.log("form的职为3",this.form)
+                          updateEqumodel(this.form).then(response => {
+                              this.$message.success("修改成功");
+                              this.open = false;
+                              this.getList();
+                              this.getList1();
+                              this.getList2();
+                              this.getList3();
+                          });
+                      } else {
+                          // const fileContent = this.$refs['ref_photoFilePath'].fileList;
+                          // if (fileContent.length) {
+                          //     this.form.photo = fileContent[0].fileId;
+                          // }
+                          addEqumodel(this.form).then(response => {
+                              this.$message.success("新增成功");
+                              this.open = false;
+                              this.getList();
+                              this.getList1();
+                              this.getList2();
+                              this.getList3();
+                          });
+                      }
+                  }
+              });
+          },
+          submitForm1() {
+              this.open1 = false;
+              this.getList();
+              this.getList1();
+              this.getList2();
+              this.getList3();
+          },
+          // submitForm1() {
+              
+          //             if (!this.isyanzhen){
+          //                 return
+          //             }
+          //             var isOk = true;
+          //             for (var i=0;i<this.formParam.length;i++){
+          //                 var item = this.formParam[i];
+          //                 if (item.param_value == null || item.param_value == ''){
+          //                     this.$message.error(item.param_name+"不能为空");
+          //                     isOk = false;
+          //                     break;
+          //                 }
+          //             }
+          //             if (isOk) {
+          //                 updateEqumodelParam(this.formParam).then(response => {
+          //                     this.$message.success("操作成功");
+          //                     this.openParam = false;
+          //                 });
+          //             }
+              
+                
+          // },
+          /** 删除按钮操作 */
+          handleDelete(row) {
+              const modelIds = row.id || this.ids;
+              this.$confirm('是否确认删除靶机编号为"' + modelIds + '"的数据项？', "提示").then(function () {
+                  return delEqumodel(modelIds);
+              }).then(() => {
+                  this.getList();
+                  this.msgSuccess("删除成功");
+              }).catch(() => {
+              });
+
+          },
+
+          // handleInput(data) {
+          //     if (data.dataType == 1){
+          //         const reg = /^\d+$/; // 正则表达式，只允许输入整数
+          //         if (reg.test(data.param_value)) {
+          //             if (data.minVal!=null && data.param_value>=data.minVal && data.maxVal!= null && data.param_value<=data.maxVal){
+          //                 this.isyanzhen=true
+          //             }else if(data.minVal == null && data.param_value<=data.maxVal){
+          //                 this.isyanzhen=true
+          //             }else if(data.maxVal == null && data.param_value>=data.minVal){
+          //                 this.isyanzhen=true
+          //             }else{
+          //                 data.param_value = ''
+          //                 this.isyanzhen=false
+          //                 this.$message.error("请输入:"+data.minVal+"-"+data.maxVal+"的整数")                        
+          //             }
+          //         }else{
+          //             data.param_value = ''
+          //             this.isyanzhen=false
+          //             this.$message.error("请输入:"+data.minVal+"-"+data.maxVal+"的整数")                        
+          //         }
+          //     }else{
+          //         const decCnts = data.decCnt*1
+          //         const reg = /^\d+(\.\d{1,2})?$/; // 正则表达式，只允许输入小数
+          //         if (reg.test(data.param_value)) {
+          //             if (data.minVal!=null && data.param_value>=data.minVal && data.maxVal!= null && data.param_value<=data.maxVal){
+          //                 this.isyanzhen=true
+          //             }else if(data.minVal == null && data.param_value<=data.maxVal){
+          //                 this.isyanzhen=true
+          //             }else if(data.maxVal == null && data.param_value>=data.minVal){
+          //                 this.isyanzhen=true
+          //             }else{
+          //                 data.param_value = ''
+          //                 this.isyanzhen=false
+          //                 this.$message.error("请输入:"+data.minVal+"-"+data.maxVal+"的"+data.decCnt+"位小数")                        }
+          //             }
+          //         else{
+          //             data.param_value = ''
+          //             this.isyanzhen=false
+          //             this.$message.error("请输入:"+data.minVal+"-"+data.maxVal+"的"+data.decCnt+"位小数")                        }
+          //     }
+
+          // }
       }
-      this.$refs.upload.submit()
-    }
-  }
-}
+
+  };
+
 </script>
\ No newline at end of file
diff --git a/src/views/system/operator/data.vue b/src/views/system/operator/data.vue
index 1b0241d..d18ff55 100644
--- a/src/views/system/operator/data.vue
+++ b/src/views/system/operator/data.vue
@@ -28,7 +28,7 @@
           
           </el-row>
 
-          <el-table v-loading="loading" :data="operatorList" @selection-change="handleSelectionChange" style="height: calc(100vh - 400px);">
+          <el-table v-loading="loading" :data="operatorList" @selection-change="handleSelectionChange" >
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="专业编号" align="center" prop="id" />
               <el-table-column label="姓名" align="center" prop="userName"  />
@@ -75,7 +75,7 @@
           
           </el-row>
 
-          <el-table v-loading="loading" :data="operatorList1" @selection-change="handleSelectionChange" style="height: calc(100vh - 400px);">
+          <el-table v-loading="loading" :data="operatorList1" @selection-change="handleSelectionChange" >
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="专业编号" align="center" prop="id" />
               <el-table-column label="姓名" align="center" prop="userName"  />
@@ -122,7 +122,7 @@
           
           </el-row>
 
-          <el-table v-loading="loading" :data="operatorList2" @selection-change="handleSelectionChange" style="height: calc(100vh - 400px);">
+          <el-table v-loading="loading" :data="operatorList2" @selection-change="handleSelectionChange" >
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="专业编号" align="center" prop="id" />
               <el-table-column label="姓名" align="center" prop="userName"  />
diff --git a/src/views/system/uavInformation/index.vue b/src/views/system/uavInformation/index.vue
index 14a0ab1..3873c19 100644
--- a/src/views/system/uavInformation/index.vue
+++ b/src/views/system/uavInformation/index.vue
@@ -6,7 +6,7 @@
         <pane size="16">
           <el-col>
             <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
+              <el-input v-model="deptName" placeholder="请输入装备类型名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
             </div>
             <div class="head-container">
               <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
@@ -17,18 +17,10 @@
         <pane size="84">
           <el-col>
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+              <el-form-item label="装备名称" prop="uavName">
+                <el-input v-model="queryParams.uavName" placeholder="请输入装备名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
               </el-form-item>
-              <el-form-item label="手机号码" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
-              </el-form-item>
-              <el-form-item label="状态" prop="status">
-                <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="创建时间">
+              <el-form-item label="创建时间" prop="dateRange">
                 <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
               </el-form-item>
               <el-form-item>
@@ -37,7 +29,7 @@
               </el-form-item>
             </el-form>
 
-            <el-row :gutter="10" class="mb8">
+            <el-row :gutter="10" class="mb8" v-if="this.showId!= null">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
               </el-col>
@@ -47,131 +39,280 @@
               <el-col :span="1.5">
                 <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
               </el-col>
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
-              </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+              </el-col> -->
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
             </el-row>
 
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
-              <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
-                </template>
-              </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns.createTime.visible" width="160">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" v-if="this.showId!= null">
+              <el-table-column type="selection" width="50" align="center" v-if="this.showId!= null"/>
+
+                    <el-table-column label="装备名称" align="center" prop="uavName"  v-if="this.showId==6"/>
+                    <el-table-column label="工作频率" align="center" prop="operatingFrequency" v-if="this.showId==6" />
+                    <el-table-column label="盲区距离" align="center" prop="blindDistance"  v-if="this.showId== 6" /> 
+                    <el-table-column label="通视(RCS)" align="center" prop="rcs"  v-if="this.showId== 6" />
+                    <el-table-column label="俯仰角" align="center" prop="pitchAngle"  v-if="this.showId== 6" />
+                    <el-table-column label="探测距离" align="center" prop="detectionRange" v-if="this.showId== 6" />
+                    <el-table-column label="探测虚警率" align="center" prop="detectFalseAlarmRates"  v-if="this.showId== 6"/>
+                    <el-table-column label="目标定位误差" align="center" prop="targetingError"  v-if="this.showId== 6"/>
+                    <el-table-column label="航迹更新时间" align="center" prop="trackUpdateTime"  v-if="this.showId== 6"/>
+
+                    <el-table-column label="装备名称" align="center" prop="uavName" v-if="this.showId==7" />
+                    <el-table-column label="探测频段" align="center" prop="detectionBands" v-if="this.showId== 7"/>
+                    <el-table-column label="探测距离" align="center" prop="detectionRange" v-if="this.showId== 7"/>
+                    <el-table-column label="探测无人机架次" align="center" prop="detectionDroneSorties" v-if="this.showId== 7"/>
+                    <el-table-column label="目标定位误差" align="center" prop="targetingError" v-if="this.showId== 7"/>
+                    <el-table-column label="定位方式" align="center" prop="targetingMethod" v-if="this.showId== 7" />
+                    <el-table-column label="是否具有协议破解功能" align="center" prop="crackingFunction" v-if="this.showId== 7" />
+
+
+                    <el-table-column label="装备名称" align="center" prop="uavName" v-if="this.showId==8" />
+                    <el-table-column label="探测距离" align="center" prop="detectionRange" v-if="this.showId== 8" />
+                    <el-table-column label="目标定位误差" align="center" prop="targetingError" v-if="this.showId== 8" />
+                    <el-table-column label="成像技术" align="center" prop="imagingTechniques" v-if="this.showId== 8" />
+
+                    <el-table-column label="装备名称" align="center" prop="uavName" v-if="this.showId==3" />
+                    <el-table-column label="频段(HZ)" align="center" prop="bandHz"  v-if="this.showId== 3 "/>
+                    <el-table-column label="作用距离" align="center" prop="useRange" v-if="this.showId== 3 " />
+                    <el-table-column label="发射功率" align="center" prop="transmitPower" v-if="this.showId== 3"/>
+
+                    <el-table-column label="装备名称" align="center" prop="uavName" v-if="this.showId==4" />
+                    <el-table-column label="频段(HZ)" align="center" prop="bandHz" v-if="this.showId== 4"/>
+                    <el-table-column label="作用距离" align="center" prop="useRange" v-if="this.showId== 4"/>
+                    <el-table-column label="水平拦截精度" align="center" prop="horizontalInterceptionAccuracy" v-if="this.showId== 4"/>
+                    <el-table-column label="垂直拦截精度" align="center" prop="verticalInterceptionAccuracy" v-if="this.showId== 4"/>
+
+
+                    <el-table-column label="装备名称" align="center" prop="uavName" v-if="this.showId== 5" />
+                    <el-table-column label="物理打击" align="center" prop="phyHit" v-if="false" />
+
+
+
+                    <el-table-column label="创建时间" align="center" prop="createTime" v-if="this.showId!= null"/>
+             
+              <el-table-column label="操作" align="center" width="160" v-if="this.showId!= null" class-name="small-padding fixed-width">
                 <template slot-scope="scope" v-if="scope.row.userId !== 1">
                   <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
                   <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
-                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                  <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
                       <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                     </el-dropdown-menu>
-                  </el-dropdown>
+                  </el-dropdown> -->
                 </template>
               </el-table-column>
             </el-table>
 
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" v-if="this.showId!= null"/>
           </el-col>
         </pane>
       </splitpanes>
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1" ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+    <el-dialog :title="title" :visible.sync="open" width="600px" height="560px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="装备名称" prop="uavName">
+                        <el-input v-model="form.uavName" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入装备名称" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="装备名称" prop="uavName">
+                        <el-input v-model="form.uavName" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入装备名称" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==8">
+                    <el-form-item label="装备名称" prop="uavName">
+                        <el-input v-model="form.uavName" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入装备名称" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==3">
+                    <el-form-item label="装备名称" prop="uavName">
+                        <el-input v-model="form.uavName" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入装备名称" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==4">
+                    <el-form-item label="装备名称" prop="uavName">
+                        <el-input v-model="form.uavName" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入装备名称" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="12" v-if="this.showId==5">
+                    <el-form-item label="装备名称" prop="uavName">
+                        <el-input v-model="form.uavName" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入装备名称" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+
+
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="工作频率" prop="operatingFrequency">
+                        <el-input v-model="form.operatingFrequency" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入工作频率" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="盲区距离" prop="blindDistance">
+                        <el-input v-model="form.blindDistance" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入盲区距离" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="通视(RCS)" prop="rcs">
+                        <el-input v-model="form.rcs" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入通视(RCS)" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="俯仰角" prop="pitchAngle">
+                        <el-input v-model="form.pitchAngle" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入俯仰角" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="探测距离" prop="detectionRange">
+                        <el-input v-model="form.detectionRange" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入探测距离" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="探测虚警率" prop="detectFalseAlarmRates">
+                        <el-input v-model="form.detectFalseAlarmRates" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入探测虚警率" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="目标定位误差" prop="targetingError">
+                        <el-input v-model="form.targetingError" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入目标定位误差" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <!-- <el-col :span="12" v-if="this.showId==6">
+                    <el-form-item label="航迹更新时间" prop="trackUpdateTime">
+                        <el-input v-model="form.trackUpdateTime" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入航迹更新时间" maxlength="30" />
+                    </el-form-item>
+                </el-col> -->
+
+                <el-col :span="12" v-if="this.showId==6">
+                    <!-- <el-form-item label="航迹更新时间"  prop="trackUpdateTime">
+                        <el-date-picker
+                            v-model="form.trackUpdateTime"
+                            type="date"
+                            placeholder="请选择迹更新时间"
+                            value-format="yyyy-MM-DD 00:00:00"
+                            :unlink-panels="true"
+                            :disabled-date="disabledDate"
+                        />
+                    </el-form-item> -->
+
+                    <el-form-item label="航迹更新时间" prop="trackUpdateTime">
+                          <el-date-picker clearable  v-model="form.trackUpdateTime" type="date" value-format="yyyy-MM-dd" placeholder="航迹更新时间"></el-date-picker>
+                  </el-form-item>
+
+                </el-col>
+
+
+                <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="探测频段" prop="detectionBands">
+                        <el-input v-model="form.detectionBands" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入探测频段" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="探测距离" prop="detectionRange">
+                        <el-input v-model="form.detectionRange" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入探测距离" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="无人机架次" prop="detectionDroneSorties">
+                        <el-input v-model="form.detectionDroneSorties" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入探测无人机架次" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="目标定位误差" prop="targetingError">
+                        <el-input v-model="form.targetingError" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入目标定位误差" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="定位方式" prop="targetingMethod">
+                        <el-input v-model="form.targetingMethod" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入定位方式" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <!-- <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="协议破解功能" prop="crackingFunction">
+                        <el-input v-model="form.crackingFunction" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入是否具有协议破解功能" maxlength="30" />
+                    </el-form-item>
+                </el-col> -->
+
+                <el-col :span="12" v-if="this.showId==7">
+                    <el-form-item label="协议破解功能" prop="crackingFunction">
+                        <el-select v-model="form.crackingFunction" placeholder="请选择是否具有协议破解功能">
+                            <el-option
+                                v-for="item in  [{ label: '不具有', value: '不具有' }, { label: '具有', value: '具有' }]"
+                                :key="item.value" :label="item.label" :value="item.value" />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="12" v-if="this.showId==8">
+                    <el-form-item label="探测距离" prop="detectionRange">
+                        <el-input v-model="form.detectionRange" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入探测距离" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==8">
+                    <el-form-item label="目标定位误差" prop="targetingError">
+                        <el-input v-model="form.targetingError" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入目标定位误差" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==8">
+                    <el-form-item label="成像技术" prop="imagingTechniques">
+                        <el-input v-model="form.imagingTechniques" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入成像技术" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+
+
+                <el-col :span="12" v-if="this.showId==3">
+                    <el-form-item label="频段(HZ)" prop="bandHz">
+                        <el-input v-model="form.bandHz" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入频段(HZ)" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==3">
+                    <el-form-item label="作用距离" prop="useRange">
+                        <el-input v-model="form.useRange" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入作用距离" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==3">
+                    <el-form-item label="发射功率" prop="transmitPower">
+                        <el-input v-model="form.transmitPower" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入发射功率" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+
+
+                <el-col :span="12" v-if="this.showId==4">
+                    <el-form-item label="频段(HZ)" prop="bandHz">
+                        <el-input v-model="form.bandHz" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入频段(HZ)" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==4">
+                    <el-form-item label="作用距离" prop="useRange">
+                        <el-input v-model="form.useRange" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入作用距离" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==4">
+                    <el-form-item label="水平拦截精度" prop="horizontalInterceptionAccuracy">
+                        <el-input v-model="form.horizontalInterceptionAccuracy" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入水平拦截精度" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="this.showId==4">
+                    <el-form-item label="垂直拦截精度" prop="verticalInterceptionAccuracy">
+                        <el-input v-model="form.verticalInterceptionAccuracy" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入垂直拦截精度" maxlength="30" />
+                    </el-form-item>
+                </el-col>
+<!-- 
+                <el-col :span="12" v-if="this.showId==5">
+                    <el-form-item label="物理打击" prop="phyHit">
+                        <el-input v-model="form.phyHit" onkeyup="this.value=this.value.replace(/\s+/g,'')" placeholder="请输入物理打击" maxlength="30" />
+                    </el-form-item>
+                </el-col> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -202,6 +343,7 @@
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import { listType, getType, delType, addType, updateType,  exportType } from '../../../api/datamodel/uavInformation/type';
 import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
@@ -240,6 +382,7 @@ export default {
       deptName: undefined,
       // 默认密码
       initPassword: undefined,
+      showId: undefined,
       // 日期范围
       dateRange: [],
       // 岗位选项
@@ -334,7 +477,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows
           this.total = response.total
           this.loading = false
@@ -343,10 +486,66 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data
-        this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
-      })
+      // deptTreeSelect().then(response => {
+      //   this.deptOptions = response.data
+      //   this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
+      // })
+
+      this.deptOptions = [ {
+           "id": 1,
+            "label": "反制装备",
+            "children": [
+                {
+                    "id": 2,
+                    "label": "发现类",
+                    "children": [
+                        // {
+                        //     "id": 2420,
+                        //     "label": "秀山县"
+                        // },
+                        // {
+                        //     "id": 2421,
+                        //     "label": "彭水县"
+                        // },
+                        // {
+                        //     "id": 2422,
+                        //     "label": "酉阳县"
+                        // },
+                        {
+                            "id": 6,
+                            "label": "雷达探测"
+                        },
+                        {
+                            "id": 7,
+                            "label": "频谱探测"
+                        },
+                        {
+                            "id": 8,
+                            "label": "光电侦测"
+                        }
+                    ]
+                },
+                {
+                    "id": 3,
+                    "label": "反制类",
+                    "children": [
+                        {
+                            "id": 3,
+                            "label": "全向电磁压制"
+                        },
+                        {
+                            "id": 4,
+                            "label": "定向反制设备"
+                        },
+                        {
+                            "id": 5,
+                            "label": "物理打击"
+                        }
+                    ]
+                }
+            ]
+        }]
+        this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(this.deptOptions)))
     },
     // 过滤禁用的部门
     filterDisabledDept(deptList) {
@@ -368,6 +567,25 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.deptId = data.id
+        if(data.id==3){
+            this.showId =3
+            console.log("3333")
+        }else if (data.id==4){
+          this.showId =4
+            console.log("444")
+        }else if (data.id==5){
+          this.showId =5
+            console.log("555")
+        }else if (data.id==6){
+          this.showId =6
+            console.log("666")
+        }else if (data.id==7){
+          this.showId =7
+            console.log("777")
+        }else if (data.id==8){
+          this.showId =8
+            console.log("888")
+        }
       this.handleQuery()
     },
     // 用户状态修改
@@ -389,18 +607,33 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        nickName: undefined,
-        password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
-        remark: undefined,
-        postIds: [],
-        roleIds: []
+      
+        uavName:'',
+        operatingFrequency:'',
+        blindDistance:'',
+        rcs:'',
+        pitchAngle:'',
+        detectionRange:'',
+        detectFalseAlarmRates:'',
+        targetingError:'',
+        trackUpdateTime:'',
+
+        detectionBands:'',
+        detectionDroneSorties:'',
+        targetingMethod:'',
+        crackingFunction:'',
+
+        targetingError:'',
+        imagingTechniques:'',
+
+        bandHz:'',
+        useRange:'',
+        transmitPower:'',
+        horizontalInterceptionAccuracy:'',
+        verticalInterceptionAccuracy:'',
+        phyHit:'',
+
+        deptId: ''
       }
       this.resetForm("form")
     },
@@ -419,7 +652,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId)
+      this.ids = selection.map(item => item.uavId)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
@@ -439,27 +672,30 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
-      getUser().then(response => {
-        this.postOptions = response.posts
-        this.roleOptions = response.roles
+      // getUser().then(response => {
+      //   this.postOptions = response.posts
+      //   this.roleOptions = response.roles
+      //   this.open = true
+      //   this.title = "添加用户"
+      //   this.form.password = this.initPassword
+      // })
         this.open = true
-        this.title = "添加用户"
-        this.form.password = this.initPassword
-      })
+        this.title = "添加"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const userId = row.userId || this.ids
-      getUser(userId).then(response => {
-        this.form = response.data
-        this.postOptions = response.posts
-        this.roleOptions = response.roles
-        this.$set(this.form, "postIds", response.postIds)
-        this.$set(this.form, "roleIds", response.roleIds)
+      console.log("row:",row)
+      console.log("row.userId:",row.userId)
+      console.log("row.uavId:",row.uavId)
+      const userId = row.uavId || this.ids
+      getType(userId).then(response => {
+        console.log("response",response)
+        this.form = response
+        console.log("response.data",response.data)
         this.open = true
-        this.title = "修改用户"
-        this.form.password = ""
+        console.log("修改1")
+        this.title = "修改"
       })
     },
     /** 重置密码按钮操作 */
@@ -490,14 +726,15 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+          this.form.deptId = this.showId;
+          if (this.form.uavId != undefined) {
+            updateType(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addUser(this.form).then(response => {
+            addType(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
@@ -508,9 +745,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds)
+      const userIds = row.uavId || this.ids
+      this.$modal.confirm('是否确认删除编号为"' + userIds + '"的数据项？').then(function() {
+        return delType(userIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")