diff --git a/src/components/earthMap/WarnInfoList.vue b/src/components/earthMap/WarnInfoList.vue
index 0f5c809..54ab8ad 100644
--- a/src/components/earthMap/WarnInfoList.vue
+++ b/src/components/earthMap/WarnInfoList.vue
@@ -139,7 +139,7 @@
   import { useMonitorStore } from '/@/store/modules/monitor';
   import _ from 'lodash';
   import ScrollBoardTable from '@/components/earthMap/components/Scroll-board-table.vue';
-  import MsWarnModal from '@/views/military/modules/warn/warnList/components/MsPreWarnModal.vue';
+  import MsWarnModal from '@/views/military/modules/alarmManage/cautionManage/components/MsPreWarnModal.vue';
   export default defineComponent({
     name: 'infoList',
     props: {},
diff --git a/src/components/earthMap/toolbar/WarnList.vue b/src/components/earthMap/toolbar/WarnList.vue
index 69d37dc..6d3988b 100644
--- a/src/components/earthMap/toolbar/WarnList.vue
+++ b/src/components/earthMap/toolbar/WarnList.vue
@@ -126,8 +126,10 @@
   import { useMonitorStore } from '/@/store/modules/monitor';
   import _ from 'lodash';
   import { Vue3SeamlessScroll } from 'vue3-seamless-scroll';
-  import MsPreWarnModal from '@/views/military/modules/warn/warnList/components/MsPreWarnModal.vue';
-  import MsWarnDetail from '@/views/military/modules/warn/warnList/components/MsWarnDetail.vue';
+  // import MsPreWarnModal from '@/views/military/modules/warn/warnList/components/MsPreWarnModal.vue';
+  import MsPreWarnModal from '@/views/military/modules/alarmManage/cautionManage/components/MsPreWarnModal.vue';
+  // import MsWarnDetail from '@/views/military/modules/warn/warnList/components/MsWarnDetail.vue';
+  import MsWarnDetail from '@/views/military/modules/alarmManage/cautionManage/components/MsWarnDetail.vue';
   import { getToken } from '/@/utils/auth';
   import md5 from 'crypto-js/md5';
   import { connectWebSocket, onWebSocket, offWebSocket } from '/@/hooks/web/useWebSocket';
diff --git a/src/views/military/modules/prewarn/MsWarnLevel.api.ts b/src/views/military/modules/alarmManage/alarmLevel/MsWarnLevel.api.ts
similarity index 100%
rename from src/views/military/modules/prewarn/MsWarnLevel.api.ts
rename to src/views/military/modules/alarmManage/alarmLevel/MsWarnLevel.api.ts
diff --git a/src/views/military/modules/prewarn/MsWarnLevel.data.ts b/src/views/military/modules/alarmManage/alarmLevel/MsWarnLevel.data.ts
similarity index 100%
rename from src/views/military/modules/prewarn/MsWarnLevel.data.ts
rename to src/views/military/modules/alarmManage/alarmLevel/MsWarnLevel.data.ts
diff --git a/src/views/military/modules/prewarn/MsWarnLevelList.vue b/src/views/military/modules/alarmManage/alarmLevel/MsWarnLevelList.vue
similarity index 97%
rename from src/views/military/modules/prewarn/MsWarnLevelList.vue
rename to src/views/military/modules/alarmManage/alarmLevel/MsWarnLevelList.vue
index cd5e94b..7b8475b 100644
--- a/src/views/military/modules/prewarn/MsWarnLevelList.vue
+++ b/src/views/military/modules/alarmManage/alarmLevel/MsWarnLevelList.vue
@@ -1,8 +1,8 @@
 <!-- 
   报警等级设置
 
-  功能划分
-  报警管理 -> 报警等级设置
+  目录位置：报警管理 -> 报警等级设置
+  功能概述：设置不同区域下的不同类型设备的不同级别的警报声音
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/prewarn/components/MsWarnLevelForm.vue b/src/views/military/modules/alarmManage/alarmLevel/components/MsWarnLevelForm.vue
similarity index 100%
rename from src/views/military/modules/prewarn/components/MsWarnLevelForm.vue
rename to src/views/military/modules/alarmManage/alarmLevel/components/MsWarnLevelForm.vue
diff --git a/src/views/military/modules/prewarn/components/MsWarnLevelModal.vue b/src/views/military/modules/alarmManage/alarmLevel/components/MsWarnLevelModal.vue
similarity index 100%
rename from src/views/military/modules/prewarn/components/MsWarnLevelModal.vue
rename to src/views/military/modules/alarmManage/alarmLevel/components/MsWarnLevelModal.vue
diff --git a/src/views/military/modules/equipment/alarm/MsAlarmSettings.api.ts b/src/views/military/modules/alarmManage/alarmSetting/MsAlarmSettings.api.ts
similarity index 100%
rename from src/views/military/modules/equipment/alarm/MsAlarmSettings.api.ts
rename to src/views/military/modules/alarmManage/alarmSetting/MsAlarmSettings.api.ts
diff --git a/src/views/military/modules/equipment/alarm/MsAlarmSettings.data.ts b/src/views/military/modules/alarmManage/alarmSetting/MsAlarmSettings.data.ts
similarity index 100%
rename from src/views/military/modules/equipment/alarm/MsAlarmSettings.data.ts
rename to src/views/military/modules/alarmManage/alarmSetting/MsAlarmSettings.data.ts
diff --git a/src/views/military/modules/equipment/alarm/MsAlarmSettingsList.vue b/src/views/military/modules/alarmManage/alarmSetting/MsAlarmSettingsList.vue
similarity index 85%
rename from src/views/military/modules/equipment/alarm/MsAlarmSettingsList.vue
rename to src/views/military/modules/alarmManage/alarmSetting/MsAlarmSettingsList.vue
index 22b6fb5..433278a 100644
--- a/src/views/military/modules/equipment/alarm/MsAlarmSettingsList.vue
+++ b/src/views/military/modules/alarmManage/alarmSetting/MsAlarmSettingsList.vue
@@ -1,17 +1,15 @@
 <!-- 
   报警设置
 
-  功能划分
-  报警管理 -> 报警设置
+  目录位置：报警管理 -> 报警设置
+  功能概述：对报警进行标定，报警区域有效时间、目标平均身高！！！（统一标准？还是不同设备会有不同标准）
  -->
 <template>
   <div>
-
     <!--引用表格-->
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -21,25 +19,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -55,7 +54,7 @@
   import { columns } from './MsAlarmSettings.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsAlarmSettings.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsAlarmSettingsModal from './components/MsAlarmSettingsModal.vue'
+  import MsAlarmSettingsModal from './components/MsAlarmSettingsModal.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -67,8 +66,8 @@
       title: '报警设置',
       api: list,
       columns,
-      canResize:false,
-      showIndexColumn:true,
+      canResize: false,
+      showIndexColumn: true,
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -79,16 +78,17 @@
       },
     },
     exportConfig: {
-      name: "报警设置",
+      name: '报警设置',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -105,7 +105,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -113,7 +113,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -121,28 +121,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -154,7 +154,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -170,7 +170,7 @@
       //     confirm: handleDelete.bind(null, record),
       //   }
       // }
-    ]
+    ];
   }
 
   /**
@@ -179,7 +179,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -189,10 +189,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -202,14 +198,14 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/equipment/alarm/components/MsAlarmSettingsForm.vue b/src/views/military/modules/alarmManage/alarmSetting/components/MsAlarmSettingsForm.vue
similarity index 100%
rename from src/views/military/modules/equipment/alarm/components/MsAlarmSettingsForm.vue
rename to src/views/military/modules/alarmManage/alarmSetting/components/MsAlarmSettingsForm.vue
diff --git a/src/views/military/modules/equipment/alarm/components/MsAlarmSettingsModal.vue b/src/views/military/modules/alarmManage/alarmSetting/components/MsAlarmSettingsModal.vue
similarity index 100%
rename from src/views/military/modules/equipment/alarm/components/MsAlarmSettingsModal.vue
rename to src/views/military/modules/alarmManage/alarmSetting/components/MsAlarmSettingsModal.vue
diff --git a/src/views/military/modules/prewarn/MsWarnEvent.api.ts b/src/views/military/modules/alarmManage/cautionEvent/MsWarnEvent.api.ts
similarity index 100%
rename from src/views/military/modules/prewarn/MsWarnEvent.api.ts
rename to src/views/military/modules/alarmManage/cautionEvent/MsWarnEvent.api.ts
diff --git a/src/views/military/modules/prewarn/MsWarnEvent.data.ts b/src/views/military/modules/alarmManage/cautionEvent/MsWarnEvent.data.ts
similarity index 100%
rename from src/views/military/modules/prewarn/MsWarnEvent.data.ts
rename to src/views/military/modules/alarmManage/cautionEvent/MsWarnEvent.data.ts
diff --git a/src/views/military/modules/prewarn/MsWarnEventList.vue b/src/views/military/modules/alarmManage/cautionEvent/MsWarnEventList.vue
similarity index 98%
rename from src/views/military/modules/prewarn/MsWarnEventList.vue
rename to src/views/military/modules/alarmManage/cautionEvent/MsWarnEventList.vue
index 1e55d86..e04dc72 100644
--- a/src/views/military/modules/prewarn/MsWarnEventList.vue
+++ b/src/views/military/modules/alarmManage/cautionEvent/MsWarnEventList.vue
@@ -1,8 +1,8 @@
 <!-- 
   警示事件查询
 
-  功能划分
-  报警管理 -> 警示事件查询
+  目录位置：报警管理 -> 警示事件查询
+  功能概述：历史记录,包含报警、预警
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/prewarn/components/MsWarnEventForm.vue b/src/views/military/modules/alarmManage/cautionEvent/components/MsWarnEventForm.vue
similarity index 100%
rename from src/views/military/modules/prewarn/components/MsWarnEventForm.vue
rename to src/views/military/modules/alarmManage/cautionEvent/components/MsWarnEventForm.vue
diff --git a/src/views/military/modules/prewarn/components/MsWarnEventModal.vue b/src/views/military/modules/alarmManage/cautionEvent/components/MsWarnEventModal.vue
similarity index 100%
rename from src/views/military/modules/prewarn/components/MsWarnEventModal.vue
rename to src/views/military/modules/alarmManage/cautionEvent/components/MsWarnEventModal.vue
diff --git a/src/views/military/modules/warn/warnList/MsPreWarn.api.ts b/src/views/military/modules/alarmManage/cautionManage/MsPreWarn.api.ts
similarity index 100%
rename from src/views/military/modules/warn/warnList/MsPreWarn.api.ts
rename to src/views/military/modules/alarmManage/cautionManage/MsPreWarn.api.ts
diff --git a/src/views/military/modules/warn/warnList/MsPreWarn.data.ts b/src/views/military/modules/alarmManage/cautionManage/MsPreWarn.data.ts
similarity index 100%
rename from src/views/military/modules/warn/warnList/MsPreWarn.data.ts
rename to src/views/military/modules/alarmManage/cautionManage/MsPreWarn.data.ts
diff --git a/src/views/military/modules/warn/warnList/MsPreWarnList.vue b/src/views/military/modules/alarmManage/cautionManage/MsPreWarnList.vue
similarity index 98%
rename from src/views/military/modules/warn/warnList/MsPreWarnList.vue
rename to src/views/military/modules/alarmManage/cautionManage/MsPreWarnList.vue
index a206b29..7d025da 100644
--- a/src/views/military/modules/warn/warnList/MsPreWarnList.vue
+++ b/src/views/military/modules/alarmManage/cautionManage/MsPreWarnList.vue
@@ -1,8 +1,8 @@
 <!-- 
   警示管理
 
-  功能划分
-  报警管理 -> 警示管理
+  目录位置：报警管理 -> 警示管理
+  功能概述：查看设备报警的级别、内容，可使用语音驱散的方式处置
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/warn/warnList/components/MsPreWarnForm.vue b/src/views/military/modules/alarmManage/cautionManage/components/MsPreWarnForm.vue
similarity index 100%
rename from src/views/military/modules/warn/warnList/components/MsPreWarnForm.vue
rename to src/views/military/modules/alarmManage/cautionManage/components/MsPreWarnForm.vue
diff --git a/src/views/military/modules/warn/warnList/components/MsPreWarnModal.vue b/src/views/military/modules/alarmManage/cautionManage/components/MsPreWarnModal.vue
similarity index 100%
rename from src/views/military/modules/warn/warnList/components/MsPreWarnModal.vue
rename to src/views/military/modules/alarmManage/cautionManage/components/MsPreWarnModal.vue
diff --git a/src/views/military/modules/warn/warnList/components/MsWarnDetail.vue b/src/views/military/modules/alarmManage/cautionManage/components/MsWarnDetail.vue
similarity index 100%
rename from src/views/military/modules/warn/warnList/components/MsWarnDetail.vue
rename to src/views/military/modules/alarmManage/cautionManage/components/MsWarnDetail.vue
diff --git a/src/views/military/modules/warn/warnList/components/MsWarnHandleForm.vue b/src/views/military/modules/alarmManage/cautionManage/components/MsWarnHandleForm.vue
similarity index 100%
rename from src/views/military/modules/warn/warnList/components/MsWarnHandleForm.vue
rename to src/views/military/modules/alarmManage/cautionManage/components/MsWarnHandleForm.vue
diff --git a/src/views/military/modules/warn/warnList/subTables/MsWarnDealLogSubTable.vue b/src/views/military/modules/alarmManage/cautionManage/subTables/MsWarnDealLogSubTable.vue
similarity index 100%
rename from src/views/military/modules/warn/warnList/subTables/MsWarnDealLogSubTable.vue
rename to src/views/military/modules/alarmManage/cautionManage/subTables/MsWarnDealLogSubTable.vue
diff --git a/src/views/military/modules/prewarn/MsWarnRelevantInfo.api.ts b/src/views/military/modules/alarmManage/cautionRelevantInfo/MsWarnRelevantInfo.api.ts
similarity index 100%
rename from src/views/military/modules/prewarn/MsWarnRelevantInfo.api.ts
rename to src/views/military/modules/alarmManage/cautionRelevantInfo/MsWarnRelevantInfo.api.ts
diff --git a/src/views/military/modules/prewarn/MsWarnRelevantInfo.data.ts b/src/views/military/modules/alarmManage/cautionRelevantInfo/MsWarnRelevantInfo.data.ts
similarity index 100%
rename from src/views/military/modules/prewarn/MsWarnRelevantInfo.data.ts
rename to src/views/military/modules/alarmManage/cautionRelevantInfo/MsWarnRelevantInfo.data.ts
diff --git a/src/views/military/modules/prewarn/MsWarnRelevantInfoList.vue b/src/views/military/modules/alarmManage/cautionRelevantInfo/MsWarnRelevantInfoList.vue
similarity index 98%
rename from src/views/military/modules/prewarn/MsWarnRelevantInfoList.vue
rename to src/views/military/modules/alarmManage/cautionRelevantInfo/MsWarnRelevantInfoList.vue
index da89227..3740792 100644
--- a/src/views/military/modules/prewarn/MsWarnRelevantInfoList.vue
+++ b/src/views/military/modules/alarmManage/cautionRelevantInfo/MsWarnRelevantInfoList.vue
@@ -1,8 +1,8 @@
 <!-- 
   警示相关信息
 
-  功能划分
-  报警管理 -> 警示相关信息
+  目录位置：报警管理 -> 警示相关信息
+  功能概述：未知使用方法
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/prewarn/components/MsWarnRelevantInfoForm.vue b/src/views/military/modules/alarmManage/cautionRelevantInfo/components/MsWarnRelevantInfoForm.vue
similarity index 100%
rename from src/views/military/modules/prewarn/components/MsWarnRelevantInfoForm.vue
rename to src/views/military/modules/alarmManage/cautionRelevantInfo/components/MsWarnRelevantInfoForm.vue
diff --git a/src/views/military/modules/prewarn/components/MsWarnRelevantInfoModal.vue b/src/views/military/modules/alarmManage/cautionRelevantInfo/components/MsWarnRelevantInfoModal.vue
similarity index 100%
rename from src/views/military/modules/prewarn/components/MsWarnRelevantInfoModal.vue
rename to src/views/military/modules/alarmManage/cautionRelevantInfo/components/MsWarnRelevantInfoModal.vue
diff --git a/src/views/military/modules/statistics/MsPatrolStatistics.api.ts b/src/views/military/modules/alarmManage/screenshots/Screenshots.api.ts
similarity index 75%
rename from src/views/military/modules/statistics/MsPatrolStatistics.api.ts
rename to src/views/military/modules/alarmManage/screenshots/Screenshots.api.ts
index c7bda7b..a58c3ae 100644
--- a/src/views/military/modules/statistics/MsPatrolStatistics.api.ts
+++ b/src/views/military/modules/alarmManage/screenshots/Screenshots.api.ts
@@ -2,8 +2,8 @@
  * @Author: Fuyuu 1805498209@qq.com
  * @Date: 2023-11-24 10:15:24
  * @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2023-11-27 11:51:14
- * @FilePath: \dt-admin-pc\src\views\military\modules\statistics\msPatrolStatistics.api.ts
+ * @LastEditTime: 2023-11-27 10:37:15
+ * @FilePath: \dt-admin-pc\src\views\military\modules\equipment\screenShots\Screenshots.api.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import { defHttp } from '/@/utils/http/axios';
@@ -12,13 +12,13 @@ import { useMessage } from '/@/hooks/web/useMessage';
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/military/msPatrolStatisticsAnalysis/list',
-  save = '/military/msPatrolStatisticsAnalysis/add',
-  edit = '/military/msPatrolStatisticsAnalysis/edit',
-  deleteOne = '/military/msPatrolStatisticsAnalysis/delete',
-  deleteBatch = '/military/msPatrolStatisticsAnalysis/deleteBatch',
-  importExcel = '/military/msPatrolStatisticsAnalysis/importExcel',
-  exportXls = '/military/msPatrolStatisticsAnalysis/exportXls',
+  list = '/military/screenShots/list',
+  save = '/military/screenShots/add',
+  edit = '/military/screenShots/edit',
+  deleteOne = '/military/screenShots/delete',
+  deleteBatch = '/military/screenShots/deleteBatch',
+  importExcel = '/military/screenShots/importExcel',
+  exportXls = '/military/screenShots/exportXls',
 }
 
 /**
diff --git a/src/views/military/modules/alarmManage/screenshots/Screenshots.data.ts b/src/views/military/modules/alarmManage/screenshots/Screenshots.data.ts
new file mode 100644
index 0000000..e79c5a1
--- /dev/null
+++ b/src/views/military/modules/alarmManage/screenshots/Screenshots.data.ts
@@ -0,0 +1,82 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '相机名称',
+    align: "center",
+    dataIndex: 'cameraName'
+  },
+  {
+    title: '创建者',
+    align: "center",
+    dataIndex: 'createBy'
+  },
+  {
+    title: '创建时间',
+    align: "center",
+    dataIndex: 'createTime'
+  },
+
+  {
+    title: '图片',
+    align: "center",
+    dataIndex: 'imgUrl',
+    customRender: render.renderImage,
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "创建人",
+    field: 'createBy',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "创建日期",
+    field: "createTime",
+    component: 'RangePicker',
+    componentProps: {
+      showTime: true,
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "相机名称",
+    field: 'cameraName',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '创建时间',
+    field: 'createTime',
+    component: 'Input',
+  },
+  {
+    label: '相机名称',
+    field: 'cameraName',
+    component: 'Input',
+  },
+  {
+    label: '图片路径',
+    field: 'imgUrl',
+    component: 'JImageUpload',
+    componentProps:{
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/alarmManage/screenshots/ScreenshotsList.vue b/src/views/military/modules/alarmManage/screenshots/ScreenshotsList.vue
new file mode 100644
index 0000000..95a4ab1
--- /dev/null
+++ b/src/views/military/modules/alarmManage/screenshots/ScreenshotsList.vue
@@ -0,0 +1,250 @@
+<!-- 
+  抓拍图片列表
+
+  目录位置：报警管理 -> 抓拍图片列表
+  功能概述：设备抓拍
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <!-- <a-form-item label="创建日期">
+               <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.createTime_begin" class="query-group-cust" />
+               <span class="query-group-split-cust">~</span>
+               <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.createTime_end" class="query-group-cust" />
+            </a-form-item> -->
+            <a-form-item label="创建日期" name="createTime_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.createTime_begin"
+                style="margin-bottom: 24px"
+              />
+              <span class="query-group-split-cust">~</span>
+              <a-form-item name="createTime_end">
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.createTime_end" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="创建人" name="createBy">
+              <JInput placeholder="请输入创建人" v-model:value="queryParam.createBy"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="相机名称" name="cameraName">
+              <JInput placeholder="请输入相机名称" v-model:value="queryParam.cameraName"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" style="margin-left: 8px"> 新增</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ScreenshotsModal ref="registerModal" @success="handleSuccess"></ScreenshotsModal>
+  </div>
+</template>
+
+<script lang="ts" name="camera-screenshots" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './Screenshots.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Screenshots.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ScreenshotsModal from './components/ScreenshotsModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  // const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '抓拍图片列表',
+      api: list,
+      columns,
+      canResize: false,
+      showIndexColumn: true,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '抓拍图片列表',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 90px;
+    }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+  }
+</style>
diff --git a/src/views/military/modules/statistics/components/MsPatrolStatisticsForm.vue b/src/views/military/modules/alarmManage/screenshots/components/ScreenshotsForm.vue
similarity index 78%
rename from src/views/military/modules/statistics/components/MsPatrolStatisticsForm.vue
rename to src/views/military/modules/alarmManage/screenshots/components/ScreenshotsForm.vue
index 96ceb20..609c560 100644
--- a/src/views/military/modules/statistics/components/MsPatrolStatisticsForm.vue
+++ b/src/views/military/modules/alarmManage/screenshots/components/ScreenshotsForm.vue
@@ -1,20 +1,16 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" :rules="validatorRules" :model="formData">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="人员id" v-bind="validateInfos.userId">
-            <a-input v-model:value="formData.userId" placeholder="请输入人员id" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="人员编号" v-bind="validateInfos.userNo">
-            <a-input v-model:value="formData.userNo" placeholder="请输入人员编号" :disabled="disabled"></a-input>
+          <a-form-item label="相机ID" v-bind="validateInfos.cameraId">
+            <a-input v-model:value="formData.cameraId" placeholder="请输入相机ID" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
+
         <a-col :span="24">
-          <a-form-item label="巡逻人员" v-bind="validateInfos.userName">
-            <a-input v-model:value="formData.userName" placeholder="请输入巡逻人员" :disabled="disabled"></a-input>
+          <a-form-item label="图片路径" v-bind="validateInfos.imgUrl">
+            <j-image-upload v-model:value="formData.imgUrl" :disabled="disabled"></j-image-upload>
           </a-form-item>
         </a-col>
       </a-row>
@@ -26,8 +22,9 @@
   import { ref, reactive, nextTick, computed, onMounted } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
   import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../MsPatrolStatistics.api';
+  import { saveOrUpdate } from '../Screenshots.api';
   import { Form } from 'ant-design-vue';
 
   const props = defineProps({
@@ -40,16 +37,18 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    userId: '',
-    userNo: '',
-    userName: '',
+    cameraId: '',
+    cameraName: '',
+    imgUrl: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
   const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
   const confirmLoading = ref<boolean>(false);
   //表单验证
-  const validatorRules = {};
+  const validatorRules = {
+    cameraId: [{ required: true, message: '相机ID不能为空！' }],
+  };
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
 
   // 表单禁用
diff --git a/src/views/military/modules/alarmManage/screenshots/components/ScreenshotsModal.vue b/src/views/military/modules/alarmManage/screenshots/components/ScreenshotsModal.vue
new file mode 100644
index 0000000..b795353
--- /dev/null
+++ b/src/views/military/modules/alarmManage/screenshots/components/ScreenshotsModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <ScreenshotsForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ScreenshotsForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import ScreenshotsForm from './ScreenshotsForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/dutyManage/duty/Duty.vue b/src/views/military/modules/dutyManage/duty/Duty.vue
new file mode 100644
index 0000000..794d4db
--- /dev/null
+++ b/src/views/military/modules/dutyManage/duty/Duty.vue
@@ -0,0 +1,291 @@
+<!-- 
+  今日值班人员
+
+  目录位置：执勤管理 -> 今日值班人员
+  功能概述：查看当日值班人员信息
+ -->
+<template>
+  <div class="dutyBox" id="dutyBox">
+    <div class="title">
+      当日值班人员
+      <div class="fullscreenBox" @click="screen">
+        <a-icon :type="isFullScren ? 'fullscreen-exit' : 'fullscreen'" />
+      </div>
+    </div>
+    <div style="height: 380px; margin-top: 230px" v-show="!dataList.length">
+      <a-empty />
+    </div>
+    <a-carousel arrows>
+      <div slot="prevArrow" slot-scope="props" class="custom-slick-arrow" style="left: 10px; zindex: 1">
+        <a-icon type="left-circle" />
+      </div>
+      <div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px">
+        <a-icon type="right-circle" />
+      </div>
+      <div class="listBox" v-for="item in dataList">
+        <div class="time">
+          {{ item.beginTime }}~{{ item.endTime.split(' ')[1] }}
+          <div class="theLine">【{{ item.lineName }}】</div>
+        </div>
+        <div class="picBox">
+          <div class="picTitle">
+            <strong>带班领导</strong>
+          </div>
+          <div class="picList">
+            <div class="picItem" v-for="leader in getLeaderList(item.msDutyUserInfoList)">
+              <!--          <img :src="getImgView(item.img)">-->
+              <img :src="getImg(leader.avatar)" />
+              <div class="name">{{ leader.dutyStaffName }}</div>
+              <div class="name">联系方式:{{ leader.phone }}</div>
+            </div>
+          </div>
+        </div>
+        <div class="picBox">
+          <div class="picTitle">
+            <strong>执勤人员</strong>
+          </div>
+          <div class="picList">
+            <div class="picItem" v-for="staff in getStaffList(item.msDutyUserInfoList)">
+              <!--                    <img :src="getImgView(item.img)">-->
+              <img :src="getImg(staff.avatar)" />
+              <div class="name">{{ staff.dutyStaffName }}</div>
+              <div class="name">联系方式:{{ staff.phone }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-carousel>
+  </div>
+</template>
+
+<script lang="ts">
+  import { computed, defineComponent, onMounted, ref } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  export default defineComponent({
+    name: 'Duty',
+    props: {},
+    setup(props, ctx) {
+      const dataList: any = ref([]);
+      const url = ref('/military/msDutyTask/qryPersonOnDutyByDate');
+      const isFullScren = ref(false);
+      const getTime = computed(() => {
+        var timeData = new Date();
+        let year = timeData.getFullYear();
+        let month = timeData.getMonth() + 1;
+        let date = timeData.getDate();
+        var time = year + '年' + month + '月' + date + '日';
+        return time;
+      });
+      onMounted(() => {
+        getPersonList();
+        {
+          //由于vue全屏时监听不到esc事件，所以页面初始化渲染完成后，绑定fullscreenchange的全屏改变监听事件，这样按esc退出全屏时也会触发
+          document.addEventListener('fullscreenchange', () => {
+            isFullScren.value = !isFullScren.value;
+          });
+          document.addEventListener('mozfullscreenchange', () => {
+            isFullScren.value = !isFullScren.value;
+          });
+          document.addEventListener('webkitfullscreenchange', () => {
+            isFullScren.value = !isFullScren.value;
+          });
+          document.addEventListener('msfullscreenchange', () => {
+            isFullScren.value = !isFullScren.value;
+          });
+        }
+      });
+
+      function screen() {
+        let element: any = document.getElementById('dutyBox');
+        if (this.isFullScren) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen();
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen();
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen();
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen();
+          }
+        } else {
+          if (element.requestFullscreen) {
+            element.requestFullscreen();
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen();
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen();
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen();
+          }
+        }
+      }
+      function getPersonList() {
+        // let Gurl = url.value
+        let time = new Date();
+        let year = time.getFullYear();
+        let month: any = time.getMonth() + 1;
+        let date: any = time.getDate();
+        if (month < 10) {
+          month = '0' + month;
+        }
+        if (date < 10) {
+          date = '0' + date;
+        }
+        let today = year + '-' + month + '-' + date;
+        defHttp
+          .get(
+            {
+              url: url.value,
+              params: { date: today },
+            },
+            { isTransformResponse: false }
+          )
+          // getAction(Gurl, {
+          //     'date': today
+          // })
+          .then((res) => {
+            if (res.success) {
+              dataList.value = res.result;
+            }
+          });
+      }
+      function getStaffList(arr) {
+        let list: any = [];
+        for (const item of arr) {
+          if (item.dutyStaffType == 2) {
+            list.push(item);
+          }
+        }
+        return list;
+      }
+      function getLeaderList(arr) {
+        let list: any = [];
+        for (const item of arr) {
+          if (item.dutyStaffType == 1) {
+            list.push(item);
+          }
+        }
+        return list;
+      }
+      function getImg(a) {
+        let adivce;
+        adivce = window._CONFIG['staticDomainURL'] + '/' + a;
+        return adivce;
+      }
+
+      return {
+        dataList,
+        url,
+        isFullScren,
+        getTime,
+        screen,
+        getPersonList,
+        getStaffList,
+        getLeaderList,
+        getImg,
+      };
+    },
+  });
+</script>
+
+<style scoped>
+  .dutyBox {
+    background: #fff;
+  }
+
+  .title {
+    position: relative;
+    height: 105px;
+    line-height: 105px;
+    font-size: 46px;
+    color: #fff;
+    background: #22f;
+    text-align: center;
+  }
+
+  .fullscreenBox {
+    height: 30px;
+    width: 30px;
+    line-height: 27px;
+    position: absolute;
+    top: 50%;
+    right: 2%;
+    transform: translate(-50%, -50%);
+    font-size: 24px;
+    color: rgb(255, 255, 255);
+    border-radius: 5px;
+    cursor: pointer;
+  }
+
+  .fullscreenBox:hover {
+    border: 1px rgb(255, 255, 255) solid;
+  }
+
+  .time {
+    position: relative;
+    font-size: 35px;
+    text-align: center;
+    color: #00db00;
+  }
+
+  .theLine {
+    position: absolute;
+    left: 15px;
+    top: 0;
+  }
+
+  .picTitle {
+    text-align: center;
+  }
+
+  .picTitle strong {
+    font-size: 45px;
+    color: #000;
+  }
+
+  .picList {
+    text-align: center;
+  }
+
+  .picItem {
+    display: inline-block;
+    padding: 0 35px 15px;
+  }
+
+  .picItem img {
+    margin: 0 auto;
+    width: 100px;
+    height: 140px;
+  }
+
+  .name {
+    padding: 3px 0;
+    font-size: 25px;
+  }
+
+  .ant-carousel >>> .slick-slide {
+    text-align: center;
+    overflow: hidden;
+  }
+
+  .ant-carousel >>> .custom-slick-arrow {
+    width: 25px;
+    height: 25px;
+    font-size: 25px;
+    color: #999;
+    opacity: 0.3;
+  }
+
+  .ant-carousel >>> .custom-slick-arrow:before {
+    display: none;
+  }
+
+  .ant-carousel >>> .custom-slick-arrow:hover {
+    opacity: 0.5;
+  }
+
+  .ant-carousel >>> .slick-slide h3 {
+    color: #fff;
+  }
+</style>
diff --git a/src/views/military/modules/dutyManage/duty/DutySet.vue b/src/views/military/modules/dutyManage/duty/DutySet.vue
new file mode 100644
index 0000000..1a3d0a0
--- /dev/null
+++ b/src/views/military/modules/dutyManage/duty/DutySet.vue
@@ -0,0 +1,293 @@
+<!-- 
+  执勤排班管理
+
+  目录位置：执勤管理 -> 执勤排班管理
+  功能概述：
+ -->
+<template>
+  <div class="dutySetBox">
+    <a-switch v-model:checked="showflag" checked-children="表格" un-checked-children="日历" default-checked />
+    <div v-show="!showflag">
+      <a-calendar @panelChange="onPanelChange">
+        <template #dateCellRender="{ current }">
+          <ul class="events">
+            <li v-for="item in getListData(current)" :key="item.id">
+              <a-badge
+                status="default"
+                :text="item.dutyStaffType == 1 ? '带班领导' + '-' + item.dutyStaffName : '执勤人员' + '-' + item.dutyStaffName"
+              />
+            </li>
+          </ul>
+        </template>
+        <template #monthCellRender="{ current }">
+          <div v-if="getMonthData(current)" class="notes-month">
+            <section>{{ getMonthData(current) }}</section>
+            <span>Backlog number</span>
+          </div>
+        </template>
+      </a-calendar>
+    </div>
+    <div v-show="showflag">
+      <dutyTaskList></dutyTaskList>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+  import { computed, defineComponent, onMounted, ref } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import dutyTaskList from './MsDutyTaskList.vue';
+  export default defineComponent({
+    name: 'DutySet',
+    props: {},
+    components: { dutyTaskList },
+    setup(props, ctx) {
+      const $message = useMessage();
+      const showflag = ref(true);
+      const visible = ref(false);
+      const addData = ref({
+        dutyStaffId: '',
+        dutyStaffType: '',
+        dutyDate: '',
+      });
+      const listData = ref([]);
+      const userIds = ref('');
+      const title = ref('');
+      const tagId = ref('');
+      const post = ref('');
+      const personName = ref('');
+      const tagMonth = ref('');
+      const tagDate = ref('');
+      const addUrl: any = ref('/military/msDutySchedule/add');
+      const getPlantListUrl = ref('/military/msDutyTask/queryDutyTaskByMonth');
+
+      const time = ref({
+        year: new Date().getFullYear(),
+        month: new Date().getMonth() + 1,
+      });
+      const planMonth = ref('');
+      const personList = ref([]);
+      const watchkeeperList = ref([]);
+      const planList = ref([]);
+
+      onMounted(() => {
+        getPlanList();
+      });
+
+      function onPanelChange(value) {
+        time.value.year = value.year();
+        time.value.month = value.month() + 1;
+        getPlanList();
+      }
+
+      function getPlanList() {
+        let month: any = time.value.month;
+        if (month < 10) {
+          month = '0' + month;
+        }
+        let timeData = {
+          date: time.value.year + '-' + month,
+        };
+        defHttp
+          .get(
+            {
+              url: getPlantListUrl.value,
+              params: timeData,
+            },
+            { isTransformResponse: false }
+          )
+          //   getAction(getPlantListUrl.value, timeData)
+          .then((res) => {
+            if (res.success) {
+              // this.$message.success(res.message)
+              planList.value = res.result;
+            }
+          });
+      }
+
+      function addPerson() {
+        console.log(userIds.value + '-' + post.value);
+        //   let addUrl = addUrl.value
+        defHttp
+          .post(
+            {
+              urll: addUrl.value,
+              params: addData.value,
+            },
+            { isTransformResponse: false }
+          )
+          //   httpAction(this.addUrl, this.addData, 'post')
+          .then((res) => {
+            if (res.success) {
+              $message.success(res.message);
+            } else {
+              // that.$message.warning(res.message);
+            }
+          });
+      }
+      function getListData(value) {
+        let month = value.month() + 1;
+        let date = value.date();
+        let GplanList = planList.value;
+        let monthPlan = [];
+        let list: any = [];
+        GplanList.some((item: any) => {
+          if (item.taskTime.split('-')[1] == month && item.taskTime.split('-')[2] == date) {
+            list = list.concat(item.msDutyUserList);
+            // return true
+          }
+        });
+        return list || [];
+      }
+
+      function getTag(a, b) {
+        console.log(a, b);
+        if (tagId.value == a) {
+          tagId.value = '';
+        } else {
+          tagId.value = a;
+        }
+      }
+
+      function handleFocus() {
+        console.log('focus');
+      }
+      function filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      }
+
+      function typeChange(value) {
+        console.log(value);
+      }
+      function changeData() {
+        visible.value = true;
+        title.value = '排班管理';
+      }
+      function handleOk() {
+        visible.value = false;
+      }
+
+      function deletePlan() {
+        // this.$confirm({
+        //     title: '删除',
+        //     content: '确定删除' + this.tagMonth + '月' + this.tagDate + '日数据吗？',
+        //     okText: '确认',
+        //     okType: 'danger',
+        //     cancelText: '否',
+        //     onOk() {
+        //         console.log('OK')
+        //     },
+        //     onCancel() {
+        //         console.log('Cancel')
+        //     }
+        // })
+        $message.createConfirm({
+          iconType: 'warning',
+          title: '删除',
+          okType: 'danger',
+          okText: '确认',
+          cancelText: '否',
+          content: '确定删除' + tagMonth.value + '月' + tagDate.value + '日数据吗？',
+          onOk: () => console.log('OK'),
+          onCancel: () => console.log('Cancel'),
+        });
+      }
+
+      function getMonthData(value) {
+        if (value.month() === 8) {
+          return 1394;
+        }
+      }
+      return {
+        showflag,
+        visible,
+        addData,
+        listData,
+        userIds,
+        title,
+        tagId,
+        post,
+        personName,
+        tagMonth,
+        tagDate,
+        addUrl,
+        getPlantListUrl,
+        time,
+        planMonth,
+        personList,
+        watchkeeperList,
+        planList,
+        onPanelChange,
+        getPlanList,
+        addPerson,
+        getListData,
+        getTag,
+        handleFocus,
+        filterOption,
+        typeChange,
+        changeData,
+        handleOk,
+        deletePlan,
+        getMonthData,
+      };
+    },
+  });
+</script>
+
+<style scoped>
+  .compileBox {
+    display: flex;
+    width: 420px;
+  }
+
+  .dutySetBox {
+    padding: 15px 20px;
+    background: #fff;
+  }
+
+  .events {
+    list-style: none;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+  }
+
+  .events .ant-badge-status {
+    overflow: hidden;
+    white-space: nowrap;
+    width: 100%;
+    text-overflow: ellipsis;
+    font-size: 12px;
+  }
+
+  .notes-month {
+    text-align: center;
+    font-size: 28px;
+  }
+
+  .notes-month section {
+    font-size: 28px;
+  }
+
+  .list {
+    height: 240px;
+    list-style: none;
+    /*border: 1px #666 solid;*/
+    overflow-y: scroll;
+    padding: 0;
+  }
+
+  .list li {
+    padding-left: 8px;
+    color: #333;
+    font-size: 18px;
+    height: 40px;
+    line-height: 40px;
+  }
+
+  .list .active {
+    background: #36cfc9;
+    color: #fff;
+  }
+</style>
diff --git a/src/views/military/modules/dutyManage/duty/MsDutyTask.api.ts b/src/views/military/modules/dutyManage/duty/MsDutyTask.api.ts
new file mode 100644
index 0000000..60734b1
--- /dev/null
+++ b/src/views/military/modules/dutyManage/duty/MsDutyTask.api.ts
@@ -0,0 +1,84 @@
+/*
+ * @Author: Fuyuu 1805498209@qq.com
+ * @Date: 2023-11-24 10:15:23
+ * @LastEditors: Fuyuu 1805498209@qq.com
+ * @LastEditTime: 2023-11-27 09:02:27
+ * @FilePath: \dt-admin-pc\src\views\military\modules\duty\MsDutyTask.api.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/msDutyTask/list',
+  save = '/military/msDutyTask/add',
+  edit = '/military/msDutyTask/edit',
+  deleteOne = '/military/msDutyTask/delete',
+  deleteBatch = '/military/msDutyTask/deleteBatch',
+  importExcel = '/military/msDutyTask/importExcel',
+  exportXls = '/military/msDutyTask/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  // let url = isUpdate ? Api.edit : Api.save;
+  // return defHttp.post({ url: url, params }, { isTransformResponse: false });
+  let http = isUpdate
+    ? defHttp.put({ url: Api.edit, params }, { isTransformResponse: false })
+    : defHttp.post({ url: Api.save, params }, { isTransformResponse: false });
+  return http;
+};
diff --git a/src/views/military/modules/dutyManage/duty/MsDutyTask.data.ts b/src/views/military/modules/dutyManage/duty/MsDutyTask.data.ts
new file mode 100644
index 0000000..73a7dcc
--- /dev/null
+++ b/src/views/military/modules/dutyManage/duty/MsDutyTask.data.ts
@@ -0,0 +1,100 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '任务创建日期',
+    align: "center",
+    dataIndex: 'createTime',
+    customRender:({text}) =>{
+        return !text?"":(text.length>10?text.substr(0,10):text);
+      },
+  },
+  {
+    title: '线路名称',
+    align: "center",
+    dataIndex: 'lineName'
+  },
+  {
+    title: '计划开始时间',
+    align: "center",
+    dataIndex: 'beginTime',
+    // customRender:({text}) =>{
+    //   return !text?"":(text.length>10?text.substr(0,10):text);
+    // },
+  },
+  {
+    title: '计划结束时间',
+    align: "center",
+    dataIndex: 'endTime',
+    // customRender:({text}) =>{
+    //   return !text?"":(text.length>10?text.substr(0,10):text);
+    // },
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "创建日期",
+    field: "createTime",
+    component: 'RangePicker',
+    componentProps: {
+      showTime: true,
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "线路id",
+    field: 'lineId',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '线路id',
+    field: 'lineId',
+    component: 'Input',
+  },
+  {
+    label: '任务日期',
+    field: 'taskTime',
+    component: 'DatePicker',
+  },
+  
+  {
+    label: '计划开始时间',
+    field: 'beginTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime:true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+  {
+    label: '计划结束时间',
+    field: 'endTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime:true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/dutyManage/duty/MsDutyTaskList.vue b/src/views/military/modules/dutyManage/duty/MsDutyTaskList.vue
new file mode 100644
index 0000000..c9aa5c8
--- /dev/null
+++ b/src/views/military/modules/dutyManage/duty/MsDutyTaskList.vue
@@ -0,0 +1,282 @@
+<!-- 
+  执勤任务
+
+  功能划分
+  xxx -> 执勤任务
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="任务创建日期" name="createTime_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.createTime_begin"
+                style="margin-bottom: 24px"
+              />
+              <span class="query-group-split-cust">~</span>
+              <a-form-item name="createTime_end">
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.createTime_end" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="线路名称" name="lineName">
+              <!-- <JInput placeholder="请选择线路" v-model:value="queryParam.lineId"></JInput> -->
+              <JInput placeholder="请选择线路" v-model:value="queryParam.lineName"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <MsDutyTaskModal ref="registerModal" @success="handleSuccess"></MsDutyTaskModal>
+  </div>
+</template>
+
+<script lang="ts" name="duty-msDutyTask" setup>
+  import { ref, reactive, onMounted } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsDutyTask.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsDutyTask.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsDutyTaskModal from './components/MsDutyTaskModal.vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  const formRef = ref();
+  const lineSelect: any = ref([]);
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '执勤任务表',
+      api: list,
+      columns,
+      showIndexColumn: true,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '执勤任务表',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  onMounted(() => {
+    initSelectLine();
+  });
+
+  function initSelectLine() {
+    defHttp
+      .get(
+        {
+          url: '/military/msPatrolLine/getLineSelectList',
+        },
+        { isTransformResponse: false }
+      )
+      // getAction(this.url.getSelectLineUrl)
+      .then((res) => {
+        if (res.success) {
+          lineSelect.value = res.result;
+        }
+      });
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add(lineSelect.value);
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record, lineSelect.value);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record, lineSelect.value);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+  }
+</style>
diff --git a/src/views/military/modules/dutyManage/duty/components/MsDutyTaskForm.vue b/src/views/military/modules/dutyManage/duty/components/MsDutyTaskForm.vue
new file mode 100644
index 0000000..267f1a3
--- /dev/null
+++ b/src/views/military/modules/dutyManage/duty/components/MsDutyTaskForm.vue
@@ -0,0 +1,544 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12">
+          <a-form-item label="线路名称" v-bind="validateInfos.lineId">
+            <!-- <a-input v-model:value="formData.lineId" placeholder="请输入线路id" :disabled="disabled"></a-input> -->
+            <a-select v-model:value="formData.lineId" @change="changeLineValue" placeholder="请选择线路名称" :disabled="disabled">
+              <a-select-option v-for="(item, index) in lineSelect" :value="item.id" :key="item.id">
+                {{ item.lineName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="任务日期" v-bind="validateInfos.taskTime">
+            <a-date-picker
+              placeholder="请选择任务日期"
+              v-model:value="formData.taskTime"
+              value-format="YYYY-MM-DD"
+              style="width: 100%"
+              :disabled="disabled"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="开始时间" v-bind="validateInfos.getbeginTime">
+            <a-time-picker
+              placeholder="请选择计划开始时间"
+              v-model:value="formData.getbeginTime"
+              value-format="HH:mm:ss"
+              style="width: 100%"
+              :disabled="disabled"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="结束时间" v-bind="validateInfos.getendTime">
+            <a-time-picker
+              placeholder="请选择计划结束时间"
+              v-model:value="formData.getendTime"
+              value-format="HH:mm:ss"
+              style="width: 100%"
+              :disabled="disabled"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="备注" v-bind="validateInfos.remark" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
+            <a-textarea v-model:value="formData.remark" placeholder="请输入备注" :disabled="disabled" :rows="4"></a-textarea>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+    <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs" style="padding: 30px">
+      <a-tab-pane tab="出勤人员表" key="msDutyUser" :forceRender="true">
+        <JVxeTable
+          ref="Jtable"
+          v-if="msDutyUserTable.show"
+          keep-source
+          resizable
+          :loading="msDutyUserTable.loading"
+          :columns="msDutyUserTable.columns"
+          :dataSource="msDutyUserTable.dataSource"
+          :height="200"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          @added="addDutyUser"
+          :bordered="false"
+          :addSetActive="false"
+        />
+      </a-tab-pane>
+    </a-tabs>
+    <div style="width: 100%; text-align: center; margin-top: 10px" v-if="showFlowSubmitButton">
+      <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="handleSubmit">提 交</a-button>
+    </div>
+
+    <UserSelectByDepModal
+      :rowKey="rowKey"
+      ref="selectModal"
+      @register="regModal"
+      @getSelectResult="setValue"
+      v-bind="getBindValue"
+      @getSelectRows="getSelectRows"
+    >
+    </UserSelectByDepModal>
+    <!-- <JSelectUserByDept v-model:value="selectValues" :placeholder="'请选择'"></JSelectUserByDept> -->
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, nextTick, computed, onMounted, unref, watchEffect, watch, toRaw } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useAttrs } from '/@/hooks/core/useAttrs';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../MsDutyTask.api';
+  import { Form } from 'ant-design-vue';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts';
+  import { JVxeTypes, JVxeColumn } from '/@/components/jeecg/JVxeTable/types';
+  import UserSelectByDepModal from '/@/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useModal } from '/@/components/Modal';
+  import {
+    JDictSelectTag,
+    JTreeSelect,
+    JCategorySelect,
+    JSelectUserByDept,
+    JSelectDept,
+    JPopup,
+    JAreaLinkage,
+    JInput,
+    JSearchSelect,
+  } from '/@/components/Form';
+  import { SelectValue } from 'ant-design-vue/es/select';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => {} },
+    formBpm: { type: Boolean, default: true },
+    rowKey: {
+      type: String,
+      default: 'username',
+    },
+    labelKey: {
+      type: String,
+      default: 'realname',
+    },
+  });
+  // const formRef = ref();
+  const refKeys = ref(['msDutyUser']);
+  const msDutyUser = ref();
+  const Jtable = ref();
+  const tableRefs = { msDutyUser };
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok', 'handleOk']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    taskTime: '',
+    lineId: undefined,
+    beginTime: '',
+    endTime: '',
+    remark: '',
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const labelCol2 = ref({
+    xs: { span: 24 },
+    sm: { span: 3 },
+  });
+  const wrapperCol2 = ref({
+    xs: { span: 24 },
+    sm: { span: 20 },
+  });
+
+  //出勤人员
+  //注册model
+  const [regModal, { openModal }] = useModal();
+  const attrs = useAttrs();
+  const activeKey = ref('msDutyUser');
+  const msDutyUserJVxeColumns: JVxeColumn[] = [
+    {
+      title: '执勤人员',
+      key: 'dutyStaffName',
+      width: '200px',
+      type: JVxeTypes.inputNumber,
+      defaultValue: '',
+    },
+    {
+      key: 'dutyStaffId',
+      width: '0px',
+      defaultValue: '',
+      visible: false,
+    },
+    {
+      key: 'sysOrgCode',
+      width: '0px',
+      defaultValue: '',
+      visible: false,
+    },
+    {
+      title: '所属部门',
+      key: 'sysOrgName',
+      type: JVxeTypes.inputNumber,
+      width: '200px',
+      defaultValue: '',
+    },
+    {
+      title: '人员编号',
+      key: 'dutyStaffNo',
+      type: JVxeTypes.inputNumber,
+      width: '200px',
+      defaultValue: '',
+    },
+    {
+      title: '是否为带班领导',
+      key: 'dutyStaffType',
+      type: JVxeTypes.checkbox,
+      width: '200px',
+      defaultChecked: false,
+      customValue: ['1', '2'],
+    },
+  ];
+
+  const msDutyUserTable: any = reactive({
+    loading: false,
+    dataSource: [],
+    columns: msDutyUserJVxeColumns,
+    show: true,
+  });
+  // 是否显示提交按钮
+  const showFlowSubmitButton = computed(() => {
+    if (props.formBpm === true) {
+      if (props.formData.disabled === false) {
+        return true;
+      }
+    }
+    return false;
+  });
+  const selectModal = ref();
+  const lineSelect: any = ref([]);
+  const userIdList: any = ref([]);
+
+  watch(
+    () => formData.taskTime,
+    (val) => {
+      formData.beginTime = val + ' ' + formData.getbeginTime;
+      formData.endTime = val + ' ' + formData.getendTime;
+    }
+  );
+  watch(
+    () => formData.getbeginTime,
+    (val) => {
+      formData.beginTime = formData.taskTime + ' ' + val;
+    }
+  );
+  watch(
+    () => formData.getendTime,
+    (val) => {
+      formData.endTime = formData.taskTime + ' ' + val;
+    }
+  );
+
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    taskTime: [{ required: true, message: '请输入任务日期!' }],
+    lineId: [{ required: true, message: '请选择路线!' }],
+    getbeginTime: [{ required: true, message: '请输入计划开始时间!' }],
+    getendTime: [{ required: true, message: '请输入计划结束时间!' }],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+  const dbData = {};
+  const [handleChangeTabs, handleSubmit, requestSubTableData, formRef] = useJvxeMethod(
+    requestAddOrEdit,
+    classifyIntoFormData,
+    tableRefs,
+    activeKey,
+    refKeys
+  );
+
+  // 表单禁用
+  const disabled = computed(() => {
+    if (props.formBpm === true) {
+      if (props.formData.disabled === false) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  //线路id
+  function changeLineValue(lineId) {
+    let len = lineSelect.value.length;
+    for (let i = 0; i < len; i++) {
+      let lineInfo = lineSelect.value[i];
+      if (lineInfo.id === lineId) {
+        formData.lineName = lineInfo.lineName;
+      }
+    }
+  }
+
+  /**
+   * 新增
+   */
+  function addCustomer(data) {
+    // 清空开始和结束时间
+    formData.getbeginTime = '';
+    formData.getendTime = '';
+    // 清空其余字段
+    resetFields();
+    add();
+    lineSelect.value = data;
+    msDutyUserTable.dataSource = [];
+  }
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function editCustomer(record, data) {
+    console.log(formData);
+    console.log(data);
+    console.log(record);
+    formData.getbeginTime = record.beginTime.split(' ')[1];
+    formData.getendTime = record.endTime.split(' ')[1];
+    edit(record);
+    lineSelect.value = data;
+  }
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+      editAfter();
+    });
+  }
+  /** 调用完edit()方法之后会调用此方法 */
+  function editAfter() {
+    nextTick(() => {});
+    // 加载子表数据
+    if (formData.id) {
+      let params = { id: formData.id };
+      msDutyUserTable.loading = true;
+      defHttp
+        .get(
+          {
+            url: '/military/msDutyTask/queryMsDutyUserByMainId',
+            params: params,
+          },
+          { isTransformResponse: false }
+        )
+        // getAction(this.url.msDutyUser.list, params)
+        .then((res) => {
+          let { result } = res;
+          let dataSource: any = [];
+          if (result) {
+            if (Array.isArray(result)) {
+              dataSource = result;
+            } else if (Array.isArray(result.records)) {
+              dataSource = result.records;
+            }
+          }
+          msDutyUserTable.dataSource = dataSource;
+        })
+        .finally(() => {
+          msDutyUserTable.loading = false;
+          // console.log(msDutyUserTable)
+          // console.log(msDutyUserTable.dataSource)
+          for (let item of msDutyUserTable.dataSource) {
+            userIdList.value.push(item.dutyStaffId);
+          }
+          // console.log(userIdList.value)
+        });
+    }
+  }
+
+  const { getSubFormAndTableData, transformData } = useValidateAntFormAndTable(activeKey, {
+    msDutyUser: Jtable,
+  });
+
+  /**
+   * 提交数据
+   */
+  async function getFormData() {
+    // 触发表单验证
+    await validate();
+    return transformData(toRaw(formData));
+  }
+
+  async function submitForm() {
+    const mainData = await getFormData();
+    const subData: any = await getSubFormAndTableData();
+    const values = Object.assign({}, dbData, mainData, subData);
+    console.log(values);
+
+    // 若存在子表数据，则可以正常提交
+    if (values.hasOwnProperty('msDutyUserList')) {
+      confirmLoading.value = true;
+      const isUpdate = ref<boolean>(false);
+      //时间格式化
+      let model = formData;
+      if (model.id) {
+        isUpdate.value = true;
+      }
+      //循环数据
+      for (let data in model) {
+        //如果该数据是数组并且是字符串类型
+        if (model[data] instanceof Array) {
+          let valueType = getValueType(formRef.value.getProps, data);
+          //如果是字符串类型的需要变成以逗号分割的字符串
+          if (valueType === 'string') {
+            model[data] = model[data].join(',');
+          }
+        }
+      }
+      await saveOrUpdate(values, isUpdate.value)
+        .then((res) => {
+          if (res.success) {
+            createMessage.success(res.message);
+            emit('ok');
+          } else {
+            createMessage.warning(res.message);
+          }
+        })
+        .finally(() => {
+          confirmLoading.value = false;
+        });
+    } else {
+      console.log('请添加出勤人员后提交');
+      createMessage.warning('请添加出勤人员后提交！');
+      return;
+    }
+  }
+
+  //子表方法
+  function addDutyUser() {
+    // 禁用added方法默认添加空行操作
+
+    openSelect();
+  }
+  function openSelect() {
+    // console.log("open");
+
+    // selectModal.value.visibleChange();
+    openModal(true, {
+      isUpdate: false,
+    });
+  }
+  function requestAddOrEdit() {}
+  function classifyIntoFormData() {}
+
+  //下拉框选项值
+  const selectOptions = ref<SelectValue>([]);
+  //下拉框选中值
+  let selectValues: any = reactive<object>({
+    value: [],
+    change: false,
+  });
+  let state = ref();
+  /**
+   * 监听组件值
+   */
+  watchEffect(() => {
+    initValue();
+  });
+  /**
+   * 监听selectValues变化
+   */
+  watch(selectValues, () => {
+    if (selectValues) {
+      state.value = selectValues.value;
+      // console.log("state", state.value);
+    }
+  });
+  /**
+   * 将字符串值转化为数组
+   */
+  function initValue() {
+    let value: any = props.formData ? props.formData : [];
+    if (value && typeof value === 'string' && value != 'null' && value != 'undefined') {
+      state.value = value.split(',');
+      selectValues.value = value.split(',');
+    } else {
+      selectValues.value = value;
+      // console.log(selectValues.value);
+    }
+  }
+  /**
+   * 设置下拉框的值
+   */
+  function setValue(options, values) {
+    selectOptions.value = options;
+    //emitData.value = values.join(",");
+    state.value = values;
+    selectValues.value = values;
+    // console.log("options", options);
+    // console.log("values", values);
+  }
+
+  //获取选择行
+  function getSelectRows(rows) {
+    if (rows) {
+      let oldValues = Jtable.value.getNewDataWithId();
+      let oldId = oldValues[oldValues.length - 1].id;
+      let userIdList: any = [];
+      for (let item of oldValues) {
+        if (item.dutyStaffId) {
+          userIdList.push(item.dutyStaffId);
+        }
+      }
+      Jtable.value.removeRowsById(oldId);
+      // console.log(rows);
+      // console.log("new", oldValues);
+
+      for (let item of rows) {
+        let findtag = userIdList.indexOf(item.id);
+        if (findtag != -1) {
+          continue;
+        }
+        Jtable.value.pushRows([
+          {
+            dutyStaffName: item.realname,
+            sysOrgCode: item.orgCode,
+            sysOrgName: item.orgCodeTxt,
+            dutyStaffId: item.id,
+            dutyStaffNo: item.workNo,
+          },
+        ]);
+      }
+    }
+    //添加
+  }
+
+  const getBindValue = Object.assign({}, unref(props), unref(attrs));
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+    Jtable,
+    addCustomer,
+    editCustomer,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    // min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/src/views/military/modules/dutyManage/duty/components/MsDutyTaskModal.vue b/src/views/military/modules/dutyManage/duty/components/MsDutyTaskModal.vue
new file mode 100644
index 0000000..02a31df
--- /dev/null
+++ b/src/views/military/modules/dutyManage/duty/components/MsDutyTaskModal.vue
@@ -0,0 +1,79 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <MsDutyTaskForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsDutyTaskForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick } from 'vue';
+  import MsDutyTaskForm from './MsDutyTaskForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(1200);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add(lineSelect= null) {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      // registerForm.value.add();
+      registerForm.value.addCustomer(lineSelect);
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record, lineSelect=null) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      // registerForm.value.edit(record);
+      registerForm.value.editCustomer(record, lineSelect);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+    emit('success');
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/statistics/Prewarn.api.ts b/src/views/military/modules/dutyManage/patrolLine/MsPatrolLine.api.ts
similarity index 65%
rename from src/views/military/modules/statistics/Prewarn.api.ts
rename to src/views/military/modules/dutyManage/patrolLine/MsPatrolLine.api.ts
index 6fd8a05..520f37a 100644
--- a/src/views/military/modules/statistics/Prewarn.api.ts
+++ b/src/views/military/modules/dutyManage/patrolLine/MsPatrolLine.api.ts
@@ -2,8 +2,8 @@
  * @Author: Fuyuu 1805498209@qq.com
  * @Date: 2023-11-24 10:15:24
  * @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2023-11-27 11:02:52
- * @FilePath: \dt-admin-pc\src\views\military\modules\statistics\prewarn.api.ts
+ * @LastEditTime: 2023-11-27 09:39:12
+ * @FilePath: \dt-admin-pc\src\views\military\modules\patrol\MsPatrolLine.api.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import { defHttp } from '/@/utils/http/axios';
@@ -12,15 +12,16 @@ import { useMessage } from '/@/hooks/web/useMessage';
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/military/prewarn/list',
-  save = '/military/prewarn/add',
-  edit = '/military/prewarn/edit',
-  deleteOne = '/military/prewarn/delete',
-  deleteBatch = '/military/prewarn/deleteBatch',
-  importExcel = '/military/prewarn/importExcel',
-  exportXls = '/military/prewarn/exportXls',
-  queryDataById = '/military/prewarn/queryById',
-  msWarnDealLogList = '/military/prewarn/queryMsWarnDealLogByMainId',
+  list = '/military/msPatrolLine/list',
+  save = '/military/msPatrolLine/add',
+  edit = '/military/msPatrolLine/edit',
+  deleteOne = '/military/msPatrolLine/delete',
+  deleteBatch = '/military/msPatrolLine/deleteBatch',
+  importExcel = '/military/msPatrolLine/importExcel',
+  exportXls = '/military/msPatrolLine/exportXls',
+  queryDataById = '/military/msPatrolLine/queryById',
+  msPatrolPointList = '/military/msPatrolLine/queryMsPatrolPointByMainId',
+  msLineConstList = '/military/msPatrolLine/queryMsLineConstByMainId',
 }
 /**
  * 导出api
@@ -37,7 +38,12 @@ export const getImportUrl = Api.importExcel;
  * 查询子表数据
  * @param params
  */
-export const queryMsWarnDealLogListByMainId = (id) => defHttp.get({ url: Api.msWarnDealLogList, params: { id } });
+export const queryMsPatrolPointListByMainId = (id) => defHttp.get({ url: Api.msPatrolPointList, params: { id } });
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const queryMsLineConstListByMainId = (id) => defHttp.get({ url: Api.msLineConstList, params: { id } });
 
 /**
  * 列表接口
diff --git a/src/views/military/modules/dutyManage/patrolLine/MsPatrolLine.data.ts b/src/views/military/modules/dutyManage/patrolLine/MsPatrolLine.data.ts
new file mode 100644
index 0000000..b8f4217
--- /dev/null
+++ b/src/views/military/modules/dutyManage/patrolLine/MsPatrolLine.data.ts
@@ -0,0 +1,133 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '创建日期',
+    align:"center",
+    dataIndex: 'createTime'
+   },
+   {
+    title: '路线名称',
+    align:"center",
+    dataIndex: 'lineName'
+   },
+   {
+    title: '路线编号',
+    align:"center",
+    dataIndex: 'lineCode'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "路线名称",
+      field: "lineName",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "路线编号",
+      field: "lineCode",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '路线名称',
+    field: 'lineName',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入路线名称!'},
+          ];
+     },
+  },
+  {
+    label: '路线编号',
+    field: 'lineCode',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+	{
+	  label: '',
+	  field: 'id',
+	  component: 'Input',
+	  show: false
+	},
+];
+//子表单数据
+//子表表格配置
+export const msPatrolPointColumns: JVxeColumn[] = [
+    {
+      title: '巡逻点',
+      key: 'pointName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '巡逻点编码',
+      key: 'pointCode',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '经度',
+      key: 'lon',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '纬度',
+      key: 'lat',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '高度',
+      key: 'height',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+export const msLineConstColumns: JVxeColumn[] = [
+    {
+      title: '经度',
+      key: 'lon',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '纬度',
+      key: 'lat',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '高度',
+      key: 'height',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
diff --git a/src/views/military/modules/dutyManage/patrolLine/MsPatrolLineList.vue b/src/views/military/modules/dutyManage/patrolLine/MsPatrolLineList.vue
new file mode 100644
index 0000000..61ea8e3
--- /dev/null
+++ b/src/views/military/modules/dutyManage/patrolLine/MsPatrolLineList.vue
@@ -0,0 +1,240 @@
+<!-- 
+  巡逻路线管理
+
+  目录位置：执勤管理 -> 巡逻路线管理
+  功能概述：巡逻点、线路点 未明白定义
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="路线名称" name="lineName">
+              <a-input placeholder="请输入路线名称" v-model:value="queryParam.lineName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="路线编号" name="lineCode">
+              <a-input placeholder="请输入路线编号" v-model:value="queryParam.lineCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <MsPatrolLineModal @register="registerModal" @success="handleSuccess"></MsPatrolLineModal>
+  </div>
+</template>
+
+<script lang="ts" name="mspatrolline-msPatrolLine" setup>
+  import { ref, reactive, computed, unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useModal } from '/@/components/Modal';
+  import MsPatrolLineModal from './components/MsPatrolLineModal.vue';
+  import { columns, searchFormSchema } from './MsPatrolLine.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsPatrolLine.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, { openModal }] = useModal();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '巡逻路线管理',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '巡逻路线管理',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
+  }
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/dutyManage/patrolLine/components/MsPatrolLineForm.vue b/src/views/military/modules/dutyManage/patrolLine/components/MsPatrolLineForm.vue
new file mode 100644
index 0000000..1058384
--- /dev/null
+++ b/src/views/military/modules/dutyManage/patrolLine/components/MsPatrolLineForm.vue
@@ -0,0 +1,205 @@
+<template>
+  <a-spin :spinning="loading">
+    <a-form v-bind="formItemLayout">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="路线名称" v-bind="validateInfos.lineName">
+            <a-input v-model:value="formData.lineName" placeholder="请输入路线名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="路线编号" v-bind="validateInfos.lineCode">
+            <a-input v-model:value="formData.lineCode" placeholder="请输入路线编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated>
+      <a-tab-pane tab="巡逻点管理" key="msPatrolPoint" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="msPatrolPointTableRef"
+          :loading="msPatrolPointTable.loading"
+          :columns="msPatrolPointTable.columns"
+          :dataSource="msPatrolPointTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+      <a-tab-pane tab="线路点管理" key="msLineConst" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="msLineConstTableRef"
+          :loading="msLineConstTable.loading"
+          :columns="msLineConstTable.columns"
+          :dataSource="msLineConstTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryMsPatrolPointListByMainId, queryMsLineConstListByMainId, queryDataById, saveOrUpdate } from '../MsPatrolLine.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {msPatrolPointColumns, msLineConstColumns} from '../MsPatrolLine.data';
+  import { Form } from 'ant-design-vue';
+  const useForm = Form.useForm;
+
+  export default defineComponent({
+    name: "MsPatrolLineForm",
+    components:{
+      JVxeTable,
+    },
+    props:{
+      formDisabled:{
+        type: Boolean,
+        default: false
+      },
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    },
+    emits:['success'],
+    setup(props, {emit}) {
+      const loading = ref(false);
+      const msPatrolPointTableRef = ref();
+      const msPatrolPointTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: msPatrolPointColumns,
+        dataSource: []
+      });
+      const msLineConstTableRef = ref();
+      const msLineConstTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: msLineConstColumns,
+        dataSource: []
+      });
+      const activeKey = ref('msPatrolPoint');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        lineName: '',
+        lineCode: '',
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+        lineName: [{ required: true, message: '请输入路线名称!'},],
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: true});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 5}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      
+
+      function add() {
+        resetFields();
+        msPatrolPointTable.dataSource = [];
+        msLineConstTable.dataSource = [];
+      }
+
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const msPatrolPointDataList = await queryMsPatrolPointListByMainId(row['id']);
+        msPatrolPointTable.dataSource = [...msPatrolPointDataList];
+        const msLineConstDataList = await queryMsLineConstListByMainId(row['id']);
+        msLineConstTable.dataSource = [...msLineConstDataList];
+      }
+
+      async function queryMainData(id) {
+        const row = await queryDataById(id);
+        Object.keys(row).map(k => {
+          formData[k] = row[k];
+        });
+      }
+
+      const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
+        'msPatrolPoint': msPatrolPointTableRef,
+        'msLineConst': msLineConstTableRef,
+      });
+
+      async function getFormData() {
+        await validate();
+        return transformData(toRaw(formData))
+      }
+
+      async function submitForm() {
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        const values = Object.assign({}, dbData, mainData, subData);
+        console.log('表单提交数据', values)
+        const isUpdate = values.id ? true : false
+        await saveOrUpdate(values, isUpdate);
+        //关闭弹窗
+        emit('success');
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
+
+      return {
+        msPatrolPointTableRef,
+        msPatrolPointTable,
+        msLineConstTableRef,
+        msLineConstTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit
+      }
+    }
+  });
+</script>
\ No newline at end of file
diff --git a/src/views/military/modules/dutyManage/patrolLine/components/MsPatrolLineModal.vue b/src/views/military/modules/dutyManage/patrolLine/components/MsPatrolLineModal.vue
new file mode 100644
index 0000000..14fc1cc
--- /dev/null
+++ b/src/views/military/modules/dutyManage/patrolLine/components/MsPatrolLineModal.vue
@@ -0,0 +1,68 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="800" @ok="handleSubmit">
+    <ms-patrol-line-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></ms-patrol-line-form>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import MsPatrolLineForm from './MsPatrolLineForm.vue';
+
+  export default {
+    name: "TestCgMainVxeModal",
+    components:{
+      BasicModal,
+      MsPatrolLineForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const title = ref('')
+
+      //表单赋值
+      const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        title.value = data?.isUpdate?'编辑':'新增'
+        formDisabled.value = !data?.showFooter;
+        if (unref(isUpdate)) {
+          console.log('data', data)
+          formComponent.value.edit(data.record)
+        }else{
+          formComponent.value.add()
+        }
+      });
+
+      function handleSubmit() {
+        formComponent.value.submitForm();
+      }
+
+      function submitSuccess(){
+        emit('success');
+        closeModal();
+      }
+
+      return {
+        registerModal,
+        title,
+        formComponent,
+        formDisabled,
+        handleSubmit,
+        submitSuccess
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+    :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/military/modules/prewarn/MsCameraLinkage.api.ts b/src/views/military/modules/earthMap/camera/MsCameraSite.api.ts
similarity index 78%
rename from src/views/military/modules/prewarn/MsCameraLinkage.api.ts
rename to src/views/military/modules/earthMap/camera/MsCameraSite.api.ts
index 6bbdcd2..cd9297a 100644
--- a/src/views/military/modules/prewarn/MsCameraLinkage.api.ts
+++ b/src/views/military/modules/earthMap/camera/MsCameraSite.api.ts
@@ -2,8 +2,8 @@
  * @Author: Fuyuu 1805498209@qq.com
  * @Date: 2023-11-24 10:15:24
  * @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2023-11-27 10:42:41
- * @FilePath: \dt-admin-pc\src\views\military\modules\prewarn\MsCameraLinkage.api.ts
+ * @LastEditTime: 2023-11-27 10:32:30
+ * @FilePath: \dt-admin-pc\src\views\military\modules\equipment\camera\MsCameraSite.api.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import { defHttp } from '/@/utils/http/axios';
@@ -12,13 +12,13 @@ import { useMessage } from '/@/hooks/web/useMessage';
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/military/msCameraLinkage/list',
-  save = '/military/msCameraLinkage/add',
-  edit = '/military/msCameraLinkage/edit',
-  deleteOne = '/military/msCameraLinkage/delete',
-  deleteBatch = '/military/msCameraLinkage/deleteBatch',
-  importExcel = '/military/msCameraLinkage/importExcel',
-  exportXls = '/military/msCameraLinkage/exportXls',
+  list = '/military/camera/site/list',
+  save = '/military/camera/site/add',
+  edit = '/military/camera/site/edit',
+  deleteOne = '/military/camera/site/delete',
+  deleteBatch = '/military/camera/site/deleteBatch',
+  importExcel = '/military/camera/site/importExcel',
+  exportXls = '/military/camera/site/exportXls',
 }
 
 /**
diff --git a/src/views/military/modules/earthMap/camera/MsCameraSite.data.ts b/src/views/military/modules/earthMap/camera/MsCameraSite.data.ts
new file mode 100644
index 0000000..47a7c14
--- /dev/null
+++ b/src/views/military/modules/earthMap/camera/MsCameraSite.data.ts
@@ -0,0 +1,153 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+
+  {
+    title: '区域',
+    align: "center",
+    // dataIndex: 'lineId_dictText',
+    dataIndex: 'lineName',
+    width: 250,
+  },
+  {
+    title: '序号',
+    align: "center",
+    dataIndex: 'sitecode',
+  },
+  {
+    title: '站点名称',
+    align: "center",
+    dataIndex: 'sitename'
+  },
+  {
+    title: '经度',
+    align: "center",
+    dataIndex: 'longitude'
+  },
+  {
+    title: '纬度',
+    align: "center",
+    dataIndex: 'latitude'
+  },
+  {
+    title: '高度',
+    align: "center",
+    dataIndex: 'height'
+  },
+  {
+    title: '偏航角',
+    align: "center",
+    dataIndex: 'yaw'
+  },
+  {
+    title: '俯仰角',
+    align: "center",
+    dataIndex: 'pitch'
+  },
+  {
+    title: '翻转角',
+    align: "center",
+    dataIndex: 'roll'
+  },
+
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "站点序号",
+    field: 'sitecode',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "线路id",
+    field: 'lineId',
+    component: 'JDictSelectTag',
+    componentProps:{
+    },
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '站点序号',
+    field: 'sitecode',
+    component: 'Input',
+  },
+  {
+    label: '站点名称',
+    field: 'sitename',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入站点名称!'},
+             ];
+    },
+  },
+  {
+    label: '经度',
+    field: 'longitude',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入经度!'},
+             ];
+    },
+  },
+  {
+    label: '纬度',
+    field: 'latitude',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入纬度!'},
+             ];
+    },
+  },
+  {
+    label: '高度',
+    field: 'height',
+    component: 'InputNumber',
+  },
+  {
+    label: '偏航角',
+    field: 'yaw',
+    component: 'InputNumber',
+  },
+  {
+    label: '俯仰角',
+    field: 'pitch',
+    component: 'InputNumber',
+  },
+  {
+    label: '翻转角',
+    field: 'roll',
+    component: 'InputNumber',
+  },
+  {
+    label: '线路id',
+    field: 'lineId',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: ""
+    },
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入线路id!'},
+             ];
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/earthMap/camera/MsCameraSiteList.vue b/src/views/military/modules/earthMap/camera/MsCameraSiteList.vue
new file mode 100644
index 0000000..c18b868
--- /dev/null
+++ b/src/views/military/modules/earthMap/camera/MsCameraSiteList.vue
@@ -0,0 +1,273 @@
+<!-- 
+  视频监控点位管理
+
+  目录位置：三维地图管理 -> 视频监控点位管理
+  功能概述：所在场景下的区域的监控杆，位置名称
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="区域名称" name="lineId">
+              <!-- <JInput placeholder="请输入序号" v-model:value="queryParam.sitecode"></JInput> -->
+              <a-select v-model:value="queryParam.lineId" style="width: 300px" placeholder="请选择区域名称" @select="searchQuery" allowClear>
+                <a-select-option v-for="(item, index) in lineSelect" :value="item.id" :key="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="站点名称" name="sitename">
+              <a-input placeholder="请输入站点名称" v-model:value="queryParam.sitename" @blur="searchQuery" allowClear></a-input>
+              <!-- <JInput laceholder="请输入站点名称" v-model:value="queryParam.sitename" ></JInput> -->
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <!-- <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button> -->
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" style="margin-left: 8px"> 新增</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <MsCameraSiteModal ref="registerModal" @success="handleSuccess"></MsCameraSiteModal>
+  </div>
+</template>
+
+<script lang="ts" name="camera-msCameraSite" setup>
+  import { ref, reactive, onMounted } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsCameraSite.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsCameraSite.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsCameraSiteModal from './components/MsCameraSiteModal.vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'ms_camera_site',
+      api: list,
+      columns,
+      canResize: false,
+      showIndexColumn: true,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: 'ms_camera_site',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  const lineSelect = ref([]);
+  //线路选择框
+  function setSelectList() {
+    defHttp
+      .get(
+        {
+          url: '/military/msMapLine/mapLineSelect',
+        },
+        { isTransformResponse: false }
+      )
+      // getAction(this.url.querySelectList, {})
+      .then((res) => {
+        if (res.success) {
+          lineSelect.value = res.result;
+        }
+      });
+  }
+
+  onMounted(() => {
+    setSelectList();
+  });
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/earthMap/camera/components/MsCameraSiteForm.vue b/src/views/military/modules/earthMap/camera/components/MsCameraSiteForm.vue
new file mode 100644
index 0000000..34a64c6
--- /dev/null
+++ b/src/views/military/modules/earthMap/camera/components/MsCameraSiteForm.vue
@@ -0,0 +1,297 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="区域" v-bind="validateInfos.lineId">
+            <!-- <j-dict-select-tag v-model:value="formData.lineId" dictCode="" placeholder="" :disabled="disabled"/> -->
+            <a-select
+              v-model:value="formData.lineId"
+              style="width: 300px"
+              @change="changeLineValue"
+              :disabled="disabled"
+              placeholder="请选择所属区域"
+            >
+              <a-select-option v-for="(item, index) in lineSelect" :value="item.id" :key="item.id">
+                {{ item.name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="站点序号" v-bind="validateInfos.sitecode">
+            <a-input v-model:value="formData.sitecode" placeholder="请输入站点序号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="站点名称" v-bind="validateInfos.sitename">
+            <a-input v-model:value="formData.sitename" placeholder="请输入站点名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <template v-if="disabled == false">
+          <a-col :span="24">
+            <a-form-item label="位置">
+              <a><img :src="locationPng" class="dwImg" @click="mapShow" /></a>
+            </a-form-item>
+          </a-col>
+
+          <EarthMapModal
+            ref="earthMapModal"
+            :enableTile="false"
+            :visible="mapVisible"
+            @closeWin="
+              () => {
+                mapVisible = false;
+              }
+            "
+            @checkPosition="checkPosition"
+            :hasMoveMethod="true"
+            @moveChinaPosition="moveChinaPosition"
+            :editTileModel="mapModel"
+            initModeType="3D"
+            :enable-pointer="false"
+          >
+          </EarthMapModal>
+        </template>
+        <a-col :span="24">
+          <a-form-item label="经度" v-bind="validateInfos.longitude">
+            <a-input-number v-model:value="formData.longitude" placeholder="请输入经度" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="纬度" v-bind="validateInfos.latitude">
+            <a-input-number v-model:value="formData.latitude" placeholder="请输入纬度" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="高度" v-bind="validateInfos.height">
+            <a-input-number v-model:value="formData.height" placeholder="请输入高度" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="偏航角" v-bind="validateInfos.yaw">
+            <a-input-number v-model:value="formData.yaw" placeholder="请输入偏航角" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="俯仰角" v-bind="validateInfos.pitch">
+            <a-input-number v-model:value="formData.pitch" placeholder="请输入俯仰角" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="翻转角" v-bind="validateInfos.roll">
+            <a-input-number v-model:value="formData.roll" placeholder="请输入翻转角" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  // import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../MsCameraSite.api';
+  import { Form } from 'ant-design-vue';
+  import EarthMapModal from '@/views/military/modules/earthMap/scene/model/mapModel/EarthMapModal.vue';
+  import locationPng from '@/assets/images/getLocation.png';
+
+  const lineSelect: any = ref([]);
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => {} },
+    formBpm: { type: Boolean, default: true },
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: undefined,
+    lineId: undefined,
+    sitecode: '',
+    sitename: '',
+    longitude: undefined,
+    latitude: undefined,
+    height: undefined,
+    yaw: undefined,
+    pitch: undefined,
+    roll: undefined,
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    sitecode: [{ required: true, message: '请输入站点序号!' }],
+    sitename: [{ required: true, message: '请输入站点名称!' }],
+    longitude: [{ required: true, message: '请输入经度!' }],
+    latitude: [{ required: true, message: '请输入纬度!' }],
+    lineId: [{ required: true, message: '请选择所属区域!' }],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(() => {
+    if (props.formBpm === true) {
+      if (props.formData.disabled === false) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  onMounted(() => {
+    setSelectList();
+  });
+  //线路选择框
+  function setSelectList() {
+    defHttp
+      .get(
+        {
+          url: '/military/msMapLine/mapLineSelect',
+        },
+        { isTransformResponse: false }
+      )
+      // getAction(this.url.querySelectList, {})
+      .then((res) => {
+        if (res.success) {
+          lineSelect.value = res.result;
+        }
+      });
+  }
+
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+  function changeLineValue(item, option) {
+    formData.lineId = option.key;
+  }
+
+  // 弹窗地图框属性
+  const mapVisible = ref(false);
+  const mapModel = ref();
+  const mapShow = function () {
+    mapModel.value = {
+      custom: {
+        id: formData.id,
+      },
+      czmObject: {
+        name: formData.sitename,
+        xbsjType: 'Model',
+        url: '/dt/sys/common/static/' + formData.modelUrl,
+        // "color": [0.52, 0.6, 0.58, 1],
+        minimumPixelSize: formData.minimumPixelSize,
+        // maximumScale: 0.02,
+        scale: formData.scale,
+        xbsjScale: formData.xyzScale ? formData.xyzScale.split(',') : [1, 1, 1],
+        xbsjPosition: [window.Cesium.Math.toRadians(formData.longitude), window.Cesium.Math.toRadians(formData.latitude), formData.height],
+        xbsjRotation: [
+          window.Cesium.Math.toRadians(formData.yaw),
+          window.Cesium.Math.toRadians(formData.pitch),
+          window.Cesium.Math.toRadians(formData.roll),
+        ],
+        viewDistance: 150,
+        distanceDisplayCondition: [1.0, 30000.0],
+      },
+    };
+
+    mapVisible.value = true;
+  };
+
+  const checkPosition = function (position, rotation, fov) {
+    const CMath = window.Cesium.Math;
+    formData.longitude = CMath.toDegrees(position[0]);
+    formData.latitude = CMath.toDegrees(position[1]);
+    formData.height = CMath.toDegrees(position[2]);
+
+    formData.yaw = CMath.toDegrees(rotation[0]);
+    formData.pitch = CMath.toDegrees(rotation[1]);
+    formData.roll = CMath.toDegrees(rotation[2]);
+
+    // subObject.value.viewDistance = fov;
+  };
+  const earthMapModal: any = ref(null);
+  // 打开地图时飞入到指定位置
+  const moveChinaPosition = function () {
+    earthMapModal.value.CModel.czmObject.flyTo();
+    // const CMath = window.Cesium.Math;
+    // window.earth.camera.position = [CMath.toRadians(formData.longitude) - 0.000001, CMath.toRadians(formData.latitude) - 0.000001, CMath.toRadians(formData.height) - 0.000001];
+    // window.earth.camera.rotation = [CMath.toRadians(formData.yaw), CMath.toRadians(formData.pitch), CMath.toRadians(formData.roll)]
+  };
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+
+  .dwImg {
+    width: 32px;
+    height: 32px;
+  }
+</style>
diff --git a/src/views/military/modules/earthMap/camera/components/MsCameraSiteModal.vue b/src/views/military/modules/earthMap/camera/components/MsCameraSiteModal.vue
new file mode 100644
index 0000000..c076824
--- /dev/null
+++ b/src/views/military/modules/earthMap/camera/components/MsCameraSiteModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <MsCameraSiteForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsCameraSiteForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import MsCameraSiteForm from './MsCameraSiteForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/earthMap/mapManage/EarthMapManage.vue b/src/views/military/modules/earthMap/mapManage/EarthMapManage.vue
index ae343b5..ab029fa 100644
--- a/src/views/military/modules/earthMap/mapManage/EarthMapManage.vue
+++ b/src/views/military/modules/earthMap/mapManage/EarthMapManage.vue
@@ -1,8 +1,8 @@
 <!-- 
   地图切片管理
 
-  功能划分
-  三维地图管理 -> 地图切片管理
+  目录位置：三维地图管理 -> 地图切片管理
+  功能概述：不同区域图层切片
  -->
 <template>
   <a-row>
@@ -14,21 +14,17 @@
         <a-radio-group :options="mapType" v-model:value="selectType" @change="typeChange" rowKey="id" />
         <a-button type="primary" @click="addLoyaut">添加图层</a-button>
         <a-button type="primary" class="map-do-upload-button" @click="uploadFiles">上传切片</a-button>
-        <input id="tilesUploadInput" type="file" v-show="false" @change="fileChange" :webkitdirectory="uploadType1"
-          multiple />
+        <input id="tilesUploadInput" type="file" v-show="false" @change="fileChange" :webkitdirectory="uploadType1" multiple />
       </div>
     </a-col>
     <a-col :span="24">
       <a-table :columns="columns" :dataSource="dataSource">
         <template #mapType="{ text, record }">
-          <a-tag color="green" v-if="record.mapType == 'web'">
-            <!-- {{ text }} -->在线地图
-          </a-tag>
-          <a-tag color="cyan" v-else-if="record.mapType == 'local'">
-            <!-- {{ text }} -->本地地图
-          </a-tag>
+          <a-tag color="green" v-if="record.mapType == 'web'"> <!-- {{ text }} -->在线地图 </a-tag>
+          <a-tag color="cyan" v-else-if="record.mapType == 'local'"> <!-- {{ text }} -->本地地图 </a-tag>
           <a-tag color="blue" v-else-if="record.mapType == 'tileset'">
-            <!-- {{ text }} --> 模型切片
+            <!-- {{ text }} -->
+            模型切片
           </a-tag>
         </template>
         <template #action="{ text, record }">
@@ -45,289 +41,287 @@
           </a>
         </template>
         <template #status="{ text, record }">
-          <a-tag color="#87d068" v-if="record.status == 1">
-            启用
-          </a-tag>
-          <a-tag color="#f50" v-else>
-            未启用
-          </a-tag>
+          <a-tag color="#87d068" v-if="record.status == 1"> 启用 </a-tag>
+          <a-tag color="#f50" v-else> 未启用 </a-tag>
         </template>
       </a-table>
     </a-col>
-    <MapModel :show="showWin" :map-model="model" :map-type="selectType" @closeWin="closeState"
-      @typeChange="selectTypeChange" @getDataSource="getDataSource" :disabled="disabled" initModeType="3D">
+    <MapModel
+      :show="showWin"
+      :map-model="model"
+      :map-type="selectType"
+      @closeWin="closeState"
+      @typeChange="selectTypeChange"
+      @getDataSource="getDataSource"
+      :disabled="disabled"
+      initModeType="3D"
+    >
     </MapModel>
     <UploadTile :show="showUploadWin" @closeWin="uploadWinClose" @confirmName="confirmName"></UploadTile>
   </a-row>
 </template>
 <script setup>
-import { ref, onMounted, reactive, nextTick } from 'vue';
-import { message } from 'ant-design-vue';
-import { defHttp } from '@/utils/http/axios';
-import { UnorderedListOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue';
-import MapModel from './modal/MapModel.vue';
-import UploadTile from './modal/UploadTile.vue';
+  import { ref, onMounted, reactive, nextTick } from 'vue';
+  import { message } from 'ant-design-vue';
+  import { defHttp } from '@/utils/http/axios';
+  import { UnorderedListOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue';
+  import MapModel from './modal/MapModel.vue';
+  import UploadTile from './modal/UploadTile.vue';
 
-
-const getMap = (params) => defHttp.get({ url: "/military/msMapManage/list", params: params }, { isTransformResponse: false });
-const deleteMap = (params) => defHttp.delete({ url: "/military/msMapManage/delete", params: params }, { isTransformResponse: false })
-const uploadTileDir = (params) => defHttp.post({ url: "/military/msMapManage/uploadTile", params }, { isTransformResponse: false })
-const uploadType1 = ref(false);
-const model = ref({
-  custom: {
-    mapName: "",
-    mapType: "",
-    status: [0]
-  },
-  xbsjZIndex: 0,
-});
-const modelInit = function () {
-  model.value = {
+  const getMap = (params) => defHttp.get({ url: '/military/msMapManage/list', params: params }, { isTransformResponse: false });
+  const deleteMap = (params) => defHttp.delete({ url: '/military/msMapManage/delete', params: params }, { isTransformResponse: false });
+  const uploadTileDir = (params) => defHttp.post({ url: '/military/msMapManage/uploadTile', params }, { isTransformResponse: false });
+  const uploadType1 = ref(false);
+  const model = ref({
     custom: {
-      mapName: "",
-      mapType: "",
-      status: [0]
+      mapName: '',
+      mapType: '',
+      status: [0],
     },
     xbsjZIndex: 0,
-  }
-  typeChange();
-}
-onMounted(() => {
-  init()
-});
-const init = function () {
-  selectType.value = "local";
-  console.log(selectType.value)
-  typeChange();
-  getDataSource();
-}
-const selectType = ref("local");
-// 地图类型
-const mapType = [
-  //   {
-  //   value: "web",
-  //   label: "在线地图"
-  // }, 
-  {
-    value: "local",
-    label: "离线地图"
-  }, {
-    value: "tileset",
-    label: "模型切片"
-  }
-]
-// 排序属性
-const sortedInfo = {
-  type: {
-    order: "ascend",
-    able: true
-  },
-  status: {
-    order: 'descend',
-    able: true
-  }
-}
-// 初始列
-const columns = [
-  {
-    title: '图层名称',
-    dataIndex: 'mapName',
-    key: 'mapName',
-    align: 'center',
-    width: '6%',
-  },
-  {
-    title: '图层类型',
-    dataIndex: 'mapType',
-    key: 'mapType',
-    width: '10%',
-    align: 'center',
-    slots: { customRender: 'mapType' },
-    sorter: (a, b) => a.mapType.length - b.mapType.length,
-    sortOrder: sortedInfo.type.able && sortedInfo.type.order,
-    // filters: filtersArr,
-  },
-  {
-    title: '状态',
-    dataIndex: 'status',
-    key: 'status',
-    align: 'center',
-    width: '10%',
-    slots: { customRender: 'status' },
-    sorter: (a, b) => { return a.status - b.status },
-    sortOrder: sortedInfo.status.able && sortedInfo.status.order,
-  },
-  {
-    title: '操作',
-    key: 'action',
-    slots: { customRender: 'action' },
-    align: 'center',
-    width: '6%',
-  }
-]
-// 初始数据源
-const dataSource = ref([{}]);
-const addLoyaut = function () {
-  modelInit();
-  model.value.custom.id = "";
-  showState();
-}
-// 弹出窗体显示与否
-const showWin = ref(false);
-const showState = () => {
-  showWin.value = true;
-  console.log(showWin.value)
-}
-const closeState = () => {
-  showWin.value = false;
-  disabled.value = false;
-}
-const typeChange = async function (e) {
-  model.value.custom.mapType = selectType.value
-  if (selectType.value == "web") {
-    model.value.czmObject = reactive({
-      xbsjType: "Imagery",
-      show: true,
-      xbsjImageryProvider: {
-        XbsjImageryProvider: {
-          url: "",
-          dstCoordType: "",
-          srcCoordType: "",
-          maximumLevel: undefined,
-          minimumLevel: 0
-        }
-      }
-    })
-  } else if (selectType.value == "local") {
-    model.value.czmObject = reactive({
-      xbsjType: "Imagery",
-      xbsjImageryProvider: {
-        createTileMapServiceImageryProvider: {
-          url: "",
-          fileExtension: "jpg"
+  });
+  const modelInit = function () {
+    model.value = {
+      custom: {
+        mapName: '',
+        mapType: '',
+        status: [0],
+      },
+      xbsjZIndex: 0,
+    };
+    typeChange();
+  };
+  onMounted(() => {
+    init();
+  });
+  const init = function () {
+    selectType.value = 'local';
+    console.log(selectType.value);
+    typeChange();
+    getDataSource();
+  };
+  const selectType = ref('local');
+  // 地图类型
+  const mapType = [
+    //   {
+    //   value: "web",
+    //   label: "在线地图"
+    // },
+    {
+      value: 'local',
+      label: '离线地图',
+    },
+    {
+      value: 'tileset',
+      label: '模型切片',
+    },
+  ];
+  // 排序属性
+  const sortedInfo = {
+    type: {
+      order: 'ascend',
+      able: true,
+    },
+    status: {
+      order: 'descend',
+      able: true,
+    },
+  };
+  // 初始列
+  const columns = [
+    {
+      title: '图层名称',
+      dataIndex: 'mapName',
+      key: 'mapName',
+      align: 'center',
+      width: '6%',
+    },
+    {
+      title: '图层类型',
+      dataIndex: 'mapType',
+      key: 'mapType',
+      width: '10%',
+      align: 'center',
+      slots: { customRender: 'mapType' },
+      sorter: (a, b) => a.mapType.length - b.mapType.length,
+      sortOrder: sortedInfo.type.able && sortedInfo.type.order,
+      // filters: filtersArr,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      width: '10%',
+      slots: { customRender: 'status' },
+      sorter: (a, b) => {
+        return a.status - b.status;
+      },
+      sortOrder: sortedInfo.status.able && sortedInfo.status.order,
+    },
+    {
+      title: '操作',
+      key: 'action',
+      slots: { customRender: 'action' },
+      align: 'center',
+      width: '6%',
+    },
+  ];
+  // 初始数据源
+  const dataSource = ref([{}]);
+  const addLoyaut = function () {
+    modelInit();
+    model.value.custom.id = '';
+    showState();
+  };
+  // 弹出窗体显示与否
+  const showWin = ref(false);
+  const showState = () => {
+    showWin.value = true;
+    console.log(showWin.value);
+  };
+  const closeState = () => {
+    showWin.value = false;
+    disabled.value = false;
+  };
+  const typeChange = async function (e) {
+    model.value.custom.mapType = selectType.value;
+    if (selectType.value == 'web') {
+      model.value.czmObject = reactive({
+        xbsjType: 'Imagery',
+        show: true,
+        xbsjImageryProvider: {
+          XbsjImageryProvider: {
+            url: '',
+            dstCoordType: '',
+            srcCoordType: '',
+            maximumLevel: undefined,
+            minimumLevel: 0,
+          },
         },
-        type: 'createTileMapServiceImageryProvider',
-      }
-    })
-  } else if (selectType.value == "tileset") {
-    model.value.czmObject = reactive({
-      xbsjType: "Tileset",
-      url: "",
-      xbsjPosition: [0, 0, 0],
-      xbsjRotation: [0, 0, 0],
-      xbsjScale: [1, 1, 1],
-      show: false,
-      allowPicking: false,
-      xbsjUseOriginTransform: false
-    })
-  }
-
-}
-const selectTypeChange = function (value) {
-  selectType.value = value;
-  typeChange();
-}
-const getDataSource = function () {
-  const params = {
-    pageNo: 1,
-    pageSize: 9999,
-  }
-  return getMap(params).then(
-    (res) => {
-      if (res.code == 200) {
-        const records = res.result;
-        records.forEach(item => {
-          item.czmObject = JSON.parse(item.czmObject);
-        });
-        dataSource.value = records;
-        return "success";
-      } else {
-        message.error("无法显示数据！");
-        return "error";
-      }
-    }
-  ).catch(
-    (err) => {
-      console.error(err);
-      message.error("无法显示数据！");
-      return "error";
+      });
+    } else if (selectType.value == 'local') {
+      model.value.czmObject = reactive({
+        xbsjType: 'Imagery',
+        xbsjImageryProvider: {
+          createTileMapServiceImageryProvider: {
+            url: '',
+            fileExtension: 'jpg',
+          },
+          type: 'createTileMapServiceImageryProvider',
+        },
+      });
+    } else if (selectType.value == 'tileset') {
+      model.value.czmObject = reactive({
+        xbsjType: 'Tileset',
+        url: '',
+        xbsjPosition: [0, 0, 0],
+        xbsjRotation: [0, 0, 0],
+        xbsjScale: [1, 1, 1],
+        show: false,
+        allowPicking: false,
+        xbsjUseOriginTransform: false,
+      });
     }
-  )
-}
-const editRecord = function (record) {
-  selectType.value = record.mapType;
-  model.value.custom = {
-    id: record.id,
-    mapName: record.mapName,
-    mapType: record.mapType,
-    status: [record.status]
   };
-  model.value.czmObject = reactive(
-    record.czmObject
-  )
-  showState();
-}
-const disabled = ref(false);
-const viewRecord = function (record) {
-  editRecord(record);
-  model.value.custom.id = "";
-  disabled.value = true;
-}
-const deleteRecord = function (record) {
-  const params = new FormData();
-  params.append("id", record.id);
-  deleteMap(params).then(
-    (res) => {
+  const selectTypeChange = function (value) {
+    selectType.value = value;
+    typeChange();
+  };
+  const getDataSource = function () {
+    const params = {
+      pageNo: 1,
+      pageSize: 9999,
+    };
+    return getMap(params)
+      .then((res) => {
+        if (res.code == 200) {
+          const records = res.result;
+          records.forEach((item) => {
+            item.czmObject = JSON.parse(item.czmObject);
+          });
+          dataSource.value = records;
+          return 'success';
+        } else {
+          message.error('无法显示数据！');
+          return 'error';
+        }
+      })
+      .catch((err) => {
+        console.error(err);
+        message.error('无法显示数据！');
+        return 'error';
+      });
+  };
+  const editRecord = function (record) {
+    selectType.value = record.mapType;
+    model.value.custom = {
+      id: record.id,
+      mapName: record.mapName,
+      mapType: record.mapType,
+      status: [record.status],
+    };
+    model.value.czmObject = reactive(record.czmObject);
+    showState();
+  };
+  const disabled = ref(false);
+  const viewRecord = function (record) {
+    editRecord(record);
+    model.value.custom.id = '';
+    disabled.value = true;
+  };
+  const deleteRecord = function (record) {
+    const params = new FormData();
+    params.append('id', record.id);
+    deleteMap(params).then((res) => {
       if (res.code == 200) {
-        message.info("删除成功!");
+        message.info('删除成功!');
         getDataSource();
       } else {
-        message.info("删除失败!");
+        message.info('删除失败!');
       }
+    });
+  };
+  // const formData = new formData();
+  const showUploadWin = ref(false);
+  const uploadWinOpen = function () {
+    showUploadWin.value = true;
+  };
+  const uploadWinClose = function () {
+    uploadType1.value = false;
+    showUploadWin.value = false;
+  };
+  let mapName = '';
+  const confirmName = async function (value, uploadType) {
+    uploadType1.value = Boolean(uploadType);
+    await nextTick();
+    mapName = value.trim();
+    if (mapName && mapName.length > 0) {
+      const inputEl = document.getElementById('tilesUploadInput');
+      inputEl.click();
     }
-  )
-}
-// const formData = new formData();
-const showUploadWin = ref(false);
-const uploadWinOpen = function () {
-  showUploadWin.value = true;
-}
-const uploadWinClose = function () {
-  uploadType1.value = false;
-  showUploadWin.value = false;
-}
-let mapName = "";
-const confirmName = async function (value, uploadType) {
-  uploadType1.value = Boolean(uploadType);
-  await nextTick();
-  mapName = value.trim();
-  if (mapName && mapName.length > 0) {
-    const inputEl = document.getElementById("tilesUploadInput");
-    inputEl.click();
-  }
-}
-const uploadFiles = function (e) {
-  uploadWinOpen();
-}
-const accept = [".zip", ".z01"]
-// const uploadTileDir = async function (params) {
+  };
+  const uploadFiles = function (e) {
+    uploadWinOpen();
+  };
+  const accept = ['.zip', '.z01'];
+  // const uploadTileDir = async function (params) {
 
-//   const headers = { "Accept-Encoding": "identity" };
-//   const response = await fetch("/military/military/msMapManage/uploadTile", {
-//     method: "post",
-//     headers: headers,
-//     body: params,
-//   });
-//   return response.json();
-// }
-const fileChange = function (e) {
-  uploadWinClose();
-  setTimeout(
-    async () => {
+  //   const headers = { "Accept-Encoding": "identity" };
+  //   const response = await fetch("/military/military/msMapManage/uploadTile", {
+  //     method: "post",
+  //     headers: headers,
+  //     body: params,
+  //   });
+  //   return response.json();
+  // }
+  const fileChange = function (e) {
+    uploadWinClose();
+    setTimeout(async () => {
       const files = e.target.files;
       let formData = new FormData();
       const filesLen = files.length;
-      const fileId = new Date().getTime() + "" + (Number.parseInt(Math.random() * 10000000));
+      const fileId = new Date().getTime() + '' + Number.parseInt(Math.random() * 10000000);
       let successFile = 0;
       for (let i = 0; i < filesLen; i++) {
         const file = files[i];
@@ -339,65 +333,59 @@ const fileChange = function (e) {
           hasType = true;
         }
         if (hasType == false) {
-          message.error("文件:" + filePath + ",类型检查不通过，无法上传!");
+          message.error('文件:' + filePath + ',类型检查不通过，无法上传!');
           break;
         }
-        formData.append("mapName", mapName);
-        formData.append("fileId", fileId);
-        formData.append("file", file);
-        formData.append("fileName", name);
-        formData.append("fileCount", filesLen);
+        formData.append('mapName', mapName);
+        formData.append('fileId', fileId);
+        formData.append('file', file);
+        formData.append('fileName', name);
+        formData.append('fileCount', filesLen);
         if (filesLen > 1) {
-          if (name.indexOf(".zip") > -1 && successFile == filesLen - 1) {
-            formData.append("isComplete", "1");
+          if (name.indexOf('.zip') > -1 && successFile == filesLen - 1) {
+            formData.append('isComplete', '1');
           } else {
-            formData.append("isComplete", "0");
+            formData.append('isComplete', '0');
           }
         } else {
-          formData.append("isComplete", "1");
+          formData.append('isComplete', '1');
         }
-        await uploadTileDir(formData).then(
-          (res) => {
+        await uploadTileDir(formData)
+          .then((res) => {
             if (res.code == 200) {
-              message.info("成功上传:" + name);
+              message.info('成功上传:' + name);
               successFile++;
               return true;
             }
-          }
-        ).finally(
-          () => {
+          })
+          .finally(() => {
             formData = new FormData();
             return true;
-          }
-        );
+          });
       }
-      getDataSource()
+      getDataSource();
       e.target.value = null;
-    }, 100
-  )
-
+    }, 100);
 
-
-
-  // if (!file) {
-  //   return;
-  // }
-  // formData.append("zipFile", file);
-}
+    // if (!file) {
+    //   return;
+    // }
+    // formData.append("zipFile", file);
+  };
 </script>
 <style scoped>
-.map-a {
-  margin-left: 12px;
-}
+  .map-a {
+    margin-left: 12px;
+  }
 
-.map-do-div {
-  padding: 12px;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
+  .map-do-div {
+    padding: 12px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
 
-.map-do-upload-button {
-  margin-left: 12px;
-}
-</style>
\ No newline at end of file
+  .map-do-upload-button {
+    margin-left: 12px;
+  }
+</style>
diff --git a/src/views/military/modules/earthMap/msMapLabel/MsMapLabelList.vue b/src/views/military/modules/earthMap/msMapLabel/MsMapLabelList.vue
index 2f5fad0..7a73651 100644
--- a/src/views/military/modules/earthMap/msMapLabel/MsMapLabelList.vue
+++ b/src/views/military/modules/earthMap/msMapLabel/MsMapLabelList.vue
@@ -1,15 +1,14 @@
 <!-- 
   地图标志管理
 
-  功能划分
-  三维地图管理 -> 地图标志管理
+  目录位置：三维地图管理 -> 地图标志管理
+  功能概述：地图上所有的标志，雷达、探测器的位置、名字、图标、状态
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item label="标志编号" name="labelCode">
@@ -47,8 +46,7 @@
             <span class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
                 <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -75,7 +73,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -93,9 +92,8 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
@@ -104,169 +102,168 @@
 </template>
 
 <script lang="ts" name="military-msMapLabel" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { columns } from './MsMapLabel.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMapLabel.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import MsMapLabelModal from './components/MsMapLabelModal.vue'
-import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-const formRef = ref();
-const queryParam = reactive<any>({});
-// const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: '地图标志管理',
-    api: list,
-    columns,
-    canResize: false,
-    useSearchForm: false,
-    actionColumn: {
-      width: 120,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsMapLabel.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMapLabel.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsMapLabelModal from './components/MsMapLabelModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  // const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '地图标志管理',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    exportConfig: {
+      name: '地图标志管理',
+      url: getExportUrl,
+      params: queryParam,
     },
-  },
-  exportConfig: {
-    name: "地图标志管理",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-    margin-left: 50px;
-  }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 50px;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}</style>
+</style>
diff --git a/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue b/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue
index 0600684..2f4b49c 100644
--- a/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue
+++ b/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue
@@ -1,15 +1,14 @@
 <!-- 
   地图线路管理
 
-  功能划分
-  三维地图管理 -> 地图线路管理
+  目录位置：三维地图管理 -> 地图线路管理
+  功能概述：管理所在场景下的区域，如雷达防区测试区域
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item label="线路名称" name="name">
@@ -20,8 +19,7 @@
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
                 <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -48,7 +46,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -66,9 +65,8 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
@@ -77,168 +75,166 @@
 </template>
 
 <script lang="ts" name="military-msMapLine" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { columns } from './MsMapLine.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMapLine.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import MsMapLineModal from './components/MsMapLineModal.vue'
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-const formRef = ref();
-const queryParam = reactive<any>({});
-// const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: '地图路线管理',
-    api: list,
-    columns,
-    canResize: false,
-    useSearchForm: false,
-    actionColumn: {
-      width: 120,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsMapLine.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMapLine.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsMapLineModal from './components/MsMapLineModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  // const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '地图路线管理',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    exportConfig: {
+      name: '地图路线管理',
+      url: getExportUrl,
+      params: queryParam,
     },
-  },
-  exportConfig: {
-    name: "地图路线管理",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
-
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-  }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}
 </style>
diff --git a/src/views/military/modules/earthMap/msModelPosition/MsModelPositionList.vue b/src/views/military/modules/earthMap/msModelPosition/MsModelPositionList.vue
index cc6e872..f4765b8 100644
--- a/src/views/military/modules/earthMap/msModelPosition/MsModelPositionList.vue
+++ b/src/views/military/modules/earthMap/msModelPosition/MsModelPositionList.vue
@@ -1,8 +1,8 @@
 <!-- 
   地图模型管理
 
-  功能划分
-  三维地图管理 -> 地图模型管理
+  目录位置：三维地图管理 -> 地图模型管理
+  功能概述：三维模型，联动事件触发
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/earthMap/scene/SceneManage.vue b/src/views/military/modules/earthMap/scene/SceneManage.vue
index 78529fd..f18655b 100644
--- a/src/views/military/modules/earthMap/scene/SceneManage.vue
+++ b/src/views/military/modules/earthMap/scene/SceneManage.vue
@@ -1,8 +1,8 @@
 <!-- 
   监控站管理
 
-  功能划分
-  三维地图管理 -> 监控站管理
+  目录位置：三维地图管理 -> 监控站管理
+  功能概述：场景管理，上帝视角，控制飞入，视角
  -->
 <template>
   <div class="mainContainer">
diff --git a/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue b/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue
index ae34c19..b99eba7 100644
--- a/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue
+++ b/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue
@@ -10,21 +10,18 @@
       </a-col>
       <a-col :span="11" :offset="1">
         <div>站点名称:</div>
-        <a-input class="inputWidthCss1" v-model:value="subObject.sceneName" placeholder="请输入场景编号名称"
-          :disabled="disable"></a-input>
+        <a-input class="inputWidthCss1" v-model:value="subObject.sceneName" placeholder="请输入场景编号名称" :disabled="disable"></a-input>
       </a-col>
       <a-col :span="11" :offset="1">
         <div>站点视距:</div>
-        <a-input-number class="inputWidthCss1" v-model:value="subObject.viewDistance"
-          :disabled="disable"></a-input-number>
+        <a-input-number class="inputWidthCss1" v-model:value="subObject.viewDistance" :disabled="disable"></a-input-number>
       </a-col>
       <a-col :span="11" :offset="1">
         <div>站点类型:</div>
-        <a-select v-model:value="subObject.sceneType" :disabled="disable">
+        <a-select v-model:value="subObject.sceneType" :disabled="disable" placeholder="请选择站点类型">
           <template :key="Number(sceneType.value)" v-for="sceneType in sceneTypes">
             <a-select-option :value="Number(sceneType.value)">{{ sceneType.text }}</a-select-option>
           </template>
-
         </a-select>
       </a-col>
       <a-col :span="11" :offset="1">
@@ -51,286 +48,263 @@
         <div class="centerText">旋转<img :src="locationPng" class="dwImg" @click="mapShow" /></div>
       </a-col> -->
       <a-col :span="11" :offset="1">
-        <div>
-          <div>中心经度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.lon" :disabled="disable" />
-        </div>
-        <div>
-          <div>中心纬度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.lat" :disabled="disable" />
-        </div>
-        <div>
-          <div>中心高度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.altitude" :disabled="disable" />
-        </div>
+        <div> <div>中心经度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.lon" :disabled="disable" /> </div>
+        <div> <div>中心纬度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.lat" :disabled="disable" /> </div>
+        <div> <div>中心高度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.altitude" :disabled="disable" /> </div>
       </a-col>
       <a-col :span="11" :offset="1">
-        <div>
-          <div>相机经度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraLon"
-            :disabled="disable" />
-        </div>
-        <div>
-          <div>相机纬度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraLat"
-            :disabled="disable" />
-        </div>
-        <div>
-          <div>相机高度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraAltitude"
-            :disabled="disable" />
-        </div>
+        <div> <div>相机经度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraLon" :disabled="disable" /> </div>
+        <div> <div>相机纬度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraLat" :disabled="disable" /> </div>
+        <div> <div>相机高度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraAltitude" :disabled="disable" /> </div>
       </a-col>
       <a-col :span="11" :offset="1">
         <div>站点图标:</div>
-        <a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
-          :customRequest="preViewOk" :before-upload="preBeforeUpload" :accept="previewType.toString()"
-          :disabled="disable">
-          <img v-if="preViewUrl" :src="subObject.icon" alt="avatar" class="preViewImg"
-            style="width:102px;height:102px;object-fit: contain;" />
+        <a-upload
+          name="avatar"
+          list-type="picture-card"
+          class="avatar-uploader"
+          :show-upload-list="false"
+          :customRequest="preViewOk"
+          :before-upload="preBeforeUpload"
+          :accept="previewType.toString()"
+          :disabled="disable"
+        >
+          <img v-if="preViewUrl" :src="subObject.icon" alt="avatar" class="preViewImg" style="width: 102px; height: 102px; object-fit: contain" />
           <div v-else>
             <div class="ant-upload-text">上传图标</div>
           </div>
         </a-upload>
       </a-col>
       <a-col :span="11" :offset="1">
-        <div>
-          <div>相机偏航角:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.rotationX"
-            :disabled="disable" />
-        </div>
-        <div>
-          <div>相机俯仰角:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.rotationY"
-            :disabled="disable" />
-        </div>
-        <div>
-          <div>相机翻转角:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.rotationZ"
-            :disabled="disable" />
-        </div>
+        <div> <div>相机偏航角:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.rotationX" :disabled="disable" /> </div>
+        <div> <div>相机俯仰角:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.rotationY" :disabled="disable" /> </div>
+        <div> <div>相机翻转角:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.rotationZ" :disabled="disable" /> </div>
       </a-col>
     </a-row>
 
-    <EarthMapModal :visible="mapVisible" :enableTile="false" :enablePointer="true"
-      @closeWin="() => { mapVisible = false }" @checkPosition="checkPosition"
-      :hasMoveMethod="(subObject && subObject.id) ? true : false" @moveChinaPosition="moveChinaPosition"></EarthMapModal>
+    <EarthMapModal
+      :visible="mapVisible"
+      :enableTile="false"
+      :enablePointer="true"
+      @closeWin="
+        () => {
+          mapVisible = false;
+        }
+      "
+      @checkPosition="checkPosition"
+      :hasMoveMethod="subObject && subObject.id ? true : false"
+      @moveChinaPosition="moveChinaPosition"
+    ></EarthMapModal>
   </div>
 </template>
 <script setup>
-import { toRefs, ref, watch, computed, onMounted } from 'vue';
-import locationPng from '@/assets/images/getLocation.png';
-import EarthMapModal from '../MapModel/EarthMapModal.vue';
-import { defHttp } from '@/utils/http/axios';
-import { message } from 'ant-design-vue';
-import { EditOutlined } from '@ant-design/icons-vue';
-
-// 新增场景
-const addScene = (params) => {
-  return defHttp.post({ url: "/military/msMapScene/add", params: params }, { isTransformResponse: false });
-}
-// 编辑场景
-const editScene = (params) => { return defHttp.put({ url: "/military/msMapScene/edit", params: params }, { isTransformResponse: false }); }
-// 获取场景类型字典
-const getSceneType = () => {
-  return defHttp.get({ url: "/sys/dict/getDictItems/SceneType" }, { isTransformResponse: false });
-}
-// 上传图片
-const fileUpload = (file) => {
-  return defHttp.post({ url: "/sys/common/upload", params: file }, { isTransformResponse: false });
-}
-// 属性
-const props = defineProps(['subObject', "parentCodeArr", "nextNodeIndex", "parentNodeCode", "disable"]);
-// 包装ref
-const { parentCodeArr, nextNodeIndex, parentNodeCode, subObject, disable } = toRefs(props);
-const emit = defineEmits(['closeWin', 'updateDataSource']);
-const sceneTypes = ref([]);
-// 创建编码
-const createCode = function () {
-  if (!nextNodeIndex.value) {
-    return;
-  }
-  const nextNodeIndexStr = nextNodeIndex.value.toString();
-  const nextNodeIndexLen = nextNodeIndexStr.length;
-  let currentCode = "";
-  for (let i = 0; i < 5 - nextNodeIndexLen; i++) {
-    currentCode += "0";
-  }
-  currentCode += nextNodeIndexStr;
-  let sceneCode = null;
-  if (parentNodeCode.value.length > 0) {
-    sceneCode = parentNodeCode.value + "-" + currentCode;
-
+  import { toRefs, ref, watch, computed, onMounted } from 'vue';
+  import locationPng from '@/assets/images/getLocation.png';
+  import EarthMapModal from '../MapModel/EarthMapModal.vue';
+  import { defHttp } from '@/utils/http/axios';
+  import { message } from 'ant-design-vue';
+  import { EditOutlined } from '@ant-design/icons-vue';
 
-  } else {
-    sceneCode = currentCode;
-  }
-  return sceneCode;
-}
-// 提交
-const handleOk = function () {
-  if (!subObject.value.sceneName || subObject.value.sceneName.length <= 0) {
-    message.warn("站点名称不能为空!");
-    return;
-  }
-  let submitUrl = "";
-  if (subObject.value.id) {
-    // 更新
-    return editScene(subObject.value).then(
-      (res) => {
+  // 新增场景
+  const addScene = (params) => {
+    return defHttp.post({ url: '/military/msMapScene/add', params: params }, { isTransformResponse: false });
+  };
+  // 编辑场景
+  const editScene = (params) => {
+    return defHttp.put({ url: '/military/msMapScene/edit', params: params }, { isTransformResponse: false });
+  };
+  // 获取场景类型字典
+  const getSceneType = () => {
+    return defHttp.get({ url: '/sys/dict/getDictItems/SceneType' }, { isTransformResponse: false });
+  };
+  // 上传图片
+  const fileUpload = (file) => {
+    return defHttp.post({ url: '/sys/common/upload', params: file }, { isTransformResponse: false });
+  };
+  // 属性
+  const props = defineProps(['subObject', 'parentCodeArr', 'nextNodeIndex', 'parentNodeCode', 'disable']);
+  // 包装ref
+  const { parentCodeArr, nextNodeIndex, parentNodeCode, subObject, disable } = toRefs(props);
+  const emit = defineEmits(['closeWin', 'updateDataSource']);
+  const sceneTypes = ref([]);
+  // 创建编码
+  const createCode = function () {
+    if (!nextNodeIndex.value) {
+      return;
+    }
+    const nextNodeIndexStr = nextNodeIndex.value.toString();
+    const nextNodeIndexLen = nextNodeIndexStr.length;
+    let currentCode = '';
+    for (let i = 0; i < 5 - nextNodeIndexLen; i++) {
+      currentCode += '0';
+    }
+    currentCode += nextNodeIndexStr;
+    let sceneCode = null;
+    if (parentNodeCode.value.length > 0) {
+      sceneCode = parentNodeCode.value + '-' + currentCode;
+    } else {
+      sceneCode = currentCode;
+    }
+    return sceneCode;
+  };
+  // 提交
+  const handleOk = function () {
+    if (!subObject.value.sceneName || subObject.value.sceneName.length <= 0) {
+      message.warn('站点名称不能为空!');
+      return;
+    }
+    let submitUrl = '';
+    if (subObject.value.id) {
+      // 更新
+      return editScene(subObject.value).then((res) => {
         if (res.code == 200) {
           emit('updateDataSource', true);
           return subObject;
         }
-      }
-    );
-  } else {
-    // 新增
-    return addScene(subObject.value).then(
-      (res) => {
+      });
+    } else {
+      // 新增
+      return addScene(subObject.value).then((res) => {
         if (res.code == 200) {
           emit('updateDataSource', true);
         }
+      });
+    }
+  };
+  // 挂载后获取场景类型
+  onMounted(async () => {
+    sceneTypes.value = await getSceneType().then((response) => {
+      if (response.success) {
+        return response.result;
       }
-    );
-  }
-}
-// 挂载后获取场景类型
-onMounted(
-  async () => {
-    sceneTypes.value = await getSceneType().then(
-      (response) => {
-        if (response.success) {
-          return response.result;
-        }
-      }
-    );
-  }
-)
-// 打开地图时飞入到指定位置
-const moveChinaPosition = function () {
-  window.earth.camera.fov = subObject.value.viewDistance;
-  window.earth.camera.position = [subObject.value.lon, subObject.value.lat, subObject.value.altitude];
-  window.earth.camera.rotation = [subObject.value.rotationX, subObject.value.rotationY, subObject.value.rotationZ]
-}
-
+    });
+  });
+  // 打开地图时飞入到指定位置
+  const moveChinaPosition = function () {
+    window.earth.camera.fov = subObject.value.viewDistance;
+    window.earth.camera.position = [subObject.value.lon, subObject.value.lat, subObject.value.altitude];
+    window.earth.camera.rotation = [subObject.value.rotationX, subObject.value.rotationY, subObject.value.rotationZ];
+  };
 
+  // const stop = watch(
+  //   visible, (value, oldValue) => {
+  //     if (value) {
+  //       initMap()
+  //       stop();
+  //     }
+  //   }
+  // )
 
-// const stop = watch(
-//   visible, (value, oldValue) => {
-//     if (value) {
-//       initMap()
-//       stop();
-//     }
-//   }
-// )
+  // 弹窗地图框属性
+  const mapVisible = ref(false);
+  const mapShow = function () {
+    mapVisible.value = true;
+  };
+  // 关闭地图时设置，视角位置，视距信息
+  const checkPosition = function (position, cameraPosition, rotation, fov) {
+    subObject.value.lon = position[0];
+    subObject.value.lat = position[1];
+    subObject.value.altitude = position[2];
 
-// 弹窗地图框属性
-const mapVisible = ref(false);
-const mapShow = function () {
-  mapVisible.value = true;
-}
-// 关闭地图时设置，视角位置，视距信息
-const checkPosition = function (position, cameraPosition, rotation, fov) {
-  subObject.value.lon = position[0];
-  subObject.value.lat = position[1];
-  subObject.value.altitude = position[2];
+    subObject.value.cameraLon = cameraPosition[0];
+    subObject.value.cameraLat = cameraPosition[1];
+    subObject.value.cameraAltitude = cameraPosition[2];
 
-  subObject.value.cameraLon = cameraPosition[0];
-  subObject.value.cameraLat = cameraPosition[1];
-  subObject.value.cameraAltitude = cameraPosition[2];
+    subObject.value.rotationX = rotation[0];
+    subObject.value.rotationY = rotation[1];
+    subObject.value.rotationZ = rotation[2];
 
-  subObject.value.rotationX = rotation[0];
-  subObject.value.rotationY = rotation[1];
-  subObject.value.rotationZ = rotation[2];
-
-  subObject.value.viewDistance = fov;
-}
-// 图片预览的计算属性
-const preViewUrl = computed(
-  {
+    subObject.value.viewDistance = fov;
+  };
+  // 图片预览的计算属性
+  const preViewUrl = computed({
     get: () => {
       return subObject.value.icon;
     },
     set: (value) => {
       if (value) {
-        if (value.indexOf("/dt/sys/common/static/") > -1) {
+        if (value.indexOf('/dt/sys/common/static/') > -1) {
           subObject.value.icon = value;
         } else {
           subObject.value.icon = '/dt/sys/common/static/' + value;
         }
-
       } else {
         subObject.value.icon = null;
       }
-
-    }
-  }
-);
-// 上传图片
-const preViewOk = function (fileInfo) {
-  const file = fileInfo.file
-  let formData = new FormData()
-  formData.append('file', file)
-  formData.append('biz', 'models/preView')
-  const requestCallBack = response => {
-    if (!response.success) {
-      return
-    }
-    const msg = response.message
-    if ('上传失败！' == msg) {
-      message.error('上传失败!')
-      preViewUrl.value = null;
-    } else {
-      preViewUrl.value = msg
-      message.info("上传成功!");
-    }
-  }
-  fileUpload(formData).then(requestCallBack).catch(
-    () => {
-      message.error('上传失败!')
+    },
+  });
+  // 上传图片
+  const preViewOk = function (fileInfo) {
+    const file = fileInfo.file;
+    let formData = new FormData();
+    formData.append('file', file);
+    formData.append('biz', 'models/preView');
+    const requestCallBack = (response) => {
+      if (!response.success) {
+        return;
+      }
+      const msg = response.message;
+      if ('上传失败！' == msg) {
+        message.error('上传失败!');
+        preViewUrl.value = null;
+      } else {
+        preViewUrl.value = msg;
+        message.info('上传成功!');
+      }
+    };
+    fileUpload(formData)
+      .then(requestCallBack)
+      .catch(() => {
+        message.error('上传失败!');
+      });
+  };
+  // 上传图片的检查类型
+  const previewType = ref(['.jpg', '.png', '.icon']);
+  // 上传之前检查类型
+  const preBeforeUpload = function (file) {
+    const fileName = file.name;
+    const fileType = fileName.substring(fileName.lastIndexOf('.'), fileName.length).toLowerCase();
+    let isFileType = false;
+    for (let type of previewType.value) {
+      if (type == fileType) {
+        isFileType = true;
+        break;
+      }
     }
-  )
-}
-// 上传图片的检查类型
-const previewType = ref([".jpg", ".png", ".icon"]);
-// 上传之前检查类型
-const preBeforeUpload = function (file) {
-  const fileName = file.name
-  const fileType = fileName.substring(fileName.lastIndexOf('.'), fileName.length).toLowerCase()
-  let isFileType = false
-  for (let type of previewType.value) {
-    if (type == fileType) {
-      isFileType = true
-      break
+    if (!isFileType) {
+      message.error('上传文件类型异常');
     }
-  }
-  if (!isFileType) {
-    message.error('上传文件类型异常')
-  }
-  return isFileType
-}
-// 向父元素抛出的方法和属性
-defineExpose({
-  preViewUrl,
-  handleOk,
-  createCode,
-});
+    return isFileType;
+  };
+  // 向父元素抛出的方法和属性
+  defineExpose({
+    preViewUrl,
+    handleOk,
+    createCode,
+  });
 </script>
 <style scoped>
-.inputWidthCss1 {
-  width: 90%;
-}
-
-.centerText {
-  width: 100%;
-  font-weight: bold;
-  line-height: 1.8rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
+  .inputWidthCss1 {
+    width: 90%;
+  }
 
+  .centerText {
+    width: 100%;
+    font-weight: bold;
+    line-height: 1.8rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 
-.dwImg {
-  width: 10%;
-  height: 10%;
-  margin-left: 3%;
-  cursor: pointer !important;
-}
+  .dwImg {
+    width: 10%;
+    height: 10%;
+    margin-left: 3%;
+    cursor: pointer !important;
+  }
 
-:deep(.ant-select) {
-  width: 90%;
-}
-</style>
\ No newline at end of file
+  :deep(.ant-select) {
+    width: 90%;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.api.ts b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.api.ts
new file mode 100644
index 0000000..45eefca
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.api.ts
@@ -0,0 +1,89 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/dtDeviceInfo/list',
+  save = '/military/dtDeviceInfo/add',
+  edit = '/military/dtDeviceInfo/edit',
+  deleteOne = '/military/dtDeviceInfo/delete',
+  deleteBatch = '/military/dtDeviceInfo/deleteBatch',
+  importExcel = '/military/dtDeviceInfo/importExcel',
+  exportXls = '/military/dtDeviceInfo/exportXls',
+  dtDeviceSensorInfoList = '/military/dtDeviceInfo/queryDtDeviceSensorInfoByMainId',
+  dtDeviceStatusList = '/military/dtDeviceInfo/queryDtDeviceStatusByMainId',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 子表单查询接口
+ * @param params
+ */
+export const queryDtDeviceSensorInfo = Api.dtDeviceSensorInfoList
+/**
+ * 子表单查询接口
+ * @param params
+ */
+export const queryDtDeviceStatus = Api.dtDeviceStatusList
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+/**
+ * 子表列表接口
+ * @param params
+ */
+export const dtDeviceSensorInfoList = (params) =>
+  defHttp.get({ url: Api.dtDeviceSensorInfoList, params }, { isTransformResponse: false });
+/**
+ * 子表列表接口
+ * @param params
+ */
+export const dtDeviceStatusList = (params) =>
+  defHttp.get({ url: Api.dtDeviceStatusList, params }, { isTransformResponse: false });
diff --git a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
new file mode 100644
index 0000000..0549f21
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
@@ -0,0 +1,706 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { JVxeTypes, JVxeColumn } from '/@/components/jeecg/JVxeTable/types'
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '所属站点',
+    align: "center",
+    dataIndex: 'deviceOwnerId_dictText'
+  },
+  {
+    title: '类型',
+    align: "center",
+    dataIndex: 'deviceType_dictText',
+    width: 120
+  },
+  {
+    title: '设备编码',
+    align: "center",
+    dataIndex: 'deviceCode',
+    width: 120
+  },
+  {
+    title: '名称',
+    align: "center",
+    dataIndex: 'deviceName'
+  },
+  {
+    title: '位置',
+    align: "center",
+    dataIndex: 'devicePosition'
+  },
+  {
+    title: '经度',
+    align: "center",
+    dataIndex: 'deviceLon'
+  },
+  {
+    title: '纬度',
+    align: "center",
+    dataIndex: 'deviceLat'
+  },
+  {
+    title: '海拔',
+    align: "center",
+    dataIndex: 'deviceAlt'
+  },
+  {
+    title: '设备状态',
+    align: "center",
+    dataIndex: 'deviceStatus_dictText',
+    width: 90
+  },
+  {
+    title: '访问路径',
+    align: "center",
+    dataIndex: 'deviceUrl'
+  },
+  {
+    title: '协议类型',
+    align: "center",
+    dataIndex: 'protocol_dictText'
+  },
+  {
+    title: 'ip地址',
+    align: "center",
+    dataIndex: 'deviceIp'
+  },
+  {
+    title: '端口',
+    align: "center",
+    dataIndex: 'ipPort'
+  },
+  {
+    title: '端口2',
+    align: "center",
+    dataIndex: 'ipPort2'
+  },
+  {
+    title: '入网许可证',
+    align: "center",
+    dataIndex: 'isAudit_dictText',
+    width: 120
+  },
+  {
+    title: '用户名',
+    align: "center",
+    dataIndex: 'username'
+  },
+  {
+    title: '密码',
+    align: "center",
+    dataIndex: 'password'
+  },
+  {
+    title: '设备子类型',
+    align: "center",
+    dataIndex: 'subtype'
+  },
+  {
+    title: '安装高度',
+    align: "center",
+    dataIndex: 'deviceHeight'
+  },
+  {
+    title: '初始方位角',
+    align: "center",
+    dataIndex: 'initAzimuth'
+  },
+  {
+    title: '初始俯仰角',
+    align: "center",
+    dataIndex: 'initPitch'
+  },
+  {
+    title: '工作半径',
+    align: "center",
+    dataIndex: 'workingRadius'
+  },
+  {
+    title: '水平视场角度',
+    align: "center",
+    dataIndex: 'horizontalAngle'
+  },
+  {
+    title: '垂直视场角度',
+    align: "center",
+    dataIndex: 'verticalAngle'
+  },
+  {
+    title: '识别刻度',
+    align: "center",
+    dataIndex: 'identificationScale'
+  },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remark'
+  },
+
+  //  {
+  //   title: '所属区域',
+  //   align:"center",
+  //   dataIndex: 'sysAreaCode'
+  //  },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "所属站点",
+    field: 'deviceOwnerId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "ms_map_scene,scene_name,scene_code"
+    },
+    colProps: { span: 6 },
+  },
+  {
+    label: "设备类型",
+    field: 'deviceType',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "dt_deveice_type,type_name,type_no"
+    },
+    colProps: { span: 6 },
+  },
+  {
+    label: "设备编码",
+    field: 'deviceCode',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "设备名称",
+    field: 'deviceName',
+    component: 'JInput',
+    colProps: { span: 6 },
+  },
+  // {
+  //     label: "位置描述置",
+  //     field: 'devicePosition',
+  //     component: 'Input',
+  //     colProps: {span: 6},
+  // },
+  {
+    label: "设备状态",
+    field: 'deviceStatus',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "dt_sensor_status"
+    },
+    colProps: { span: 6 },
+  },
+  // {
+  //     label: "设备访问路径",
+  //     field: 'deviceUrl',
+  //     component: 'Input',
+  //     colProps: {span: 6},
+  // },
+  // {
+  //     label: "设备ip地址",
+  //     field: 'deviceIp',
+  //     component: 'Input',
+  //     colProps: {span: 6},
+  // },
+  {
+    label: "协议类型",
+    field: 'protocol',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "dt_deveice_protocol_type,protocol_name,protocol_type"
+    },
+    colProps: { span: 6 },
+  },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '所属站点',
+    field: 'deviceOwnerId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "ms_map_scene,scene_name,scene_code"
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '所属站点不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '类型',
+    field: 'deviceType',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "dt_deveice_type,type_name,type_no",
+      stringToNumber: true
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '类型不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '编码',
+    field: 'deviceCode',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '编码不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '名称',
+    field: 'deviceName',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '名称不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '位置',
+    field: 'devicePosition',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '位置不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '经度',
+    field: 'deviceLon',
+    component: 'InputNumber',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '经度不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '纬度',
+    field: 'deviceLat',
+    component: 'InputNumber',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '纬度不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '海拔',
+    field: 'deviceAlt',
+    component: 'InputNumber',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '海拔不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '设备状态',
+    field: 'deviceStatus',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "dt_sensor_status",
+      stringToNumber: true
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '设备状态不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '协议类型',
+    field: 'protocol',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "dt_deveice_protocol_type,protocol_name,protocol_type",
+      stringToNumber: true
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '协议类型不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '访问路径',
+    field: 'deviceUrl',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '访问路径不能为空!' },
+      ];
+    },
+  },
+  {
+    label: 'ip地址',
+    field: 'deviceIp',
+    component: 'Input',
+    rules: [
+      {
+        required: true,
+        message: 'ip地址不能为空！',
+      },
+      {
+        pattern: /^((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}$/,
+        message: 'ip地址格式不正确！',
+      }
+    ],
+  },
+  {
+    label: '端口',
+    field: 'ipPort',
+    component: 'InputNumber',
+    rules: [
+      {
+        required: true,
+        message: '端口不能为空！',
+      },
+      {
+        pattern: /^([1-9]\d{0,3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/,
+        message: '端口格式不正确！',
+      }
+    ],
+  },
+  {
+    label: '端口2',
+    field: 'ipPort2',
+    component: 'InputNumber',
+    rules: [
+      {
+        pattern: /^([1-9]\d{0,3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/,
+        message: '端口2格式不正确！',
+      }
+    ],
+  },
+  {
+    label: '入网许可证',
+    field: 'isAudit',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "dt_is_audit",
+      stringToNumber: true
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '入网许可证不能为空!' },
+      ];
+    },
+  },
+  {
+    label: '用户名',
+    field: 'username',
+    component: 'Input',
+  },
+  {
+    label: '密码',
+    field: 'password',
+    component: 'InputPassword',
+  },
+  {
+    label: '设备子类型',
+    field: 'subtype',
+    component: 'InputNumber',
+  },
+  {
+    label: '安装高度',
+    field: 'deviceHeight',
+    component: 'InputNumber',
+  },
+  {
+    label: '初始方位角',
+    field: 'initAzimuth',
+    component: 'InputNumber',
+  },
+  {
+    label: '初始俯仰角',
+    field: 'initPitch',
+    component: 'InputNumber',
+  },
+  {
+    label: '工作半径',
+    field: 'workingRadius',
+    component: 'InputNumber',
+  },
+  {
+    label: '水平角度',
+    field: 'horizontalAngle',
+    component: 'InputNumber',
+  },
+  {
+    label: '垂直角度',
+    field: 'verticalAngle',
+    component: 'InputNumber',
+  },
+  {
+    label: '识别刻度',
+    field: 'identificationScale',
+    component: 'InputNumber',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+
+  // {
+  //   label: '所属区域',
+  //   field: 'sysAreaCode',
+  //   component: 'Input',
+  // },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
+];
+//子表单数据
+//子表列表数据
+export const dtDeviceSensorInfoColumns: BasicColumn[] = [
+  //  {
+  //   title: '设备id',
+  //   align:"center",
+  //   dataIndex: 'deveiceId'
+  //  },
+  {
+    title: '传感器名称',
+    align: "center",
+    dataIndex: 'sensorName'
+  },
+  {
+    title: '传感器编号',
+    align: "center",
+    dataIndex: 'sensorCode'
+  },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'sensorStatus'
+  },
+  {
+    title: '经度',
+    align: "center",
+    dataIndex: 'sensorLon'
+  },
+  {
+    title: '维度',
+    align: "center",
+    dataIndex: 'sensorLat'
+  },
+  {
+    title: '地址编号例如01',
+    align: "center",
+    dataIndex: 'sensorAddress'
+  },
+  {
+    title: '寄存器地址编号',
+    align: "center",
+    dataIndex: 'portId'
+  },
+  {
+    title: '值',
+    align: "center",
+    dataIndex: 'sdata'
+  },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remark'
+  },
+  {
+    title: '所属区域',
+    align: "center",
+    dataIndex: 'sysAreaCode'
+  },
+];
+//子表列表数据
+export const dtDeviceStatusColumns: BasicColumn[] = [
+  //  {
+  //   title: '设备唯一标识',
+  //   align:"center",
+  //   dataIndex: 'deviceId'
+  //  },
+  //  {
+  //   title: '设备所属站点ID',
+  //   align:"center",
+  //   dataIndex: 'deviceOwnerId'
+  //  },
+  {
+    title: '设备初始状态',
+    align: "center",
+    dataIndex: 'status'
+  },
+  {
+    title: '状态补充说明',
+    align: "center",
+    dataIndex: 'remark'
+  },
+  {
+    title: '所属区域',
+    align: "center",
+    dataIndex: 'sysAreaCode'
+  },
+];
+//子表表格配置
+export const dtDeviceSensorInfoJVxeColumns: JVxeColumn[] = [
+  // {
+  //   title: '设备id',
+  //   key: 'deveiceId',
+  //   type: JVxeTypes.input,
+  //   width:"200px",
+  //   placeholder: '请输入${title}',
+  //   defaultValue:'',
+  // },
+  {
+    title: '传感器名称',
+    key: 'sensorName',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+    validateRules: [
+      { required: true, message: '${title}不能为空' },
+    ],
+  },
+  {
+    title: '传感器编号',
+    key: 'sensorCode',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '状态',
+    key: 'sensorStatus',
+    type: JVxeTypes.inputNumber,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '经度',
+    key: 'sensorLon',
+    type: JVxeTypes.inputNumber,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '维度',
+    key: 'sensorLat',
+    type: JVxeTypes.inputNumber,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '地址编号例如01',
+    key: 'sensorAddress',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '寄存器地址编号',
+    key: 'portId',
+    type: JVxeTypes.inputNumber,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '值',
+    key: 'sdata',
+    type: JVxeTypes.inputNumber,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '备注',
+    key: 'remark',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '所属区域',
+    key: 'sysAreaCode',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+]
+export const dtDeviceStatusJVxeColumns: JVxeColumn[] = [
+  {
+    title: '设备唯一标识',
+    key: 'deviceId',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '所属站点ID',
+    key: 'deviceOwnerId',
+    type: JVxeTypes.inputNumber,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+    validateRules: [
+      { required: true, message: '${title}不能为空' },
+    ],
+  },
+  {
+    title: '设备初始状态',
+    key: 'status',
+    type: JVxeTypes.inputNumber,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+    validateRules: [
+      { required: true, message: '${title}不能为空' },
+    ],
+  },
+  {
+    title: '状态补充说明',
+    key: 'remark',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '所属区域',
+    key: 'sysAreaCode',
+    type: JVxeTypes.input,
+    width: "200px",
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+]
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[] {
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/info/DtDeviceInfoList.vue b/src/views/military/modules/equipmentManage/info/DtDeviceInfoList.vue
new file mode 100644
index 0000000..a2cce16
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/DtDeviceInfoList.vue
@@ -0,0 +1,250 @@
+<!-- 
+  综合设备信息
+
+  目录位置：设备管理 -> 综合设备信息
+  功能概述：管理所在区域下所有不同类型的设备的静态信息，编号、IP端口、安装高度（设备状态）
+ -->
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
+      <!-- 内嵌table区域 begin -->
+      <!-- <template #expandedRowRender="{ record }">
+        <a-tabs tabPosition="top">
+          <a-tab-pane tab="设备传感器表" key="dtDeviceSensorInfo" forceRender>
+            <dtDeviceSensorInfoSubTable :id="expandedRowKeys[0]" />
+          </a-tab-pane>
+          <a-tab-pane tab="设备状态信息" key="dtDeviceStatus" forceRender>
+            <dtDeviceStatusSubTable :id="expandedRowKeys[0]" />
+          </a-tab-pane>
+        </a-tabs>
+      </template> -->
+      <!-- 内嵌table区域 end -->
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DtDeviceInfoModal @register="registerModal" @success="handleSuccess"></DtDeviceInfoModal>
+    <!-- <DtDeviceSensorInfoModal ref="sensorInfoModal" @success="handleSuccess"></DtDeviceSensorInfoModal> -->
+    <a-modal v-model:visible="sensorInfoListShow" destroyOnClose title="设备传感器表" width="1080px" @success="handleSuccess">
+      <template #footer="">
+        <a-button @click="sensorInfoListShow = false">关闭</a-button>
+      </template>
+      <DtDeviceSensorInfoList :deviceInfo="deviceInfo"></DtDeviceSensorInfoList>
+    </a-modal>
+    <a-modal v-model:visible="statusListShow" destroyOnClose title="历史状态表" width="1080px" @success="handleSuccess">
+      <template #footer="">
+        <a-button @click="sensorInfoListShow = false">关闭</a-button>
+      </template>
+      <DtDeviceStatusList :deviceInfo="deviceInfo"></DtDeviceStatusList>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" name="military-dtDeviceInfo" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useModal } from '/@/components/Modal';
+  import DtDeviceInfoModal from './components/DtDeviceInfoModal.vue';
+  import DtDeviceSensorInfoSubTable from './subTables/DtDeviceSensorInfoSubTable.vue';
+  import DtDeviceStatusSubTable from './subTables/DtDeviceStatusSubTable.vue';
+  import { columns, searchFormSchema } from './DtDeviceInfo.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DtDeviceInfo.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import DtDeviceSensorInfoModal from './sensor/components/DtDeviceSensorInfoModal.vue';
+  import DtDeviceSensorInfoList from './sensor/DtDeviceSensorInfoList.vue';
+  import DtDeviceStatusList from './status/DtDeviceStatusList.vue';
+
+  // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  //注册model
+  const [registerModal, { openModal }] = useModal();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备信息表',
+      api: list,
+      columns,
+      canResize: false,
+      formConfig: {
+        //labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter: true,
+        showAdvancedButton: false,
+        fieldMapToNumber: [],
+        fieldMapToTime: [],
+      },
+      actionColumn: {
+        width: 160,
+        fixed: 'right',
+      },
+    },
+    exportConfig: {
+      name: '设备信息表',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const sensorInfoModal = ref(); //添加传感器
+  const sensorInfoListShow = ref(false); //传感器列表
+  const statusListShow = ref(false); //设备状态列表
+  const deviceInfo = ref(); //设备信息
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  /**
+   * 展开事件
+   * */
+  function handleExpand(expanded, record) {
+    expandedRowKeys.value = [];
+    if (expanded === true) {
+      expandedRowKeys.value.push(record.id);
+    }
+  }
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
+  }
+
+  /**
+   * 传感器列表
+   */
+  function handleSensorList(record) {
+    // sensorInfoModal.value.disableSubmit = false;
+    // sensorInfoModal.value.add(record);
+    sensorInfoListShow.value = true;
+    deviceInfo.value = record;
+  }
+  /**
+   * 设备状态列表
+   */
+  function handleStatusList(record) {
+    statusListShow.value = true;
+    deviceInfo.value = record;
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '查看传感器',
+        onClick: handleSensorList.bind(null, record),
+      },
+      // {
+      //   label: '编辑',
+      //   onClick: handleEdit.bind(null, record),
+      // }
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '历史状态',
+        onClick: handleStatusList.bind(null, record),
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+</script>
+
+<style scoped></style>
diff --git a/src/views/military/modules/equipmentManage/info/components/DtDeviceInfoForm.vue b/src/views/military/modules/equipmentManage/info/components/DtDeviceInfoForm.vue
new file mode 100644
index 0000000..5de5674
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/components/DtDeviceInfoForm.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <BasicForm @register="registerForm" ref="formRef"/>
+  <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs" v-show="false">
+      <a-tab-pane tab="设备传感器表" key="dtDeviceSensorInfo" :forceRender="true">
+        <JVxeTable
+          v-if="dtDeviceSensorInfoTable.show"      
+          keep-source
+          resizable
+          ref="dtDeviceSensorInfo"
+          :loading="dtDeviceSensorInfoTable.loading"
+          :columns="dtDeviceSensorInfoTable.columns"
+          :dataSource="dtDeviceSensorInfoTable.dataSource"
+          :height="340"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+      <a-tab-pane tab="设备状态信息" key="dtDeviceStatus" :forceRender="true">
+        <JVxeTable
+          v-if="dtDeviceStatusTable.show"      
+          keep-source
+          resizable
+          ref="dtDeviceStatus"
+          :loading="dtDeviceStatusTable.loading"
+          :columns="dtDeviceStatusTable.columns"
+          :dataSource="dtDeviceStatusTable.dataSource"
+          :height="340"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+    </a-tabs>
+    <div style="width: 100%;text-align: center;margin-top: 10px;" v-if="showFlowSubmitButton">
+      <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="handleSubmit">提 交</a-button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+    import { defHttp } from '/@/utils/http/axios';
+    import {ref, computed, unref,reactive, onMounted } from 'vue';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import {formSchema,dtDeviceSensorInfoJVxeColumns,dtDeviceStatusJVxeColumns} from '../DtDeviceInfo.data';
+    import {saveOrUpdate,queryDtDeviceSensorInfo,queryDtDeviceStatus} from '../DtDeviceInfo.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
+    const isUpdate = ref(true);
+    
+    const refKeys = ref(['dtDeviceSensorInfo', 'dtDeviceStatus', ]);
+    const activeKey = ref('dtDeviceSensorInfo');
+    const dtDeviceSensorInfo = ref();
+    const dtDeviceStatus = ref();
+    const tableRefs = {dtDeviceSensorInfo, dtDeviceStatus, };
+    const dtDeviceSensorInfoTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:dtDeviceSensorInfoJVxeColumns,
+          show: false
+    })
+    const dtDeviceStatusTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:dtDeviceStatusJVxeColumns,
+          show: false
+    })
+
+    const props = defineProps({
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    });
+    const formDisabled = computed(()=>{
+      if(props.formBpm === true){
+        if(props.formData.disabled === false){
+          return false;
+        }
+      }
+      return true;
+    });
+    // 是否显示提交按钮
+    const showFlowSubmitButton = computed(()=>{
+      if(props.formBpm === true){
+        if(props.formData.disabled === false){
+          return true
+        }
+      }
+      return false
+    });
+    
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 8}
+    });
+
+    onMounted(()=>{
+      initFormData();
+    });
+    //渲染流程表单数据
+    const queryByIdUrl = '/military/dtDeviceInfo/queryById';
+    async function initFormData(){
+      if(props.formBpm === true){
+        await reset();
+        let params = {id: props.formData.dataId};
+        const data = await defHttp.get({url: queryByIdUrl, params});
+        //表单赋值
+        await setFieldsValue({
+          ...data
+        });
+        requestSubTableData(queryDtDeviceSensorInfo, {id: data.id}, dtDeviceSensorInfoTable, ()=>{
+          dtDeviceSensorInfoTable.show = true;
+        });
+        requestSubTableData(queryDtDeviceStatus, {id: data.id}, dtDeviceStatusTable, ()=>{
+          dtDeviceStatusTable.show = true;
+        });
+        // 隐藏底部时禁用整个表单
+        setProps({ disabled: formDisabled.value })
+      }
+    }
+    
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys);
+
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'dtDeviceSensorInfo';
+      dtDeviceSensorInfoTable.dataSource = [];
+      dtDeviceStatusTable.dataSource = [];
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           dtDeviceSensorInfoList: allValues.tablesValue[0].tableData,
+           dtDeviceStatusList: allValues.tablesValue[1].tableData,
+         }
+       }
+    //表单提交事件
+    async function requestAddOrEdit(values) {
+      //提交表单
+      await saveOrUpdate(values, true);
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+    :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/info/components/DtDeviceInfoModal.vue b/src/views/military/modules/equipmentManage/info/components/DtDeviceInfoModal.vue
new file mode 100644
index 0000000..7c311eb
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/components/DtDeviceInfoModal.vue
@@ -0,0 +1,119 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="1440" @ok="handleSubmit">
+    <BasicForm @register="registerForm" ref="formRef" />
+    <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs" v-show="false">
+      <a-tab-pane tab="设备传感器表" key="dtDeviceSensorInfo" :forceRender="true">
+        <JVxeTable keep-source resizable ref="dtDeviceSensorInfo" :loading="dtDeviceSensorInfoTable.loading"
+          :columns="dtDeviceSensorInfoTable.columns" :dataSource="dtDeviceSensorInfoTable.dataSource" :height="340"
+          :disabled="formDisabled" :rowNumber="true" :rowSelection="true" :toolbar="true" />
+      </a-tab-pane>
+      <a-tab-pane tab="设备状态信息" key="dtDeviceStatus" :forceRender="true">
+        <JVxeTable keep-source resizable ref="dtDeviceStatus" :loading="dtDeviceStatusTable.loading"
+          :columns="dtDeviceStatusTable.columns" :dataSource="dtDeviceStatusTable.dataSource" :height="340"
+          :disabled="formDisabled" :rowNumber="true" :rowSelection="true" :toolbar="true" />
+      </a-tab-pane>
+    </a-tabs>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, unref, reactive } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+import { formSchema, dtDeviceSensorInfoJVxeColumns, dtDeviceStatusJVxeColumns } from '../DtDeviceInfo.data';
+import { saveOrUpdate, queryDtDeviceSensorInfo, queryDtDeviceStatus } from '../DtDeviceInfo.api';
+import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
+// Emits声明
+const emit = defineEmits(['register', 'success']);
+const isUpdate = ref(true);
+const formDisabled = ref(false);
+const refKeys = ref(['dtDeviceSensorInfo', 'dtDeviceStatus',]);
+const activeKey = ref('dtDeviceSensorInfo');
+const dtDeviceSensorInfo = ref();
+const dtDeviceStatus = ref();
+const tableRefs = { dtDeviceSensorInfo, dtDeviceStatus, };
+const dtDeviceSensorInfoTable = reactive({
+  loading: false,
+  dataSource: [],
+  columns: dtDeviceSensorInfoJVxeColumns
+})
+const dtDeviceStatusTable = reactive({
+  loading: false,
+  dataSource: [],
+  columns: dtDeviceStatusJVxeColumns
+})
+//表单配置
+const [registerForm, { setProps, resetFields, setFieldsValue, validate }] = useForm({
+  //labelWidth: 150,
+  schemas: formSchema,
+  showActionButtonGroup: false,
+  baseColProps: { span: 8 }
+});
+//表单赋值
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+  //重置表单
+  await reset();
+  setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
+  isUpdate.value = !!data?.isUpdate;
+  formDisabled.value = !data?.showFooter;
+  if (unref(isUpdate)) {
+    //表单赋值
+    await setFieldsValue({
+      ...data.record,
+    });
+    requestSubTableData(queryDtDeviceSensorInfo, { id: data?.record?.id }, dtDeviceSensorInfoTable)
+    requestSubTableData(queryDtDeviceStatus, { id: data?.record?.id }, dtDeviceStatusTable)
+  }
+  // 隐藏底部时禁用整个表单
+  setProps({ disabled: !data?.showFooter })
+});
+//方法配置
+const [handleChangeTabs, handleSubmit, requestSubTableData, formRef] = useJvxeMethod(requestAddOrEdit, classifyIntoFormData, tableRefs, activeKey, refKeys);
+
+//设置标题
+const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+
+async function reset() {
+  await resetFields();
+  activeKey.value = 'dtDeviceSensorInfo';
+  dtDeviceSensorInfoTable.dataSource = [];
+  dtDeviceStatusTable.dataSource = [];
+}
+function classifyIntoFormData(allValues) {
+  let main = Object.assign({}, allValues.formValue)
+  return {
+    ...main, // 展开
+    dtDeviceSensorInfoList: allValues.tablesValue[0].tableData,
+    dtDeviceStatusList: allValues.tablesValue[1].tableData,
+  }
+}
+//表单提交事件
+async function requestAddOrEdit(values) {
+  try {
+    setModalProps({ confirmLoading: true });
+    console.log(values)
+    //提交表单
+    await saveOrUpdate(values, isUpdate.value);
+    //关闭弹窗
+    closeModal();
+    //刷新列表
+    emit('success');
+  } finally {
+    setModalProps({ confirmLoading: false });
+  }
+}
+</script>
+
+<style lang="less" scoped>
+/** 时间和数字输入框样式 */
+:deep(.ant-input-number) {
+  width: 100%
+}
+
+:deep(.ant-calendar-picker) {
+  width: 100%
+}
+</style>
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfo.api.ts b/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfo.api.ts
new file mode 100644
index 0000000..8340344
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfo.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/dtDeviceSensorInfo/list',
+  save='/military/dtDeviceSensorInfo/add',
+  edit='/military/dtDeviceSensorInfo/edit',
+  deleteOne = '/military/dtDeviceSensorInfo/delete',
+  deleteBatch = '/military/dtDeviceSensorInfo/deleteBatch',
+  importExcel = '/military/dtDeviceSensorInfo/importExcel',
+  exportXls = '/military/dtDeviceSensorInfo/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfo.data.ts b/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfo.data.ts
new file mode 100644
index 0000000..e0cb021
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfo.data.ts
@@ -0,0 +1,185 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  // {
+  //   title: '设备id',
+  //   align: "center",
+  //   dataIndex: 'deveiceId'
+  // },
+  {
+    title: '传感器名称',
+    align: "center",
+    dataIndex: 'sensorName'
+  },
+  {
+    title: '传感器编号',
+    align: "center",
+    dataIndex: 'sensorCode'
+  },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'sensorStatus_dictText'
+  },
+  {
+    title: '经度',
+    align: "center",
+    dataIndex: 'sensorLon'
+  },
+  {
+    title: '纬度',
+    align: "center",
+    dataIndex: 'sensorLat'
+  },
+  {
+    title: '地址编号',
+    align: "center",
+    dataIndex: 'sensorAddress'
+  },
+  {
+    title: '寄存器地址编号',
+    align: "center",
+    dataIndex: 'portId'
+  },
+  {
+    title: '值',
+    align: "center",
+    dataIndex: 'sdata'
+  },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remark'
+  },
+  // {
+  //   title: '所属区域',
+  //   align: "center",
+  //   dataIndex: 'sysAreaCode'
+  // },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "设备id",
+    field: 'deveiceId',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "传感器名称",
+    field: 'sensorName',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "传感器编号",
+    field: 'sensorCode',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "状态",
+    field: 'sensorStatus',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "经度",
+    field: 'sensorLon',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "维度",
+    field: 'sensorLat',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "地址编号例如01",
+    field: 'sensorAddress',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "寄存器地址编号",
+    field: 'portId',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '设备id',
+    field: 'deveiceId',
+    component: 'Input',
+  },
+  {
+    label: '传感器名称',
+    field: 'sensorName',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入传感器名称!' },
+      ];
+    },
+  },
+  {
+    label: '传感器编号',
+    field: 'sensorCode',
+    component: 'Input',
+  },
+  {
+    label: '状态',
+    field: 'sensorStatus',
+    component: 'InputNumber',
+  },
+  {
+    label: '经度',
+    field: 'sensorLon',
+    component: 'InputNumber',
+  },
+  {
+    label: '纬度',
+    field: 'sensorLat',
+    component: 'InputNumber',
+  },
+  {
+    label: '地址编号例如01',
+    field: 'sensorAddress',
+    component: 'Input',
+  },
+  {
+    label: '寄存器地址编号',
+    field: 'portId',
+    component: 'InputNumber',
+  },
+  {
+    label: '值',
+    field: 'sdata',
+    component: 'InputNumber',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+  {
+    label: '所属区域',
+    field: 'sysAreaCode',
+    component: 'Input',
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfoList.vue b/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfoList.vue
new file mode 100644
index 0000000..b3da380
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/sensor/DtDeviceSensorInfoList.vue
@@ -0,0 +1,288 @@
+<!-- 
+  设备传感器
+
+  功能划分
+  xxx -> 设备传感器
+ -->
+<template>
+  <div style="padding: 10px">
+    <!--查询区域-->
+    <!-- <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="设备id" name="deveiceId">
+              <JInput placeholder="请输入设备id" v-model:value="queryParam.deveiceId"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="传感器名称" name="sensorName">
+              <JInput placeholder="请输入传感器名称" v-model:value="queryParam.sensorName"></JInput>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item label="传感器编号" name="sensorCode">
+                <JInput placeholder="请输入传感器编号" v-model:value="queryParam.sensorCode"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="状态" name="sensorStatus">
+                <JInput placeholder="请输入状态" v-model:value="queryParam.sensorStatus"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="经度" name="sensorLon">
+                <JInput placeholder="请输入经度" v-model:value="queryParam.sensorLon"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="维度" name="sensorLat">
+                <JInput placeholder="请输入维度" v-model:value="queryParam.sensorLat"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="地址编号" name="sensorAddress">
+                <JInput placeholder="请输入地址编号例如01" v-model:value="queryParam.sensorAddress"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="寄存器地址编号" name="portId">
+                <JInput placeholder="请输入寄存器地址编号" v-model:value="queryParam.portId"></JInput>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div> -->
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DtDeviceSensorInfoModal ref="registerModal" @success="handleSuccess"></DtDeviceSensorInfoModal>
+  </div>
+</template>
+
+<script lang="ts" name="military-dtDeviceSensorInfo" setup>
+  import { ref, reactive, onMounted } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './DtDeviceSensorInfo.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DtDeviceSensorInfo.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import DtDeviceSensorInfoModal from './components/DtDeviceSensorInfoModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  const props: any = defineProps({
+    deviceInfo: { type: Object }, //设备信息
+  });
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备传感器表',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      showTableSetting: true,
+      showIndexColumn: true,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.deveiceId = props.deviceInfo.id; //主表id
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '设备传感器表',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  onMounted(() => {
+    // console.log(16416,props.deviceInfo);
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add(props.deviceInfo);
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/info/sensor/components/DtDeviceSensorInfoForm.vue b/src/views/military/modules/equipmentManage/info/sensor/components/DtDeviceSensorInfoForm.vue
new file mode 100644
index 0000000..de86454
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/sensor/components/DtDeviceSensorInfoForm.vue
@@ -0,0 +1,203 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12" v-show="false">
+          <a-form-item label="设备id" v-bind="validateInfos.deveiceId">
+            <a-input v-model:value="formData.deveiceId" placeholder="请输入设备id" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="传感器名称" v-bind="validateInfos.sensorName">
+            <a-input v-model:value="formData.sensorName" placeholder="请输入传感器名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="传感器编号" v-bind="validateInfos.sensorCode">
+            <a-input v-model:value="formData.sensorCode" placeholder="请输入传感器编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态" v-bind="validateInfos.sensorStatus">
+            <!-- <a-input-number v-model:value="formData.sensorStatus" placeholder="请输入状态" style="width: 100%" :disabled="disabled"/> -->
+            <j-dict-select-tag v-model:value="formData.sensorStatus" dictCode="dt_sensor_status" :stringToNumber='true'
+              placeholder="请选择状态" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="经度" v-bind="validateInfos.sensorLon">
+            <a-input-number v-model:value="formData.sensorLon" placeholder="请输入经度" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="纬度" v-bind="validateInfos.sensorLat">
+            <a-input-number v-model:value="formData.sensorLat" placeholder="请输入纬度" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="地址编号" v-bind="validateInfos.sensorAddress">
+            <a-input v-model:value="formData.sensorAddress" placeholder="请输入地址编号例如01" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="寄存器地址编号" v-bind="validateInfos.portId">
+            <a-input-number v-model:value="formData.portId" placeholder="请输入寄存器地址编号" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="值" v-bind="validateInfos.sdata">
+            <a-input-number v-model:value="formData.sdata" placeholder="请输入值" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="备注" v-bind="validateInfos.remark">
+            <a-input v-model:value="formData.remark" placeholder="请输入备注" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <!-- <a-col :span="12">
+          <a-form-item label="所属区域" v-bind="validateInfos.sysAreaCode">
+            <a-input v-model:value="formData.sysAreaCode" placeholder="请输入所属区域" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col> -->
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../DtDeviceSensorInfo.api';
+import { Form } from 'ant-design-vue';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => { } },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  deveiceId: '',
+  sensorName: '',
+  sensorCode: '',
+  sensorStatus: undefined,
+  sensorLon: undefined,
+  sensorLat: undefined,
+  sensorAddress: '',
+  portId: undefined,
+  sdata: undefined,
+  remark: '',
+  sysAreaCode: '',
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = {
+  sensorName: [{ required: true, message: '请输入传感器名称!' },],
+  sensorCode: [{ required: true, message: '请输入传感器编号!' },],
+  sensorStatus: [{ required: true, message: '请选择状态!' },],
+  sensorLon: [{ required: true, message: '请输入经度!' },],
+  sensorLat: [{ required: true, message: '请输入纬度!' },],
+  sensorAddress: [{ required: true, message: '请输入地址编号!' },],
+  portId: [{ required: true, message: '请输入寄存器地址编号!' }],
+  sdata: [{ required: true, message: '请输入值!' }]
+};
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add(record) {
+  edit({
+    deveiceId: record.id
+  });
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    //赋值
+    Object.assign(formData, record);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  // 触发表单验证
+  await validate();
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  min-height: 500px !important;
+  overflow-y: auto;
+  padding: 24px 24px 24px 24px;
+}
+</style>
diff --git a/src/views/military/modules/equipmentManage/info/sensor/components/DtDeviceSensorInfoModal.vue b/src/views/military/modules/equipmentManage/info/sensor/components/DtDeviceSensorInfoModal.vue
new file mode 100644
index 0000000..c25567a
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/sensor/components/DtDeviceSensorInfoModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <DtDeviceSensorInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </DtDeviceSensorInfoForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick} from 'vue';
+import DtDeviceSensorInfoForm from './DtDeviceSensorInfoForm.vue'
+
+const title = ref<string>('');
+const width = ref<number>(1180);
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const emit = defineEmits(['register', 'success']);
+
+/**
+ * 新增
+ */
+function add(record) {
+  title.value = '新增';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.add(record);
+  });
+}
+
+/**
+ * 编辑
+ * @param record
+ */
+function edit(record) {
+  title.value = disableSubmit.value ? '详情' : '编辑';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.edit(record);
+  });
+}
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback() {
+  handleCancel();
+  emit('success');
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+defineExpose({
+  add,
+  edit,
+  disableSubmit,
+});
+</script>
+
+<style>
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
+</style>
diff --git a/src/views/military/modules/equipmentManage/info/status/DtDeviceStatus.api.ts b/src/views/military/modules/equipmentManage/info/status/DtDeviceStatus.api.ts
new file mode 100644
index 0000000..a1f9be4
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/status/DtDeviceStatus.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/dtDeviceStatus/list',
+  save='/military/dtDeviceStatus/add',
+  edit='/military/dtDeviceStatus/edit',
+  deleteOne = '/military/dtDeviceStatus/delete',
+  deleteBatch = '/military/dtDeviceStatus/deleteBatch',
+  importExcel = '/military/dtDeviceStatus/importExcel',
+  exportXls = '/military/dtDeviceStatus/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentManage/info/status/DtDeviceStatus.data.ts b/src/views/military/modules/equipmentManage/info/status/DtDeviceStatus.data.ts
new file mode 100644
index 0000000..9bfe102
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/status/DtDeviceStatus.data.ts
@@ -0,0 +1,111 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '设备唯一标识',
+    align: "center",
+    dataIndex: 'deviceId'
+  },
+  {
+    title: '所属站点',
+    align: "center",
+    dataIndex: 'deviceOwnerId'
+  },
+  {
+    title: '设备状态',
+    align: "center",
+    dataIndex: 'status_dictText'
+  },
+  {
+    title: '补充说明',
+    align: "center",
+    dataIndex: 'remark'
+  },
+  {
+    title: '创建时间',
+    align: "center",
+    dataIndex: 'createTime'
+  },
+  // {
+  //   title: '所属区域',
+  //   align: "center",
+  //   dataIndex: 'sysAreaCode'
+  // },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "设备唯一标识",
+    field: 'deviceId',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "所属站点ID",
+    field: 'deviceOwnerId',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "设备初始状态",
+    field: 'status',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "所属区域",
+    field: 'sysAreaCode',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '设备唯一标识',
+    field: 'deviceId',
+    component: 'Input',
+  },
+  {
+    label: '所属站点ID',
+    field: 'deviceOwnerId',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入设备所属站点ID!'},
+             ];
+    },
+  },
+  {
+    label: '设备初始状态',
+    field: 'status',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入设备初始状态!'},
+             ];
+    },
+  },
+  {
+    label: '状态补充说明',
+    field: 'remark',
+    component: 'Input',
+  },
+  {
+    label: '所属区域',
+    field: 'sysAreaCode',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/equipmentManage/info/status/DtDeviceStatusList.vue b/src/views/military/modules/equipmentManage/info/status/DtDeviceStatusList.vue
new file mode 100644
index 0000000..795d384
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/status/DtDeviceStatusList.vue
@@ -0,0 +1,269 @@
+<!-- 
+  历史状态
+
+  功能划分
+  xxx -> 历史状态
+ -->
+<template>
+  <div style="padding: 10px">
+    <!--查询区域-->
+    <!-- <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="设备唯一标识" name="deviceId">
+              <JInput placeholder="请输入设备唯一标识" v-model:value="queryParam.deviceId"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="设备所属站点ID" name="deviceOwnerId">
+              <JInput placeholder="请输入设备所属站点ID" v-model:value="queryParam.deviceOwnerId"></JInput>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item label="设备初始状态" name="status">
+                <JInput placeholder="请输入设备初始状态" v-model:value="queryParam.status"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="所属区域" name="sysAreaCode">
+                <JInput placeholder="请输入所属区域" v-model:value="queryParam.sysAreaCode"></JInput>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div> -->
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DtDeviceStatusModal ref="registerModal" @success="handleSuccess"></DtDeviceStatusModal>
+  </div>
+</template>
+
+<script lang="ts" name="military-dtDeviceStatus" setup>
+  import { ref, reactive, onMounted } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './DtDeviceStatus.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DtDeviceStatus.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import DtDeviceStatusModal from './components/DtDeviceStatusModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+
+  const props: any = defineProps({
+    deviceInfo: { type: Object }, //设备信息
+  });
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备状态信息',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      showActionColumn: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.deviceId = props.deviceInfo.id; //主表id
+        params.deviceOwnerId = props.deviceInfo.deviceOwnerIdDictText; //站点id
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '设备状态信息',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  onMounted(() => {
+    console.log(16416, props.deviceInfo);
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add(props.deviceInfo);
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/info/status/components/DtDeviceStatusForm.vue b/src/views/military/modules/equipmentManage/info/status/components/DtDeviceStatusForm.vue
new file mode 100644
index 0000000..c771ca5
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/status/components/DtDeviceStatusForm.vue
@@ -0,0 +1,161 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12">
+          <a-form-item label="设备唯一标识" v-bind="validateInfos.deviceId">
+            <a-input v-model:value="formData.deviceId" placeholder="请输入设备唯一标识" disabled="true"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="所属站点ID" v-bind="validateInfos.deviceOwnerId">
+            <a-input-number v-model:value="formData.deviceOwnerId" placeholder="请输入设备所属站点ID" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="设备初始状态" v-bind="validateInfos.status">
+            <j-dict-select-tag v-model:value="formData.status" dictCode="dt_sensor_status" placeholder="请输入设备初始状态"
+              :stringToNumber='true' :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态补充说明" v-bind="validateInfos.remark">
+            <a-input v-model:value="formData.remark" placeholder="请输入状态补充说明" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="所属区域" v-bind="validateInfos.sysAreaCode">
+            <a-input v-model:value="formData.sysAreaCode" placeholder="请输入所属区域" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../DtDeviceStatus.api';
+import { Form } from 'ant-design-vue';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => { } },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  deviceId: '',
+  deviceOwnerId: undefined,
+  status: undefined,
+  remark: '',
+  sysAreaCode: '',
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = {
+  // id: [{ required: true, message: '请输入设备唯一标识!' },],
+  deviceOwnerId: [{ required: true, message: '请输入设备所属站点ID!' },],
+  status: [{ required: true, message: '请选择设备初始状态!' },],
+  sysAreaCode: [{ required: true, message: '请输入所属区域!' },],
+};
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add(record) {
+  edit({
+    deviceId: record.id
+  });
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+
+  nextTick(() => {
+    resetFields();
+    //赋值
+    Object.assign(formData, record);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  // 触发表单验证
+  await validate();
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  min-height: 500px !important;
+  overflow-y: auto;
+  padding: 24px 24px 24px 24px;
+}
+</style>
diff --git a/src/views/military/modules/equipmentManage/info/status/components/DtDeviceStatusModal.vue b/src/views/military/modules/equipmentManage/info/status/components/DtDeviceStatusModal.vue
new file mode 100644
index 0000000..c5c2881
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/status/components/DtDeviceStatusModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <DtDeviceStatusForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </DtDeviceStatusForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick} from 'vue';
+import DtDeviceStatusForm from './DtDeviceStatusForm.vue'
+
+const title = ref<string>('');
+const width = ref<number>(1080);
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const emit = defineEmits(['register', 'success']);
+
+/**
+ * 新增
+ */
+function add(record) {
+  title.value = '新增';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.add(record);
+  });
+}
+
+/**
+ * 编辑
+ * @param record
+ */
+function edit(record) {
+  title.value = disableSubmit.value ? '详情' : '编辑';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.edit(record);
+  });
+}
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback() {
+  handleCancel();
+  emit('success');
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+defineExpose({
+  add,
+  edit,
+  disableSubmit,
+});
+</script>
+
+<style>
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
+</style>
diff --git a/src/views/military/modules/equipmentManage/info/subTables/DtDeviceSensorInfoSubTable.vue b/src/views/military/modules/equipmentManage/info/subTables/DtDeviceSensorInfoSubTable.vue
new file mode 100644
index 0000000..05c9f8c
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/subTables/DtDeviceSensorInfoSubTable.vue
@@ -0,0 +1,48 @@
+<template>
+  <div>
+      <!--引用表格-->
+     <BasicTable bordered size="middle" :loading="loading" rowKey="id" :canResize="false" :columns="dtDeviceSensorInfoColumns" :dataSource="dataSource" :pagination="false">
+        <!--字段回显插槽-->
+        <template #htmlSlot="{text}">
+           <div v-html="text"></div>
+        </template>
+        <template #fileSlot="{text}">
+           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+           <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        </template>
+      </BasicTable>
+    </div>
+</template>
+
+<script lang="ts" setup>
+  import {ref,watchEffect} from 'vue';
+  import {BasicTable} from '/@/components/Table';
+  import {dtDeviceSensorInfoColumns} from '../DtDeviceInfo.data';
+  import {dtDeviceSensorInfoList} from '../DtDeviceInfo.api';
+
+  const props = defineProps({
+    id: {
+       type: String,
+       default: '',
+     },
+  })
+
+  const loading = ref(false);
+  const dataSource = ref([]);
+
+  watchEffect(() => {
+      props.id && loadData(props.id);
+   });
+
+   function loadData(id) {
+         dataSource.value = []
+         loading.value = true
+          dtDeviceSensorInfoList({id}).then((res) => {
+           if (res.success) {
+              dataSource.value = res.result.records
+           }
+         }).finally(() => {
+           loading.value = false
+         })
+    }
+</script>
diff --git a/src/views/military/modules/equipmentManage/info/subTables/DtDeviceStatusSubTable.vue b/src/views/military/modules/equipmentManage/info/subTables/DtDeviceStatusSubTable.vue
new file mode 100644
index 0000000..8dd1a00
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/info/subTables/DtDeviceStatusSubTable.vue
@@ -0,0 +1,48 @@
+<template>
+  <div>
+      <!--引用表格-->
+     <BasicTable bordered size="middle" :loading="loading" rowKey="id" :canResize="false" :columns="dtDeviceStatusColumns" :dataSource="dataSource" :pagination="false">
+        <!--字段回显插槽-->
+        <template #htmlSlot="{text}">
+           <div v-html="text"></div>
+        </template>
+        <template #fileSlot="{text}">
+           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+           <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        </template>
+      </BasicTable>
+    </div>
+</template>
+
+<script lang="ts" setup>
+  import {ref,watchEffect} from 'vue';
+  import {BasicTable} from '/@/components/Table';
+  import {dtDeviceStatusColumns} from '../DtDeviceInfo.data';
+  import {dtDeviceStatusList} from '../DtDeviceInfo.api';
+
+  const props = defineProps({
+    id: {
+       type: String,
+       default: '',
+     },
+  })
+
+  const loading = ref(false);
+  const dataSource = ref([]);
+
+  watchEffect(() => {
+      props.id && loadData(props.id);
+   });
+
+   function loadData(id) {
+         dataSource.value = []
+         loading.value = true
+          dtDeviceStatusList({id}).then((res) => {
+           if (res.success) {
+              dataSource.value = res.result.records
+           }
+         }).finally(() => {
+           loading.value = false
+         })
+    }
+</script>
diff --git a/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicense.api.ts b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicense.api.ts
new file mode 100644
index 0000000..4741e05
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicense.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/msIotImportLicense/list',
+  save='/military/msIotImportLicense/add',
+  edit='/military/msIotImportLicense/edit',
+  deleteOne = '/military/msIotImportLicense/delete',
+  deleteBatch = '/military/msIotImportLicense/deleteBatch',
+  importExcel = '/military/msIotImportLicense/importExcel',
+  exportXls = '/military/msIotImportLicense/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicense.data.ts b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicense.data.ts
new file mode 100644
index 0000000..578c6eb
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicense.data.ts
@@ -0,0 +1,274 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'status_dictText',
+    sorter: true,
+    width: 120
+  },
+  {
+    title: '设备Id',
+    align: "center",
+    dataIndex: 'deviceId',
+    width: 200
+  },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName'
+  },
+  {
+    title: '设备类型',
+    align: "center",
+    dataIndex: 'deviceType_dictText',
+    sorter: true,
+  },
+  {
+    title: '入网时间',
+    align: "center",
+    dataIndex: 'importDate',
+    sorter: true,
+  },
+  {
+    title: '申请人',
+    align: 'center',
+    dataIndex: 'createBy',
+  },
+  {
+    title: '申请时间',
+    align: 'center',
+    dataIndex: 'createTime',
+    sorter: true,
+  },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remark'
+  },
+  {
+    title: '许可证编号',
+    align: "center",
+    dataIndex: 'licenseNo',
+  },
+  {
+    title: '审批人',
+    align: "center",
+    dataIndex: 'auditManid'
+  },
+  {
+    title: '审批时间',
+    align: "center",
+    dataIndex: 'auditDate',
+    sorter: true,
+  },
+
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "设备名称",
+    field: 'deviceName',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "入网时间",
+    field: "importDate",
+    component: 'RangePicker',
+    componentProps: {
+      showTime: true,
+    },
+    colProps: { span: 6 },
+  },
+  {
+    label: "审批时间",
+    field: "auditDate",
+    component: 'RangePicker',
+    componentProps: {
+      showTime: true,
+    },
+    colProps: { span: 6 },
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '设备Id',
+    field: 'deviceId',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入设备Id!' },
+      ];
+    },
+  },
+  {
+    label: '设备名称',
+    field: 'deviceName',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入设备名称!' },
+      ];
+    },
+  },
+  {
+    label: '设备类型',
+    field: 'deviceType',
+    component: 'InputNumber',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入设备类型!' },
+      ];
+    },
+  },
+  {
+    label: '许可证编号',
+    field: 'licenseNo',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入许可证编号!' },
+      ];
+    },
+  },
+  {
+    label: '入网时间',
+    field: 'importDate',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入入网时间!' },
+      ];
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'InputNumber',
+  },
+  {
+    label: '审批人',
+    field: 'auditManid',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入审批人!' },
+      ];
+    },
+  },
+  {
+    label: '审批时间',
+    field: 'auditDate',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入审批时间!' },
+      ];
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
+
+
+
+//申请列表数据
+export const applyColumns: BasicColumn[] = [
+
+  {
+    title: '设备Id',
+    align: "center",
+    dataIndex: 'deviceId'
+  },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName'
+  },
+  {
+    title: '设备类型',
+    align: "center",
+    dataIndex: 'deviceType_dictText',
+    sorter: true,
+    width: 120
+  },
+  {
+    title: '许可证编号',
+    align: "center",
+    dataIndex: 'licenseNo'
+  },
+  {
+    title: '入网时间',
+    align: "center",
+    dataIndex: 'importDate',
+    sorter: true,
+  },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'status_dictText',
+    sorter: true,
+    width: 90
+  },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remark'
+  },
+  // {
+  //   title: '申请人',
+  //   align: 'center',
+  //   dataIndex: 'createBy',
+  // },
+  {
+    title: '申请时间',
+    align: 'center',
+    dataIndex: 'createTime',
+    sorter: true,
+  },
+
+  {
+    title: '更新时间',
+    align: 'center',
+    dataIndex: 'updateTime',
+    sorter: true,
+  },
+  // {
+  //   title: '审批人',
+  //   align: "center",
+  //   dataIndex: 'auditManid'
+  // },
+  // {
+  //   title: '审批时间',
+  //   align: "center",
+  //   dataIndex: 'auditDate',
+  //   sorter: true,
+  // },
+
+];
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicenseApply.vue b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicenseApply.vue
new file mode 100644
index 0000000..db4e3b0
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicenseApply.vue
@@ -0,0 +1,277 @@
+<!-- 
+  准入许可证管理
+
+  功能划分
+  设备管理 -> 准入许可证管理
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item label="设备名称" name="deviceName">
+              <JInput placeholder="请输入设备名称" v-model:value="queryParam.deviceName"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="入网时间" name="importDate_begin">
+              <a-date-picker
+                style="margin-bottom: 24px"
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.importDate_begin"
+              />
+              <span class="query-group-split-cust">~</span>
+              <a-form-item name="importDate_end">
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.importDate_end" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
+          <!-- <template v-if="toggleSearchStatus"> -->
+          <!-- <a-col :lg="6">
+              <a-form-item label="审批时间">
+                 <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.auditDate_begin" class="query-group-cust" />
+                 <span class="query-group-split-cust">~</span>
+                 <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.auditDate_end" class="query-group-cust" />
+              </a-form-item>
+            </a-col> -->
+          <!-- </template> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ApplyModal ref="registerModal" @success="handleSuccess"></ApplyModal>
+  </div>
+</template>
+
+<script lang="ts" name="military-msIotImportLicense" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { applyColumns } from './MsIotImportLicense.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsIotImportLicense.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ApplyModal from './components/ApplyModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'ms_iot_import_license',
+      api: list,
+      columns: applyColumns,
+      canResize: false,
+      useSearchForm: false,
+      showIndexColumn: true,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: 'ms_iot_import_license',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.supplement = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.supplement = true;
+    console.log(registerModal.value);
+
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '补充',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      // {
+      //   label: '详情',
+      //   onClick: handleDetail.bind(null, record),
+      // },
+      // {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //   }
+      // }
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+  }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicenseList.vue b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicenseList.vue
new file mode 100644
index 0000000..76798d8
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/licenseManage/MsIotImportLicenseList.vue
@@ -0,0 +1,278 @@
+<!-- 
+  设备接入申请
+
+  功能划分
+  设备管理 -> 设备接入申请
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item label="设备名称" name="deviceName">
+              <JInput placeholder="请输入设备名称" v-model:value="queryParam.deviceName"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="入网时间" name="importDate_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.importDate_begin"
+                style="margin-bottom: 24px"
+              />
+              <span class="query-group-split-cust">~</span>
+              <a-form-item name="importDate_end">
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.importDate_end" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
+          <!-- <template v-if="toggleSearchStatus"> -->
+          <a-col :lg="6">
+            <a-form-item label="审批时间" name="auditDate_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.auditDate_begin"
+                style="margin-bottom: 24px"
+              />
+              <span class="query-group-split-cust">~</span>
+              <a-form-item name="auditDate_end">
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.auditDate_end" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
+          <!-- </template> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <MsIotImportLicenseModal ref="registerModal" @success="handleSuccess"></MsIotImportLicenseModal>
+  </div>
+</template>
+
+<script lang="ts" name="military-msIotImportLicense" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsIotImportLicense.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsIotImportLicense.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsIotImportLicenseModal from './components/MsIotImportLicenseModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'ms_iot_import_license',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      showIndexColumn: true,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: 'ms_iot_import_license',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '审批',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+  }
+
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 50px;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/licenseManage/components/ApplyForm.vue b/src/views/military/modules/equipmentManage/licenseManage/components/ApplyForm.vue
new file mode 100644
index 0000000..ad3e05d
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/licenseManage/components/ApplyForm.vue
@@ -0,0 +1,232 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="设备类型" v-bind="validateInfos.deviceType">
+            <j-dict-select-tag v-model:value="formData.deviceType" dictCode="ms_device_type" placeholder="请选择设备类型"
+              :disabled="disabled || supplementDisable" :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
+              :string-to-number="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备名称" v-bind="validateInfos.deviceName">
+            <!-- <a-input v-model:value="formData.deviceName" placeholder="请输入设备名称" :disabled="disabled"></a-input> -->
+            <a-select v-model:value="formData.deviceName" show-search placeholder="请输入设备名称" :options="options"
+              @focus="handleFocus" @select="handleselect" :disabled="disabled || supplementDisable">
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备Id" v-bind="validateInfos.deviceId">
+            <a-input v-model:value="formData.deviceId" placeholder="请输入设备Id"
+              :disabled="true"></a-input>
+          </a-form-item>
+        </a-col>
+        
+
+        <a-col :span="24">
+          <a-form-item label="入网时间" v-bind="validateInfos.importDate">
+            <a-date-picker placeholder="请选择入网时间" v-model:value="formData.importDate" showTime
+              value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" :disabled="disabled || supplementDisable" />
+          </a-form-item>
+        </a-col>
+        <!-- <a-col :span="12">
+          <a-form-item label="状态" v-bind="validateInfos.status">
+	          <a-input-number v-model:value="formData.status" placeholder="请输入状态" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col> -->
+        <!-- <a-col :span="12">
+          <a-form-item label="许可证编号" v-bind="validateInfos.licenseNo">
+            <a-input v-model:value="formData.licenseNo" placeholder="请输入许可证编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col> -->
+        <!-- <a-col :span="12">
+          <a-form-item label="审批人" v-bind="validateInfos.auditManid">
+            <a-input v-model:value="formData.auditManid" placeholder="请输入审批人" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col> -->
+        <!-- <a-col :span="12">
+          <a-form-item label="审批时间" v-bind="validateInfos.auditDate">
+		        <a-date-picker placeholder="请选择审批时间"  v-model:value="formData.auditDate" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col> -->
+        <a-col :span="24">
+          <a-form-item label="备注" v-bind="validateInfos.remark">
+            <a-input v-model:value="formData.remark" placeholder="请输入备注" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../MsIotImportLicense.api';
+import { Form } from 'ant-design-vue';
+import dayjs from 'dayjs';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => { } },
+  formBpm: { type: Boolean, default: true },
+  //补充信息 部分字段禁用
+  supplement: {
+    type: Boolean,
+    default: false,
+    required: false,
+  },
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  deviceId: '',
+  deviceName: '',
+  deviceType: undefined,
+  licenseNo: '',
+  importDate: '',
+  status: undefined,
+  auditManid: '',
+  auditDate: '',
+  remark: '',
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+const options: any = ref([]);
+//表单验证
+const validatorRules = {
+  deviceId: [{ required: true, message: '请输入设备Id!' },],
+  deviceName: [{ required: true, message: '请输入设备名称!' },],
+  deviceType: [{ required: true, message: '请输入设备类型!' },],
+  // licenseNo: [{ required: true, message: '请输入许可证编号!'},],
+  importDate: [{ required: true, message: '请输入入网时间!' },],
+  // auditManid: [{ required: true, message: '请输入审批人!'},],
+  // auditDate: [{ required: true, message: '请输入审批时间!'},],
+};
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+//补充信息 部分字段禁用
+const supplementDisable = computed(() => {
+  return props.supplement;
+});
+
+/**
+ * 新增
+ */
+function add() {
+  edit({
+    importDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), //自动注入入网时间
+    status: 0 //自动注入待审批
+  });
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    //赋值
+    Object.assign(formData, record);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  // 触发表单验证
+  await validate();
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+function handleFocus() {
+  defHttp.get({
+    url: "/military/msDeviceInfo/list",
+    params: { deviceType: formData.deviceType }
+  }, { isTransformResponse: false })
+    // getAction("/military/msDeviceInfo/list",{deviceType:this.model.deviceType})
+    .then(res => {
+      if (res.success) {
+        options.value = [] //清空
+        let records = res.result.records;
+        for (let i of records) {
+          let item = { value: i.deviceName, label: i.deviceName, id: i.id, type: i.deviceType };
+          options.value.push(item)
+        }
+      } else {
+        console.error(res.message)
+      }
+    })
+
+}
+function handleselect(e, option) {
+  console.log(e, option);
+  formData.deviceId = option.id
+  formData.deviceType = option.type
+
+}
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  min-height: 500px !important;
+  overflow-y: auto;
+  padding: 24px 24px 24px 24px;
+}
+</style>
diff --git a/src/views/military/modules/statistics/components/MsPatrolStatisticsModal.vue b/src/views/military/modules/equipmentManage/licenseManage/components/ApplyModal.vue
similarity index 78%
rename from src/views/military/modules/statistics/components/MsPatrolStatisticsModal.vue
rename to src/views/military/modules/equipmentManage/licenseManage/components/ApplyModal.vue
index 15d15c0..2f00d79 100644
--- a/src/views/military/modules/statistics/components/MsPatrolStatisticsModal.vue
+++ b/src/views/military/modules/equipmentManage/licenseManage/components/ApplyModal.vue
@@ -1,9 +1,9 @@
 <!--
  * @Author: Fuyuu 1805498209@qq.com
- * @Date: 2023-11-24 10:15:24
+ * @Date: 2023-11-30 10:39:05
  * @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2023-11-29 11:06:14
- * @FilePath: \dt-admin-pc\src\views\military\modules\statistics\components\msPatrolStatisticsModal.vue
+ * @LastEditTime: 2023-12-01 09:22:01
+ * @FilePath: \dt-admin-pc-v2\src\views\military\modules\iot\components\ApplyModal.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
@@ -16,18 +16,19 @@
     @cancel="handleCancel"
     cancelText="关闭"
   >
-    <MsPatrolStatisticsForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsPatrolStatisticsForm>
+    <ApplyForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :supplement="supplement" :formBpm="false"></ApplyForm>
   </a-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick } from 'vue';
-  import MsPatrolStatisticsForm from './MsPatrolStatisticsForm.vue';
+  import ApplyForm from './ApplyForm.vue';
 
   const title = ref<string>('');
   const width = ref<number>(800);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
+  const supplement = ref<boolean>(false);
   const registerForm = ref();
   const emit = defineEmits(['register', 'success']);
 
@@ -47,7 +48,7 @@
    * @param record
    */
   function edit(record) {
-    title.value = disableSubmit.value ? '详情' : '编辑';
+    title.value = disableSubmit.value ? '详情' : '补充';
     visible.value = true;
     nextTick(() => {
       registerForm.value.edit(record);
@@ -80,6 +81,7 @@
     add,
     edit,
     disableSubmit,
+    supplement,
   });
 </script>
 
diff --git a/src/views/military/modules/equipmentManage/licenseManage/components/MsIotImportLicenseForm.vue b/src/views/military/modules/equipmentManage/licenseManage/components/MsIotImportLicenseForm.vue
new file mode 100644
index 0000000..7011d68
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/licenseManage/components/MsIotImportLicenseForm.vue
@@ -0,0 +1,211 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12">
+          <a-form-item label="设备Id" v-bind="validateInfos.deviceId">
+            <a-input v-model:value="formData.deviceId" placeholder="请输入设备Id" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="设备名称" v-bind="validateInfos.deviceName">
+            <a-input v-model:value="formData.deviceName" placeholder="请输入设备名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="设备类型" v-bind="validateInfos.deviceType">
+            <j-dict-select-tag v-model:value="formData.deviceType" dictCode="ms_device_type" placeholder="请选择设备类型"
+              :disabled="disabled" :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
+              :string-to-number="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="入网时间" v-bind="validateInfos.importDate">
+            <a-date-picker placeholder="请选择入网时间" v-model:value="formData.importDate" showTime
+              value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态" v-bind="validateInfos.status">
+            <j-dict-select-tag type="list" v-model:value="formData.status" dictCode="ms_approval_status"
+              :string-to-number="true" placeholder="请选择状态" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="许可证编号" v-bind="validateInfos.licenseNo">
+            <a-input v-model:value="formData.licenseNo" placeholder="请输入许可证编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="审批人" v-bind="validateInfos.auditManid">
+            <a-input v-model:value="formData.auditManid" placeholder="请输入审批人" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="审批时间" v-bind="validateInfos.auditDate">
+            <a-date-picker placeholder="请选择审批时间" v-model:value="formData.auditDate" showTime
+              value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="备注" v-bind="validateInfos.remark">
+            <a-input v-model:value="formData.remark" placeholder="请输入备注" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, nextTick, computed, onMounted, watch } from 'vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../MsIotImportLicense.api';
+import { Form } from 'ant-design-vue';
+import dayjs from 'dayjs';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => { } },
+  formBpm: { type: Boolean, default: true },
+  //补充信息 部分字段禁用
+  supplement: {
+    type: Boolean,
+    default: false,
+    required: false,
+  },
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  deviceId: '',
+  deviceName: '',
+  deviceType: undefined,
+  licenseNo: '',
+  importDate: '',
+  status: undefined,
+  auditManid: '',
+  auditDate: '',
+  remark: '',
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = {
+  deviceId: [{ required: true, message: '请输入设备Id!' },],
+  deviceName: [{ required: true, message: '请输入设备名称!' },],
+  deviceType: [{ required: true, message: '请选择设备类型!' },],
+  licenseNo: [{ required: true, message: '请输入许可证编号!' },],
+  importDate: [{ required: true, message: '请输入入网时间!' },],
+  status: [{ required: true, message: '请选择状态！' }],
+  auditManid: [{ required: true, message: '请输入审批人!' },],
+  auditDate: [{ required: true, message: '请输入审批时间!' },],
+};
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+//补充信息 部分字段禁用
+const supplementDisable = computed(() => {
+  return props.supplement;
+});
+
+watch(() => formData.status, (val) => {
+  if (val == 2) {
+    formData.licenseNo = null
+  }
+  else if (val == 1) {
+    formData.licenseNo = new Date().getTime() + Math.floor(Math.random() * 100) //自动注入许可证编号
+  }
+})
+
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    //赋值
+    Object.assign(formData, record);
+    // formData.licenseNo = new Date().getTime() + Math.floor(Math.random() * 100) //自动注入许可证编号
+    formData.auditDate = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') //自动注入审批时间
+    // formData.status = 1 //自动注入审批状态
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  // 触发表单验证
+  await validate();
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  min-height: 500px !important;
+  overflow-y: auto;
+  padding: 24px 24px 24px 24px;
+}
+</style>
diff --git a/src/views/military/modules/equipmentManage/licenseManage/components/MsIotImportLicenseModal.vue b/src/views/military/modules/equipmentManage/licenseManage/components/MsIotImportLicenseModal.vue
new file mode 100644
index 0000000..9dba9f5
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/licenseManage/components/MsIotImportLicenseModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <MsIotImportLicenseForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsIotImportLicenseForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import MsIotImportLicenseForm from './MsIotImportLicenseForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(1080);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.api.ts b/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.api.ts
new file mode 100644
index 0000000..62e31fe
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/dtDeveiceProtocolType/list',
+  save='/military/dtDeveiceProtocolType/add',
+  edit='/military/dtDeveiceProtocolType/edit',
+  deleteOne = '/military/dtDeveiceProtocolType/delete',
+  deleteBatch = '/military/dtDeveiceProtocolType/deleteBatch',
+  importExcel = '/military/dtDeveiceProtocolType/importExcel',
+  exportXls = '/military/dtDeveiceProtocolType/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.data.ts b/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.data.ts
new file mode 100644
index 0000000..42e471b
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.data.ts
@@ -0,0 +1,90 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '协议类型编号',
+    align: "center",
+    dataIndex: 'protocolType'
+  },
+  {
+    title: '协议名称',
+    align: "center",
+    dataIndex: 'protocolName'
+  },
+  {
+    title: '备注',
+    align: "center",
+    dataIndex: 'remark'
+  },
+  // {
+  //   title: '所属区域',
+  //   align: "center",
+  //   dataIndex: 'sysAreaCode'
+  // },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "协议类型编号",
+    field: 'protocolType',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "协议名称",
+    field: 'protocolName',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "所属区域",
+    field: 'sysAreaCode',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '协议类型编号',
+    field: 'protocolType',
+    component: 'InputNumber',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入协议类型编号!' },
+      ];
+    },
+  },
+  {
+    label: '协议名称',
+    field: 'protocolName',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入协议名称!' },
+      ];
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+  {
+    label: '所属区域',
+    field: 'sysAreaCode',
+    component: 'Input',
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolTypeList.vue b/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolTypeList.vue
new file mode 100644
index 0000000..2ee250e
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolTypeList.vue
@@ -0,0 +1,252 @@
+<!-- 
+  设备通讯协议
+
+  目录位置：设备管理 -> 设备通讯协议
+  功能概述：管理设备协议，编号名称
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item label="协议类型编号" name="protocolType">
+              <a-input placeholder="请输入协议类型编号" v-model:value="queryParam.protocolType"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="协议名称" name="protocolName">
+              <JInput placeholder="请输入协议名称" v-model:value="queryParam.protocolName"></JInput>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="6">
+            <a-form-item label="所属区域" name="sysAreaCode">
+              <JInput placeholder="请输入所属区域" v-model:value="queryParam.sysAreaCode"></JInput>
+            </a-form-item>
+          </a-col> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DtDeveiceProtocolTypeModal ref="registerModal" @success="handleSuccess"></DtDeveiceProtocolTypeModal>
+  </div>
+</template>
+
+<script lang="ts" name="military-dtDeveiceProtocolType" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './DtDeveiceProtocolType.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DtDeveiceProtocolType.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import DtDeveiceProtocolTypeModal from './components/DtDeveiceProtocolTypeModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备通讯协议表',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '设备通讯协议表',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 20px;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeForm.vue b/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeForm.vue
new file mode 100644
index 0000000..189af0f
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeForm.vue
@@ -0,0 +1,148 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12">
+          <a-form-item label="协议类型编号" v-bind="validateInfos.protocolType">
+            <a-input-number v-model:value="formData.protocolType" placeholder="请输入协议类型编号" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="协议名称" v-bind="validateInfos.protocolName">
+            <a-input v-model:value="formData.protocolName" placeholder="请输入协议名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="备注" v-bind="validateInfos.remark">
+            <a-input v-model:value="formData.remark" placeholder="请输入备注" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <!-- <a-col :span="12">
+          <a-form-item label="所属区域" v-bind="validateInfos.sysAreaCode">
+            <a-input v-model:value="formData.sysAreaCode" placeholder="请输入所属区域" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col> -->
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../DtDeveiceProtocolType.api';
+import { Form } from 'ant-design-vue';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => { } },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  protocolType: undefined,
+  protocolName: '',
+  remark: '',
+  sysAreaCode: '',
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = {
+  protocolType: [{ required: true, message: '请输入协议类型编号!' },],
+  protocolName: [{ required: true, message: '请输入协议名称!' },],
+};
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    //赋值
+    Object.assign(formData, record);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  // 触发表单验证
+  await validate();
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  min-height: 500px !important;
+  overflow-y: auto;
+  padding: 24px 24px 24px 24px;
+}
+</style>
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeModal.vue b/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeModal.vue
new file mode 100644
index 0000000..4c5f2a2
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <DtDeveiceProtocolTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DtDeveiceProtocolTypeForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import DtDeveiceProtocolTypeForm from './DtDeveiceProtocolTypeForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(1080);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/type/DtDeveiceType.api.ts b/src/views/military/modules/equipmentManage/type/DtDeveiceType.api.ts
new file mode 100644
index 0000000..70b0135
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/type/DtDeveiceType.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/dtDeveiceType/list',
+  save='/military/dtDeveiceType/add',
+  edit='/military/dtDeveiceType/edit',
+  deleteOne = '/military/dtDeveiceType/delete',
+  deleteBatch = '/military/dtDeveiceType/deleteBatch',
+  importExcel = '/military/dtDeveiceType/importExcel',
+  exportXls = '/military/dtDeveiceType/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentManage/type/DtDeveiceType.data.ts b/src/views/military/modules/equipmentManage/type/DtDeveiceType.data.ts
new file mode 100644
index 0000000..d59acaa
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/type/DtDeveiceType.data.ts
@@ -0,0 +1,205 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '类型编号',
+    align: "center",
+    dataIndex: 'typeNo'
+  },
+  {
+    title: '类型名称',
+    align: "center",
+    dataIndex: 'typeName'
+  },
+  {
+    title: '是否有传感器',
+    align: "center",
+    dataIndex: 'havesensor',
+    width: 120,
+    customRender: ({ text }) => {
+      // console.log("text222", text);
+      let show = ''
+      switch (text) {
+        case 1:
+          show = "是"
+          break;
+        case 0:
+          show = "否"
+          break;
+        default:
+          break;
+      }
+      return show
+    },
+  },
+  {
+    title: '地图显示图片模型',
+    align: "center",
+    dataIndex: 'mapIco',
+    slots: { customRender: 'fileSlot' },
+  },
+  {
+    title: '是否3D',
+    align: "center",
+    dataIndex: 'is3d',
+    customRender: ({ text }) => {
+      // console.log("text", text);
+      let show = ''
+      switch (text) {
+        case 1:
+          show = "是"
+          break;
+        case 0:
+          show = "否"
+          break;
+        default:
+          break;
+      }
+      return show
+    },
+  },
+  {
+    title: '默认宽度',
+    align: "center",
+    dataIndex: 'width'
+  },
+  {
+    title: '默认长度',
+    align: "center",
+    dataIndex: 'length'
+  },
+  {
+    title: '默认高度',
+    align: "center",
+    dataIndex: 'height'
+  },
+  // {
+  //   title: '所属区域',
+  //   align: "center",
+  //   dataIndex: 'sysAreaCode'
+  // },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "类型编号",
+    field: 'typeNo',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "类型名称",
+    field: 'typeName',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "是否有传感器",
+    field: 'havesensor',
+    component: 'JSwitch',
+    componentProps: {
+    },
+    colProps: { span: 6 },
+  },
+  {
+    label: "地图显示图片模型",
+    field: 'mapIco',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "是否3D",
+    field: 'is3d',
+    component: 'JDictSelectTag',
+    componentProps: {
+    },
+    colProps: { span: 6 },
+  },
+  // {
+  //   label: "所属区域",
+  //   field: 'sysAreaCode',
+  //   component: 'Input',
+  //   colProps: { span: 6 },
+  // },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '类型编号',
+    field: 'typeNo',
+    component: 'InputNumber',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入类型编号!' },
+      ];
+    },
+  },
+  {
+    label: '类型名称',
+    field: 'typeName',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入类型名称!' },
+      ];
+    },
+  },
+  {
+    label: '是否有传感器',
+    field: 'havesensor',
+    component: 'JSwitch',
+    componentProps: {
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入是否有传感器!' },
+      ];
+    },
+  },
+  {
+    label: '地图显示图片模型',
+    field: 'mapIco',
+    component: 'JUpload',
+    componentProps: {
+    },
+  },
+  {
+    label: '是否3D',
+    field: 'is3d',
+    component: 'JDictSelectTag',
+    componentProps: {
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请选择是否3D!' },
+      ];
+    },
+  },
+  {
+    label: '默认宽度',
+    field: 'width',
+    component: 'InputNumber',
+  },
+  {
+    label: '默认长度',
+    field: 'length',
+    component: 'InputNumber',
+  },
+  {
+    label: '默认高度',
+    field: 'height',
+    component: 'InputNumber',
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/equipmentManage/type/DtDeveiceTypeList.vue b/src/views/military/modules/equipmentManage/type/DtDeveiceTypeList.vue
new file mode 100644
index 0000000..aadb1e4
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/type/DtDeveiceTypeList.vue
@@ -0,0 +1,290 @@
+<!-- 
+  设备类型
+
+  目录位置：设备管理 -> 设备类型
+  功能概述：设置设备有什么分类，雷达、光伏等，设置模型图片，是否有传感器
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item label="类型编号" name="typeNo">
+              <a-input placeholder="请输入类型编号" v-model:value="queryParam.typeNo"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="类型名称" name="typeName">
+              <JInput placeholder="请输入类型名称" v-model:value="queryParam.typeName"></JInput>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="是否有传感器" name="havesensor">
+              <j-switch placeholder="请选择是否有传感器" v-model:value="queryParam.havesensor" query :options="['1', '0']" />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="6">
+            <a-form-item label="图片模型" name="mapIco">
+              <JInput placeholder="请输入地图显示图片模型" v-model:value="queryParam.mapIco"></JInput>
+            </a-form-item>
+          </a-col> -->
+          <a-col :lg="6">
+            <a-form-item label="是否3D" name="is3d">
+              <j-switch placeholder="请选择是否3D" v-model:value="queryParam.is3d" query :options="['1', '0']" />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="6">
+            <a-form-item label="所属区域" name="sysAreaCode">
+              <JInput placeholder="请输入所属区域" v-model:value="queryParam.sysAreaCode"></JInput>
+            </a-form-item>
+          </a-col> -->
+          <!-- <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item label="是否有传感器" name="havesensor">
+                <j-switch placeholder="请选择是否有传感器" v-model:value="queryParam.havesensor"  query />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="地图显示图片模型" name="mapIco">
+                <JInput placeholder="请输入地图显示图片模型" v-model:value="queryParam.mapIco"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="是否3D" name="is3d">
+                <JInput placeholder="请输入是否3D" v-model:value="queryParam.is3d"></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item label="所属区域" name="sysAreaCode">
+                <JInput placeholder="请输入所属区域" v-model:value="queryParam.sysAreaCode"></JInput>
+              </a-form-item>
+            </a-col>
+          </template> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DtDeveiceTypeModal ref="registerModal" @success="handleSuccess"></DtDeveiceTypeModal>
+  </div>
+</template>
+
+<script lang="ts" name="military-dtDeveiceType" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './DtDeveiceType.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DtDeveiceType.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import DtDeveiceTypeModal from './components/DtDeveiceTypeModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  // const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '设备类型表',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '设备类型表',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 50px;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/type/components/DtDeveiceTypeForm.vue b/src/views/military/modules/equipmentManage/type/components/DtDeveiceTypeForm.vue
new file mode 100644
index 0000000..1157a33
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/type/components/DtDeveiceTypeForm.vue
@@ -0,0 +1,183 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12">
+          <a-form-item label="类型编号" v-bind="validateInfos.typeNo">
+            <a-input-number v-model:value="formData.typeNo" placeholder="请输入类型编号" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="类型名称" v-bind="validateInfos.typeName">
+            <a-input v-model:value="formData.typeName" placeholder="请输入类型名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="是否有传感器" v-bind="validateInfos.havesensor">
+            <j-switch v-model:value="formData.havesensor" :disabled="disabled" :options="['1', '0']"></j-switch>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="图片模型" v-bind="validateInfos.mapIco">
+            <j-upload v-model:value="formData.mapIco" :disabled="disabled"></j-upload>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="是否3D" v-bind="validateInfos.is3d">
+            <j-switch v-model:value="formData.is3d" :disabled="disabled" :options="['1', '0']"></j-switch>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="默认宽度" v-bind="validateInfos.width">
+            <a-input-number v-model:value="formData.width" placeholder="请输入默认宽度" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="默认长度" v-bind="validateInfos.length">
+            <a-input-number v-model:value="formData.length" placeholder="请输入默认长度" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="默认高度" v-bind="validateInfos.height">
+            <a-input-number v-model:value="formData.height" placeholder="请输入默认高度" style="width: 100%"
+              :disabled="disabled" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../DtDeveiceType.api';
+import { Form } from 'ant-design-vue';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => { } },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  typeNo: undefined,
+  typeName: '',
+  havesensor: undefined,
+  mapIco: '',
+  is3d: undefined,
+  width: 0,
+  length: 0,
+  height: 0,
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = {
+  typeNo: [{ required: true, message: '请输入类型编号!' },],
+  typeName: [{ required: true, message: '请输入类型名称!' },],
+  havesensor: [{ required: true, message: '请输入是否有传感器!' },],
+  is3d: [{ required: true, message: '请输入是否3D!' },],
+  width: [{ required: true, message: '请输入默认宽度!' },],
+  length: [{ required: true, message: '请输入默认长度!' },],
+  height: [{ required: true, message: '请输入默认高度!' },],
+};
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    //赋值
+    Object.assign(formData, record);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  // 触发表单验证
+  await validate();
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  min-height: 500px !important;
+  overflow-y: auto;
+  padding: 24px 24px 24px 24px;
+}
+</style>
diff --git a/src/views/military/modules/equipmentManage/type/components/DtDeveiceTypeModal.vue b/src/views/military/modules/equipmentManage/type/components/DtDeveiceTypeModal.vue
new file mode 100644
index 0000000..583bc39
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/type/components/DtDeveiceTypeModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <DtDeveiceTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DtDeveiceTypeForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import DtDeveiceTypeForm from './DtDeveiceTypeForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(1080);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSet.vue b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSet.vue
new file mode 100644
index 0000000..ad2961a
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSet.vue
@@ -0,0 +1,1052 @@
+<!-- 
+  相机管理
+
+  目录位置：设备管理 -> 视频监控设备信息 -> 相机管理
+  功能概述：管理所有区域下的相机，rtsp地址，安装位置等
+ -->
+<template>
+  <div style="background: #fff">
+    <p style="margin: 0; padding: 5px 20px; font-size: 20px">
+      相机列表
+      <a-icon type="sync" @click="reNew" ref="reNewBtn" />
+    </p>
+    <div class="cameraBox">
+      <!--    树形控件界面-->
+      <div class="treeBox">
+        <a-input-search style="margin-bottom: 8px" placeholder="搜索" @change="onChange" />
+        <a-tree
+          :defaultExpandAll="true"
+          v-if="gData.length != 0"
+          :expanded-keys="expandedKeys"
+          :auto-expand-parent="autoExpandParent"
+          :tree-data="treeData"
+          :fieldNames="replaceFields"
+          @select="onSelect"
+          @expand="onExpand"
+          ref="dataTree"
+          style="display: inline-block"
+        >
+        </a-tree>
+      </div>
+      <!--    菜单界面-->
+      <div class="menuBox">
+        <div class="menuTop">
+          <a-button type="primary" @click="add"> 新增 </a-button>
+          <a-button style="margin-left: 10px" @click="edit" :disabled="!getTag"> 修改 </a-button>
+          <a-button style="margin-left: 10px" type="danger" @click="del" :disabled="!getTag"> 删除 </a-button>
+          <a-button style="margin-left: 10px" type="danger" @click="cancel" v-show="cancelFlag"> 取消 </a-button>
+        </div>
+        <div class="menuFrom">
+          <a-form
+            style="flex: 1"
+            class="antd-modal-form"
+            :label-col="{ span: 6, offset: 1 }"
+            :wrapper-col="{ span: 14 }"
+            ref="ruleForm"
+            :model="cameraForm"
+          >
+            <a-form-item label="监控点位" class="mustInput" name="siteName">
+              <a-col :span="11">
+                <a-select name="lineNameTemp" v-model:value="lineNameTemp" @change="handleLineChange" :disabled="!changeTag">
+                  <a-select-option v-for="(line, i) in lineArr" :key="line.id">
+                    {{ line.name }}
+                  </a-select-option>
+                </a-select>
+              </a-col>
+
+              <a-col :offset="1" :span="12">
+                <a-form-item style="margin-bottom: 0px">
+                  <a-select name="siteNameTemp" v-model:value="siteNameTemp" @change="handleSiteChange" :disabled="!changeTag">
+                    <a-select-option v-for="(site, i) in siteArr" :key="site.id">
+                      {{ site.name }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+            </a-form-item>
+            <a-form-item label="相机名称" class="mustInput" name="cameraName">
+              <a-input v-model:value="cameraForm.cameraName" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="相机IP" class="mustInput" name="ip">
+              <a-input v-model:value="cameraForm.ip" :disabled="!changeTag" />
+            </a-form-item>
+
+            <a-form-item label="相机备用IP" class="mustInput" name="ip2">
+              <a-input v-model:value="cameraForm.ip2" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="相机端口" class="mustInput" name="port">
+              <!-- <a-input v-model="cameraForm.port" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.port" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="相机认证用户名" class="mustInput" name="user">
+              <a-input v-model:value="cameraForm.user" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="相机认证密码" class="mustInput" name="password">
+              <a-input-password v-model:value="cameraForm.password" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="厂家" class="mustInput" name="factory" v-if="cameraFactorys.length > 0">
+              <!-- <j-dict-select-tag v-model:value="cameraForm.factory" placeholder="选择"
+                                dictCode="ms_camera_factory" :disabled="!changeTag" /> -->
+              <!-- 使用antd原生下拉框 -->
+              <a-select v-model:value="cameraForm.factory" :disabled="!changeTag">
+                <template :key="Number(cameraFactory.value)" v-for="cameraFactory in cameraFactorys">
+                  <a-select-option :value="Number(cameraFactory.value)">{{ cameraFactory.text }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+            <a-form-item label="类型" class="mustInput" name="type">
+              <a-col :span="11">
+                <!-- <j-dict-select-tag name="type" v-model:value="cameraForm.type" placeholder="选择"
+                                    dictCode="ms_camera_type" @change="typeChange" :disabled="!changeTag" /> -->
+                <!-- 使用antd原生下拉框 -->
+                <a-select name="type" v-model:value="cameraForm.type" :disabled="!changeTag" @change="typeChange">
+                  <template :key="Number(cameraType.value)" v-for="cameraType in cameraTypes">
+                    <a-select-option :value="Number(cameraType.value)">{{ cameraType.text }}</a-select-option>
+                  </template>
+                </a-select>
+              </a-col>
+              <a-col :offset="1" :span="12">
+                <!-- <a-form-item style="margin-bottom: 0px;">
+                                    <j-dict-select-tag name="style" v-model:value="cameraForm.style" placeholder="选择"
+                                        dictCode="ms_camera_style" :disabled="!flag || !changeTag" />
+                                </a-form-item> -->
+                <!-- 使用antd原生下拉框 -->
+                <a-select name="style" v-model:value="cameraForm.style" :disabled="!flag || !changeTag">
+                  <template :key="Number(cameraStyle.value)" v-for="cameraStyle in cameraStyles">
+                    <a-select-option :value="Number(cameraStyle.value)">{{ cameraStyle.text }}</a-select-option>
+                  </template>
+                </a-select>
+              </a-col>
+            </a-form-item>
+
+            <a-form-item label="安装高度" class="mustInput" name="height">
+              <!-- <a-input v-model="cameraForm.height" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.height" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="录像机" name="videoRecorder">
+              <a-select v-model:value="cameraForm.videoRecorderId" :disabled="!changeTag">
+                <a-select-option v-for="(vr, i) in videoRecorderArr" :value="vr.id" :key="vr.id">
+                  {{ vr.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+            <a-form-item label="相机认证通道号" name="channel">
+              <a-input v-model:value="cameraForm.channel" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="视频预览RTSP地址" name="preRtsp">
+              <a-input v-model:value="cameraForm.preRtsp" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="视频分析RTSP地址" name="analysisRtsp">
+              <a-input v-model:value="cameraForm.analysisRtsp" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="视频录像RTSP地址" name="recordRtsp">
+              <a-input v-model:value="cameraForm.recordRtsp" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="Web播放地址" name="webcastAddress">
+              <a-input v-model:value="cameraForm.webcastAddress" :disabled="!changeTag" />
+            </a-form-item>
+          </a-form>
+          <a-form
+            style="flex: 1"
+            class="antd-modal-form"
+            :label-col="{ span: 6, offset: 0 }"
+            :wrapper-col="{ span: 14 }"
+            ref="ruleForm"
+            :model="cameraForm"
+          >
+            <a-form-item label="地理经度" name="longitude">
+              <a-input v-model:value="cameraForm.longitude" disabled />
+            </a-form-item>
+            <a-form-item label="地理纬度" name="latitude">
+              <a-input v-model:value="cameraForm.latitude" disabled />
+            </a-form-item>
+            <!-- <a-form-model-item :wrapper-col="{offset:8,span:14}" name="style">
+                                                                                                                                  <j-dict-select-tag v-model="cameraForm.style" placeholder="选择" dictCode="ms_camera_style"/>
+                                                                                                                                </a-form-model-item>-->
+            <a-form-item label="视线水平左夹角" name="leftAngle">
+              <!-- <a-input v-model="cameraForm.leftAngle" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.leftAngle" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="视线水平右夹角" name="rightAngle">
+              <!-- <a-input v-model="cameraForm.rightAngle" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.rightAngle" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="视野中央有效视距" name="viewDistance">
+              <!-- <a-input v-model="cameraForm.viewDistance" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.viewDistance" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="采样帧率" name="frameRate">
+              <!-- <a-input v-model="cameraForm.frameRate" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.frameRate" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="最大跟踪范围" name="maxRange">
+              <!-- <a-input v-model="cameraForm.maxRange" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.maxRange" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="云台控制IP" name="cloudCtrlIp">
+              <a-input v-model:value="cameraForm.cloudCtrlIp" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="云台控制端口" name="cloudCtrlPort">
+              <a-input v-model:value="cameraForm.cloudCtrlPort" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="零方位角" name="zeroAzimuth">
+              <!-- <a-input v-model="cameraForm.zeroAzimuth" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.zeroAzimuth" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="最大仰角" name="maxElevation">
+              <!-- <a-input v-model="cameraForm.maxElevation" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.maxElevation" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="安装垂直角" name="fixedAngle">
+              <!-- <a-input v-model="cameraForm.fixedAngle" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.fixedAngle" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="最大可视距离" name="maxVisibleDistance">
+              <!-- <a-input v-model="cameraForm.maxVisibleDistance" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.maxVisibleDistance" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="变倍因子" name="zoomFactor">
+              <!-- <a-input v-model="cameraForm.zoomFactor" type="number" :disabled="!changeTag" /> -->
+              <a-input-number v-model:value="cameraForm.zoomFactor" :disabled="!changeTag" style="width: 100%" />
+            </a-form-item>
+            <a-form-item label="报警持续时间（秒）" name="alarmNum">
+              <a-input-number placeholder="" style="width: 100%" v-model:value="cameraForm.alarmNum" :disabled="!changeTag" />
+            </a-form-item>
+            <a-form-item label="白光时间段" name="dayBeginTime">
+              <a-col :span="11">
+                <a-time-picker
+                  name="dayBeginTime"
+                  valueFormat="HH:mm:ss"
+                  placeholder=""
+                  v-model:value="cameraForm.dayBeginTime"
+                  style="width: 100%"
+                  format="HH:mm:ss"
+                  :disabled="!changeTag"
+                />
+              </a-col>
+              <a-col class="timePeriodDelimiter" span="2"> - </a-col>
+              <a-col :span="11">
+                <a-form-item name="dayEndTime">
+                  <a-time-picker
+                    name="dayEndTime"
+                    valueFormat="HH:mm:ss"
+                    placeholder=""
+                    v-model:value="cameraForm.dayEndTime"
+                    style="width: 100%"
+                    :disabled="!changeTag"
+                    format="HH:mm:ss"
+                /></a-form-item>
+              </a-col>
+            </a-form-item>
+          </a-form>
+        </div>
+        <div class="menuBottom">
+          <a-button @click="submitForm" type="primary" :disabled="!addOrEdit"> 提交 </a-button>
+          <a-button style="margin-left: 10px" @click="fromReset()"> 重置 </a-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, onMounted } from 'vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import axios from 'axios';
+  import { defHttp } from '/@/utils/http/axios';
+  import { Modal } from 'ant-design-vue';
+
+  // 厂家
+  const cameraFactorys: any = ref([]);
+  // 类型
+  const cameraTypes: any = ref([]);
+  const cameraStyles: any = ref([]);
+
+  // 获取场景类型字典
+  const getCameraFactory = () => {
+    return defHttp.get({ url: '/sys/dict/getDictItems/ms_camera_factory' }, { isTransformResponse: false });
+  };
+  //获取场景类型字典
+  const getCameraType = () => {
+    return defHttp.get({ url: '/sys/dict/getDictItems/ms_camera_type' }, { isTransformResponse: false });
+  };
+  //获取场景类型字典
+  const getCameraStyle = () => {
+    return defHttp.get({ url: '/sys/dict/getDictItems/ms_camera_style' }, { isTransformResponse: false });
+  };
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 18 } });
+
+  const reNewBtn = ref();
+  const userStore = useUserStore();
+  const { createMessage } = useMessage();
+  const x = 3;
+  const y = 2;
+  const z = 1;
+  // const gData = []
+  // const dataList = []
+
+  const getParentKey = (key, tree) => {
+    let parentKey;
+    for (let i = 0; i < tree.length; i++) {
+      const node = tree[i];
+      if (node.children) {
+        if (node.children.some((item) => item.id === key)) {
+          parentKey = node.id;
+        } else if (getParentKey(key, node.children)) {
+          parentKey = getParentKey(key, node.children);
+        }
+      }
+    }
+    return parentKey;
+  };
+
+  const expandedKeys: any = ref([]);
+  const searchValue = ref('');
+  const autoExpandParent = ref(true);
+  const gData: any = ref([]);
+  const treeData: any = ref([]);
+  const dataList: any = ref([]);
+  const replaceFields = ref({
+    key: 'id',
+    title: 'name',
+    children: 'children',
+  });
+  const url = ref({
+    getSiteCameraInfo: '/military/camera/site/getSiteCameraInfo',
+    getCameraInfoById: '/military/camera/setting/queryById',
+    add: '/military/camera/setting/add',
+    edit: '/military/camera/setting/edit',
+    delete: '/military/camera/setting/delete',
+    getVideoRecorderInfo: '/military/videoRecorder/qryCameraList',
+    getVMCameraInfo: '/third/api/getVMCameraInfo',
+  });
+  const lineNameTemp = ref('');
+  const siteNameTemp = ref('');
+  const vrNameTemp = ref('');
+  const dataId = ref('');
+  const cancelFlag = ref(false);
+  const flag = ref(false);
+  const changeTag = ref(false);
+  const getTag = ref(false);
+  const addOrEdit = ref(false);
+  const cameraForm: any = ref({
+    id: '',
+    ip: '',
+    ip2: '',
+    port: '',
+    factory: '',
+    style: '',
+    type: '',
+    user: '',
+    siteId: '',
+    password: '',
+    channel: '',
+    preRtsp: '',
+    analysisRtsp: '',
+    recordRtsp: '',
+    lineName: '',
+    siteName: '',
+    cloudCtrlIp: '',
+    cloudCtrlPort: '',
+    cameraName: '',
+    latitude: '',
+    longitude: '',
+    height: '',
+    videoRecorder: '',
+    cameraType: '',
+    cameraColor: '',
+    leftAngle: '',
+    rightAngle: '',
+    viewDistance: '',
+    frameRate: '',
+    maxRange: '',
+    zeroAzimuth: '',
+    maxElevation: '',
+    fixedAngle: '',
+    maxVisibleDistance: '',
+    zoomFactor: '',
+    videoRecorderId: '',
+    dayBeginTime: '',
+    dayEndTime: '',
+    alarmNum: undefined,
+    webcastAddress: '',
+  });
+  const lineArr: any = ref([]); //线路数据
+  const siteData: any = ref({}); //线路站点对应关系
+  const siteArr: any = ref([]); //站点数据
+  const videoRecorderArr: any = ref([]); //录像机数据
+
+  onMounted(() => {
+    dataList.value.length = 0;
+    getTreeInfo();
+    // 厂家
+    getCameraFactory().then((response) => {
+      if (response.success) {
+        cameraFactorys.value = response.result;
+      }
+    });
+    // 类型
+    getCameraType().then((response) => {
+      if (response.success) {
+        cameraTypes.value = response.result;
+      }
+    }),
+      getCameraStyle().then((response) => {
+        if (response.success) {
+          cameraStyles.value = response.result;
+        }
+      });
+    getVideoRecorderArr();
+  });
+
+  function handleLineChange(id) {
+    changeSiteArr(id);
+  }
+
+  function handleSiteChange(id) {
+    cameraForm.value.siteId = id;
+  }
+
+  function changeSiteArr(id) {
+    let lineLen = gData.value.length;
+    siteArr.value = [];
+    for (let i = 0; i < lineLen; i++) {
+      let lineData: any = gData.value[i];
+      if (gData.value[i].id === id) {
+        if (lineData.children !== null && lineData.children.length > 0) {
+          let siteTempArr = lineData.children;
+          for (let j = 0; j < siteTempArr.length; j++) {
+            let siteData = siteTempArr[j];
+            siteArr.value.push({ id: siteData.id, name: siteData.name });
+          }
+        } else {
+          siteArr.value.push({ id: '', name: '' });
+        }
+      }
+    }
+    cameraForm.value.siteId = siteArr.value[0].id;
+    cameraForm.value.siteName = siteArr.value[0].name;
+    siteNameTemp.value = cameraForm.value.siteName; //改变线路，默认回显该线路的第一个站点
+  }
+
+  function add() {
+    addOrEdit.value = true;
+    cancelFlag.value = true;
+    changeTag.value = true;
+    getTag.value = false;
+    dataId.value = '';
+    fromClear();
+  }
+
+  function edit() {
+    if (cameraForm.value.type == '1' || cameraForm.value.type == '3') {
+      flag.value = true;
+    } else {
+      cameraForm.value.style = '';
+      flag.value = false;
+    }
+
+    if (cameraForm.value.id == '') {
+      // this.$message.info("请先选择需要修改的数据!");
+      createMessage.info('请先选择需要修改的数据!');
+      return false;
+    }
+    cancelFlag.value = true;
+    addOrEdit.value = true;
+    changeTag.value = true;
+  }
+
+  function del() {
+    Modal.confirm({
+      title: '确认删除',
+      content: '是否删除选中数据?',
+      onOk: function () {
+        defHttp
+          .delete(
+            {
+              url: url.value.delete,
+              params: { id: cameraForm.value.id },
+            },
+            { joinParamsToUrl: true, isTransformResponse: false }
+          )
+          //   deleteAction(that.url.delete, {id: that.cameraForm.id})
+          .then((res) => {
+            if (res.success) {
+              createMessage.success(res.message);
+              fromClear();
+              getTreeInfo();
+              getTag.value = false;
+            } else {
+              createMessage.warning(res.message);
+            }
+          });
+        changeTag.value = false;
+        cancelFlag.value = false;
+        addOrEdit.value = false;
+      },
+    });
+  }
+
+  function submitForm() {
+    const pattern =
+      /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
+    let settingId = cameraForm.value.id;
+    let cloudCtrlIp = cameraForm.value.cloudCtrlIp;
+    let cloudCtrlPort = cameraForm.value.cloudCtrlPort;
+    let cameraName = cameraForm.value.cameraName;
+    let siteName = cameraForm.value.siteName;
+    let ip = cameraForm.value.ip;
+    let ip2 = cameraForm.value.ip2;
+    let port = cameraForm.value.port;
+    let user = cameraForm.value.user;
+    let password = cameraForm.value.password;
+    let height = cameraForm.value.height;
+    let videoRecorderId = cameraForm.value.videoRecorderId;
+    let type = cameraForm.value.type;
+    let factory = cameraForm.value.factory;
+    let leftAngle = cameraForm.value.leftAngle;
+    let rightAngle = cameraForm.value.rightAngle;
+    let frameRate = cameraForm.value.frameRate;
+    let viewDistance = cameraForm.value.viewDistance;
+    let maxRange = cameraForm.value.maxRange;
+    let zeroAzimuth = cameraForm.value.zeroAzimuth;
+    let maxElevation = cameraForm.value.maxElevation;
+    let fixedAngle = cameraForm.value.fixedAngle;
+    let maxVisibleDistance = cameraForm.value.maxVisibleDistance;
+    let zoomFactor = cameraForm.value.zoomFactor;
+    let channel = cameraForm.value.channel;
+    let style = cameraForm.value.style;
+    cameraForm.value.cloudCtrlIp = cloudCtrlIp ? cloudCtrlIp : ip;
+    let flagList = [
+      {
+        code: siteName,
+        name: '站点名称',
+      },
+      {
+        code: cameraName,
+        name: '相机名',
+      },
+      {
+        code: port,
+        name: '相机端口',
+      },
+      {
+        code: user,
+        name: '相机认证用户名',
+      },
+      {
+        code: password,
+        name: '相机认证密码',
+      },
+      {
+        code: factory,
+        name: '厂家',
+      },
+      {
+        code: type,
+        name: '类型',
+      },
+      {
+        code: ip,
+        name: '相机IP',
+      },
+      {
+        code: ip2,
+        name: '相机备用IP',
+      },
+      {
+        code: height,
+        name: '安装高度',
+      },
+    ];
+    let errorMessage = '';
+    if (!cameraName || !siteName || !port || !user || !password || !height || !type || !factory || !ip || !ip2) {
+      for (const flag of flagList) {
+        if (!flag.code) {
+          errorMessage += flag.name + '、';
+        }
+      }
+      errorMessage = errorMessage.slice(0, errorMessage.length - 1);
+      createMessage.warning(errorMessage + '未填写！');
+      return;
+    } else if (!pattern.test(ip) || !pattern.test(cameraForm.value.cloudCtrlIp) || !pattern.test(ip2)) {
+      createMessage.warning('请检查IP格式并正确填写！');
+      return;
+    }
+    // else if (!pattern.test(this.cameraForm.cloudCtrlIp)){
+    //   this.$message.warning("请正确填写云台IP！");
+    //   return
+    // }
+    cameraForm.value.channel = channel ? channel : '0';
+    cameraForm.value.leftAngle = leftAngle ? leftAngle : '0';
+    cameraForm.value.rightAngle = rightAngle ? rightAngle : '0';
+    cameraForm.value.frameRate = frameRate ? frameRate : '0';
+    cameraForm.value.viewDistance = viewDistance ? viewDistance : '0';
+    cameraForm.value.zeroAzimuth = zeroAzimuth ? zeroAzimuth : '0';
+    cameraForm.value.maxRange = maxRange ? maxRange : '0';
+    cameraForm.value.maxElevation = maxElevation ? maxElevation : '0';
+    cameraForm.value.fixedAngle = fixedAngle ? fixedAngle : '0';
+    cameraForm.value.maxVisibleDistance = maxVisibleDistance ? maxVisibleDistance : '0';
+    cameraForm.value.zoomFactor = zoomFactor ? zoomFactor : '0';
+    cameraForm.value.cloudCtrlIp = cloudCtrlIp ? cloudCtrlIp : ip;
+    cameraForm.value.cloudCtrlPort = cloudCtrlPort ? cloudCtrlPort : port;
+    console.log(cameraForm.value.style);
+    cameraForm.value.style = style ? style : '';
+    console.log(cameraForm.value.style);
+    let http;
+    if (addOrEdit.value) {
+      let httpurl = '';
+      let method = '';
+      if (!cameraForm.value.id) {
+        httpurl += url.value.add;
+        method = 'post';
+        console.log(cameraForm.value.style);
+        http = defHttp.post(
+          {
+            url: httpurl,
+            params: cameraForm.value,
+          },
+          { isTransformResponse: false }
+        );
+      } else {
+        httpurl += url.value.edit;
+        method = 'put';
+        console.log(cameraForm.value.style);
+        http = defHttp.put(
+          {
+            url: httpurl,
+            params: cameraForm.value,
+          },
+          { isTransformResponse: false }
+        );
+      }
+      http
+        // httpAction(httpurl, cameraForm.value, method)
+        .then((res) => {
+          let success_message = cameraForm.value.id ? '修改成功' : '添加成功';
+          let error_message = cameraForm.value.id ? '修改失败' : '添加失败';
+          if (res.success) {
+            createMessage.success(success_message);
+            cameraForm.value = res.result;
+            getTreeInfo();
+            // fromClear();
+          } else {
+            console.log(res);
+            createMessage.warning(error_message);
+          }
+        });
+      cancelFlag.value = false;
+      addOrEdit.value = false;
+      changeTag.value = false;
+      getTag.value = true;
+      flag.value = false;
+    }
+  }
+
+  function selectSite(item, option) {
+    let siteId = option.key;
+    cameraForm.value.siteId = siteId;
+  }
+
+  function typeChange(item) {
+    console.log(item);
+    if (item == '1' || item == '3') {
+      flag.value = true;
+    } else {
+      cameraForm.value.style = '';
+      flag.value = false;
+    }
+  }
+
+  function onSelect(selectedKeys, info) {
+    console.log(selectedKeys);
+    fromClear();
+    addOrEdit.value = false;
+    cancelFlag.value = false;
+    changeTag.value = false;
+    dataId.value = selectedKeys[0];
+    // console.log(selectedKeys,info);
+
+    selectedKeys = selectedKeys;
+    let gDataLen = gData.value.length;
+    getTag.value = false;
+    for (let i = 0; i < gDataLen; i++) {
+      if (gData.value[i].id == dataId.value) {
+        return;
+      }
+    }
+    //请求相机数据
+    console.log('dataId.value', dataId.value);
+
+    defHttp
+      .get(
+        {
+          url: url.value.getCameraInfoById,
+          params: { id: dataId.value },
+        },
+        { isTransformResponse: false }
+      )
+      //   getAction(this.url.getCameraInfoById + "?id=" + this.dataId)
+      .then((res) => {
+        console.log(res);
+        if (res.success) {
+          getTag.value = true;
+          cameraForm.value = res.result;
+          lineNameTemp.value = cameraForm.value.lineName;
+          siteNameTemp.value = cameraForm.value.siteName;
+          vrNameTemp.value = cameraForm.value.videoRecorderName;
+        }
+      });
+  }
+
+  function getTreeInfo() {
+    defHttp
+      .get(
+        {
+          url: url.value.getSiteCameraInfo,
+          // params: model.value
+        },
+        { isTransformResponse: false }
+      )
+      //   httpAction(this.url.getSiteCameraInfo, this.model, 'get')
+      .then((res) => {
+        if (res.success) {
+          gData.value = res.result;
+          treeData.value = gData.value;
+          // console.log("treeData",treeData.value);
+
+          generateList(gData.value);
+          lineArr.value = [];
+          initLineArr();
+        }
+      });
+  }
+
+  function onExpand(onExpandedKeys) {
+    expandedKeys.value = onExpandedKeys;
+    autoExpandParent.value = false;
+  }
+
+  function onChange(e) {
+    let time = null;
+    const value = e.target.value;
+    treeData.value = [];
+    // console.log(time)
+    const expandedKeys = dataList.value.map((item) => {
+      if (value) {
+        if (item.title.indexOf(value) > -1) {
+          console.log(item);
+
+          treeData.value.push({
+            children: [],
+            id: item.key,
+            name: item.title,
+          });
+          // treeData.value = gData.value
+        }
+      } else {
+        treeData.value = gData.value;
+      }
+    });
+
+    // Object.assign(this, {
+    //   expandedKeys,
+    //   searchValue: value,
+    //   autoExpandParent: true
+    // })
+  }
+
+  function generateList(data) {
+    // dataList.length=0
+    // console.log(dataList)
+    for (let i = 0; i < data.length; i++) {
+      const node: any = data[i];
+      const key = node.name;
+      dataList.value.push({ key: node.id, title: node.name });
+      if (node.children) {
+        generateList(node.children);
+      }
+    }
+  }
+
+  function initLineArr() {
+    let lineLen = gData.value.length;
+    for (let i = 0; i < lineLen; i++) {
+      let lineData = gData.value[i];
+      lineArr.value.push({ id: lineData.id, name: lineData.name });
+    }
+  }
+  function cancel() {
+    // fromClear()
+
+    let mycameraForm = cameraForm.value;
+    if (!getTag.value) {
+      // this.getTag = false;
+      cameraForm.value.id = '';
+      cameraForm.value.ip = '';
+      cameraForm.value.ip2 = '';
+      cameraForm.value.channel = '';
+      cameraForm.value.analysisRtsp = '';
+      cameraForm.value.cameraName = '';
+      cameraForm.value.cameraType = '';
+      cameraForm.value.cameraColor = '';
+      cameraForm.value.cloudCtrlIp = '';
+      cameraForm.value.cloudCtrlPort = '';
+      cameraForm.value.latitude = '';
+      cameraForm.value.height = '';
+      cameraForm.value.videoRecorderId = '';
+      cameraForm.value.viewDistance = '';
+      cameraForm.value.frameRate = '';
+      cameraForm.value.leftAngle = '';
+      cameraForm.value.rightAngle = '';
+      cameraForm.value.longitude = '';
+      cameraForm.value.password = '';
+      cameraForm.value.port = '';
+      cameraForm.value.preRtsp = '';
+      cameraForm.value.maxRange = '';
+      cameraForm.value.lineName = '';
+      cameraForm.value.siteName = '';
+      cameraForm.value.user = '';
+      cameraForm.value.type = '';
+      cameraForm.value.factory = '';
+      cameraForm.value.style = '';
+      cameraForm.value.recordRtsp = '';
+      cameraForm.value.siteId = '';
+      cameraForm.value.zeroAzimuth = '';
+      cameraForm.value.maxElevation = '';
+      cameraForm.value.fixedAngle = '';
+      cameraForm.value.maxVisibleDistance = '';
+      cameraForm.value.zoomFactor = '';
+      cameraForm.value.createBy = '';
+      cameraForm.value.createTime = '';
+      cameraForm.value.updateBy = '';
+      cameraForm.value.updateTime = '';
+      cameraForm.value.dayBeginTime = '';
+      cameraForm.value.dayEndTime = '';
+      cameraForm.value.alarmNum = '';
+      lineNameTemp.value = '';
+      siteNameTemp.value = '';
+      vrNameTemp.value = '';
+    } else {
+      defHttp
+        .get(
+          {
+            url: url.value.getCameraInfoById,
+            params: { id: dataId.value },
+          },
+          { isTransformResponse: false }
+        )
+        // getAction(this.url.getCameraInfoById + "?id=" + that.dataId)
+        .then((res) => {
+          if (res.success) {
+            getTag.value = true;
+            cameraForm.value = res.result;
+            lineNameTemp.value = cameraForm.value.lineName;
+            siteNameTemp.value = cameraForm.value.siteName;
+            vrNameTemp.value = cameraForm.value.videoRecorderName;
+          }
+        });
+    }
+    changeTag.value = false;
+    cancelFlag.value = false;
+    addOrEdit.value = false;
+  }
+  function fromReset() {
+    if (dataId.value) {
+      defHttp
+        .get(
+          {
+            url: url.value.getCameraInfoById,
+            params: { id: dataId.value },
+          },
+          { isTransformResponse: false }
+        )
+        // getAction(this.url.getCameraInfoById + "?id=" + that.dataId)
+        .then((res) => {
+          if (res.success) {
+            getTag.value = true;
+            cameraForm.value = res.result;
+            lineNameTemp.value = cameraForm.value.lineName;
+            siteNameTemp.value = cameraForm.value.siteName;
+            vrNameTemp.value = cameraForm.value.videoRecorderName;
+          }
+        });
+    } else {
+      fromClear();
+    }
+  }
+  function fromClear() {
+    // let cameraForm = cameraForm.value;
+    dataId.value = '';
+    cameraForm.value.id = '';
+    cameraForm.value.ip = '';
+    cameraForm.value.ip2 = '';
+    cameraForm.value.channel = '';
+    cameraForm.value.analysisRtsp = '';
+    cameraForm.value.cameraName = '';
+    cameraForm.value.cameraType = '';
+    cameraForm.value.cameraColor = '';
+    cameraForm.value.cloudCtrlIp = '';
+    cameraForm.value.cloudCtrlPort = '';
+    cameraForm.value.latitude = '';
+    cameraForm.value.height = '';
+    cameraForm.value.videoRecorderId = '';
+    cameraForm.value.viewDistance = '';
+    cameraForm.value.frameRate = '';
+    cameraForm.value.leftAngle = '';
+    cameraForm.value.rightAngle = '';
+    cameraForm.value.longitude = '';
+    cameraForm.value.password = '';
+    cameraForm.value.port = '';
+    cameraForm.value.preRtsp = '';
+    cameraForm.value.maxRange = '';
+    cameraForm.value.lineName = '';
+    cameraForm.value.siteName = '';
+    cameraForm.value.user = '';
+    cameraForm.value.type = '';
+    cameraForm.value.factory = '';
+    cameraForm.value.style = '';
+    cameraForm.value.recordRtsp = '';
+    cameraForm.value.siteId = '';
+    cameraForm.value.zeroAzimuth = '';
+    cameraForm.value.maxElevation = '';
+    cameraForm.value.fixedAngle = '';
+    cameraForm.value.maxVisibleDistance = '';
+    cameraForm.value.zoomFactor = '';
+    cameraForm.value.createBy = '';
+    cameraForm.value.createTime = '';
+    cameraForm.value.updateBy = '';
+    cameraForm.value.updateTime = '';
+    cameraForm.value.dayBeginTime = '';
+    cameraForm.value.dayEndTime = '';
+    cameraForm.value.alarmNum = '';
+    lineNameTemp.value = '';
+    siteNameTemp.value = '';
+    vrNameTemp.value = '';
+  }
+  function getVideoRecorderArr() {
+    defHttp
+      .get(
+        {
+          url: url.value.getVideoRecorderInfo,
+        },
+        { isTransformResponse: false }
+      )
+      //   getAction(this.url.getVideoRecorderInfo)
+      .then((res) => {
+        if (res.success) {
+          res.result.forEach((data, index) => {
+            videoRecorderArr.value.push({ id: data.id, name: data.deviceName });
+          });
+        }
+      });
+  }
+  function videoRecorderChange(id) {
+    cameraForm.value.videoRecorderId = id;
+  }
+  function reNew() {
+    reNewBtn.value.spin = true;
+    defHttp
+      .get(
+        {
+          url: url.value.getVMCameraInfo,
+        },
+        { isTransformResponse: false }
+      )
+      //   getAction(this.url.getVMCameraInfo)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success('相机列表更新成功!');
+        } else {
+          createMessage.error(res.message);
+        }
+        getTreeInfo();
+        getVideoRecorderArr();
+        reNewBtn.value.spin = false;
+      });
+  }
+
+  defineExpose({
+    reNewBtn,
+    gData,
+  });
+</script>
+
+<style scoped lang="less">
+  ::-webkit-scrollbar {
+    display: inline-block;
+  }
+
+  ::-webkit-scrollbar-track {
+    background: rgba(0, 0, 0, 0);
+    border-radius: 2px;
+  }
+
+  .ant-form-vertical .ant-form-item {
+    padding-bottom: 0 !important;
+  }
+
+  .cameraBox {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    padding: 5px 15px;
+  }
+
+  .treeBox {
+    flex: 1;
+    padding: 15px 20px;
+    border: #88887770 1px solid;
+    overflow: scroll;
+    max-height: 863px;
+  }
+
+  .menuBox {
+    flex: 4;
+    padding: 0 20px;
+  }
+
+  .menuFrom {
+    display: flex;
+    padding: 15px 0 0 0;
+  }
+
+  .menuBottom {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .mustInput {
+    display: flex;
+    position: relative;
+  }
+
+  .mustInput::before {
+    content: '*';
+    color: red;
+    position: absolute;
+    top: 6px;
+    left: -8px;
+  }
+
+  .timePeriodDelimiter {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    height: 2em;
+  }
+
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+  }
+
+  :deep(.ant-form-item-label) {
+    display: flex;
+    justify-content: flex-start;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorder.api.ts b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorder.api.ts
new file mode 100644
index 0000000..0fd1b6e
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorder.api.ts
@@ -0,0 +1,83 @@
+/*
+ * @Author: Fuyuu 1805498209@qq.com
+ * @Date: 2023-11-24 10:15:24
+ * @LastEditors: Fuyuu 1805498209@qq.com
+ * @LastEditTime: 2023-11-27 09:28:52
+ * @FilePath: \dt-admin-pc\src\views\military\modules\equipment\video\MsVideoRecorder.api.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/videoRecorder/list',
+  save = '/military/videoRecorder/add',
+  edit = '/military/videoRecorder/edit',
+  deleteOne = '/military/videoRecorder/delete',
+  deleteBatch = '/military/videoRecorder/deleteBatch',
+  importExcel = '/military/videoRecorder/importExcel',
+  exportXls = '/military/videoRecorder/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  if (url == Api.edit) {
+    return defHttp.put({ url: url, params }, { isTransformResponse: false });
+  }
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+};
diff --git a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorder.data.ts b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorder.data.ts
new file mode 100644
index 0000000..9de84bc
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorder.data.ts
@@ -0,0 +1,172 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '设备编号',
+    align: "center",
+    dataIndex: 'deviceNum',
+    width:120
+  },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName'
+  },
+  {
+    title: '设备类型',
+    align: "center",
+    dataIndex: 'deviceType_dictText',
+    width:150
+  },
+  {
+    title: '设备地址',
+    align: "center",
+    dataIndex: 'deviceAddress'
+  },
+  {
+    title: '用户姓名',
+    align: "center",
+    dataIndex: 'userName',
+    width:150
+  },
+  {
+    title: '用户密码',
+    align: "center",
+    dataIndex: 'userPassword'
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'isEnable',
+    customRender: ({ text }) => {
+      console.log(text);
+      return text == 0 ? "否" : "是"
+      //  return  render.renderSwitch(text, [{text:'是',value:1},{text: '否',value:0}]);
+    },
+    width:100
+  },
+  {
+    title: '安装位置',
+    align: "center",
+    dataIndex: 'fixedPosition'
+  },
+
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "设备名称",
+    field: 'deviceName',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: "设备类型",
+    field: 'deviceType',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "device_type"
+    },
+    colProps: { span: 6 },
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '设备名称',
+    field: 'deviceName',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入设备名称!' },
+      ];
+    },
+  },
+  {
+    label: '设备类型',
+    field: 'deviceType',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "device_type"
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入设备类型!' },
+      ];
+    },
+  },
+  {
+    label: '设备地址',
+    field: 'deviceAddress',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入设备地址!' },
+      ];
+    },
+  },
+  {
+    label: '用户姓名',
+    field: 'userName',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入用户姓名!' },
+      ];
+    },
+  },
+  {
+    label: '用户密码',
+    field: 'userPassword',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入用户密码!' },
+      ];
+    },
+  },
+  {
+    label: '是否启用',
+    field: 'isEnable',
+    component: 'JSwitch',
+    componentProps: {
+    },
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入是否启用!' },
+      ];
+    },
+  },
+  {
+    label: '安装位置',
+    field: 'fixedPosition',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入安装位置!' },
+      ];
+    },
+  },
+  {
+    label: '设备编号',
+    field: 'deviceNum',
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { required: true, message: '请输入设备编号!' },
+      ];
+    },
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/statistics/MsPatrolStatisticsList.vue b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorderList.vue
similarity index 81%
rename from src/views/military/modules/statistics/MsPatrolStatisticsList.vue
rename to src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorderList.vue
index d8f2ff0..dd89d9e 100644
--- a/src/views/military/modules/statistics/MsPatrolStatisticsList.vue
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/MsVideoRecorderList.vue
@@ -1,8 +1,8 @@
 <!-- 
-  巡逻人员统计
+  录像机管理
 
-  功能划分
-  统计分析 -> 巡逻人员统计
+  目录位置：设备管理 -> 视频监控设备信息 -> 录像机管理
+  功能概述：设置设备的编号、安装位置、用户密码、URL
  -->
 <template>
   <div>
@@ -11,13 +11,13 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
-            <a-form-item label="人员编号" name="userNo">
-              <JInput placeholder="请输入人员编号" v-model:value="queryParam.userNo"></JInput>
+            <a-form-item label="设备名称" name="deviceName">
+              <JInput placeholder="请输入设备名称" v-model:value="queryParam.deviceName"></JInput>
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item label="巡逻人员" name="userName">
-              <JInput placeholder="请输入巡逻人员" v-model:value="queryParam.userName"></JInput>
+            <a-form-item label="设备类型" name="deviceType">
+              <j-dict-select-tag placeholder="请选择设备类型" v-model:value="queryParam.deviceType" dictCode="device_type" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -25,6 +25,8 @@
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" style="margin-left: 8px"> 新增</a-button>
+                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
                 <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -39,9 +41,6 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -75,32 +74,32 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <MsPatrolStatisticsModal ref="registerModal" @success="handleSuccess"></MsPatrolStatisticsModal>
+    <MsVideoRecorderModal ref="registerModal" @success="handleSuccess"></MsVideoRecorderModal>
   </div>
 </template>
 
-<script lang="ts" name="patrol-msPatrolStatistics" setup>
+<script lang="ts" name="camera-msVideoRecorder" setup>
   import { ref, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns } from './MsPatrolStatistics.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsPatrolStatistics.api';
+  import { columns } from './MsVideoRecorder.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsVideoRecorder.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsPatrolStatisticsModal from './components/MsPatrolStatisticsModal.vue';
+  import MsVideoRecorderModal from './components/MsVideoRecorderModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
   import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
-  const toggleSearchStatus = ref<boolean>(false);
+  // const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
-      title: 'ms_patrol_statistics',
+      title: '录像机管理',
       api: list,
       columns,
-      showIndexColumn: true,
-      showActionColumn: false,
       canResize: false,
       useSearchForm: false,
       actionColumn: {
@@ -112,7 +111,7 @@
       },
     },
     exportConfig: {
-      name: '巡逻人员统计表',
+      name: '录像机管理',
       url: getExportUrl,
       params: queryParam,
     },
diff --git a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/components/MsVideoRecorderForm.vue b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/components/MsVideoRecorderForm.vue
new file mode 100644
index 0000000..1555d35
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/components/MsVideoRecorderForm.vue
@@ -0,0 +1,180 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12">
+          <a-form-item label="设备编号" v-bind="validateInfos.deviceNum">
+            <a-input v-model:value="formData.deviceNum" placeholder="请输入设备编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="设备名称" v-bind="validateInfos.deviceName">
+            <a-input v-model:value="formData.deviceName" placeholder="请输入设备名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="设备类型" v-bind="validateInfos.deviceType">
+	          <j-dict-select-tag v-model:value="formData.deviceType" dictCode="device_type" :string-to-number="true" placeholder="请选择设备类型" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="设备地址" v-bind="validateInfos.deviceAddress">
+            <a-input v-model:value="formData.deviceAddress" placeholder="请输入设备地址" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="用户姓名" v-bind="validateInfos.userName">
+            <a-input v-model:value="formData.userName" placeholder="请输入用户姓名" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="用户密码" v-bind="validateInfos.userPassword">
+            <a-input v-model:value="formData.userPassword" placeholder="请输入用户密码" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="是否启用" v-bind="validateInfos.isEnable">
+	          <j-switch v-model:value="formData.isEnable"  :options="['1','0']" :disabled="disabled"></j-switch>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="安装位置" v-bind="validateInfos.fixedPosition">
+            <a-input v-model:value="formData.fixedPosition" placeholder="请输入安装位置" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../MsVideoRecorder.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    deviceName: '',   
+    deviceType: undefined,
+    deviceAddress: '',   
+    userName: '',   
+    userPassword: '',   
+    isEnable: undefined,
+    fixedPosition: '',   
+    deviceNum: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    deviceName: [{ required: true, message: '请输入设备名称!'},],
+    deviceType: [{ required: true, message: '请输入设备类型!'},],
+    deviceAddress: [{ required: true, message: '请输入设备地址!'},],
+    userName: [{ required: true, message: '请输入用户姓名!'},],
+    userPassword: [{ required: true, message: '请输入用户密码!'},],
+    isEnable: [{ required: true, message: '请输入是否启用!'},],
+    fixedPosition: [{ required: true, message: '请输入安装位置!'},],
+    deviceNum: [{ required: true, message: '请输入设备编号!'},],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/components/MsVideoRecorderModal.vue b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/components/MsVideoRecorderModal.vue
new file mode 100644
index 0000000..0eacc51
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/videoManage/components/MsVideoRecorderModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <MsVideoRecorderForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsVideoRecorderForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import MsVideoRecorderForm from './MsVideoRecorderForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(1080);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.api.ts b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.api.ts
new file mode 100644
index 0000000..36905b9
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.api.ts
@@ -0,0 +1,75 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/msDeviceInfo/list',
+  save='/military/msDeviceInfo/add',
+  edit='/military/msDeviceInfo/edit',
+  deleteOne = '/military/msDeviceInfo/delete',
+  deleteBatch = '/military/msDeviceInfo/deleteBatch',
+  importExcel = '/military/msDeviceInfo/importExcel',
+  exportXls = '/military/msDeviceInfo/exportXls',
+
+  relayCorxSwitch= '/alarm/recv/relayCorx/switch',
+}
+
+export const relayCorxSwitch = Api.relayCorxSwitch;
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.data.ts b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.data.ts
new file mode 100644
index 0000000..5fb8bf4
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarm.data.ts
@@ -0,0 +1,98 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '设备编号',
+    align: "center",
+    dataIndex: 'deviceNum'
+  },
+  {
+    title: '设备厂商',
+    align: "center",
+    dataIndex: 'deviceComp_dictText'
+  },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName'
+  },
+
+  {
+    title: '设备IP',
+    align: "center",
+    dataIndex: 'ip'
+  },
+  {
+    title: '监听通信端口',
+    align: "center",
+    dataIndex: 'port'
+  },
+  {
+    title: '设备状态',
+    align: "center",
+    dataIndex: 'state',
+    slots: { customRender: 'state' },
+  },
+  {
+    title: '状态更新时间',
+    align: "center",
+    dataIndex: 'aliveTime'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '设备厂商',
+    field: 'deviceComp',
+    component: 'InputNumber',
+  },
+  {
+    label: '设备名称',
+    field: 'deviceName',
+    component: 'Input',
+  },
+  {
+    label: '设备编号',
+    field: 'deviceNum',
+    component: 'Input',
+  },
+  {
+    label: '设备IP',
+    field: 'ip',
+    component: 'Input',
+  },
+  {
+    label: '监听/通信端口',
+    field: 'port',
+    component: 'InputNumber',
+  },
+  {
+    label: '启用状态',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '心跳更新时间',
+    field: 'aliveTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarmView.vue b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarmView.vue
new file mode 100644
index 0000000..40cbc09
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/PerimeterAlarmView.vue
@@ -0,0 +1,575 @@
+<!-- 
+  电子围网监控
+
+  目录位置： 设备状态实时监控-> 电子围网监控
+  功能概述：管理电子围网的IP、端口、工作状态，可重启、查看故障记录、设置防区
+ -->
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #state="{ record }">
+        <div :style="record.deviceState === '0' ? redStyle : greenStyle" :title="record.deviceState === '0' ? messageRed : messageGreen" />
+      </template>
+
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <!--查询区域-->
+        <div class="jeecg-basic-table-form-container">
+          <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+            <a-row :gutter="24"> </a-row>
+          </a-form>
+        </div>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PerimeterAlarmModal ref="registerModal" @success="handleSuccess"></PerimeterAlarmModal>
+
+    <a-modal :visible="fencesvisible" title="设置防区" :closable="false" style="width: 400px; height: 200px">
+      <a-spin :spinning="fencesLoading">
+        <a-row>
+          <a-col :span="8" v-for="p in pZoneList" :key="p.fencesCode" style="margin-top: 5px">
+            <a-row>
+              <a-col :span="12">
+                <span style="margin-left: 5px">防区编号</span>
+              </a-col>
+              <a-col :span="4">
+                <span>{{ p.fencesCode }}</span>
+              </a-col>
+              <a-col :span="8">
+                <a-switch checked-children="开" un-checked-children="关" @click="updateDefense(p)" :checked="p.fencesState" />
+              </a-col>
+            </a-row>
+          </a-col>
+        </a-row>
+      </a-spin>
+      <template slot="footer">
+        <a-button @click="handleCancel">关闭</a-button>
+      </template>
+    </a-modal>
+
+    <a-modal title="故障记录" :visible="visible" :footer="null" @cancel="handleCancel" :width="1080">
+      <a-table :columns="faultColumns" :data-source="faultRecordData" rowKey="id" @change="handleTableChange">
+        <template #code="{ text }">
+          <a-tag>
+            {{ text }}
+          </a-tag>
+        </template>
+      </a-table>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" name="military-radarDetection" setup>
+  import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './PerimeterAlarm.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, relayCorxSwitch } from './PerimeterAlarm.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import PerimeterAlarmModal from './components/PerimeterAlarmModal.vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import axios from 'axios';
+  import { defHttp } from '/@/utils/http/axios';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  const { createMessage } = useMessage();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '电子围网监控',
+      api: list,
+      columns,
+      showIndexColumn: true,
+      indexColumnProps: {
+        title: '编号',
+      },
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 220,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.deviceType = 3;
+        params.sysOrgCode = userStore.userInfo?.orgCode + '*';
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '电子围网监控',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const url = ref({
+    listById: '/military/msFencesInfo/listById',
+    readDisarmDefencesData: '/alarm/recv/perimeter/alarm/readDisarmDefencesData',
+    setUpDefences: '/alarm/recv/perimeter/alarm/setUpDefences',
+    disarmDefences: '/alarm/recv/perimeter/alarm/disarmDefences',
+  });
+
+  let timer: any = null;
+  //设备状态显示
+  const greenStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#8fc31f',
+    border: '1px solid #8fc31f',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  const redStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#be1508',
+    border: '1px solid #be1508',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  const grayStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#868485',
+    border: '1px solid #868485',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  let messageGreen = '启动';
+  let messageRed = '离线';
+  let messageGray = '异常';
+  //故障表
+  let deviceId = ref('');
+  let ipagination = ref({ current: 0, total: 0 });
+  let radarAll: any = ref([]);
+  let faultRecordData = ref([]);
+  let visible = ref(false);
+  // 故障记录表头
+  let faultColumns = ref([
+    {
+      title: '#',
+      width: 50,
+      align: 'center',
+      customRender: ({ index }) => {
+        return `${index + 1}`;
+      },
+    },
+    {
+      title: '故障码',
+      align: 'center',
+      dataIndex: 'code',
+      // scopedSlots: { customRender: 'code' }
+      slots: { customRender: 'code' },
+    },
+    {
+      title: '描述',
+      align: 'center',
+      dataIndex: 'content',
+    },
+    {
+      title: '发生时间',
+      align: 'center',
+      dataIndex: 'happenTime',
+    },
+  ]);
+  // let paginationOpt = ref({
+  //         defaultCurrent: 1, // 默认当前页数
+  //         defaultPageSize: 10, // 默认当前页显示数据的大小
+  //         total: 0, // 总数，必须先有
+  //         showSizeChanger: true,
+  //         showQuickJumper: true,
+  //         pageSizeOptions: ['5', '10', '15', '20'],
+  //         showTotal: (total) => `共 ${total} 条`, // 显示总数
+  //         onShowSizeChange: (current, pageSize) => {
+  //           paginationOpt.value.defaultCurrent = 1
+  //           paginationOpt.value.defaultPageSize = pageSize
+  //           getDataList()
+  //         },
+  //         // 改变每页数量时更新显示
+  //         onChange: (current, size) => {
+  //           paginationOpt.value.defaultCurrent = current
+  //           paginationOpt.value.defaultPageSize = size
+  //           getDataList()
+  //         }
+  //       })
+
+  //设置防区////////////////////////////////////////////////////////////////
+  const fencesLoading = ref(true);
+  // 防区列表
+  const pZoneList: any = ref([]);
+  const fencesvisible = ref(false);
+  const selectAlarm = ref(''); // 选中的电子围网设备
+
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  //重启
+  function handleOpen(record) {
+    const service = axios.create({
+      timeout: 9000, // 请求超时时间
+    });
+    if (record.deviceComp === 1) {
+      // 雷远雷达
+      let params = {
+        device: record,
+        position: 0,
+        status: false,
+      };
+      // 发送请求关闭继电器
+      service.post(relayCorxSwitch, params).then((res) => {
+        if (res.data.success) {
+          setTimeout(function () {
+            params.status = true;
+            // 发送请求开启继电器
+            service.post(relayCorxSwitch, params).then((res) => {
+              if (res.data.success) {
+                // message.success('重启成功')
+                createMessage.success('重启成功');
+              } else {
+                // message.warning('重启失败:' + res.data.message)
+                createMessage.warning('重启失败:' + res.data.message);
+              }
+            });
+          }, 1000);
+        } else {
+          // message.warning('重启失败:' + res.data.message)
+          createMessage.warning('重启失败:' + res.data.message);
+        }
+      });
+    } else {
+      // 赛英雷达时
+      // message.error('该雷达暂不支持重启!')
+      createMessage.error('该雷达暂不支持重启!');
+    }
+  }
+
+  //故障记录********************************************
+  function faultRecord(record) {
+    visible.value = true;
+    deviceId.value = record.id;
+    let params = { deviceId: deviceId.value, column: 'happenTime', order: 'desc', pageNo: 1, pageSize: 10 };
+    getFaultRecordList(params);
+  }
+
+  function getFaultRecordList(params) {
+    defHttp
+      .get(
+        {
+          url: '/military/msFaultRecord/list',
+          params: params,
+        },
+        { isTransformResponse: false }
+      )
+      // getAction('/military/msFaultRecord/list', params)
+      .then((res) => {
+        if (res.success) {
+          faultRecordData.value = res.result.records;
+          ipagination.value.total = res.result.total;
+        }
+      });
+  }
+
+  function handleTableChange(pagination, filters, sorter) {
+    ipagination.value.current = pagination.current;
+    let params = {
+      deviceId: deviceId.value,
+      column: 'happenTime',
+      order: 'desc',
+      pageNo: pagination.current,
+      pageSize: pagination.pageSize,
+    };
+    getFaultRecordList(params);
+  }
+
+  function handleCancel() {
+    visible.value = false;
+    fencesvisible.value = false;
+  }
+
+  function getDataList() {
+    // let column = 'createTime'
+    // let order = 'desc'
+    // const { defaultCurrent, defaultPageSize } = paginationOpt.value
+    // let data = '&pageNo=' + defaultCurrent + '&pageSize=' + defaultPageSize + '&column=' + column + '&order=' + order
+    // defHttp.get({
+    //   url: '/military/msDeviceInfo/list?deviceType=1' + data
+    // },{ isTransformResponse: false })
+    // // getAction('/military/msDeviceInfo/list?deviceType=1' + data)
+    // .then((res) => {
+    //   radarAll.value = res.result.records
+    //   paginationOpt.value.total = res.result.total
+    //   for (let i = 0; i < radarAll.value.length; i++) {
+    //     if (radarAll.value[i].state == 1) {
+    //       radarAll.value[i].state = 1
+    //     } else {
+    //       radarAll.value[i].state = 0
+    //     }
+    //   }
+    // })
+
+    //刷新数据
+    reload();
+  }
+
+  function setDefense(record) {
+    selectAlarm.value = record;
+    fencesvisible.value = true;
+    fencesLoading.value = true;
+    let params = {
+      id: record.id,
+    };
+    defHttp
+      .get(
+        {
+          url: url.value.listById,
+          params: params,
+        },
+        { isTransformResponse: false }
+      )
+      // 获取数据库中的防区列表
+      // getAction(this.url.listById, params)
+      .then((res) => {
+        if (res.success) {
+          pZoneList.value = res.result;
+        }
+        const axiosService = axios.create({
+          timeout: 9000,
+        });
+        let params = {
+          ip: record.ip,
+          port: record.port,
+          host: record.deviceNum,
+        };
+        // 查询设备防区状态
+        axiosService
+          .get(url.value.readDisarmDefencesData, { params: params })
+          .then((res) => {
+            if (res.data.success) {
+              let data = res.data.result.defenceAreaDataList;
+              pZoneList.value.forEach((fences) => {
+                fences.fencesState = data[fences.fencesCode - 1];
+              });
+              fencesLoading.value = false;
+            } else {
+              createMessage.error('查询防区时出错:' + res.data.message);
+              fencesvisible.value = false;
+            }
+          })
+          .catch((_e) => {
+            createMessage.error('查询防区时出错!');
+            fencesvisible.value = false;
+            fencesLoading.value = false;
+          });
+      });
+  }
+
+  function updateDefense(value) {
+    // console.log(selectAlarm)
+    // console.log(value)
+    const service = axios.create({
+      timeout: 9000, // 请求超时时间
+    });
+    let params = {
+      ip: selectAlarm.value.ip,
+      port: selectAlarm.value.port,
+      host: selectAlarm.value.deviceNum,
+      defenceArea: value.fencesCode,
+    };
+    let furl = value.fencesState ? url.value.disarmDefences : url.value.setUpDefences;
+    let msg = value.fencesState ? '撤防' : '设防';
+    service.get(furl, { params: params }).then((res) => {
+      if (res.data.success) {
+        let successMsg = params.host + '号主机, ' + params.defenceArea + '防区' + msg + '成功';
+        createMessage.success(successMsg);
+        value.fencesState = !value.fencesState;
+      } else {
+        let errorMsg = params.host + '号主机, ' + params.defenceArea + '防区' + msg + '失败:' + res.data.message;
+        createMessage.error(errorMsg);
+      }
+    });
+  }
+
+  onMounted(() => {
+    timer = window.setInterval(() => {
+      getDataList();
+    }, 5000);
+  });
+
+  onBeforeUnmount(() => {
+    // vue程序销毁时，需要清理相关资源
+    clearInterval(timer); //清除定时器
+    timer = null;
+  });
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      // {
+      //   label: '编辑',
+      //   onClick: handleEdit.bind(null, record),
+      // },
+      {
+        label: '重启',
+        onClick: handleOpen.bind(null, record),
+      },
+      {
+        label: '设置防区',
+        onClick: setDefense.bind(null, record),
+      },
+      {
+        label: '故障记录',
+        onClick: faultRecord.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      // {
+      //   label: '详情',
+      //   onClick: handleDetail.bind(null, record),
+      // }, {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //   }
+      // }
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmForm.vue b/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmForm.vue
new file mode 100644
index 0000000..5e8e221
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmForm.vue
@@ -0,0 +1,163 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="设备厂商" v-bind="validateInfos.deviceComp">
+	          <a-input-number v-model:value="formData.deviceComp" placeholder="请输入设备厂商" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备名称" v-bind="validateInfos.deviceName">
+            <a-input v-model:value="formData.deviceName" placeholder="请输入设备名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备编号" v-bind="validateInfos.deviceNum">
+            <a-input v-model:value="formData.deviceNum" placeholder="请输入设备编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备IP" v-bind="validateInfos.ip">
+            <a-input v-model:value="formData.ip" placeholder="请输入设备IP" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="监听/通信端口" v-bind="validateInfos.port">
+	          <a-input-number v-model:value="formData.port" placeholder="请输入监听/通信端口" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="启用状态" v-bind="validateInfos.state">
+	          <a-input-number v-model:value="formData.state" placeholder="请输入启用状态" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="心跳更新时间" v-bind="validateInfos.aliveTime">
+		        <a-date-picker placeholder="请选择心跳更新时间"  v-model:value="formData.aliveTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../PerimeterAlarm.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    deviceComp: undefined,
+    deviceName: '',   
+    deviceNum: '',   
+    ip: '',   
+    port: undefined,
+    state: undefined,
+    aliveTime: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmModal.vue b/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmModal.vue
new file mode 100644
index 0000000..c94564c
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/perimeterAlarm/components/PerimeterAlarmModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <RadarDetectionForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></RadarDetectionForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick } from 'vue';
+  import RadarDetectionForm from './PerimeterAlarmForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.api.ts b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.api.ts
new file mode 100644
index 0000000..ac14aa2
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.api.ts
@@ -0,0 +1,76 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/msDeviceInfo/list',
+  save='/military/msDeviceInfo/add',
+  edit='/military/msDeviceInfo/edit',
+  deleteOne = '/military/msDeviceInfo/delete',
+  deleteBatch = '/military/msDeviceInfo/deleteBatch',
+  importExcel = '/military/msDeviceInfo/importExcel',
+  exportXls = '/military/msDeviceInfo/exportXls',
+
+  relayCorxSwitch= '/alarm/recv/relayCorx/switch',
+}
+
+export const relayCorxSwitch = Api.relayCorxSwitch;
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.data.ts b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.data.ts
new file mode 100644
index 0000000..7d31d19
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/Photoelectric.data.ts
@@ -0,0 +1,99 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '设备编号',
+    align: "center",
+    dataIndex: 'deviceNum'
+  },
+  {
+    title: '设备厂商',
+    align: "center",
+    // dataIndex: 'deviceComp'
+    dataIndex: 'deviceComp_dictText'
+  },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName'
+  },
+
+  {
+    title: '设备IP',
+    align: "center",
+    dataIndex: 'ip'
+  },
+  {
+    title: '监听通信端口',
+    align: "center",
+    dataIndex: 'port'
+  },
+  {
+    title: '设备状态',
+    align: "center",
+    dataIndex: 'state',
+    slots: { customRender: 'state' },
+  },
+  {
+    title: '状态更新时间',
+    align: "center",
+    dataIndex: 'aliveTime'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '设备厂商',
+    field: 'deviceComp',
+    component: 'InputNumber',
+  },
+  {
+    label: '设备名称',
+    field: 'deviceName',
+    component: 'Input',
+  },
+  {
+    label: '设备编号',
+    field: 'deviceNum',
+    component: 'Input',
+  },
+  {
+    label: '设备IP',
+    field: 'ip',
+    component: 'Input',
+  },
+  {
+    label: '监听/通信端口',
+    field: 'port',
+    component: 'InputNumber',
+  },
+  {
+    label: '启用状态',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '心跳更新时间',
+    field: 'aliveTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/equipmentMonitor/photoelectric/PhotoelectricList.vue b/src/views/military/modules/equipmentMonitor/photoelectric/PhotoelectricList.vue
new file mode 100644
index 0000000..3fdec80
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/PhotoelectricList.vue
@@ -0,0 +1,471 @@
+<!-- 
+  光电监控
+
+  目录位置： 设备状态实时监控-> 光电监控
+  功能概述：查看光电设备的IP、端口、工作状态，可重启、查看故障记录
+ -->
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #state="{ record }">
+        <div :style="record.deviceState === '0' ? redStyle : greenStyle" :title="record.deviceState === '0' ? messageRed : messageGreen" />
+      </template>
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PhotoelectricModal ref="registerModal" @success="handleSuccess"></PhotoelectricModal>
+
+    <a-modal :title="modalTitle" :visible="visible" :footer="null" @cancel="handleCancel" :width="800" destroyOnClose>
+      <a-input-group>
+        <a-row :gutter="8">
+          <a-col :span="8">
+            <a-button @click="faultDiagnose" :disabled="diagnoseBtn">开始诊断</a-button>
+            <a-divider type="vertical" />
+            <a-checkbox :checked="deepDiagnose" @change="diagnoseChange">深度诊断</a-checkbox>
+          </a-col>
+          <a-col :span="5">
+            <a-button @click="faultDiagnoseStop" :disabled="!diagnoseBtn">停止诊断</a-button>
+          </a-col>
+          <a-col :span="8">
+            <a-input addon-before="进度" :value="progressVal" style="width: 200px" disabled />
+          </a-col>
+        </a-row>
+      </a-input-group>
+      <br />
+      <a-textarea :value="diagnoseResult" :auto-size="{ minRows: 6, maxRows: 25 }" />
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" name="military-photoelectric" setup>
+  import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './Photoelectric.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, relayCorxSwitch } from './Photoelectric.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import PhotoelectricModal from './components/PhotoelectricModal.vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import axios from 'axios';
+  import { defHttp } from '/@/utils/http/axios';
+  import { Modal } from 'ant-design-vue';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  const { createMessage } = useMessage();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '光电监控',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      showIndexColumn: true,
+      indexColumnProps: {
+        title: '编号',
+      },
+      actionColumn: {
+        width: 180,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.deviceType = 2;
+        params.sysOrgCode = userStore.userInfo?.orgCode + '*';
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '光电监控',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  let progressVal = ref('');
+  let diagnoseResult = ref('');
+  let diagnoseTimer: any = ref(null);
+  let radarAll: any = ref([]);
+  let visible = ref(false);
+  let diagnoseBtn = ref(false);
+  let deepDiagnose = ref(false);
+  let timer: any = null;
+  let modalRecord: any = ref(null);
+  //设备状态显示
+  const greenStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#8fc31f',
+    border: '1px solid #8fc31f',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  const redStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#be1508',
+    border: '1px solid #be1508',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  const grayStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#868485',
+    border: '1px solid #868485',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  let messageGreen = '启动';
+  let messageRed = '离线';
+  let messageGray = '异常';
+  let modalTitle = '故障诊断';
+  // let paginationOpt = ref({
+  //   defaultCurrent: 1, // 默认当前页数
+  //   defaultPageSize: 10, // 默认当前页显示数据的大小
+  //   total: 0, // 总数，必须先有
+  //   showSizeChanger: true,
+  //   showQuickJumper: true,
+  //   pageSizeOptions: ['5', '10', '15', '20'],
+  //   showTotal: (total) => `共 ${total} 条`, // 显示总数
+  //   onShowSizeChange: (current, pageSize) => {
+  //     paginationOpt.value.defaultCurrent = 1
+  //     paginationOpt.value.defaultPageSize = pageSize
+  //     getDataList()
+  //   },
+  //   // 改变每页数量时更新显示
+  //   onChange: (current, size) => {
+  //     paginationOpt.value.defaultCurrent = current
+  //     paginationOpt.value.defaultPageSize = size
+  //     getDataList()
+  //   }
+  // })
+
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  onMounted(() => {
+    timer = window.setInterval(() => {
+      getDataList();
+    }, 5000);
+  });
+
+  onBeforeUnmount(() => {
+    // vue程序销毁时，需要清理相关资源
+    clearInterval(timer); //清除定时器
+    timer = null;
+  });
+
+  function handleCancel() {
+    visible.value = false;
+  }
+  function handleOpen(record) {
+    if (record.deviceState === '0') {
+      // message.warn('设备处于离线状态，无法进行故障诊断')
+      createMessage.warn('设备处于离线状态，无法进行故障诊断');
+      return;
+    }
+    visible.value = true;
+    modalRecord.value = record;
+  }
+  function getDataList() {
+    // let column = 'createTime'
+    // let order = 'desc'
+    // const { defaultCurrent, defaultPageSize } = paginationOpt.value
+    // let data = '&pageNo=' + defaultCurrent + '&pageSize=' + defaultPageSize + '&column=' + column + '&order=' + order
+    // defHttp.get({
+    //   url: '/military/msDeviceInfo/list?deviceType=2' + data
+    // }, { isTransformResponse: false })
+    //   .then((res) => {
+    //     radarAll.value = res.result.records
+    //     paginationOpt.value.total = res.result.total
+    //     for (let i = 0; i < radarAll.value.length; i++) {
+    //       if (radarAll.value[i].state == 1) {
+    //         radarAll.value[i].state = 1
+    //       } else {
+    //         radarAll.value[i].state = 0
+    //       }
+    //     }
+    //   })
+    //刷新数据
+    reload();
+  }
+  function reboot(record) {
+    // console.log(record);
+
+    if (record.deviceState === '0') {
+      // message.warn('设备处于离线状态，无法重启')
+      createMessage.warn('设备处于离线状态，无法重启');
+      return;
+    }
+    defHttp
+      .get({
+        url: '/military/msDeviceInfo/cameraReboot',
+        params: { deviceIp: record.ip },
+      })
+      // getAction('/military/msDeviceInfo/cameraReboot', { deviceIp: record.ip })
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+        } else {
+          createMessage.error(res.message);
+        }
+      });
+  }
+
+  function diagnoseChange(e) {
+    if (!deepDiagnose.value) {
+      Modal.confirm({
+        title: '提示',
+        content: '深度诊断会将可见光、热像、云台等组件重启，需要等待一段时间，是否确认？',
+        onOk() {
+          deepDiagnose.value = true;
+        },
+      });
+    } else {
+      deepDiagnose.value = e.target.checked;
+    }
+  }
+
+  function faultDiagnose() {
+    diagnoseBtn.value = !diagnoseBtn.value;
+    progressVal.value = '';
+    diagnoseResult.value = '';
+
+    let type = 0;
+    if (deepDiagnose.value) {
+      type = 1;
+    }
+    defHttp
+      .get({
+        url: '/military/msDeviceInfo/cameraFaultDiagnose',
+        params: { deviceIp: modalRecord.value.ip, flag: true, type: type },
+      })
+      // getAction('/military/msDeviceInfo/cameraFaultDiagnose', { deviceIp: this.modalRecord.ip, flag: true, type: type })
+      .then((res) => {
+        if (res.success) {
+          diagnoseTimer.value = setInterval(faultDiagnoseResult, 1500);
+        } else {
+          createMessage.error(res.message);
+        }
+      });
+  }
+
+  function faultDiagnoseStop() {
+    diagnoseBtn.value = !diagnoseBtn.value;
+    defHttp
+      .get({
+        url: '/military/msDeviceInfo/cameraFaultDiagnose',
+        params: { deviceIp: modalRecord.value.ip, flag: false },
+      })
+      // getAction('/military/msDeviceInfo/cameraFaultDiagnose', { deviceIp: this.modalRecord.ip, flag: false })
+      .then((res) => {
+        if (res.success) {
+          clearInterval(diagnoseTimer.value);
+          diagnoseTimer.value = null;
+          diagnoseResult.value += '\n故障诊断已停止。';
+        } else {
+          createMessage.error(res.message);
+        }
+      });
+  }
+
+  function faultDiagnoseResult() {
+    defHttp
+      .get({
+        url: '/military/msDeviceInfo/getDiagnoseResult',
+        params: { deviceIp: modalRecord.value.ip },
+      })
+      // getAction('/military/msDeviceInfo/getDiagnoseResult', { deviceIp: this.modalRecord.ip })
+      .then((res) => {
+        if (res.success) {
+          //诊断结果
+          diagnoseResult.value = JSON.stringify(res.result.faultResult)
+            .replace(/{/g, '')
+            .replace(/}/g, '')
+            .replace(/":/g, '：')
+            .replace(/",/g, '\n')
+            .replace(/"/g, '');
+          //进度
+          progressVal.value = res.result.status + '/' + res.result.statusMax;
+          //若达到最大诊断项，则停止诊断
+          if (res.result.status == res.result.statusMax) {
+            clearInterval(diagnoseTimer.value);
+            diagnoseTimer.value = null;
+            diagnoseResult.value += '\n故障诊断完成。';
+            diagnoseBtn.value = !diagnoseBtn.value;
+          }
+        }
+      });
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      // {
+      //   label: '编辑',
+      //   onClick: handleEdit.bind(null, record),
+      // },
+      {
+        label: '重启',
+        onClick: reboot.bind(null, record),
+      },
+      {
+        label: '故障诊断',
+        onClick: handleOpen.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      // {
+      //   label: '详情',
+      //   onClick: handleDetail.bind(null, record),
+      // }, {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //   }
+      // }
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/statistics/components/MsPrewarnDaystatisticsForm.vue b/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricForm.vue
similarity index 60%
rename from src/views/military/modules/statistics/components/MsPrewarnDaystatisticsForm.vue
rename to src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricForm.vue
index 2563a3a..1eb0df2 100644
--- a/src/views/military/modules/statistics/components/MsPrewarnDaystatisticsForm.vue
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricForm.vue
@@ -3,40 +3,38 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="发生时间" v-bind="validateInfos.happenTime">
-            <a-date-picker
-              placeholder="请选择发生时间"
-              v-model:value="formData.happenTime"
-              showTime
-              value-format="YYYY-MM-DD HH:mm:ss"
-              style="width: 100%"
-              :disabled="disabled"
-            />
+          <a-form-item label="设备厂商" v-bind="validateInfos.deviceComp">
+	          <a-input-number v-model:value="formData.deviceComp" placeholder="请输入设备厂商" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="预警类型" v-bind="validateInfos.prewarnType">
-            <a-input-number v-model:value="formData.prewarnType" placeholder="请输入预警类型" style="width: 100%" :disabled="disabled" />
+          <a-form-item label="设备名称" v-bind="validateInfos.deviceName">
+            <a-input v-model:value="formData.deviceName" placeholder="请输入设备名称" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="预警级别" v-bind="validateInfos.prewarnLevel">
-            <a-input-number v-model:value="formData.prewarnLevel" placeholder="请输入预警级别" style="width: 100%" :disabled="disabled" />
+          <a-form-item label="设备编号" v-bind="validateInfos.deviceNum">
+            <a-input v-model:value="formData.deviceNum" placeholder="请输入设备编号" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="预警数量" v-bind="validateInfos.prewarnNum">
-            <a-input-number v-model:value="formData.prewarnNum" placeholder="请输入预警数量" style="width: 100%" :disabled="disabled" />
+          <a-form-item label="设备IP" v-bind="validateInfos.ip">
+            <a-input v-model:value="formData.ip" placeholder="请输入设备IP" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="已处理数量" v-bind="validateInfos.processedNum">
-            <a-input-number v-model:value="formData.processedNum" placeholder="请输入已处理数量" style="width: 100%" :disabled="disabled" />
+          <a-form-item label="监听/通信端口" v-bind="validateInfos.port">
+	          <a-input-number v-model:value="formData.port" placeholder="请输入监听/通信端口" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="未处理数量" v-bind="validateInfos.unprocessed">
-            <a-input-number v-model:value="formData.unprocessed" placeholder="请输入未处理数量" style="width: 100%" :disabled="disabled" />
+          <a-form-item label="启用状态" v-bind="validateInfos.state">
+	          <a-input-number v-model:value="formData.state" placeholder="请输入启用状态" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="心跳更新时间" v-bind="validateInfos.aliveTime">
+		        <a-date-picker placeholder="请选择心跳更新时间"  v-model:value="formData.aliveTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -49,46 +47,49 @@
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../MsPrewarnDaystatistics.api';
+  import { saveOrUpdate } from '../Photoelectric.api';
   import { Form } from 'ant-design-vue';
-
+  
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
-    formData: { type: Object, default: () => {} },
-    formBpm: { type: Boolean, default: true },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
   });
   const formRef = ref();
   const useForm = Form.useForm;
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    happenTime: '',
-    prewarnType: undefined,
-    prewarnLevel: undefined,
-    prewarnNum: undefined,
-    processedNum: undefined,
-    unprocessed: undefined,
+    deviceComp: undefined,
+    deviceName: '',   
+    deviceNum: '',   
+    ip: '',   
+    port: undefined,
+    state: undefined,
+    aliveTime: '',   
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
   const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
   const confirmLoading = ref<boolean>(false);
   //表单验证
-  const validatorRules = {};
+  const validatorRules = {
+  };
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
 
   // 表单禁用
-  const disabled = computed(() => {
-    if (props.formBpm === true) {
-      if (props.formData.disabled === false) {
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
         return false;
-      } else {
+      }else{
         return true;
       }
     }
     return props.formDisabled;
   });
 
+  
   /**
    * 新增
    */
@@ -145,6 +146,7 @@
       });
   }
 
+
   defineExpose({
     add,
     edit,
diff --git a/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricModal.vue b/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricModal.vue
new file mode 100644
index 0000000..810140c
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/photoelectric/components/PhotoelectricModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <PhotoelectricForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></PhotoelectricForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import PhotoelectricForm from './PhotoelectricForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/radar/RadarDetection.api.ts b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.api.ts
new file mode 100644
index 0000000..36905b9
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.api.ts
@@ -0,0 +1,75 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/msDeviceInfo/list',
+  save='/military/msDeviceInfo/add',
+  edit='/military/msDeviceInfo/edit',
+  deleteOne = '/military/msDeviceInfo/delete',
+  deleteBatch = '/military/msDeviceInfo/deleteBatch',
+  importExcel = '/military/msDeviceInfo/importExcel',
+  exportXls = '/military/msDeviceInfo/exportXls',
+
+  relayCorxSwitch= '/alarm/recv/relayCorx/switch',
+}
+
+export const relayCorxSwitch = Api.relayCorxSwitch;
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/equipmentMonitor/radar/RadarDetection.data.ts b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.data.ts
new file mode 100644
index 0000000..5fb8bf4
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/radar/RadarDetection.data.ts
@@ -0,0 +1,98 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '设备编号',
+    align: "center",
+    dataIndex: 'deviceNum'
+  },
+  {
+    title: '设备厂商',
+    align: "center",
+    dataIndex: 'deviceComp_dictText'
+  },
+  {
+    title: '设备名称',
+    align: "center",
+    dataIndex: 'deviceName'
+  },
+
+  {
+    title: '设备IP',
+    align: "center",
+    dataIndex: 'ip'
+  },
+  {
+    title: '监听通信端口',
+    align: "center",
+    dataIndex: 'port'
+  },
+  {
+    title: '设备状态',
+    align: "center",
+    dataIndex: 'state',
+    slots: { customRender: 'state' },
+  },
+  {
+    title: '状态更新时间',
+    align: "center",
+    dataIndex: 'aliveTime'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '设备厂商',
+    field: 'deviceComp',
+    component: 'InputNumber',
+  },
+  {
+    label: '设备名称',
+    field: 'deviceName',
+    component: 'Input',
+  },
+  {
+    label: '设备编号',
+    field: 'deviceNum',
+    component: 'Input',
+  },
+  {
+    label: '设备IP',
+    field: 'ip',
+    component: 'Input',
+  },
+  {
+    label: '监听/通信端口',
+    field: 'port',
+    component: 'InputNumber',
+  },
+  {
+    label: '启用状态',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '心跳更新时间',
+    field: 'aliveTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/equipmentMonitor/radar/RadarDetectionList.vue b/src/views/military/modules/equipmentMonitor/radar/RadarDetectionList.vue
new file mode 100644
index 0000000..8baa36b
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/radar/RadarDetectionList.vue
@@ -0,0 +1,456 @@
+<!-- 
+  雷达监控
+
+  目录位置： 设备状态实时监控-> 雷达监控
+  功能概述：管理雷达设备的IP、端口、工作状态，可重启、查看故障记录
+ -->
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #state="{ record }">
+        <div :style="record.deviceState === '0' ? redStyle : greenStyle" :title="record.deviceState === '0' ? messageRed : messageGreen" />
+      </template>
+
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <!--查询区域-->
+        <div class="jeecg-basic-table-form-container">
+          <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+            <a-row :gutter="24"> </a-row>
+          </a-form>
+        </div>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <RadarDetectionModal ref="registerModal" @success="handleSuccess"></RadarDetectionModal>
+
+    <a-modal title="故障记录" :visible="visible" :footer="null" @cancel="handleCancel" :width="1080">
+      <a-table :columns="faultColumns" :data-source="faultRecordData" rowKey="id" @change="handleTableChange">
+        <template #code="{ text }">
+          <a-tag>
+            {{ text }}
+          </a-tag>
+        </template>
+      </a-table>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" name="military-radarDetection" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './RadarDetection.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, relayCorxSwitch } from './RadarDetection.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import RadarDetectionModal from './components/RadarDetectionModal.vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import axios from 'axios';
+  import { defHttp } from '/@/utils/http/axios';
+  import { onMounted } from 'vue';
+  import { onBeforeUnmount } from 'vue';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  const { createMessage } = useMessage();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '雷达监控',
+      api: list,
+      columns,
+      showIndexColumn: true,
+      indexColumnProps: {
+        title: '编号',
+      },
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 180,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.deviceType = 1;
+        params.sysOrgCode = userStore.userInfo?.orgCode + '*';
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '雷达监控',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+
+  let timer: any = null;
+  //设备状态显示
+  const greenStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#8fc31f',
+    border: '1px solid #8fc31f',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  const redStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#be1508',
+    border: '1px solid #be1508',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  const grayStyle = {
+    width: '20px',
+    height: '20px',
+    background: '#868485',
+    border: '1px solid #868485',
+    borderRadius: '50%',
+    margin: '0 auto',
+  };
+  let messageGreen = '启动';
+  let messageRed = '离线';
+  let messageGray = '异常';
+  //故障表
+  let deviceId = ref('');
+  let ipagination = ref({ current: 0, total: 0 });
+  let radarAll: any = ref([]);
+  let faultRecordData = ref([]);
+  let visible = ref(false);
+  // 故障记录表头
+  let faultColumns = ref([
+    {
+      title: '#',
+      width: 50,
+      align: 'center',
+      customRender: ({ index }) => {
+        return `${index + 1}`;
+      },
+    },
+    {
+      title: '故障码',
+      align: 'center',
+      dataIndex: 'code',
+      // scopedSlots: { customRender: 'code' }
+      slots: { customRender: 'code' },
+    },
+    {
+      title: '描述',
+      align: 'center',
+      dataIndex: 'content',
+    },
+    {
+      title: '发生时间',
+      align: 'center',
+      dataIndex: 'happenTime',
+    },
+  ]);
+  // let paginationOpt = ref({
+  //         defaultCurrent: 1, // 默认当前页数
+  //         defaultPageSize: 10, // 默认当前页显示数据的大小
+  //         total: 0, // 总数，必须先有
+  //         showSizeChanger: true,
+  //         showQuickJumper: true,
+  //         pageSizeOptions: ['5', '10', '15', '20'],
+  //         showTotal: (total) => `共 ${total} 条`, // 显示总数
+  //         onShowSizeChange: (current, pageSize) => {
+  //           paginationOpt.value.defaultCurrent = 1
+  //           paginationOpt.value.defaultPageSize = pageSize
+  //           getDataList()
+  //         },
+  //         // 改变每页数量时更新显示
+  //         onChange: (current, size) => {
+  //           paginationOpt.value.defaultCurrent = current
+  //           paginationOpt.value.defaultPageSize = size
+  //           getDataList()
+  //         }
+  //       })
+
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  function handleOpen(record) {
+    const service = axios.create({
+      timeout: 9000, // 请求超时时间
+    });
+    if (record.deviceComp === 1) {
+      // 雷远雷达
+      let params = {
+        device: record,
+        position: 0,
+        status: false,
+      };
+      // 发送请求关闭继电器
+      service.post(relayCorxSwitch, params).then((res) => {
+        if (res.data.success) {
+          setTimeout(function () {
+            params.status = true;
+            // 发送请求开启继电器
+            service.post(relayCorxSwitch, params).then((res) => {
+              if (res.data.success) {
+                // message.success('重启成功')
+                createMessage.success('重启成功');
+              } else {
+                // message.warning('重启失败:' + res.data.message)
+                createMessage.warning('重启失败:' + res.data.message);
+              }
+            });
+          }, 1000);
+        } else {
+          // message.warning('重启失败:' + res.data.message)
+          createMessage.warning('重启失败:' + res.data.message);
+        }
+      });
+    } else {
+      // 赛英雷达时
+      // message.error('该雷达暂不支持重启!')
+      createMessage.error('该雷达暂不支持重启!');
+    }
+  }
+
+  function faultRecord(record) {
+    visible.value = true;
+    deviceId.value = record.id;
+    let params = { deviceId: deviceId.value, column: 'happenTime', order: 'desc', pageNo: 1, pageSize: 10 };
+    getFaultRecordList(params);
+  }
+
+  function getFaultRecordList(params) {
+    defHttp
+      .get(
+        {
+          url: '/military/msFaultRecord/list',
+          params: params,
+        },
+        { isTransformResponse: false }
+      )
+      // getAction('/military/msFaultRecord/list', params)
+      .then((res) => {
+        if (res.success) {
+          faultRecordData.value = res.result.records;
+          ipagination.value.total = res.result.total;
+        }
+      });
+  }
+
+  function handleTableChange(pagination, filters, sorter) {
+    ipagination.value.current = pagination.current;
+    let params = {
+      deviceId: deviceId.value,
+      column: 'happenTime',
+      order: 'desc',
+      pageNo: pagination.current,
+      pageSize: pagination.pageSize,
+    };
+    getFaultRecordList(params);
+  }
+
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  function getDataList() {
+    // let column = 'createTime'
+    // let order = 'desc'
+    // const { defaultCurrent, defaultPageSize } = paginationOpt.value
+    // let data = '&pageNo=' + defaultCurrent + '&pageSize=' + defaultPageSize + '&column=' + column + '&order=' + order
+    // defHttp.get({
+    //   url: '/military/msDeviceInfo/list?deviceType=1' + data
+    // },{ isTransformResponse: false })
+    // // getAction('/military/msDeviceInfo/list?deviceType=1' + data)
+    // .then((res) => {
+    //   radarAll.value = res.result.records
+    //   paginationOpt.value.total = res.result.total
+    //   for (let i = 0; i < radarAll.value.length; i++) {
+    //     if (radarAll.value[i].state == 1) {
+    //       radarAll.value[i].state = 1
+    //     } else {
+    //       radarAll.value[i].state = 0
+    //     }
+    //   }
+    // })
+
+    //刷新数据
+    reload();
+  }
+
+  onMounted(() => {
+    timer = window.setInterval(() => {
+      getDataList();
+    }, 5000);
+  });
+
+  onBeforeUnmount(() => {
+    // vue程序销毁时，需要清理相关资源
+    clearInterval(timer); //清除定时器
+    timer = null;
+  });
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      // {
+      //   label: '编辑',
+      //   onClick: handleEdit.bind(null, record),
+      // },
+      {
+        label: '重启',
+        onClick: handleOpen.bind(null, record),
+      },
+      {
+        label: '故障记录',
+        onClick: faultRecord.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      // {
+      //   label: '详情',
+      //   onClick: handleDetail.bind(null, record),
+      // }, {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //   }
+      // }
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionForm.vue b/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionForm.vue
new file mode 100644
index 0000000..3fb43c7
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionForm.vue
@@ -0,0 +1,163 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="设备厂商" v-bind="validateInfos.deviceComp">
+	          <a-input-number v-model:value="formData.deviceComp" placeholder="请输入设备厂商" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备名称" v-bind="validateInfos.deviceName">
+            <a-input v-model:value="formData.deviceName" placeholder="请输入设备名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备编号" v-bind="validateInfos.deviceNum">
+            <a-input v-model:value="formData.deviceNum" placeholder="请输入设备编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="设备IP" v-bind="validateInfos.ip">
+            <a-input v-model:value="formData.ip" placeholder="请输入设备IP" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="监听/通信端口" v-bind="validateInfos.port">
+	          <a-input-number v-model:value="formData.port" placeholder="请输入监听/通信端口" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="启用状态" v-bind="validateInfos.state">
+	          <a-input-number v-model:value="formData.state" placeholder="请输入启用状态" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="心跳更新时间" v-bind="validateInfos.aliveTime">
+		        <a-date-picker placeholder="请选择心跳更新时间"  v-model:value="formData.aliveTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../RadarDetection.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    deviceComp: undefined,
+    deviceName: '',   
+    deviceNum: '',   
+    ip: '',   
+    port: undefined,
+    state: undefined,
+    aliveTime: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionModal.vue b/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionModal.vue
new file mode 100644
index 0000000..d3caa79
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/radar/components/RadarDetectionModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <RadarDetectionForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></RadarDetectionForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick} from 'vue';
+  import RadarDetectionForm from './RadarDetectionForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/equipmentMonitor/solarEnergy/SiteView.vue b/src/views/military/modules/equipmentMonitor/solarEnergy/SiteView.vue
new file mode 100644
index 0000000..2b3927c
--- /dev/null
+++ b/src/views/military/modules/equipmentMonitor/solarEnergy/SiteView.vue
@@ -0,0 +1,490 @@
+<!-- 
+  太阳能站点监控
+
+  目录位置： 设备状态实时监控-> 太阳能站点监控
+  功能概述：查看光伏控制器、逆变器工作状态
+ -->
+<template>
+  <a-spin :spinning="confirmLoading" class="c1">
+    <div style="margin-left: 200px">
+      <a-divider />
+      <span style="font-size: 20px"><b>站点名称:</b></span
+      ><span style="margin-left: 100px">{{ gateway.GW_id }}</span>
+      <a-select
+        v-model:value="device.deviceName"
+        :show-search="true"
+        :not-found-content="null"
+        :filter-option="true"
+        :allowClear="true"
+        style="width: 180px; margin-left: 800px"
+        placeholder="请选择太阳能控制器"
+        @search="handleSearch"
+        @blur="handleBlur"
+        @change="handleChange"
+      >
+        <a-select-option v-for="(d, index) in device" :key="index" :value="d.deviceName">
+          {{ d.deviceName }}
+        </a-select-option>
+      </a-select>
+
+      <br />
+      <span style="font-size: 20px"><b>MAC:</b></span>
+      <span style="margin-left: 135px">{{ gateway.GW_mac }}</span>
+      <br />
+      <span style="font-size: 20px; margin: 10px auto"><b>MPPT光伏控制器状态</b></span>
+      <a-row style="margin-top: 10px">
+        <a-col :span="4">
+          <div><span>蓄电池电量(%):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.bat_capacity }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>蓄电池电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.bat_vol }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>充电电流(A):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.charge_cur }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>控制器温度(℃):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ gateway.GW_TEMP }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>太阳能板电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.pv_vol }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>太阳能板电流(A):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.pv_cur }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>控制器状态字:</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.ctrl_status }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>总运行天数</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.ctrl_runTime }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>充电功率(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.charge_power }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>负载电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.load_vol }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>负载电流(A):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.load_cur }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>负载功率(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.load_power }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>电池当天最高电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.bat_maxVol_today }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>电池当天最低电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.bat_minVol_today }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>当天充电最大功率(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.max_chargePower }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>当天发电量(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.energyGen_today }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>累计发电量(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.energyACC_today }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>蓄电池总充满次数:</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ MPPT_CTRLR.batFullyCharge_times }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-divider />
+      <span style="font-size: 20px; margin-top: 10px"><b>1号逆变器状态</b></span>
+      <a-row style="margin-top: 10px">
+        <a-col :span="4">
+          <div><span>交流电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.AC_vol }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>交流电流(A):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.AC_cur }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>故障状态:</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.inverter_status }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>输出功率(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.AC_outputPower }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>总电能(KWh):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.AC_totalEnergy }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>功率因数:</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.power_factor }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>碳排放量(KG):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.CO2_output }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>温度(℃):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.temp }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>频率(HZ):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.power_frequency }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>负载电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.load_vol }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>负载电流(A):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.load_cur }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>负载功率(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER1.load_power }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-divider />
+      <span style="font-size: 20px; margin-top: 10px"><b>2号逆变器状态</b></span>
+      <a-row style="margin-top: 10px">
+        <a-col :span="4">
+          <div><span>交流电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.AC_vol }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>交流电流(A):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.AC_cur }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>故障状态:</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.inverter_status }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>输出功率(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.AC_outputPower }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>总电能(KWh):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.AC_totalEnergy }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>功率因数:</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.power_factor }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>碳排放量(KG):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.CO2_output }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>温度(℃):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.temp }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>频率(HZ):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.power_frequency }}</span></div
+          >
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">
+          <div><span>负载电压(V):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.load_vol }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>负载电流(A):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.load_cur }}</span></div
+          >
+        </a-col>
+        <a-col :span="4">
+          <div><span>负载功率(W):</span></div>
+        </a-col>
+        <a-col :span="4">
+          <div
+            ><span>{{ AC_POWER_METER2.load_power }}</span></div
+          >
+        </a-col>
+      </a-row>
+    </div>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import axios from 'axios';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { onMounted, ref } from 'vue';
+
+  const confirmLoading = ref(false);
+  const gateway = ref({});
+  const MPPT_CTRLR = ref({});
+  const AC_POWER_METER1 = ref({});
+  const AC_POWER_METER2 = ref({});
+  const device: any = ref([{}]);
+
+  onMounted(() => {
+    const service = axios.create({
+      timeout: 9000, // 请求超时时间
+    });
+
+    defHttp
+      .get(
+        {
+          url: '/military/msDeviceInfo/list',
+          params: { deviceType: 4 },
+        },
+        { isTransformResponse: false }
+      )
+      // getAction('/military/msDeviceInfo/list?deviceType=4')
+      .then((res) => {
+        if (res.result.records.length == 0) {
+          return;
+        }
+        device.value = res.result.records;
+        let ip = device[0].value.ip;
+        let port = device[0].value.port;
+        let data = 'ip=' + ip + '&port=' + port;
+        service.get('/alarm/recv/photovoltaics/status?' + data).then((res) => {
+          gateway.value = res.data.gateway;
+          MPPT_CTRLR.value = res.data.MPPT_CTRLR;
+          AC_POWER_METER1.value = res.data.AC_POWER_METER1;
+          AC_POWER_METER2.value = res.data.AC_POWER_METER2;
+        });
+      });
+  });
+
+  function handleChange(value) {
+    const service = axios.create({
+      timeout: 9000, // 请求超时时间
+    });
+    defHttp
+      .get(
+        {
+          url: '/military/msDeviceInfo/list',
+          params: { deviceName: value },
+        },
+        { isTransformResponse: false }
+      )
+      //   getAction('/military/msDeviceInfo/list?deviceName=' + value)
+      .then((res) => {
+        let ip = res.result.records[0].ip;
+        let port = res.result.records[0].port;
+        let data = 'ip=' + ip + '&port=' + port;
+        service.get('/alarm/recv/photovoltaics/status?' + data).then((res) => {
+          this.gateway = res.data.gateway;
+          this.MPPT_CTRLR = res.data.MPPT_CTRLR;
+          this.AC_POWER_METER1 = res.data.AC_POWER_METER1;
+          this.AC_POWER_METER2 = res.data.AC_POWER_METER2;
+        });
+      });
+  }
+
+  function handleSearch(value) {
+    handleChange(value);
+  }
+  function handleBlur(value) {
+    // this.result = value
+  }
+</script>
+
+<style>
+  .c1 {
+    font-size: 18px;
+  }
+</style>
diff --git a/src/views/military/modules/case/MsCaseNotification.api.ts b/src/views/military/modules/eventManage/emergencyCommand/caseNotification/MsCaseNotification.api.ts
similarity index 100%
rename from src/views/military/modules/case/MsCaseNotification.api.ts
rename to src/views/military/modules/eventManage/emergencyCommand/caseNotification/MsCaseNotification.api.ts
diff --git a/src/views/military/modules/case/MsCaseNotification.data.ts b/src/views/military/modules/eventManage/emergencyCommand/caseNotification/MsCaseNotification.data.ts
similarity index 100%
rename from src/views/military/modules/case/MsCaseNotification.data.ts
rename to src/views/military/modules/eventManage/emergencyCommand/caseNotification/MsCaseNotification.data.ts
diff --git a/src/views/military/modules/case/MsCaseNotificationList.vue b/src/views/military/modules/eventManage/emergencyCommand/caseNotification/MsCaseNotificationList.vue
similarity index 84%
rename from src/views/military/modules/case/MsCaseNotificationList.vue
rename to src/views/military/modules/eventManage/emergencyCommand/caseNotification/MsCaseNotificationList.vue
index cbb4a78..0a9ad65 100644
--- a/src/views/military/modules/case/MsCaseNotificationList.vue
+++ b/src/views/military/modules/eventManage/emergencyCommand/caseNotification/MsCaseNotificationList.vue
@@ -1,8 +1,8 @@
 <!-- 
   事件通报
 
-  功能划分
-  事件管理 -> 应急指挥-> 事件通报
+  目录位置：事件管理 -> 应急指挥 -> 事件通报
+  功能概述：用于事件通报信息管理，包括通报标题、类型、等级、内容等基础信息的编辑，可进行多条件筛选
  -->
 <template>
   <div>
@@ -12,16 +12,16 @@
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item label="通报类型" name="noticeType">
-              <j-dict-select-tag placeholder="请选择通报类型" v-model:value="queryParam.noticeType" dictCode="ms_notice_type"/>
+              <j-dict-select-tag placeholder="请选择通报类型" v-model:value="queryParam.noticeType" dictCode="ms_notice_type" />
             </a-form-item>
           </a-col>
           <a-col :lg="8">
             <a-form-item label="通报等级" name="noticeLevel">
-              <j-dict-select-tag placeholder="请选择通报等级" v-model:value="queryParam.noticeLevel" dictCode="ms_emer_level"/>
+              <j-dict-select-tag placeholder="请选择通报等级" v-model:value="queryParam.noticeLevel" dictCode="ms_emer_level" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;" class="table-page-search-submitButtons">
+            <span style="float: left" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
@@ -40,8 +40,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -51,25 +51,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -85,7 +86,7 @@
   import { columns } from './MsCaseNotification.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsCaseNotification.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsCaseNotificationModal from './components/MsCaseNotificationModal.vue'
+  import MsCaseNotificationModal from './components/MsCaseNotificationModal.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   const formRef = ref();
@@ -98,7 +99,7 @@
       title: '事件通报',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -109,16 +110,17 @@
       },
     },
     exportConfig: {
-      name: "事件通报",
+      name: '事件通报',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -135,7 +137,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -143,7 +145,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -151,28 +153,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -184,7 +186,7 @@
       // },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -193,14 +195,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -209,7 +212,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -219,10 +222,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -232,14 +231,14 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/case/components/MsCaseNotificationForm.vue b/src/views/military/modules/eventManage/emergencyCommand/caseNotification/components/MsCaseNotificationForm.vue
similarity index 100%
rename from src/views/military/modules/case/components/MsCaseNotificationForm.vue
rename to src/views/military/modules/eventManage/emergencyCommand/caseNotification/components/MsCaseNotificationForm.vue
diff --git a/src/views/military/modules/case/components/MsCaseNotificationModal.vue b/src/views/military/modules/eventManage/emergencyCommand/caseNotification/components/MsCaseNotificationModal.vue
similarity index 100%
rename from src/views/military/modules/case/components/MsCaseNotificationModal.vue
rename to src/views/military/modules/eventManage/emergencyCommand/caseNotification/components/MsCaseNotificationModal.vue
diff --git a/src/views/military/modules/case/MsCaseApproval.vue b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseApproval.vue
similarity index 98%
rename from src/views/military/modules/case/MsCaseApproval.vue
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseApproval.vue
index 3d4a59b..a545dac 100644
--- a/src/views/military/modules/case/MsCaseApproval.vue
+++ b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseApproval.vue
@@ -1,10 +1,9 @@
 <!-- 
   案件审批
 
-  功能划分
-  事件管理 -> 应急指挥-> 案件审批
+  目录位置：事件管理 -> 应急指挥 -> 案件审批
+  功能概述：用于审批案件和进行案件的条件筛选功能
  -->
-
 <template>
   <div>
     <!--查询区域-->
diff --git a/src/views/military/modules/case/MsCaseInfo.api.ts b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseInfo.api.ts
similarity index 100%
rename from src/views/military/modules/case/MsCaseInfo.api.ts
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseInfo.api.ts
diff --git a/src/views/military/modules/case/MsCaseInfo.data.ts b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseInfo.data.ts
similarity index 100%
rename from src/views/military/modules/case/MsCaseInfo.data.ts
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseInfo.data.ts
diff --git a/src/views/military/modules/case/MsCaseInfoList.vue b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseInfoList.vue
similarity index 79%
rename from src/views/military/modules/case/MsCaseInfoList.vue
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseInfoList.vue
index 52057d7..b01c43f 100644
--- a/src/views/military/modules/case/MsCaseInfoList.vue
+++ b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/MsCaseInfoList.vue
@@ -1,8 +1,9 @@
 <!-- 
   接警登记
 
-  功能划分
-  事件管理 -> 应急指挥-> 接警登记
+  目录位置：事件管理 -> 应急指挥 -> 接警登记
+  功能概述：用于案件信息管理，包括案件编号、类型、等级、来源等基础信息的编辑配置，可进行多条件筛选
+
  -->
 <template>
   <div>
@@ -17,23 +18,23 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="案件类型" name="caseType">
-              <j-dict-select-tag placeholder="请选择案件类型" v-model:value="queryParam.caseType" dictCode="ms_case_type"/>
+              <j-dict-select-tag placeholder="请选择案件类型" v-model:value="queryParam.caseType" dictCode="ms_case_type" />
             </a-form-item>
           </a-col>
           <!-- <template v-if="toggleSearchStatus"> -->
-            <a-col :lg="6">
-              <a-form-item label="案件等级" name="caseLevel">
-                <j-dict-select-tag placeholder="请选择案件等级" v-model:value="queryParam.caseLevel" dictCode="ms_emer_level"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item label="案件状态" name="caseState">
-                <j-dict-select-tag placeholder="请选择案件状态" v-model:value="queryParam.caseState" dictCode="ms_case_status"/>
-              </a-form-item>
-            </a-col>
+          <a-col :lg="6">
+            <a-form-item label="案件等级" name="caseLevel">
+              <j-dict-select-tag placeholder="请选择案件等级" v-model:value="queryParam.caseLevel" dictCode="ms_emer_level" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="案件状态" name="caseState">
+              <j-dict-select-tag placeholder="请选择案件状态" v-model:value="queryParam.caseState" dictCode="ms_case_status" />
+            </a-form-item>
+          </a-col>
           <!-- </template> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;" class="table-page-search-submitButtons">
+            <span style="float: left" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
@@ -52,8 +53,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -63,25 +64,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -97,7 +99,7 @@
   import { columns } from './MsCaseInfo.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsCaseInfo.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsCaseInfoModal from './components/MsCaseInfoModal.vue'
+  import MsCaseInfoModal from './components/MsCaseInfoModal.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
   const formRef = ref();
@@ -110,7 +112,7 @@
       title: '接警登记表',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -121,16 +123,17 @@
       },
     },
     exportConfig: {
-      name: "接警登记表",
+      name: '接警登记表',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -147,7 +150,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -155,7 +158,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -163,28 +166,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -196,7 +199,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -205,14 +208,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -221,7 +225,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -231,10 +235,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -245,14 +245,14 @@
       white-space: nowrap;
       margin-left: 50px;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/case/components/MsCaseApprovalForm.vue b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseApprovalForm.vue
similarity index 100%
rename from src/views/military/modules/case/components/MsCaseApprovalForm.vue
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseApprovalForm.vue
diff --git a/src/views/military/modules/case/components/MsCaseApprovalModal.vue b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseApprovalModal.vue
similarity index 100%
rename from src/views/military/modules/case/components/MsCaseApprovalModal.vue
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseApprovalModal.vue
diff --git a/src/views/military/modules/case/components/MsCaseInfoForm.vue b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseInfoForm.vue
similarity index 100%
rename from src/views/military/modules/case/components/MsCaseInfoForm.vue
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseInfoForm.vue
diff --git a/src/views/military/modules/case/components/MsCaseInfoModal.vue b/src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseInfoModal.vue
similarity index 100%
rename from src/views/military/modules/case/components/MsCaseInfoModal.vue
rename to src/views/military/modules/eventManage/emergencyCommand/receivingAlarm/components/MsCaseInfoModal.vue
diff --git a/src/views/military/modules/emergencyPlan/MsEmergencyPlan.api.ts b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyPlan.api.ts
similarity index 100%
rename from src/views/military/modules/emergencyPlan/MsEmergencyPlan.api.ts
rename to src/views/military/modules/eventManage/emergencyPlan/MsEmergencyPlan.api.ts
diff --git a/src/views/military/modules/emergencyPlan/MsEmergencyPlan.data.ts b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyPlan.data.ts
similarity index 100%
rename from src/views/military/modules/emergencyPlan/MsEmergencyPlan.data.ts
rename to src/views/military/modules/eventManage/emergencyPlan/MsEmergencyPlan.data.ts
diff --git a/src/views/military/modules/emergencyPlan/MsEmergencyPlanList.vue b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyPlanList.vue
similarity index 80%
rename from src/views/military/modules/emergencyPlan/MsEmergencyPlanList.vue
rename to src/views/military/modules/eventManage/emergencyPlan/MsEmergencyPlanList.vue
index 44b4d37..84d4298 100644
--- a/src/views/military/modules/emergencyPlan/MsEmergencyPlanList.vue
+++ b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyPlanList.vue
@@ -1,8 +1,8 @@
 <!-- 
   预案编制
 
-  功能划分
-  事件管理 -> 应急预案 -> 预案编制
+  目录位置：事件管理 -> 应急预案 -> 预案编制
+  功能概述：可以进行应急预案编制，包括预案编号、名称、描述、类型等基础信息的配置，可进行多条件筛选
  -->
 <template>
   <div>
@@ -17,20 +17,20 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="预案类型" name="emerType">
-              <j-dict-select-tag placeholder="请选择预案类型" v-model:value="queryParam.emerType" dictCode="ms_emer_type"/>
+              <j-dict-select-tag placeholder="请选择预案类型" v-model:value="queryParam.emerType" dictCode="ms_emer_type" />
             </a-form-item>
           </a-col>
           <!-- <template v-if="toggleSearchStatus"> -->
-            <a-col :lg="6">
-              <a-form-item label="预案风险等级" name="emerLevel">
-                <j-dict-select-tag placeholder="请选择预案风险等级" v-model:value="queryParam.emerLevel" dictCode="ms_emer_level"/>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item label="预案状态" name="emerStatus">
-                <j-dict-select-tag placeholder="请选择预案状态" v-model:value="queryParam.emerStatus" dictCode="ms_emer_status"/>
-              </a-form-item>
-            </a-col>
+          <a-col :lg="6">
+            <a-form-item label="预案风险等级" name="emerLevel">
+              <j-dict-select-tag placeholder="请选择预案风险等级" v-model:value="queryParam.emerLevel" dictCode="ms_emer_level" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="预案状态" name="emerStatus">
+              <j-dict-select-tag placeholder="请选择预案状态" v-model:value="queryParam.emerStatus" dictCode="ms_emer_status" />
+            </a-form-item>
+          </a-col>
           <!-- </template> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -52,8 +52,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -63,25 +63,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -97,7 +98,7 @@
   import { columns } from './MsEmergencyPlan.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsEmergencyPlan.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsEmergencyPlanModal from './components/MsEmergencyPlanModal.vue'
+  import MsEmergencyPlanModal from './components/MsEmergencyPlanModal.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
 
@@ -111,7 +112,7 @@
       title: '预案编制信息表',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -122,16 +123,17 @@
       },
     },
     exportConfig: {
-      name: "预案编制信息表",
+      name: '预案编制信息表',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -148,7 +150,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -156,7 +158,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -164,28 +166,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -197,7 +199,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -206,14 +208,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -222,7 +225,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -232,10 +235,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -246,14 +245,14 @@
       white-space: nowrap;
       margin-left: 50px;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/emergencyPlan/MsEmergencyTemplateList.vue b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyTemplateList.vue
similarity index 84%
rename from src/views/military/modules/emergencyPlan/MsEmergencyTemplateList.vue
rename to src/views/military/modules/eventManage/emergencyPlan/MsEmergencyTemplateList.vue
index 0de7b5b..9295540 100644
--- a/src/views/military/modules/emergencyPlan/MsEmergencyTemplateList.vue
+++ b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyTemplateList.vue
@@ -1,8 +1,8 @@
 <!-- 
   预案模板
 
-  功能划分
-  事件管理 -> 应急预案 -> 预案模板
+  目录位置：事件管理 -> 应急预案 -> 预案模板
+  功能概述：可以进行应急预案编制，包括预案编号、名称、描述、类型等基础信息的配置，可进行多条件筛选
  -->
 <template>
   <div>
@@ -17,15 +17,15 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="预案类型" name="emerType">
-              <j-dict-select-tag placeholder="请选择预案类型" v-model:value="queryParam.emerType" dictCode="ms_emer_type"/>
+              <j-dict-select-tag placeholder="请选择预案类型" v-model:value="queryParam.emerType" dictCode="ms_emer_type" />
             </a-form-item>
-          </a-col>      
-            <a-col :lg="6">
-              <a-form-item label="预案等级" name="emerLevel">
-                <j-dict-select-tag placeholder="请选择预案等级" v-model:value="queryParam.emerLevel" dictCode="ms_emer_level"/>
-              </a-form-item>
-            </a-col>
-            <!-- <a-col :lg="8">
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item label="预案等级" name="emerLevel">
+              <j-dict-select-tag placeholder="请选择预案等级" v-model:value="queryParam.emerLevel" dictCode="ms_emer_level" />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="8">
               <a-form-item label="预案状态" name="emerStatus">
                 <j-dict-select-tag placeholder="请选择预案状态" v-model:value="queryParam.emerStatus" dictCode="ms_emer_status"/>
               </a-form-item>
@@ -50,7 +50,7 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> -->
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <!-- <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
@@ -61,25 +61,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -95,7 +96,7 @@
   import { columns } from './MsEmergencyPlan.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsEmergencyPlan.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsEmergencyPlanModal from './components/MsEmergencyPlanModal.vue'
+  import MsEmergencyPlanModal from './components/MsEmergencyPlanModal.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
   const formRef = ref();
@@ -108,7 +109,7 @@
       title: '预案编制信息表',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -119,16 +120,17 @@
       },
     },
     exportConfig: {
-      name: "预案编制信息表",
+      name: '预案编制信息表',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -145,7 +147,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -153,7 +155,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -161,28 +163,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -194,7 +196,7 @@
       // },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -203,14 +205,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -219,7 +222,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -229,10 +232,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -242,14 +241,14 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/emergencyPlan/MsEmergencyVettingList.vue b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyVettingList.vue
similarity index 88%
rename from src/views/military/modules/emergencyPlan/MsEmergencyVettingList.vue
rename to src/views/military/modules/eventManage/emergencyPlan/MsEmergencyVettingList.vue
index c554814..11befc8 100644
--- a/src/views/military/modules/emergencyPlan/MsEmergencyVettingList.vue
+++ b/src/views/military/modules/eventManage/emergencyPlan/MsEmergencyVettingList.vue
@@ -1,9 +1,9 @@
 <!-- 
   预案审批
 
-  功能划分
-  事件管理 -> 应急预案 -> 预案审批
--->
+  目录位置：事件管理 -> 应急预案 -> 预案审批
+  功能概述：可以进行应急预案编制，包括预案编号、名称、描述、类型等基础信息的配置，可进行多条件筛选
+ -->
 <template>
   <div>
     <!--查询区域-->
@@ -17,13 +17,13 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="预案类型" name="emerType">
-              <j-dict-select-tag placeholder="请选择预案类型" v-model:value="queryParam.emerType" dictCode="ms_emer_type"/>
+              <j-dict-select-tag placeholder="请选择预案类型" v-model:value="queryParam.emerType" dictCode="ms_emer_type" />
             </a-form-item>
           </a-col>
           <template>
             <a-col :lg="6">
               <a-form-item label="预案等级" name="emerLevel">
-                <j-dict-select-tag placeholder="请选择预案等级" v-model:value="queryParam.emerLevel" dictCode="ms_emer_level"/>
+                <j-dict-select-tag placeholder="请选择预案等级" v-model:value="queryParam.emerLevel" dictCode="ms_emer_level" />
               </a-form-item>
             </a-col>
             <!-- <a-col :lg="8">
@@ -37,7 +37,6 @@
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-               
               </a-col>
             </span>
           </a-col>
@@ -60,25 +59,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -94,10 +94,10 @@
   import { columns } from './MsEmergencyPlan.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsEmergencyPlan.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsEmergencyVettingModal from './components/MsEmergencyVettingModal.vue'
+  import MsEmergencyVettingModal from './components/MsEmergencyVettingModal.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-  
+
   const formRef = ref();
   const queryParam = reactive<any>({});
   const toggleSearchStatus = ref<boolean>(false);
@@ -108,29 +108,30 @@
       title: '预案编制信息表',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
         width: 120,
         fixed: 'right',
       },
       beforeFetch: (params) => {
-        params.emerStatus_begin = 0  //未核实
-        params.emerStatus_end = 1  //核实中
+        params.emerStatus_begin = 0; //未核实
+        params.emerStatus_end = 1; //核实中
         return Object.assign(params, queryParam);
       },
     },
     exportConfig: {
-      name: "预案编制信息表",
+      name: '预案编制信息表',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -147,7 +148,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -155,7 +156,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -163,28 +164,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -200,7 +201,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -209,14 +210,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -225,7 +227,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -235,10 +237,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -248,14 +246,14 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/emergencyPlan/components/MsEmergencyPlanForm.vue b/src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyPlanForm.vue
similarity index 100%
rename from src/views/military/modules/emergencyPlan/components/MsEmergencyPlanForm.vue
rename to src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyPlanForm.vue
diff --git a/src/views/military/modules/emergencyPlan/components/MsEmergencyPlanModal.vue b/src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyPlanModal.vue
similarity index 100%
rename from src/views/military/modules/emergencyPlan/components/MsEmergencyPlanModal.vue
rename to src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyPlanModal.vue
diff --git a/src/views/military/modules/emergencyPlan/components/MsEmergencyVettingForm.vue b/src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyVettingForm.vue
similarity index 100%
rename from src/views/military/modules/emergencyPlan/components/MsEmergencyVettingForm.vue
rename to src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyVettingForm.vue
diff --git a/src/views/military/modules/emergencyPlan/components/MsEmergencyVettingModal.vue b/src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyVettingModal.vue
similarity index 100%
rename from src/views/military/modules/emergencyPlan/components/MsEmergencyVettingModal.vue
rename to src/views/military/modules/eventManage/emergencyPlan/components/MsEmergencyVettingModal.vue
diff --git a/src/views/military/modules/emergencyTeam/MsEmergencyTeam.api.ts b/src/views/military/modules/eventManage/resourceManage/emergencyTeam/MsEmergencyTeam.api.ts
similarity index 100%
rename from src/views/military/modules/emergencyTeam/MsEmergencyTeam.api.ts
rename to src/views/military/modules/eventManage/resourceManage/emergencyTeam/MsEmergencyTeam.api.ts
diff --git a/src/views/military/modules/emergencyTeam/MsEmergencyTeam.data.ts b/src/views/military/modules/eventManage/resourceManage/emergencyTeam/MsEmergencyTeam.data.ts
similarity index 100%
rename from src/views/military/modules/emergencyTeam/MsEmergencyTeam.data.ts
rename to src/views/military/modules/eventManage/resourceManage/emergencyTeam/MsEmergencyTeam.data.ts
diff --git a/src/views/military/modules/emergencyTeam/MsEmergencyTeamList.vue b/src/views/military/modules/eventManage/resourceManage/emergencyTeam/MsEmergencyTeamList.vue
similarity index 83%
rename from src/views/military/modules/emergencyTeam/MsEmergencyTeamList.vue
rename to src/views/military/modules/eventManage/resourceManage/emergencyTeam/MsEmergencyTeamList.vue
index 33501de..94fd5ea 100644
--- a/src/views/military/modules/emergencyTeam/MsEmergencyTeamList.vue
+++ b/src/views/military/modules/eventManage/resourceManage/emergencyTeam/MsEmergencyTeamList.vue
@@ -1,10 +1,9 @@
 <!-- 
   应急队伍
 
-  功能划分
-  事件管理 -> 资源管理-> 应急队伍
+  目录位置：事件管理 -> 资源管理-> 应急队伍
+  功能概述：用于管理应急队伍信息，包括应急队伍的添加、修改、删除、查询等操作。
  -->
-
 <template>
   <div>
     <!--查询区域-->
@@ -19,8 +18,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -30,25 +29,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -64,7 +64,7 @@
   import { columns } from './MsEmergencyTeam.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsEmergencyTeam.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsEmergencyTeamModal from './components/MsEmergencyTeamModal.vue'
+  import MsEmergencyTeamModal from './components/MsEmergencyTeamModal.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -76,7 +76,7 @@
       title: '应急队伍表',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -87,16 +87,17 @@
       },
     },
     exportConfig: {
-      name: "应急队伍表",
+      name: '应急队伍表',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -113,7 +114,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -121,7 +122,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -129,28 +130,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -162,7 +163,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -171,14 +172,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -187,7 +189,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -197,10 +199,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -210,14 +208,14 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/emergencyTeam/components/MsEmergencyTeamForm.vue b/src/views/military/modules/eventManage/resourceManage/emergencyTeam/components/MsEmergencyTeamForm.vue
similarity index 100%
rename from src/views/military/modules/emergencyTeam/components/MsEmergencyTeamForm.vue
rename to src/views/military/modules/eventManage/resourceManage/emergencyTeam/components/MsEmergencyTeamForm.vue
diff --git a/src/views/military/modules/emergencyTeam/components/MsEmergencyTeamModal.vue b/src/views/military/modules/eventManage/resourceManage/emergencyTeam/components/MsEmergencyTeamModal.vue
similarity index 100%
rename from src/views/military/modules/emergencyTeam/components/MsEmergencyTeamModal.vue
rename to src/views/military/modules/eventManage/resourceManage/emergencyTeam/components/MsEmergencyTeamModal.vue
diff --git a/src/views/military/modules/expertInfo/MsExpertInfo.api.ts b/src/views/military/modules/eventManage/resourceManage/expertBase/MsExpertInfo.api.ts
similarity index 100%
rename from src/views/military/modules/expertInfo/MsExpertInfo.api.ts
rename to src/views/military/modules/eventManage/resourceManage/expertBase/MsExpertInfo.api.ts
diff --git a/src/views/military/modules/expertInfo/MsExpertInfo.data.ts b/src/views/military/modules/eventManage/resourceManage/expertBase/MsExpertInfo.data.ts
similarity index 100%
rename from src/views/military/modules/expertInfo/MsExpertInfo.data.ts
rename to src/views/military/modules/eventManage/resourceManage/expertBase/MsExpertInfo.data.ts
diff --git a/src/views/military/modules/expertInfo/MsExpertInfoList.vue b/src/views/military/modules/eventManage/resourceManage/expertBase/MsExpertInfoList.vue
similarity index 83%
rename from src/views/military/modules/expertInfo/MsExpertInfoList.vue
rename to src/views/military/modules/eventManage/resourceManage/expertBase/MsExpertInfoList.vue
index 658be04..1518480 100644
--- a/src/views/military/modules/expertInfo/MsExpertInfoList.vue
+++ b/src/views/military/modules/eventManage/resourceManage/expertBase/MsExpertInfoList.vue
@@ -1,10 +1,9 @@
 <!-- 
   专家库
 
-  功能划分
-  事件管理 -> 资源管理-> 专家库
+  目录位置：事件管理 -> 资源管理-> 专家库
+  功能概述：用于展示专家库列表，并可以进行增删改查操作
  -->
-
 <template>
   <div>
     <!--查询区域-->
@@ -19,8 +18,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -30,25 +29,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -64,7 +64,7 @@
   import { columns } from './MsExpertInfo.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsExpertInfo.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsExpertInfoModal from './components/MsExpertInfoModal.vue'
+  import MsExpertInfoModal from './components/MsExpertInfoModal.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -76,7 +76,7 @@
       title: '专家库',
       api: list,
       columns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       actionColumn: {
         width: 120,
@@ -87,16 +87,17 @@
       },
     },
     exportConfig: {
-      name: "专家库",
+      name: '专家库',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -113,7 +114,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -121,7 +122,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -129,28 +130,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -162,7 +163,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -171,14 +172,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -187,7 +189,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -197,10 +199,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -210,14 +208,14 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
 </style>
diff --git a/src/views/military/modules/expertInfo/components/MsExpertInfoForm.vue b/src/views/military/modules/eventManage/resourceManage/expertBase/components/MsExpertInfoForm.vue
similarity index 100%
rename from src/views/military/modules/expertInfo/components/MsExpertInfoForm.vue
rename to src/views/military/modules/eventManage/resourceManage/expertBase/components/MsExpertInfoForm.vue
diff --git a/src/views/military/modules/expertInfo/components/MsExpertInfoModal.vue b/src/views/military/modules/eventManage/resourceManage/expertBase/components/MsExpertInfoModal.vue
similarity index 100%
rename from src/views/military/modules/expertInfo/components/MsExpertInfoModal.vue
rename to src/views/military/modules/eventManage/resourceManage/expertBase/components/MsExpertInfoModal.vue
diff --git a/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfo.api.ts b/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfo.api.ts
new file mode 100644
index 0000000..e0b17e5
--- /dev/null
+++ b/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfo.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/military/msMaterialInfo/list',
+  save='/military/msMaterialInfo/add',
+  edit='/military/msMaterialInfo/edit',
+  deleteOne = '/military/msMaterialInfo/delete',
+  deleteBatch = '/military/msMaterialInfo/deleteBatch',
+  importExcel = '/military/msMaterialInfo/importExcel',
+  exportXls = '/military/msMaterialInfo/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfo.data.ts b/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfo.data.ts
new file mode 100644
index 0000000..a22f145
--- /dev/null
+++ b/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfo.data.ts
@@ -0,0 +1,145 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '登记日期',
+    align: "center",
+    dataIndex: 'createTime'
+  },
+  {
+    title: '更新日期',
+    align: "center",
+    dataIndex: 'updateTime'
+  },
+  {
+    title: '物资类别',
+    align: "center",
+    dataIndex: 'materialType_dictText'
+  },
+  {
+    title: '物资名称',
+    align: "center",
+    dataIndex: 'materialName'
+  },
+  {
+    title: '规格型号',
+    align: "center",
+    dataIndex: 'specifications'
+  },
+  {
+    title: '单位',
+    align: "center",
+    dataIndex: 'unit_dictText'
+  },
+  {
+    title: '数量',
+    align: "center",
+    dataIndex: 'materialNum'
+  },
+  {
+    title: '是否为消耗品',
+    align: "center",
+    dataIndex: 'consumable_dictText'
+  },
+  {
+    title: '供应商',
+    align: "center",
+    dataIndex: 'suppliers'
+  },
+  {
+    title: '保质期',
+    align: "center",
+    dataIndex: 'shelfLife'
+  },
+  {
+    title: '备注 ',
+    align: "center",
+    dataIndex: 'remark'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "物资类别",
+    field: 'materialType',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "material_type"
+    },
+    colProps: {span: 6},
+  },
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '物资类别',
+    field: 'materialType',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "material_type"
+    },
+  },
+  {
+    label: '物资名称',
+    field: 'materialName',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+              { required: true, message: '请输入物资名称!'},
+             ];
+    },
+  },
+  {
+    label: '规格型号',
+    field: 'specifications',
+    component: 'Input',
+  },
+  {
+    label: '单位',
+    field: 'unit',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "unit"
+    },
+  },
+  {
+    label: '数量',
+    field: 'materialNum',
+    component: 'InputNumber',
+  },
+  {
+    label: '是否为消耗品',
+    field: 'consumable',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "is_consumable"
+    },
+  },
+  {
+    label: '供应商',
+    field: 'suppliers',
+    component: 'Input',
+  },
+  {
+    label: '保质期',
+    field: 'shelfLife',
+    component: 'Input',
+  },
+  {
+    label: '备注 ',
+    field: 'remark',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfoList.vue b/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfoList.vue
new file mode 100644
index 0000000..80c8100
--- /dev/null
+++ b/src/views/military/modules/eventManage/resourceManage/materialInfo/MsMaterialInfoList.vue
@@ -0,0 +1,244 @@
+<!-- 
+  物资信息
+
+  目录位置：事件管理 -> 资源管理-> 物资信息
+  功能概述：用于展示物资信息，并可以进行增删改查操作
+ -->
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="物资类别" name="materialType">
+              <j-dict-select-tag
+                placeholder="请选择物资类别"
+                v-model:value="queryParam.materialType"
+                :string-to-number="true"
+                dictCode="material_type"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{ text }">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{ text }">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <MsMaterialInfoModal ref="registerModal" @success="handleSuccess"></MsMaterialInfoModal>
+  </div>
+</template>
+
+<script lang="ts" name="military-msMaterialInfo" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsMaterialInfo.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMaterialInfo.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsMaterialInfoModal from './components/MsMaterialInfoModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '物资信息表',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '物资信息表',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
+  }
+</style>
diff --git a/src/views/military/modules/eventManage/resourceManage/materialInfo/components/MsMaterialInfoForm.vue b/src/views/military/modules/eventManage/resourceManage/materialInfo/components/MsMaterialInfoForm.vue
new file mode 100644
index 0000000..80754d6
--- /dev/null
+++ b/src/views/military/modules/eventManage/resourceManage/materialInfo/components/MsMaterialInfoForm.vue
@@ -0,0 +1,181 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="12">
+          <a-form-item label="物资类别" v-bind="validateInfos.materialType">
+	          <j-dict-select-tag v-model:value="formData.materialType" dictCode="material_type" :string-to-number="true" placeholder="请选择物资类别" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="物资名称" v-bind="validateInfos.materialName">
+            <a-input v-model:value="formData.materialName" placeholder="请输入物资名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="规格型号" v-bind="validateInfos.specifications">
+            <a-input v-model:value="formData.specifications" placeholder="请输入规格型号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="单位" v-bind="validateInfos.unit">
+	          <j-dict-select-tag v-model:value="formData.unit" dictCode="unit" :string-to-number="true" placeholder="请选择单位" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="数量" v-bind="validateInfos.materialNum">
+	          <a-input-number v-model:value="formData.materialNum" placeholder="请输入数量" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="是否为消耗品" v-bind="validateInfos.consumable">
+	          <j-dict-select-tag v-model:value="formData.consumable" dictCode="is_consumable" :stringToNumber='true' placeholder="请选择是否为消耗品" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="供应商" v-bind="validateInfos.suppliers">
+            <a-input v-model:value="formData.suppliers" placeholder="请输入供应商" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="保质期" v-bind="validateInfos.shelfLife">
+            <a-input v-model:value="formData.shelfLife" placeholder="请输入保质期" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="备注 " v-bind="validateInfos.remark">
+            <a-input v-model:value="formData.remark" placeholder="请输入备注 " :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, nextTick, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../MsMaterialInfo.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    materialType: undefined,
+    materialName: '',   
+    specifications: '',   
+    unit: undefined,
+    materialNum: undefined,
+    consumable: undefined,
+    suppliers: '',   
+    shelfLife: '',   
+    remark: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    materialName: [{ required: true, message: '请输入物资名称!'},],
+    materialType: [{ required: true, message: '请选择物资类别!'},],
+    consumable: [{ required: true, message: '请选择是否为消耗品!'},],
+    materialNum: [{ required: true, message: '请输入数量!'},],
+    unit: [{ required: true, message: '请选择单位!'},],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/src/views/military/modules/eventManage/resourceManage/materialInfo/components/MsMaterialInfoModal.vue b/src/views/military/modules/eventManage/resourceManage/materialInfo/components/MsMaterialInfoModal.vue
new file mode 100644
index 0000000..0751b5c
--- /dev/null
+++ b/src/views/military/modules/eventManage/resourceManage/materialInfo/components/MsMaterialInfoModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <MsMaterialInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsMaterialInfoForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick } from 'vue';
+  import MsMaterialInfoForm from './MsMaterialInfoForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(1080);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/src/views/military/modules/iot/components/MsIotImportLicenseModal.vue b/src/views/military/modules/iot/components/MsIotImportLicenseModal.vue
index 9dba9f5..4783e4d 100644
--- a/src/views/military/modules/iot/components/MsIotImportLicenseModal.vue
+++ b/src/views/military/modules/iot/components/MsIotImportLicenseModal.vue
@@ -1,13 +1,29 @@
+<!--
+ * @Author: Fuyuu 1805498209@qq.com
+ * @Date: 2023-11-30 10:39:05
+ * @LastEditors: Fuyuu 1805498209@qq.com
+ * @LastEditTime: 2023-12-07 11:49:20
+ * @FilePath: \dt-admin-pc-v2\src\views\military\modules\iot\components\MsIotImportLicenseModal.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
-  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <a-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
     <MsIotImportLicenseForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsIotImportLicenseForm>
   </a-modal>
 </template>
 
 <script lang="ts" setup>
-  import { ref, nextTick} from 'vue';
-  import MsIotImportLicenseForm from './MsIotImportLicenseForm.vue'
-  
+  import { ref, nextTick } from 'vue';
+  import MsIotImportLicenseForm from './MsIotImportLicenseForm.vue';
+
   const title = ref<string>('');
   const width = ref<number>(1080);
   const visible = ref<boolean>(false);
@@ -25,7 +41,7 @@
       registerForm.value.add();
     });
   }
-  
+
   /**
    * 编辑
    * @param record
@@ -37,7 +53,7 @@
       registerForm.value.edit(record);
     });
   }
-  
+
   /**
    * 确定按钮点击事件
    */
diff --git a/src/views/military/modules/ops/maintain/MsMaintainList.vue b/src/views/military/modules/ops/maintain/MsMaintainList.vue
index d734048..e8d735c 100644
--- a/src/views/military/modules/ops/maintain/MsMaintainList.vue
+++ b/src/views/military/modules/ops/maintain/MsMaintainList.vue
@@ -1,15 +1,14 @@
 <!-- 
   保养检查及进度
 
-  功能划分
-  运维保障 -> 保养检查及进度
+  目录位置：运维保障 -> 保养检查及进度
+  功能概述：用于展示并管理保养进度等信息
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item label="计划单号" name="code">
@@ -23,8 +22,7 @@
           </a-col> -->
           <a-col :lg="6">
             <a-form-item label="设备类型" name="deviceType">
-              <j-dict-select-tag placeholder="请选择设备类型" v-model:value="queryParam.deviceType"
-                dictCode="ms_maintain_device_type" />
+              <j-dict-select-tag placeholder="请选择设备类型" v-model:value="queryParam.deviceType" dictCode="ms_maintain_device_type" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -38,17 +36,19 @@
             </a-form-item>
           </a-col> -->
           <a-col :lg="6">
-
-            <a-form-item label="计划时间" name="planTime_begin"  >
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.planTime_begin"  style="margin-bottom: 24px;"/>
+            <a-form-item label="计划时间" name="planTime_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.planTime_begin"
+                style="margin-bottom: 24px"
+              />
               <span class="query-group-split-cust">~</span>
               <a-form-item name="planTime_end">
-                  <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.planTime_end" />
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.planTime_end" />
               </a-form-item>
             </a-form-item>
-
           </a-col>
           <!-- <a-col :lg="8">
             <a-form-item label="创建时间">
@@ -63,9 +63,7 @@
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
-
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </a-col>
             </span>
           </a-col>
@@ -73,8 +71,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys"
-      @expand="handleExpand">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
       <!-- 内嵌table区域 begin -->
       <template #expandedRowRender="{ record }">
         <a-tabs tabPosition="top">
@@ -98,7 +95,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -116,214 +114,211 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <MsMaintainModal ref="registerModal" @success="handleSuccess"></MsMaintainModal>
-    <MsMaintainRecordModal ref="modalMaintainRecord"  @success="handleSuccess"></MsMaintainRecordModal>
+    <MsMaintainRecordModal ref="modalMaintainRecord" @success="handleSuccess"></MsMaintainRecordModal>
   </div>
 </template>
 
 <script lang="ts" name="military-msMaintain" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { columns } from './MsMaintain.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMaintain.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import MsMaintainModal from './components/MsMaintainModal.vue'
-import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import MsMaintainRecordsSubTable from './subTables/MsMaintainRecordsSubTable.vue'
-import MsMaintainRecordModal from './subTables/MsMaintainRecordModal.vue'
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-// 展开key
-const expandedRowKeys = ref<any[]>([]);
-const randomKey = ref();
-const formRef = ref();
-const modalMaintainRecord = ref();
-const queryParam = reactive<any>({});
-const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: 'ms_maintain',
-    api: list,
-    columns,
-    canResize: false,
-    useSearchForm: false,
-    actionColumn: {
-      width: 180,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsMaintain.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMaintain.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsMaintainModal from './components/MsMaintainModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import MsMaintainRecordsSubTable from './subTables/MsMaintainRecordsSubTable.vue';
+  import MsMaintainRecordModal from './subTables/MsMaintainRecordModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  const randomKey = ref();
+  const formRef = ref();
+  const modalMaintainRecord = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'ms_maintain',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 180,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    exportConfig: {
+      name: 'ms_maintain',
+      url: getExportUrl,
+      params: queryParam,
     },
-  },
-  exportConfig: {
-    name: "ms_maintain",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
-
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
-/**
-* 展开事件
-* */
-function handleExpand(expanded, record) {
-  expandedRowKeys.value = [];
-  if (expanded === true) {
-    expandedRowKeys.value.push(record.id)
+  /**
+   * 展开事件
+   * */
+  function handleExpand(expanded, record) {
+    expandedRowKeys.value = [];
+    if (expanded === true) {
+      expandedRowKeys.value.push(record.id);
+    }
   }
-}
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
 
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 添加记录
- */
- function handleMaintain(record: Recordable) {
-  modalMaintainRecord.value.disableSubmit = false;
-  modalMaintainRecord.value.add(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-  randomKey.value = Math.random();
-}
+  /**
+   * 添加记录
+   */
+  function handleMaintain(record: Recordable) {
+    modalMaintainRecord.value.disableSubmit = false;
+    modalMaintainRecord.value.add(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '添加记录',
-      onClick: handleMaintain.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+    randomKey.value = Math.random();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '添加记录',
+        onClick: handleMaintain.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-form-item-control-input-content){
-  display: flex;
-}
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-    margin-left: 50px;
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
   }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 50px;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}</style>
+</style>
diff --git a/src/views/military/modules/ops/maintain/MsMaintainPlan.vue b/src/views/military/modules/ops/maintain/MsMaintainPlan.vue
index faf448f..bb2d670 100644
--- a/src/views/military/modules/ops/maintain/MsMaintainPlan.vue
+++ b/src/views/military/modules/ops/maintain/MsMaintainPlan.vue
@@ -1,15 +1,14 @@
 <!-- 
   保养计划
 
-  功能划分
-  运维保障 -> 保养计划
+  目录位置：运维保障 -> 保养计划
+  功能概述：用于管理保养计划信息，包括编辑、查询等操作
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item label="计划单号" name="code">
@@ -23,8 +22,7 @@
           </a-col> -->
           <a-col :lg="6">
             <a-form-item label="设备类型" name="deviceType">
-              <j-dict-select-tag placeholder="请选择设备类型" v-model:value="queryParam.deviceType"
-                dictCode="ms_maintain_device_type" />
+              <j-dict-select-tag placeholder="请选择设备类型" v-model:value="queryParam.deviceType" dictCode="ms_maintain_device_type" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -59,9 +57,7 @@
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
-
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </a-col>
             </span>
           </a-col>
@@ -69,8 +65,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys"
-      @expand="handleExpand">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
       <!-- 内嵌table区域 begin -->
       <template #expandedRowRender="{ record }">
         <a-tabs tabPosition="top">
@@ -94,7 +89,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -112,211 +108,208 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <MsMaintainModal ref="registerModal" @success="handleSuccess"></MsMaintainModal>
-    <MsMaintainRecordModal ref="modalMaintainRecord"  @success="handleSuccess"></MsMaintainRecordModal>
+    <MsMaintainRecordModal ref="modalMaintainRecord" @success="handleSuccess"></MsMaintainRecordModal>
   </div>
 </template>
 
 <script lang="ts" name="military-msMaintain" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { columns } from './MsMaintain.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMaintain.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import MsMaintainModal from './components/MsMaintainModal.vue'
-import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import MsMaintainRecordsSubTable from './subTables/MsMaintainRecordsSubTable.vue'
-import MsMaintainRecordModal from './subTables/MsMaintainRecordModal.vue'
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-// 展开key
-const expandedRowKeys = ref<any[]>([]);
-const randomKey = ref();
-const formRef = ref();
-const modalMaintainRecord = ref();
-const queryParam = reactive<any>({});
-const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: 'ms_maintain',
-    api: list,
-    columns,
-    canResize: false,
-    useSearchForm: false,
-    actionColumn: {
-      width: 220,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsMaintain.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMaintain.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsMaintainModal from './components/MsMaintainModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import MsMaintainRecordsSubTable from './subTables/MsMaintainRecordsSubTable.vue';
+  import MsMaintainRecordModal from './subTables/MsMaintainRecordModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  const randomKey = ref();
+  const formRef = ref();
+  const modalMaintainRecord = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'ms_maintain',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 220,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    exportConfig: {
+      name: 'ms_maintain',
+      url: getExportUrl,
+      params: queryParam,
     },
-  },
-  exportConfig: {
-    name: "ms_maintain",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
-
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
-/**
-* 展开事件
-* */
-function handleExpand(expanded, record) {
-  expandedRowKeys.value = [];
-  if (expanded === true) {
-    expandedRowKeys.value.push(record.id)
+  /**
+   * 展开事件
+   * */
+  function handleExpand(expanded, record) {
+    expandedRowKeys.value = [];
+    if (expanded === true) {
+      expandedRowKeys.value.push(record.id);
+    }
   }
-}
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 添加记录
- */
- function handleMaintain(record: Recordable) {
-  modalMaintainRecord.value.disableSubmit = false;
-  modalMaintainRecord.value.add(record);
-}
 
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-  randomKey.value = Math.random();
-}
+  /**
+   * 添加记录
+   */
+  function handleMaintain(record: Recordable) {
+    modalMaintainRecord.value.disableSubmit = false;
+    modalMaintainRecord.value.add(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '添加子项计划',
-      onClick: handleMaintain.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+    randomKey.value = Math.random();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '添加子项计划',
+        onClick: handleMaintain.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-    margin-left: 50px;
-  }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 50px;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}</style>
+</style>
diff --git a/src/views/military/modules/ops/maintain/MsMaintainRecord.vue b/src/views/military/modules/ops/maintain/MsMaintainRecord.vue
index 12cf905..0cde0c3 100644
--- a/src/views/military/modules/ops/maintain/MsMaintainRecord.vue
+++ b/src/views/military/modules/ops/maintain/MsMaintainRecord.vue
@@ -1,15 +1,14 @@
 <!-- 
   保养记录
 
-  功能划分
-  运维保障 -> 保养记录
+  目录位置：运维保障 -> 保养记录
+  功能概述：用于管理保养记录数据，包括记录的录入、编辑等，可以进行多条件查询
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item label="计划单号" name="code">
@@ -23,8 +22,7 @@
           </a-col>
           <a-col :lg="8">
             <a-form-item label="设备类型" name="deviceType">
-              <j-dict-select-tag placeholder="请选择设备类型" v-model:value="queryParam.deviceType"
-                dictCode="ms_maintain_device_type" />
+              <j-dict-select-tag placeholder="请选择设备类型" v-model:value="queryParam.deviceType" dictCode="ms_maintain_device_type" />
             </a-form-item>
           </a-col>
           <a-col :lg="8">
@@ -45,15 +43,18 @@
               <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
                 v-model:value="queryParam.planTime_end" class="query-group-cust" />
             </a-form-item> -->
-            <a-form-item label="计划保养日期" name="planTime_begin"  >
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.planTime_begin"  style="margin-bottom: 24px;"/>
+            <a-form-item label="计划保养日期" name="planTime_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.planTime_begin"
+                style="margin-bottom: 24px"
+              />
               <span class="query-group-split-cust">~</span>
               <a-form-item name="planTime_end">
-                  <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.planTime_end" />
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.planTime_end" />
               </a-form-item>
-            
             </a-form-item>
           </a-col>
           <a-col :lg="8">
@@ -64,24 +65,25 @@
               <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
                 v-model:value="queryParam.createTime_end" class="query-group-cust" />
             </a-form-item> -->
-            <a-form-item label="创建时间" name="createTime_begin"  >
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.createTime_begin"  style="margin-bottom: 24px;"/>
+            <a-form-item label="创建时间" name="createTime_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.createTime_begin"
+                style="margin-bottom: 24px"
+              />
               <span class="query-group-split-cust">~</span>
               <a-form-item name="createTime_end">
-                  <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.createTime_end" />
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.createTime_end" />
               </a-form-item>
-            
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
-
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </a-col>
             </span>
           </a-col>
@@ -89,8 +91,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys"
-      @expand="handleExpand">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
       <!-- 内嵌table区域 begin -->
       <template #expandedRowRender="{ record }">
         <a-tabs tabPosition="top">
@@ -114,7 +115,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -132,214 +134,211 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <MsMaintainModal ref="registerModal" @success="handleSuccess"></MsMaintainModal>
-    <MsMaintainRecordModal ref="modalMaintainRecord"  @success="handleSuccess"></MsMaintainRecordModal>
+    <MsMaintainRecordModal ref="modalMaintainRecord" @success="handleSuccess"></MsMaintainRecordModal>
   </div>
 </template>
 
 <script lang="ts" name="military-msMaintain" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { columns } from './MsMaintain.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMaintain.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import MsMaintainModal from './components/MsMaintainModal.vue'
-import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import MsMaintainRecordsSubTable from './subTables/MsMaintainRecordsSubTable.vue'
-import MsMaintainRecordModal from './subTables/MsMaintainRecordModal.vue'
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-// 展开key
-const expandedRowKeys = ref<any[]>([]);
-const randomKey = ref();
-const formRef = ref();
-const modalMaintainRecord = ref();
-const queryParam = reactive<any>({});
-const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: 'ms_maintain',
-    api: list,
-    columns,
-    canResize: false,
-    useSearchForm: false,
-    actionColumn: {
-      width: 180,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './MsMaintain.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsMaintain.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsMaintainModal from './components/MsMaintainModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import MsMaintainRecordsSubTable from './subTables/MsMaintainRecordsSubTable.vue';
+  import MsMaintainRecordModal from './subTables/MsMaintainRecordModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  const randomKey = ref();
+  const formRef = ref();
+  const modalMaintainRecord = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'ms_maintain',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 180,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.state = 4;
+        return Object.assign(params, queryParam);
+      },
     },
-    beforeFetch: (params) => {
-      params.state = 4
-      return Object.assign(params, queryParam);
+    exportConfig: {
+      name: 'ms_maintain',
+      url: getExportUrl,
+      params: queryParam,
     },
-  },
-  exportConfig: {
-    name: "ms_maintain",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
-
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
-/**
-* 展开事件
-* */
-function handleExpand(expanded, record) {
-  expandedRowKeys.value = [];
-  if (expanded === true) {
-    expandedRowKeys.value.push(record.id)
+  /**
+   * 展开事件
+   * */
+  function handleExpand(expanded, record) {
+    expandedRowKeys.value = [];
+    if (expanded === true) {
+      expandedRowKeys.value.push(record.id);
+    }
   }
-}
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
 
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 添加记录
- */
- function handleMaintain(record: Recordable) {
-  modalMaintainRecord.value.disableSubmit = false;
-  modalMaintainRecord.value.add(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-  randomKey.value = Math.random();
-}
+  /**
+   * 添加记录
+   */
+  function handleMaintain(record: Recordable) {
+    modalMaintainRecord.value.disableSubmit = false;
+    modalMaintainRecord.value.add(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '添加记录',
-      onClick: handleMaintain.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+    randomKey.value = Math.random();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '添加记录',
+        onClick: handleMaintain.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-form-item-control-input-content){
-  display: flex;
-}
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
   }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}</style>
+</style>
diff --git a/src/views/military/modules/ops/repair/audit/MsFaultAudit.vue b/src/views/military/modules/ops/repair/audit/MsFaultAudit.vue
index 42b3f0f..2eaa254 100644
--- a/src/views/military/modules/ops/repair/audit/MsFaultAudit.vue
+++ b/src/views/military/modules/ops/repair/audit/MsFaultAudit.vue
@@ -1,15 +1,14 @@
 <!-- 
   故障报单审核及计划 审批及计划
 
-  功能划分
-  运维保障 -> 故障报单审核及计划 审批及计划
+  目录位置：运维保障 -> 故障报单审核及计划 审批及计划
+  功能概述：用于管理故障保单计划并进行审核等操作，可以多条件查询
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item label="单号" name="code">
@@ -18,7 +17,7 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="状态" name="state">
-              <j-dict-select-tag placeholder="请选择状态" v-model:value="queryParam.state" dictCode="ms_fault_state"/>
+              <j-dict-select-tag placeholder="请选择状态" v-model:value="queryParam.state" dictCode="ms_fault_state" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -28,15 +27,14 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="设备状态" name="deviceState">
-              <j-dict-select-tag placeholder="请选择设备状态" v-model:value="queryParam.deviceState"
-                dictCode="ms_fault_device_state" />
+              <j-dict-select-tag placeholder="请选择设备状态" v-model:value="queryParam.deviceState" dictCode="ms_fault_device_state" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-              <a-form-item label="故障码" name="errorCode">
-                <JInput placeholder="请输入故障码" v-model:value="queryParam.errorCode"></JInput>
-              </a-form-item>
-            </a-col>
+            <a-form-item label="故障码" name="errorCode">
+              <JInput placeholder="请输入故障码" v-model:value="queryParam.errorCode"></JInput>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6">
             <a-form-item label="故障类型" name="type">
               <j-dict-select-tag placeholder="请选择故障类型" v-model:value="queryParam.type" dictCode="ms_fault_type" />
@@ -62,21 +60,25 @@
             </a-form-item>
           </a-col> -->
           <a-col :lg="6">
-              <a-form-item label="故障发生时间" name="time_begin">
-                 <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="开始时间" v-model:value="queryParam.time_begin"  style="margin-bottom: 24px;"/>
-                 <span class="query-group-split-cust">~</span>
-                 <a-form-item name="time_end">
-                   <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="结束时间" v-model:value="queryParam.time_end" />
-                 </a-form-item>
+            <a-form-item label="故障发生时间" name="time_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始时间"
+                v-model:value="queryParam.time_begin"
+                style="margin-bottom: 24px"
+              />
+              <span class="query-group-split-cust">~</span>
+              <a-form-item name="time_end">
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="结束时间" v-model:value="queryParam.time_end" />
               </a-form-item>
-            </a-col>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
-
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </a-col>
             </span>
           </a-col>
@@ -84,13 +86,12 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys"
-      @expand="handleExpand">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
       <!-- 内嵌table区域 begin -->
       <template #expandedRowRender="{ record }">
         <a-tabs tabPosition="top">
           <a-tab-pane tab="故障维修表" key="msRepair" forceRender>
-            <msRepairSubTable :id="expandedRowKeys[0]" :randomKey="randomKey"/>
+            <msRepairSubTable :id="expandedRowKeys[0]" :randomKey="randomKey" />
           </a-tab-pane>
         </a-tabs>
       </template>
@@ -109,7 +110,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -127,216 +129,210 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <AuditModal ref="registerModal" @success="handleSuccess"></AuditModal>
-    <MsRepairModal  ref="registerRepairModal" @success="handleSuccess"></MsRepairModal>
+    <MsRepairModal ref="registerRepairModal" @success="handleSuccess"></MsRepairModal>
   </div>
 </template>
 
 <script lang="ts" name="military-msFault" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { repairColumns } from '../MsFault.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from '../MsFault.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import AuditModal from './components/AuditModal.vue'
-import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import MsRepairSubTable from '../subTables/MsRepairSubTable.vue'
-import MsRepairModal from '../subTables/MsRepairModal.vue';
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-// 展开key
-const expandedRowKeys = ref<any[]>([]);
-const randomKey = ref();
-const formRef = ref();
-const subTable = ref();
-const queryParam = reactive<any>({});
-const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: '故障表',
-    api: list,
-    columns: repairColumns,
-    canResize: false,
-    useSearchForm: false,
-    showIndexColumn: true,
-    actionColumn: {
-      width: 180,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { repairColumns } from '../MsFault.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from '../MsFault.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import AuditModal from './components/AuditModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import MsRepairSubTable from '../subTables/MsRepairSubTable.vue';
+  import MsRepairModal from '../subTables/MsRepairModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  const randomKey = ref();
+  const formRef = ref();
+  const subTable = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '故障表',
+      api: list,
+      columns: repairColumns,
+      canResize: false,
+      useSearchForm: false,
+      showIndexColumn: true,
+      actionColumn: {
+        width: 180,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    exportConfig: {
+      name: '故障表',
+      url: getExportUrl,
+      params: queryParam,
     },
-  },
-  exportConfig: {
-    name: "故障表",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
-/**
-* 展开事件
-* */
-function handleExpand(expanded, record) {
-  expandedRowKeys.value = [];
-  if (expanded === true) {
-    expandedRowKeys.value.push(record.id)
+  /**
+   * 展开事件
+   * */
+  function handleExpand(expanded, record) {
+    expandedRowKeys.value = [];
+    if (expanded === true) {
+      expandedRowKeys.value.push(record.id);
+    }
+  }
+  //维修上报
+  const registerRepairModal = ref();
+  function handleRepair(record: Recordable) {
+    registerRepairModal.value.disableSubmit = false;
+    registerRepairModal.value.add(record);
   }
-}
-//维修上报
-const registerRepairModal = ref();
-function handleRepair(record: Recordable) {
-  registerRepairModal.value.disableSubmit = false;
-  registerRepairModal.value.add(record);
-}
-
-
-
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
-
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-  randomKey.value = Math.random();
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '审核',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '添加计划',
-      onClick: handleRepair.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+    randomKey.value = Math.random();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '审核',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '添加计划',
+        onClick: handleRepair.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-form-item-control-input-content){
-  display: flex;
-}
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-    margin-left: 60px;
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
   }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+      margin-left: 60px;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}</style>
+</style>
diff --git a/src/views/military/modules/ops/repair/record/MsFaultRecord.vue b/src/views/military/modules/ops/repair/record/MsFaultRecord.vue
index 4a3a27c..0e81d56 100644
--- a/src/views/military/modules/ops/repair/record/MsFaultRecord.vue
+++ b/src/views/military/modules/ops/repair/record/MsFaultRecord.vue
@@ -1,15 +1,14 @@
 <!-- 
   维修记录库
 
-  功能划分
-  运维保障 -> 维修记录库
+  目录位置：运维保障 -> 维修记录库
+  功能概述：用于管理维修记录数据，包括记录的录入、编辑等，可以进行多条件查询
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item label="单号" name="code">
@@ -28,8 +27,7 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="设备状态" name="deviceState">
-              <j-dict-select-tag placeholder="请选择设备状态" v-model:value="queryParam.deviceState"
-                dictCode="ms_fault_device_state" />
+              <j-dict-select-tag placeholder="请选择设备状态" v-model:value="queryParam.deviceState" dictCode="ms_fault_device_state" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -48,13 +46,17 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item label="故障发生时间" name="time_begin"  >
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.time_begin"  style="margin-bottom: 24px;"/>
+            <a-form-item label="故障发生时间" name="time_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.time_begin"
+                style="margin-bottom: 24px"
+              />
               <span class="query-group-split-cust">~</span>
               <a-form-item name="time_end">
-                  <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.time_end" />
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.time_end" />
               </a-form-item>
             </a-form-item>
           </a-col>
@@ -64,13 +66,17 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item label="审核时间" name="auditTime_begin"  >
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.auditTime_begin"  style="margin-bottom: 24px;"/>
+            <a-form-item label="审核时间" name="auditTime_begin">
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.auditTime_begin"
+                style="margin-bottom: 24px"
+              />
               <span class="query-group-split-cust">~</span>
               <a-form-item name="auditTime_end">
-                  <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.auditTime_end" />
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.auditTime_end" />
               </a-form-item>
             </a-form-item>
           </a-col>
@@ -78,8 +84,7 @@
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </a-col>
             </span>
           </a-col>
@@ -87,13 +92,12 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys"
-      @expand="handleExpand">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
       <!-- 内嵌table区域 begin -->
       <template #expandedRowRender="{ record }">
         <a-tabs tabPosition="top">
           <a-tab-pane tab="故障维修表" key="msRepair" forceRender>
-            <msRepairSubTable :id="expandedRowKeys[0]" :randomKey="randomKey"/>
+            <msRepairSubTable :id="expandedRowKeys[0]" :randomKey="randomKey" />
           </a-tab-pane>
         </a-tabs>
       </template>
@@ -101,8 +105,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -112,7 +116,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -130,215 +135,209 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <FaultRecordModal ref="registerModal" @success="handleSuccess"></FaultRecordModal>
-    <MsRepairModal  ref="registerRepairModal" @success="handleSuccess"></MsRepairModal>
+    <MsRepairModal ref="registerRepairModal" @success="handleSuccess"></MsRepairModal>
   </div>
 </template>
 
 <script lang="ts" name="military-msFault" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { repairColumns } from '../MsFault.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from '../MsFault.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import FaultRecordModal from './components/FaultRecordModal.vue'
-import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import MsRepairSubTable from '../subTables/MsRepairSubTable.vue'
-import MsRepairModal from '../subTables/MsRepairModal.vue';
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-// 展开key
-const expandedRowKeys = ref<any[]>([]);
-const randomKey = ref();
-const formRef = ref();
-const subTable = ref();
-const queryParam = reactive<any>({});
-const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: '故障表',
-    api: list,
-    columns: repairColumns,
-    canResize: false,
-    useSearchForm: false,
-    showIndexColumn: true,
-    actionColumn: {
-      width: 180,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { repairColumns } from '../MsFault.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from '../MsFault.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import FaultRecordModal from './components/FaultRecordModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import MsRepairSubTable from '../subTables/MsRepairSubTable.vue';
+  import MsRepairModal from '../subTables/MsRepairModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  const randomKey = ref();
+  const formRef = ref();
+  const subTable = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '故障表',
+      api: list,
+      columns: repairColumns,
+      canResize: false,
+      useSearchForm: false,
+      showIndexColumn: true,
+      actionColumn: {
+        width: 180,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    exportConfig: {
+      name: '故障表',
+      url: getExportUrl,
+      params: queryParam,
     },
-  },
-  exportConfig: {
-    name: "故障表",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
-/**
-* 展开事件
-* */
-function handleExpand(expanded, record) {
-  expandedRowKeys.value = [];
-  if (expanded === true) {
-    expandedRowKeys.value.push(record.id)
+  /**
+   * 展开事件
+   * */
+  function handleExpand(expanded, record) {
+    expandedRowKeys.value = [];
+    if (expanded === true) {
+      expandedRowKeys.value.push(record.id);
+    }
+  }
+  //维修上报
+  const registerRepairModal = ref();
+  function handleRepair(record: Recordable) {
+    registerRepairModal.value.disableSubmit = false;
+    registerRepairModal.value.add(record);
   }
-}
-//维修上报
-const registerRepairModal = ref();
-function handleRepair(record: Recordable) {
-  registerRepairModal.value.disableSubmit = false;
-  registerRepairModal.value.add(record);
-}
-
-
-
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
-
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-  randomKey.value = Math.random();
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '新增记录',
-      onClick: handleRepair.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+    randomKey.value = Math.random();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '新增记录',
+        onClick: handleRepair.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-form-item-control-input-content){
-  display: flex;
-}
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
   }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}</style>
+</style>
diff --git a/src/views/military/modules/ops/repair/repair/MsFaultList.vue b/src/views/military/modules/ops/repair/repair/MsFaultList.vue
index ff73629..d4710c1 100644
--- a/src/views/military/modules/ops/repair/repair/MsFaultList.vue
+++ b/src/views/military/modules/ops/repair/repair/MsFaultList.vue
@@ -1,15 +1,14 @@
 <!-- 
   维修进度
 
-  功能划分
-  运维保障 -> 维修进度
+  目录位置：运维保障 -> 维修进度
+  功能概述：用于管理维修进度，包括维修单号、状态、故障码基础信息，可进行多条件查询
  -->
 <template>
   <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
-        :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item label="单号" name="code">
@@ -23,8 +22,7 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="设备状态" name="deviceState">
-              <j-dict-select-tag placeholder="请选择设备状态" v-model:value="queryParam.deviceState"
-                dictCode="ms_fault_device_state" />
+              <j-dict-select-tag placeholder="请选择设备状态" v-model:value="queryParam.deviceState" dictCode="ms_fault_device_state" />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -44,23 +42,24 @@
           </a-col>
           <a-col :lg="6">
             <a-form-item label="审核时间" name="auditTime_begin">
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.auditTime_begin"  style="margin-bottom: 24px;"/>
+              <a-date-picker
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.auditTime_begin"
+                style="margin-bottom: 24px"
+              />
               <span class="query-group-split-cust">~</span>
               <a-form-item name="auditTime_end">
-                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.auditTime_end"  />
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.auditTime_end" />
               </a-form-item>
-              
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
-                  style="margin-left: 8px">重置</a-button>
-
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </a-col>
             </span>
           </a-col>
@@ -68,13 +67,12 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys"
-      @expand="handleExpand">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
       <!-- 内嵌table区域 begin -->
       <template #expandedRowRender="{ record }">
         <a-tabs tabPosition="top">
           <a-tab-pane tab="故障维修表" key="msRepair" forceRender>
-            <msRepairSubTable :id="expandedRowKeys[0]" :randomKey="randomKey"/>
+            <msRepairSubTable :id="expandedRowKeys[0]" :randomKey="randomKey" />
           </a-tab-pane>
         </a-tabs>
       </template>
@@ -93,7 +91,8 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -111,215 +110,208 @@
         {{ getAreaTextByCode(text) }}
       </template>
       <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <MsFaultModal ref="registerModal" @success="handleSuccess"></MsFaultModal>
-    <MsRepairModal  ref="registerRepairModal" @success="handleSuccess"></MsRepairModal>
+    <MsRepairModal ref="registerRepairModal" @success="handleSuccess"></MsRepairModal>
   </div>
 </template>
 
 <script lang="ts" name="military-msFault" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { repairColumns } from '../MsFault.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from '../MsFault.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import MsFaultModal from './components/MsFaultModal.vue'
-import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import MsRepairSubTable from '../subTables/MsRepairSubTable.vue'
-import MsRepairModal from '../subTables/MsRepairModal.vue';
-import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-// 展开key
-const expandedRowKeys = ref<any[]>([]);
-const randomKey = ref();
-const formRef = ref();
-const subTable = ref();
-const queryParam = reactive<any>({});
-const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: '故障表',
-    api: list,
-    columns: repairColumns,
-    canResize: false,
-    useSearchForm: false,
-    showIndexColumn: true,
-    actionColumn: {
-      width: 160,
-      fixed: 'right',
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { repairColumns } from '../MsFault.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from '../MsFault.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import MsFaultModal from './components/MsFaultModal.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import MsRepairSubTable from '../subTables/MsRepairSubTable.vue';
+  import MsRepairModal from '../subTables/MsRepairModal.vue';
+  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
+  // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  const randomKey = ref();
+  const formRef = ref();
+  const subTable = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '故障表',
+      api: list,
+      columns: repairColumns,
+      canResize: false,
+      useSearchForm: false,
+      showIndexColumn: true,
+      actionColumn: {
+        width: 160,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: '故障表',
+      url: getExportUrl,
+      params: queryParam,
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
     },
-  },
-  exportConfig: {
-    name: "故障表",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
 
-/**
-* 展开事件
-* */
-function handleExpand(expanded, record) {
-  expandedRowKeys.value = [];
-  if (expanded === true) {
-    expandedRowKeys.value.push(record.id)
+  /**
+   * 展开事件
+   * */
+  function handleExpand(expanded, record) {
+    expandedRowKeys.value = [];
+    if (expanded === true) {
+      expandedRowKeys.value.push(record.id);
+    }
+  }
+  //维修上报
+  const registerRepairModal = ref();
+  function handleRepair(record: Recordable) {
+    registerRepairModal.value.disableSubmit = false;
+    registerRepairModal.value.add(record);
   }
-}
-//维修上报
-const registerRepairModal = ref();
-function handleRepair(record: Recordable) {
-  registerRepairModal.value.disableSubmit = false;
-  registerRepairModal.value.add(record);
-}
-
-
-
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
-
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
 
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-  randomKey.value = Math.random();
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
 
-}
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '维修上报',
-      onClick: handleRepair.bind(null, record),
-    },
-  ];
-}
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
 
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    // {
-    //   label: '详情',
-    //   onClick: handleDetail.bind(null, record),
-    // }, {
-    //   label: '删除',
-    //   popConfirm: {
-    //     title: '是否确认删除',
-    //     confirm: handleDelete.bind(null, record),
-    //   }
-    // }
-  ]
-}
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
 
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
 
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+    randomKey.value = Math.random();
+  }
 
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '维修上报',
+        onClick: handleRepair.bind(null, record),
+      },
+    ];
+  }
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      // {
+      //   label: '详情',
+      //   onClick: handleDetail.bind(null, record),
+      // }, {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //   }
+      // }
+    ];
+  }
 
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
 
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-form-item-control-input-content){
-  display: flex;
-}
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
   }
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
 
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
+    .query-group-cust {
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
 
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
+    .query-group-split-cust {
+      width: 30px;
+      display: inline-block;
+      text-align: center;
+    }
   }
-}</style>
+</style>
diff --git a/src/views/military/modules/ops/repair/report/MsFaultReport.vue b/src/views/military/modules/ops/repair/report/MsFaultReport.vue
index 4e5a69a..330fe3e 100644
--- a/src/views/military/modules/ops/repair/report/MsFaultReport.vue
+++ b/src/views/military/modules/ops/repair/report/MsFaultReport.vue
@@ -1,8 +1,8 @@
 <!-- 
   故障上报
 
-  功能划分
-  运维保障 -> 故障上报
+  目录位置：运维保障 -> 故障上报
+  功能概述：用于管理故障保单数据，包括故障的基础信息编辑，以及故障发生时间的筛选
  -->
 <template>
   <div>
@@ -15,22 +15,27 @@
               <JInput placeholder="请输入单号" v-model:value="queryParam.code"></JInput>
             </a-form-item>
           </a-col>
-            <a-col :lg="8">
-              <a-form-item label="故障发生时间" name="time_begin">
-                 <a-date-picker style="margin-bottom: 24px;" showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.time_begin"  />
-                 <span class="query-group-split-cust">~</span>
-                 <a-form-item name="time_end">
-                 <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.time_end"  />
-                  </a-form-item>
-                </a-form-item>
-            </a-col>
+          <a-col :lg="8">
+            <a-form-item label="故障发生时间" name="time_begin">
+              <a-date-picker
+                style="margin-bottom: 24px"
+                showTime
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择开始时间"
+                v-model:value="queryParam.time_begin"
+              />
+              <span class="query-group-split-cust">~</span>
+              <a-form-item name="time_end">
+                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.time_end" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-                
               </a-col>
             </span>
           </a-col>
@@ -53,25 +58,26 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
+      <template #htmlSlot="{ text }">
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
+      <template #pcaSlot="{ text }">
         {{ getAreaTextByCode(text) }}
       </template>
-      <template #fileSlot="{text}">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+      <template #fileSlot="{ text }">
+        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
       </template>
     </BasicTable>
@@ -87,7 +93,7 @@
   import { reportColumns } from '../MsFault.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from '../MsFault.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsFaultModal from './components/MsFaultReportModal.vue'
+  import MsFaultModal from './components/MsFaultReportModal.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
   const formRef = ref();
@@ -100,7 +106,7 @@
       title: '故障表',
       api: list,
       columns: reportColumns,
-      canResize:false,
+      canResize: false,
       useSearchForm: false,
       showIndexColumn: true,
       actionColumn: {
@@ -112,16 +118,17 @@
       },
     },
     exportConfig: {
-      name: "故障表",
+      name: '故障表',
       url: getExportUrl,
       params: queryParam,
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
   });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const labelCol = reactive({
     xs: { span: 24 },
     sm: { span: 7 },
@@ -138,7 +145,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -146,7 +153,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -154,28 +161,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -187,7 +194,7 @@
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -196,14 +203,15 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
-        }
-      }
-    ]
+        },
+      },
+    ];
   }
 
   /**
@@ -212,7 +220,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -222,10 +230,6 @@
     //刷新数据
     reload();
   }
-  
-
-
-
 </script>
 
 <style lang="less" scoped>
@@ -235,17 +239,17 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       width: calc(50% - 15px);
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
   }
-  :deep(.ant-form-item-control-input-content){
-  display: flex;
-}
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+  }
 </style>
diff --git a/src/views/military/modules/prewarn/MsCameraLinkage.data.ts b/src/views/military/modules/prewarn/MsCameraLinkage.data.ts
deleted file mode 100644
index 9bb77ae..0000000
--- a/src/views/military/modules/prewarn/MsCameraLinkage.data.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-  {
-    title: '对象编号',
-    align: "center",
-    dataIndex: 'objCode'
-  },
-  {
-    title: '相机编号',
-    align: "center",
-    dataIndex: 'cameraId_dictText'
-  },
-  {
-    title: 'PTZ值',
-    align: "center",
-    dataIndex: 'ptz'
-  },
-  {
-    title: '预置位',
-    align: "center",
-    dataIndex: 'placements'
-  },
-];
-
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '对象编号',
-    field: 'objCode',
-    component: 'Input',
-  },
-  {
-    label: '相机编号',
-    field: 'cameraId',
-    component: 'JSelectMultiple',
-    componentProps:{
-      dictCode: ""
-    },
-  },
-  {
-    label: 'PTZ值',
-    field: 'ptz',
-    component: 'Input',
-  },
-  {
-    label: '预置位',
-    field: 'placements',
-    component: 'Input',
-  },
-	// TODO 主键隐藏字段，目前写死为ID
-  {
-    label: '',
-    field: 'id',
-    component: 'Input',
-    show: false,
-  },
-];
diff --git a/src/views/military/modules/prewarn/MsCameraLinkageList.vue b/src/views/military/modules/prewarn/MsCameraLinkageList.vue
deleted file mode 100644
index 348ede3..0000000
--- a/src/views/military/modules/prewarn/MsCameraLinkageList.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<!-- 
-  联动参数设置
-
-  功能划分
-  报警管理 -> 联动参数设置
- -->
-<template>
-  <div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button>批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
-
-        <div style="width: 100%;margin-bottom: 16px;background: #e6f7ff;padding: 10px;border: solid 1px #91d5ff;">
-          <p>该参数设置包含：</p>
-          <p>①枪球联动（枪机编码-球机编码）</p>
-          <p>②微波球机联动（探测器编号-相机id）</p>
-          <p>③球机补盲联动（BM-相机id）</p>
-        </div>
-      </template>
-
-
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{ text }">
-        <div v-html="text"></div>
-      </template>
-      <!--省市区字段回显插槽-->
-      <template #pcaSlot="{ text }">
-        {{ getAreaTextByCode(text) }}
-      </template>
-      <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
-          @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <MsCameraLinkageModal ref="registerModal" @success="handleSuccess"></MsCameraLinkageModal>
-  </div>
-</template>
-
-<script lang="ts" name="military-msCameraLinkage" setup>
-import { ref, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useListPage } from '/@/hooks/system/useListPage';
-import { columns } from './MsCameraLinkage.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsCameraLinkage.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import MsCameraLinkageModal from './components/MsCameraLinkageModal.vue'
-import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
-
-const formRef = ref();
-const queryParam = reactive<any>({});
-const toggleSearchStatus = ref<boolean>(false);
-const registerModal = ref();
-//注册table数据
-const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-  tableProps: {
-    title: 'ms_camera_linkage',
-    api: list,
-    columns,
-    showIndexColumn: true,
-    canResize: false,
-    useSearchForm: false,
-    showTableSetting: false,
-    actionColumn: {
-      width: 120,
-      fixed: 'right',
-    },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
-    },
-  },
-  exportConfig: {
-    name: "相机联动表",
-    url: getExportUrl,
-    params: queryParam,
-  },
-  importConfig: {
-    url: getImportUrl,
-    success: handleSuccess
-  },
-});
-const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-const labelCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 7 },
-});
-const wrapperCol = reactive({
-  xs: { span: 24 },
-  sm: { span: 16 },
-});
-
-/**
- * 新增事件
- */
-function handleAdd() {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.add();
-}
-
-/**
- * 编辑事件
- */
-function handleEdit(record: Recordable) {
-  registerModal.value.disableSubmit = false;
-  registerModal.value.edit(record);
-}
-
-/**
- * 详情
- */
-function handleDetail(record: Recordable) {
-  registerModal.value.disableSubmit = true;
-  registerModal.value.edit(record);
-}
-
-/**
- * 删除事件
- */
-async function handleDelete(record) {
-  await deleteOne({ id: record.id }, handleSuccess);
-}
-
-/**
- * 批量删除事件
- */
-async function batchHandleDelete() {
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
-
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && reload();
-}
-
-/**
- * 操作栏
- */
-function getTableAction(record) {
-  return [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-  ];
-}
-
-/**
- * 下拉操作栏
- */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    }, {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      }
-    }
-  ]
-}
-
-/**
- * 查询
- */
-function searchQuery() {
-  reload();
-}
-
-/**
- * 重置
- */
-function searchReset() {
-  formRef.value.resetFields();
-  selectedRowKeys.value = [];
-  //刷新数据
-  reload();
-}
-
-
-
-
-</script>
-
-<style lang="less" scoped>
-.jeecg-basic-table-form-container {
-  .table-page-search-submitButtons {
-    display: block;
-    margin-bottom: 24px;
-    white-space: nowrap;
-  }
-
-  .query-group-cust {
-    width: calc(50% - 15px);
-    min-width: 100px !important;
-  }
-
-  .query-group-split-cust {
-    width: 30px;
-    display: inline-block;
-    text-align: center
-  }
-}</style>
diff --git a/src/views/military/modules/prewarn/components/MsCameraLinkageForm.vue b/src/views/military/modules/prewarn/components/MsCameraLinkageForm.vue
deleted file mode 100644
index fa14397..0000000
--- a/src/views/military/modules/prewarn/components/MsCameraLinkageForm.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
-      <a-row>
-        <a-col :span="24">
-          <a-form-item label="对象编号" v-bind="validateInfos.objCode">
-            <a-input v-model:value="formData.objCode" placeholder="请输入对象编号" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-
-        <a-col :span="24">
-          <a-form-item label="关联相机" v-bind="validateInfos.cameraId">
-            <!-- <j-select-multiple type="list_multi" v-model:value="formData.cameraId" dictCode="" placeholder="请选择相机编号" :disabled="disabled" :triggerChange="false"/> -->
-            <a-tree-select v-model:value="formData.cameraId" allow-clear :treeData="cameraList" :disabled="disabled" placeholder="请选择关联相机">
-            </a-tree-select>
-          </a-form-item>
-        </a-col>
-
-        <a-col :span="24">
-          <a-form-item label="预置位" v-bind="validateInfos.placements">
-            <!-- <a-input v-model:value="formData.placements" placeholder="请输入预置位" :disabled="disabled"></a-input> -->
-            <!-- <JSelectMultiple mode="tags" v-model:value="formData.placements" placeholder="请输入预置点"></JSelectMultiple> -->
-            <a-select
-              mode="tags"
-              v-model:value="formData.placements"
-              placeholder="请输入预置点"
-              :disabled="disabled"
-              allowClear
-              :token-separators="[',', '，']"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-
-        <a-col :span="24">
-          <a-form-item label="PTZ" v-bind="validateInfos.ptz">
-            <!-- <a-input v-model:value="formData.ptz" placeholder="请输入PTZ值" :disabled="disabled"></a-input> -->
-            <a-button type="dashed" style="width: 50%; margin-bottom: 16px" @click="addPTZInput()" v-show="!formDisabled">
-              <a-icon type="plus" />
-              添加
-            </a-button>
-            <!-- 动态 -->
-            <a-space v-for="(K, index) in formData.ptz" :key="K.id" style="display: flex; margin-bottom: 8px" align="baseline">
-              <a-form-item
-                :name="['ptz', index, 'P']"
-                :rules="{
-                  required: true,
-                  message: 'P值不能为空.',
-                }"
-              >
-                <a-input-number :disabled="disabled" v-model:value="K.P" placeholder="水平旋转值" step="0.1" style="width: 100%" />
-              </a-form-item>
-              <a-form-item
-                :name="['ptz', index, 'T']"
-                :rules="{
-                  required: true,
-                  message: 'T值不能为空.',
-                }"
-              >
-                <a-input-number :disabled="disabled" v-model:value="K.T" placeholder="垂直旋转值" step="0.1" style="width: 100%" />
-              </a-form-item>
-              <a-form-item
-                :name="['ptz', index, 'Z']"
-                :rules="{
-                  required: true,
-                  message: 'Z值不能为空.',
-                }"
-              >
-                <a-input-number :disabled="disabled" v-model:value="K.Z" placeholder="镜头焦距" step="0.1" style="width: 100%" />
-              </a-form-item>
-              <MinusCircleOutlined @click="removePTZInput(K)" v-if="formData.ptz.length > 1 && !formDisabled" />
-            </a-space>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-spin>
-</template>
-
-<script lang="ts" setup>
-  import { ref, reactive, nextTick, computed, onMounted, watch } from 'vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
-  import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../MsCameraLinkage.api';
-  import { Form } from 'ant-design-vue';
-  import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
-
-  const props = defineProps({
-    formDisabled: { type: Boolean, default: false },
-    formData: { type: Object, default: () => {} },
-    formBpm: { type: Boolean, default: true },
-  });
-  const formRef = ref();
-  const cameraList: any = ref([]);
-  const useForm = Form.useForm;
-  const emit = defineEmits(['register', 'ok']);
-  const formData = reactive<Record<string, any>>({
-    id: '',
-    objCode: '',
-    cameraId: undefined,
-    ptz: [],
-    placements: [],
-  });
-  const { createMessage } = useMessage();
-  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
-  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
-  const confirmLoading = ref<boolean>(false);
-  //表单验证
-  const validatorRules = {
-    objCode: [{ required: true, message: '请输入对象编号！' }],
-    cameraId: [{ required: true, message: '请选择关联相机！' }],
-    placements: [{ required: true, message: '请输入预置位！' }],
-    ptz: [{ required: true, message: '请输入PTZ！' }],
-  };
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
-
-  // 表单禁用
-  const disabled = computed(() => {
-    if (props.formBpm === true) {
-      if (props.formData.disabled === false) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    return props.formDisabled;
-  });
-
-  let names = ref({});
-  let id = ref();
-
-  onMounted(() => {
-    setSelectList();
-  });
-
-  //逗号切割
-  watch(
-    () => formData.placements,
-    (val) => {
-      if (!val) {
-        formData.placements = [];
-      } else {
-        // console.log("formData.placements", formData.placements);
-        if (!Array.isArray(formData.placements)) {
-          let temp = formData.placements.split(',');
-          temp = temp.filter((item) => {
-            const regex = /\d/g;
-            return regex.test(item);
-          });
-          formData.placements = temp;
-        }
-      }
-    }
-  );
-
-  function setSelectList() {
-    defHttp
-      .get(
-        {
-          url: '/military/camera/site/getSiteCameraInfo',
-          params: { pageNo: 1, pageSize: 9999 },
-        },
-        { isTransformResponse: false }
-      )
-      // getAction(this.url.queryCameraSelectList, {pageNo: 1, pageSize: 9999})
-      .then((res) => {
-        if (res.success) {
-          cameraList.value = handleCameraTree(res.result);
-          // console.log("cameraList.value", cameraList.value);
-          // cameraList.value = [
-          //   {
-          //     title: 'Node1',
-          //     value: '0-0',
-          //     key: '0-0',
-          //     children: [
-          //       {
-          //         value: '0-0-1',
-          //         key: '0-0-1',
-          //         slots: {
-          //           title: 'title',
-          //         },
-          //       },
-          //       {
-          //         title: 'Child Node2',
-          //         value: '0-0-2',
-          //         key: '0-0-2',
-          //       },
-          //     ],
-          //   },
-          //   {
-          //     title: 'Node2',
-          //     value: '0-1',
-          //     key: '0-6',
-          //   },
-          // ];
-        }
-      });
-  }
-
-  function handleCameraTree(data, index = undefined) {
-    let arr: any = [];
-    for (let i = 0; i < data.length; i++) {
-      let obj: any = {};
-      let item = data[i];
-      obj.title = item.name;
-      obj.value = obj.key = item.id;
-      // obj.selectable = false;
-      if (item.children && item.children.length > 0) {
-        obj.children = [];
-        // obj.key = i + 1;
-        let indexValue: any = index ? index + '-' + (i + 1) : i + 1;
-        obj.children = handleCameraTree(item.children, indexValue);
-      } else {
-        // obj.key = index !== undefined ? index + '-' + (i + 1) : (i + 1) + '';
-        // let tmp = (obj.key + '').split('-').length;
-        // obj.selectable = tmp >= 3;
-      }
-      // obj.key = index !== undefined ? index + '-' + (i + 1) : (i + 1) + '';
-      arr.push(obj);
-    }
-    return arr;
-  }
-  //
-
-  function addPTZInput(P: any = null, T = null, Z = null) {
-    // const { form } = this;
-    // const keys = form.getFieldValue('keys');
-    // const nextKeys = keys.concat(++id.value);
-    // form.setFieldsValue({
-    //   keys: nextKeys,
-    // });
-    formData.ptz.push({
-      P: P,
-      T: T,
-      Z: Z,
-      // id: Date.now(),
-    });
-    // console.log("form", formData);
-  }
-  const removePTZInput = (item: any) => {
-    let index = formData.ptz.indexOf(item);
-    if (index !== -1) {
-      formData.ptz.splice(index, 1);
-    }
-  };
-
-  function init(record: any = null) {
-    if (!formData.ptz) return;
-    let arr = JSON.parse(record.ptz);
-    let name: any = [];
-    arr.forEach((element) => {
-      let arr: any = {};
-      arr['P'] = parseFloat(element[0]);
-      arr['T'] = parseFloat(element[1]);
-      arr['Z'] = parseFloat(element[2]);
-      name.push(arr);
-    });
-    // names.value = name
-    return name;
-  }
-
-  /**
-   * 新增
-   */
-  function add() {
-    edit({});
-  }
-
-  /**
-   * 编辑
-   */
-  function edit(record) {
-    nextTick(() => {
-      resetFields();
-      //赋值
-      if (record.id) {
-        // record.ptz = JSON.parse(record.ptz)
-        record.ptz = init(record);
-        // init();
-      }
-      Object.assign(formData, record);
-
-      // console.log("receive", formData);
-    });
-  }
-
-  /**
-   * 提交数据
-   */
-  async function submitForm() {
-    // 触发表单验证
-    await validate();
-    confirmLoading.value = true;
-    const isUpdate = ref<boolean>(false);
-    //时间格式化
-    let model = formData;
-    if (model.id) {
-      isUpdate.value = true;
-    }
-    //循环数据
-    for (let data in model) {
-      //如果该数据是数组并且是字符串类型
-      // console.log("data",data);
-      if (model[data] instanceof Array && data != 'ptz') {
-        let valueType = getValueType(formRef.value.getProps, data);
-        //如果是字符串类型的需要变成以逗号分割的字符串
-        if (valueType === 'string') {
-          model[data] = model[data].join(',');
-        }
-      }
-    }
-    if (model.ptz) {
-      let arr: any = [];
-      try {
-        model.ptz.forEach((e) => {
-          let a = Object.values(e);
-          if (a.includes(NaN) || a.includes(null)) {
-            throw Error();
-          }
-          // console.log(a);
-          arr.push(a);
-        });
-        model.ptz = JSON.stringify(arr);
-      } catch (error) {
-        emit('ok');
-        return createMessage.error('请检查参数，PTZ值非法');
-      }
-    }
-
-    // console.log("formData",formData);
-    console.log('model', model);
-
-    await saveOrUpdate(model, isUpdate.value)
-      .then((res) => {
-        if (res.success) {
-          createMessage.success(res.message);
-          emit('ok');
-        } else {
-          createMessage.warning(res.message);
-        }
-      })
-      .finally(() => {
-        confirmLoading.value = false;
-      });
-  }
-
-  defineExpose({
-    add,
-    edit,
-    submitForm,
-  });
-</script>
-
-<style lang="less" scoped>
-  .antd-modal-form {
-    min-height: 500px !important;
-    overflow-y: auto;
-    padding: 24px 24px 24px 24px;
-  }
-</style>
diff --git a/src/views/military/modules/prewarn/components/MsCameraLinkageModal.vue b/src/views/military/modules/prewarn/components/MsCameraLinkageModal.vue
deleted file mode 100644
index 5777fcb..0000000
--- a/src/views/military/modules/prewarn/components/MsCameraLinkageModal.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<template>
-  <a-modal destroyOnClose :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <MsCameraLinkageForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsCameraLinkageForm>
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, nextTick} from 'vue';
-  import MsCameraLinkageForm from './MsCameraLinkageForm.vue'
-  
-  const title = ref<string>('');
-  const width = ref<number>(800);
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
-
-  /**
-   * 新增
-   */
-  function add() {
-    title.value = '新增';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.add();
-    });
-  }
-  
-  /**
-   * 编辑
-   * @param record
-   */
-  function edit(record) {
-    title.value = disableSubmit.value ? '详情' : '编辑';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.edit(record);
-    });
-  }
-  
-  /**
-   * 确定按钮点击事件
-   */
-  function handleOk() {
-    registerForm.value.submitForm();
-  }
-
-  /**
-   * form保存回调事件
-   */
-  function submitCallback() {
-    handleCancel();
-    emit('success');
-  }
-
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-    emit('success');
-  }
-
-  defineExpose({
-    add,
-    edit,
-    disableSubmit,
-  });
-</script>
-
-<style>
-  /**隐藏样式-modal确定按钮 */
-  .jee-hidden {
-    display: none !important;
-  }
-</style>
diff --git a/src/views/military/modules/statistics/MsBayonetStatistics.api.ts b/src/views/military/modules/statistics/MsBayonetStatistics.api.ts
deleted file mode 100644
index 024e4e9..0000000
--- a/src/views/military/modules/statistics/MsBayonetStatistics.api.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { defHttp } from '/@/utils/http/axios';
-import { useMessage } from '/@/hooks/web/useMessage';
-
-const { createConfirm } = useMessage();
-
-enum Api {
-  list = '/military/msBayonetStatistics/list',
-  save = '/military/msBayonetStatistics/add',
-  edit = '/military/msBayonetStatistics/edit',
-  deleteOne = '/military/msBayonetStatistics/delete',
-  deleteBatch = '/military/msBayonetStatistics/deleteBatch',
-  importExcel = '/military/msBayonetStatistics/importExcel',
-  exportXls = '/military/msBayonetStatistics/exportXls',
-}
-
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) => defHttp.get({ url: Api.list, params });
-
-/**
- * 删除单个
- * @param params
- * @param handleSuccess
- */
-export const deleteOne = (params, handleSuccess) => {
-  return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
-    handleSuccess();
-  });
-};
-
-/**
- * 批量删除
- * @param params
- * @param handleSuccess
- */
-export const batchDelete = (params, handleSuccess) => {
-  createConfirm({
-    iconType: 'warning',
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
-        handleSuccess();
-      });
-    },
-  });
-};
-
-/**
- * 保存或者更新
- * @param params
- * @param isUpdate
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.put({ url: url, params }, { isTransformResponse: false });
-};
diff --git a/src/views/military/modules/statistics/MsBayonetStatistics.data.ts b/src/views/military/modules/statistics/MsBayonetStatistics.data.ts
deleted file mode 100644
index 75888be..0000000
--- a/src/views/military/modules/statistics/MsBayonetStatistics.data.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-  {
-    title: '卡口',
-    align: "center",
-    dataIndex: 'labelId_dictText'
-  },
-  {
-    title: '姓名',
-    align: "center",
-    dataIndex: 'name'
-  },
-  {
-    title: '身份证号',
-    align: "center",
-    dataIndex: 'idCard'
-  },
-  {
-    title: '联系电话',
-    align: "center",
-    dataIndex: 'phone'
-  },
-  {
-    title: '属性',
-    align: "center",
-    dataIndex: 'attr_dictText'
-  },
-  {
-    title: '人员状态',
-    align: "center",
-    dataIndex: 'perStatus'
-  },
-
-  {
-    title: '进入时间',
-    align: "center",
-    dataIndex: 'enterTime'
-  },
-  {
-    title: '离开时间',
-    align: "center",
-    dataIndex: 'leaveTime'
-  },
-  {
-    title: '车牌号',
-    align: "center",
-    dataIndex: 'carsNo'
-  },
-
-];
-
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-  {
-    label: "姓名",
-    field: 'name',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-  {
-    label: "身份证号",
-    field: 'idCard',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-  {
-    label: "属性（个人还是团体）",
-    field: 'attr',
-    component: 'JDictSelectTag',
-    componentProps:{
-      dictCode: "ms_person_attr"
-    },
-    colProps: {span: 6},
-  },
-  {
-    label: "联系电话",
-    field: 'phone',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-  {
-    label: "车牌号",
-    field: 'carsNo',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-  {
-    label: "进入时间",
-    field: "enterTime",
-    component: 'RangePicker',
-    componentProps: {
-      showTime: true,
-    },
-    colProps: {span: 6},
-  },
-  {
-    label: "离开时间",
-    field: "leaveTime",
-    component: 'RangePicker',
-    componentProps: {
-      showTime: true,
-    },
-    colProps: {span: 6},
-  },
-  {
-    label: "卡口标签id",
-    field: 'labelId',
-    component: 'JDictSelectTag',
-    componentProps:{
-    },
-    colProps: {span: 6},
-  },
-  {
-    label: "人员状态",
-    field: 'perStatus',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-];
-
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '姓名',
-    field: 'name',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-      return [
-              { required: true, message: '请输入姓名!'},
-             ];
-    },
-  },
-  {
-    label: '身份证号',
-    field: 'idCard',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-      return [
-              { required: true, message: '请输入身份证号!'},
-             ];
-    },
-  },
-  {
-    label: '属性（个人还是团体）',
-    field: 'attr',
-    component: 'JDictSelectTag',
-    componentProps:{
-      dictCode: "ms_person_attr"
-    },
-    dynamicRules: ({model,schema}) => {
-      return [
-              { required: true, message: '请输入属性（个人还是团体）!'},
-             ];
-    },
-  },
-  {
-    label: '联系电话',
-    field: 'phone',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-      return [
-              { required: true, message: '请输入联系电话!'},
-             ];
-    },
-  },
-  {
-    label: '车牌号',
-    field: 'carsNo',
-    component: 'Input',
-  },
-  {
-    label: '进入时间',
-    field: 'enterTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      valueFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    dynamicRules: ({model,schema}) => {
-      return [
-              { required: true, message: '请输入进入时间!'},
-             ];
-    },
-  },
-  {
-    label: '离开时间',
-    field: 'leaveTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      valueFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-  {
-    label: '性别',
-    field: 'sex',
-    component: 'InputNumber',
-  },
-  {
-    label: '年龄',
-    field: 'age',
-    component: 'InputNumber',
-  },
-  {
-    label: '紧急联系电话',
-    field: 'emergencyPhone',
-    component: 'Input',
-  },
-  {
-    label: '卡口标签id',
-    field: 'labelId',
-    component: 'JDictSelectTag',
-    componentProps:{
-      dictCode: ""
-    },
-    dynamicRules: ({model,schema}) => {
-      return [
-              { required: true, message: '请输入卡口标签id!'},
-             ];
-    },
-  },
-  {
-    label: '人员状态',
-    field: 'perStatus',
-    component: 'InputNumber',
-    dynamicDisabled: true
-  },
-	// TODO 主键隐藏字段，目前写死为ID
-  {
-    label: '',
-    field: 'id',
-    component: 'Input',
-    show: false,
-  },
-];
diff --git a/src/views/military/modules/statistics/MsBayonetStatisticsList.vue b/src/views/military/modules/statistics/MsBayonetStatisticsList.vue
deleted file mode 100644
index ed5a5f3..0000000
--- a/src/views/military/modules/statistics/MsBayonetStatisticsList.vue
+++ /dev/null
@@ -1,388 +0,0 @@
-<!-- 
-  卡口人员统计
-
-  功能划分
-  统计分析 -> 卡口人员统计
- -->
-<template>
-  <div>
-    <!--查询区域-->
-    <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-row :gutter="24">
-          <a-col :lg="6">
-            <a-form-item label="卡口" name="labelId">
-              <!-- <JInput placeholder="" v-model:value="queryParam.labelId"></JInput> -->
-              <a-select v-model:value="queryParam.labelId">
-                <a-select-option v-for="(item, index) in labelSelect" :value="item.id" :key="item.id">
-                  {{ item.labelName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="姓名" name="name">
-              <JInput placeholder="请输入姓名" v-model:value="queryParam.name"></JInput>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="身份证号" name="idCard">
-              <JInput placeholder="请输入身份证号" v-model:value="queryParam.idCard"></JInput>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="联系电话" name="phone">
-              <JInput placeholder="请输入联系电话" v-model:value="queryParam.phone"></JInput>
-            </a-form-item>
-          </a-col>
-          <!-- <template v-if="toggleSearchStatus"> -->
-          <a-col :lg="6">
-            <a-form-item label="属性" name="attr">
-              <j-dict-select-tag placeholder="请选择" v-model:value="queryParam.attr" dictCode="ms_person_attr" />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="车牌号" name="carsNo">
-              <JInput placeholder="车牌号" v-model:value="queryParam.carsNo"></JInput>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="人员状态" name="perStatus">
-              <j-dict-select-tag placeholder="请输入人员状态" v-model:value="queryParam.perStatus" dictCode="ms_person_status" />
-            </a-form-item>
-          </a-col>
-
-          <a-col :lg="6">
-            <!-- <a-form-item label="进入时间">
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.enterTime_begin" class="query-group-cust" />
-              <span class="query-group-split-cust">~</span>
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.enterTime_end" class="query-group-cust" />
-            </a-form-item> -->
-            <a-form-item label="进入时间" name="enterTime_begin">
-              <a-date-picker
-                showTime
-                value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择开始时间"
-                v-model:value="queryParam.enterTime_begin"
-                style="margin-bottom: 24px"
-              />
-              <span class="query-group-split-cust">~</span>
-              <a-form-item name="enterTime_end">
-                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.enterTime_end" />
-              </a-form-item>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <!-- <a-form-item label="离开时间">
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
-                v-model:value="queryParam.leaveTime_begin" class="query-group-cust" />
-              <span class="query-group-split-cust">~</span>
-              <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
-                v-model:value="queryParam.leaveTime_end" class="query-group-cust" />
-            </a-form-item> -->
-            <a-form-item label="离开时间" name="leaveTime_begin">
-              <a-date-picker
-                showTime
-                value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择开始时间"
-                v-model:value="queryParam.leaveTime_begin"
-                style="margin-bottom: 24px"
-              />
-              <span class="query-group-split-cust">~</span>
-              <a-form-item name="leaveTime_end">
-                <a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.leaveTime_end" />
-              </a-form-item>
-            </a-form-item>
-          </a-col>
-
-          <!-- </template> -->
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-                <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" style="margin-left: 8px"> 新增</a-button>
-                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
-                  {{ toggleSearchStatus ? '收起' : '展开' }}
-                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-                </a> -->
-              </a-col>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button
-            >批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
-        <LineMulti :chartData="chartDataSource" height="30vh" :option="multiOption" type="line"></LineMulti>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{ text }">
-        <div v-html="text"></div>
-      </template>
-      <!--省市区字段回显插槽-->
-      <template #pcaSlot="{ text }">
-        {{ getAreaTextByCode(text) }}
-      </template>
-      <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <MsBayonetStatisticsModal ref="registerModal" @success="handleSuccess"></MsBayonetStatisticsModal>
-  </div>
-</template>
-
-<script lang="ts" name="bayonet-msBayonetStatistics" setup>
-  import { ref, reactive, onMounted } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns } from './MsBayonetStatistics.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsBayonetStatistics.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsBayonetStatisticsModal from './components/MsBayonetStatisticsModal.vue';
-  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import LineMulti from '/@/components/chart/LineMulti.vue';
-  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-
-  const labelSelect: any = ref(); //卡口
-  const chartDataSource: any = ref([]);
-  const formRef = ref();
-  const queryParam = reactive<any>({});
-  const toggleSearchStatus = ref<boolean>(false);
-  const registerModal = ref();
-  //注册table数据
-  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-    tableProps: {
-      title: '卡口人员统计',
-      api: list,
-      columns,
-      showIndexColumn: true,
-      canResize: false,
-      useSearchForm: false,
-      showTableSetting: false,
-      actionColumn: {
-        width: 120,
-        fixed: 'right',
-      },
-      beforeFetch: (params) => {
-        return Object.assign(params, queryParam);
-      },
-    },
-    exportConfig: {
-      name: '卡口人员统计表',
-      url: getExportUrl,
-      params: queryParam,
-    },
-    importConfig: {
-      url: getImportUrl,
-      success: handleSuccess,
-    },
-  });
-
-  //趋势图
-  const multiOption = {
-    title: { text: '卡口人数统计', left: 'center' },
-  };
-
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
-    tableContext;
-  const labelCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 7 },
-  });
-  const wrapperCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 16 },
-  });
-
-  onMounted(() => {
-    initEchartData();
-    getLabelList();
-  });
-
-  function getLabelList() {
-    defHttp
-      .get(
-        {
-          url: '/military/msMapLabel/list',
-          params: { pageNo: 1, pageSize: 1000, labelAttr: 2 },
-        },
-        { isTransformResponse: false }
-      )
-      // getAction(this.url.getLabelListUrl, { pageNo: 1, pageSize: 1000, labelAttr: 2 })
-      .then((res) => {
-        if (res.success) {
-          labelSelect.value = res.result.records;
-        }
-      });
-  }
-  function initEchartData() {
-    defHttp
-      .get(
-        {
-          url: 'military/msBayonetStatistics/getBayonetStatistics',
-        },
-        { isTransformResponse: false }
-      )
-      // getAction(this.url.getBayonetStatistics)
-      .then((res) => {
-        if (res.success) {
-          // chartDataSource.value = res.result
-          let result = res.result;
-          result.forEach((element) => {
-            let enterCountItem = { name: element.type, value: element.enterCount, type: '进入人数' };
-            let leaveCountItem = { name: element.type, value: element.leaveCount, type: '离开人数' };
-            let surplusCountItem = { name: element.type, value: element.surplusCount, type: '滞留人数' };
-            chartDataSource.value.push(enterCountItem);
-            chartDataSource.value.push(leaveCountItem);
-            chartDataSource.value.push(surplusCountItem);
-          });
-        }
-      });
-  }
-
-  /**
-   * 新增事件
-   */
-  function handleAdd() {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.add();
-  }
-
-  /**
-   * 编辑事件
-   */
-  function handleEdit(record: Recordable) {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.edit(record);
-  }
-
-  /**
-   * 详情
-   */
-  function handleDetail(record: Recordable) {
-    registerModal.value.disableSubmit = true;
-    registerModal.value.edit(record);
-  }
-
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
-  }
-
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
-
-  /**
-   * 成功回调
-   */
-  function handleSuccess() {
-    (selectedRowKeys.value = []) && reload();
-  }
-
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-    ];
-  }
-
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-    ];
-  }
-
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
-  }
-
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-</script>
-
-<style lang="less" scoped>
-  :deep(.ant-form-item-control-input-content) {
-    display: flex;
-  }
-  .jeecg-basic-table-form-container {
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-
-    .query-group-cust {
-      width: calc(50% - 15px);
-      min-width: 100px !important;
-    }
-
-    .query-group-split-cust {
-      width: 30px;
-      display: inline-block;
-      text-align: center;
-    }
-  }
-</style>
diff --git a/src/views/military/modules/statistics/MsPatrolStatistics.data.ts b/src/views/military/modules/statistics/MsPatrolStatistics.data.ts
deleted file mode 100644
index 76209b0..0000000
--- a/src/views/military/modules/statistics/MsPatrolStatistics.data.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-
-  {
-    title: '人员编号',
-    align: "center",
-    dataIndex: 'userNo'
-  },
-  {
-    title: '巡逻人员',
-    align: "center",
-    dataIndex: 'userName'
-  },
-  {
-    title: '巡逻次数',
-    align: 'center',
-    dataIndex: 'times',
-    // scopedSlots: { customRender: 'ahref' },
-  }
-];
-
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-  {
-    label: "人员编号",
-    field: 'userNo',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-  {
-    label: "巡逻人员",
-    field: 'userName',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-];
-
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '人员id',
-    field: 'userId',
-    component: 'Input',
-  },
-  {
-    label: '人员编号',
-    field: 'userNo',
-    component: 'Input',
-  },
-  {
-    label: '巡逻人员',
-    field: 'userName',
-    component: 'Input',
-  },
-	// TODO 主键隐藏字段，目前写死为ID
-  {
-    label: '',
-    field: 'id',
-    component: 'Input',
-    show: false,
-  },
-];
diff --git a/src/views/military/modules/statistics/MsPrewarnDaystatistics.api.ts b/src/views/military/modules/statistics/MsPrewarnDaystatistics.api.ts
deleted file mode 100644
index d08a725..0000000
--- a/src/views/military/modules/statistics/MsPrewarnDaystatistics.api.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { defHttp } from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
-
-const { createConfirm } = useMessage();
-
-enum Api {
-  list = '/military/msPrewarnDaystatisticsAnalysis/list',
-  save='/military/msPrewarnDaystatisticsAnalysis/add',
-  edit='/military/msPrewarnDaystatisticsAnalysis/edit',
-  deleteOne = '/military/msPrewarnDaystatisticsAnalysis/delete',
-  deleteBatch = '/military/msPrewarnDaystatisticsAnalysis/deleteBatch',
-  importExcel = '/military/msPrewarnDaystatisticsAnalysis/importExcel',
-  exportXls = '/military/msPrewarnDaystatisticsAnalysis/exportXls',
-}
-
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) => defHttp.get({ url: Api.list, params });
-
-/**
- * 删除单个
- * @param params
- * @param handleSuccess
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-
-/**
- * 批量删除
- * @param params
- * @param handleSuccess
- */
-export const batchDelete = (params, handleSuccess) => {
-  createConfirm({
-    iconType: 'warning',
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-
-/**
- * 保存或者更新
- * @param params
- * @param isUpdate
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({ url: url, params }, { isTransformResponse: false });
-}
diff --git a/src/views/military/modules/statistics/MsPrewarnDaystatistics.data.ts b/src/views/military/modules/statistics/MsPrewarnDaystatistics.data.ts
deleted file mode 100644
index e345fe7..0000000
--- a/src/views/military/modules/statistics/MsPrewarnDaystatistics.data.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-  {
-    title: '日期',
-    align: "center",
-    dataIndex: 'happenTime',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
-    }
-  },
-  {
-    title: '预警级别',
-    align: "center",
-    dataIndex: 'prewarnLevel_dictText'
-  },
-  {
-    title: '预警类型',
-    align: "center",
-    dataIndex: 'prewarnType_dictText'
-  },
-  {
-    title: '预警数量',
-    align: "center",
-    dataIndex: 'prewarnNum'
-  },
-  {
-    title: '已处理数量',
-    align: "center",
-    dataIndex: 'processedNum'
-  },
-  {
-    title: '未处理数量',
-    align: "center",
-    dataIndex: 'unprocessed'
-  },
-];
-
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-  {
-    label: "日期",
-    field: "happenTime",
-    component: 'RangePicker',
-    componentProps: {
-      showTime: true,
-    },
-    colProps: {span: 6},
-  },
-  {
-    label: "预警类型",
-    field: 'prewarnType',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-  {
-    label: "预警级别",
-    field: 'prewarnLevel',
-    component: 'Input',
-    colProps: {span: 6},
-  },
-];
-
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '发生时间',
-    field: 'happenTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      valueFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-  {
-    label: '预警类型',
-    field: 'prewarnType',
-    component: 'InputNumber',
-  },
-  {
-    label: '预警级别',
-    field: 'prewarnLevel',
-    component: 'InputNumber',
-  },
-  {
-    label: '预警数量',
-    field: 'prewarnNum',
-    component: 'InputNumber',
-  },
-  {
-    label: '已处理数量',
-    field: 'processedNum',
-    component: 'InputNumber',
-  },
-  {
-    label: '未处理数量',
-    field: 'unprocessed',
-    component: 'InputNumber',
-  },
-	// TODO 主键隐藏字段，目前写死为ID
-  {
-    label: '',
-    field: 'id',
-    component: 'Input',
-    show: false,
-  },
-];
diff --git a/src/views/military/modules/statistics/MsPrewarnDaystatisticsList.vue b/src/views/military/modules/statistics/MsPrewarnDaystatisticsList.vue
deleted file mode 100644
index d54a207..0000000
--- a/src/views/military/modules/statistics/MsPrewarnDaystatisticsList.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<!-- 
-  预警日统计
-
-  功能划分
-  统计分析 -> 预警日统计
- -->
-<template>
-  <div>
-    <!--查询区域-->
-    <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-row :gutter="24">
-          <a-col :lg="6">
-            <a-form-item label="日期" name="happenTime_begin">
-              <a-date-picker
-                style="margin-bottom: 24px"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择开始日期"
-                v-model:value="queryParam.happenTime_begin"
-              />
-              <span class="query-group-split-cust">~</span>
-              <a-form-item name="happenTime_end">
-                <a-date-picker value-format="YYYY-MM-DD" placeholder="请选择结束日期" v-model:value="queryParam.happenTime_end" />
-              </a-form-item>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="预警类型" name="prewarnType">
-              <!-- <JInput placeholder="请输入预警类型" v-model:value="queryParam.prewarnType"></JInput> -->
-              <j-dict-select-tag placeholder="请输入预警类型" v-model:value="queryParam.prewarnType" dictCode="ms_warn_type" />
-            </a-form-item>
-          </a-col>
-
-          <a-col :lg="6">
-            <a-form-item label="预警级别" name="prewarnLevel">
-              <!-- <JInput placeholder="请输入预警级别" v-model:value="queryParam.prewarnLevel"></JInput>
-              -->
-              <j-dict-select-tag placeholder="请输入预警级别" v-model:value="queryParam.prewarnLevel" dictCode="ms_warn_level" />
-            </a-form-item>
-          </a-col>
-
-          <a-col :xl="6" :lg="7" :md="6" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
-              </a-col>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
-        <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button>批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown> -->
-        <div
-          v-if="loadOver"
-          style="
-            display: -webkit-flex;
-            display: flex;
-            -webkit-align-items: center;
-            align-items: center;
-            -webkit-justify-content: center;
-            justify-content: center;
-          "
-        >
-          <div style="width: 50%; float: left">
-            <!-- <pie title="报警级别" :dataSource="prewarnLevelData" :height="250"></pie> -->
-            <pie :chartData="prewarnLevelData" height="30vh" width="771.5px" />
-          </div>
-          <div style="width: 50%; float: left">
-            <!-- <pie title="报警内容" :dataSource="prewarnTypeData" :height="250"></pie> -->
-            <pie :chartData="prewarnTypeData" height="30vh" width="771.5px" />
-          </div>
-        </div>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{ text }">
-        <div v-html="text"></div>
-      </template>
-      <!--省市区字段回显插槽-->
-      <template #pcaSlot="{ text }">
-        {{ getAreaTextByCode(text) }}
-      </template>
-      <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <MsPrewarnDaystatisticsModal ref="registerModal" @success="handleSuccess"></MsPrewarnDaystatisticsModal>
-  </div>
-</template>
-
-<script lang="ts" name="military-msPrewarnDaystatistics" setup>
-  import { ref, reactive, onMounted } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns } from './MsPrewarnDaystatistics.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MsPrewarnDaystatistics.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import MsPrewarnDaystatisticsModal from './components/MsPrewarnDaystatisticsModal.vue';
-  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import Pie from '/@/components/chart/Pie.vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
-
-  const formRef = ref();
-  const queryParam = reactive<any>({});
-  const toggleSearchStatus = ref<boolean>(false);
-  const registerModal = ref();
-
-  const loadOver = ref(false);
-  const prewarnLevelData = ref([
-    { value: 0, name: '一级' },
-    { value: 0, name: '二级' },
-    { value: 0, name: '三级' },
-    { value: 0, name: '四级' },
-  ]);
-  const prewarnTypeData = ref([
-    { name: '雷达报警', value: 0 },
-    { name: '微振动光缆报警', value: 0 },
-    { name: '巡逻人员报警', value: 0 },
-    { name: '视频报警', value: 0 },
-    { name: '其他报警', value: 0 },
-  ]);
-
-  //注册table数据
-  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-    tableProps: {
-      title: 'ms_prewarn_daystatistics',
-      api: list,
-      columns,
-      showIndexColumn: true,
-      showActionColumn: false,
-      canResize: false,
-      useSearchForm: false,
-      showTableSetting: false,
-      actionColumn: {
-        width: 120,
-        fixed: 'right',
-      },
-      beforeFetch: (params) => {
-        return Object.assign(params, queryParam);
-      },
-    },
-    exportConfig: {
-      name: '预警日统计表',
-      url: getExportUrl,
-      params: queryParam,
-    },
-    importConfig: {
-      url: getImportUrl,
-      success: handleSuccess,
-    },
-  });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
-    tableContext;
-  const labelCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 7 },
-  });
-  const wrapperCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 16 },
-  });
-
-  onMounted(() => {
-    getPieData();
-  });
-
-  function getPieData() {
-    defHttp
-      .get(
-        {
-          url: '/military/msPrewarnDaystatisticsAnalysis/getLevelDataStatistics',
-          params: queryParam,
-        },
-        { isTransformResponse: false }
-      )
-      // getAction(this.url.getLevelDataStatistics,this.queryParam)
-      .then((res) => {
-        if (res.success) {
-          prewarnLevelData.value = res.result;
-        }
-      });
-    // console.log("queryParam.value",queryParam);
-
-    defHttp
-      .get(
-        {
-          url: '/military/msPrewarnDaystatisticsAnalysis/getTypeDataStatistics',
-          params: queryParam,
-        },
-        { isTransformResponse: false }
-      )
-      // getAction(this.url.getTypeDataStatistics,this.queryParam)
-      .then((res) => {
-        if (res.success) {
-          prewarnTypeData.value = res.result;
-        }
-        loadOver.value = true;
-      });
-  }
-
-  /**
-   * 新增事件
-   */
-  function handleAdd() {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.add();
-  }
-
-  /**
-   * 编辑事件
-   */
-  function handleEdit(record: Recordable) {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.edit(record);
-  }
-
-  /**
-   * 详情
-   */
-  function handleDetail(record: Recordable) {
-    registerModal.value.disableSubmit = true;
-    registerModal.value.edit(record);
-  }
-
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
-  }
-
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
-
-  /**
-   * 成功回调
-   */
-  function handleSuccess() {
-    (selectedRowKeys.value = []) && reload();
-  }
-
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-    ];
-  }
-
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-    ];
-  }
-
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
-    if (queryParam.happenTime_begin || queryParam.happenTime_end) {
-      getPieData();
-    }
-  }
-
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-</script>
-
-<style lang="less" scoped>
-  .jeecg-basic-table-form-container {
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-
-    .query-group-cust {
-      width: calc(50% - 15px);
-      min-width: 100px !important;
-    }
-
-    .query-group-split-cust {
-      width: 30px;
-      display: inline-block;
-      text-align: center;
-    }
-  }
-  :deep(.ant-form-item-control-input-content) {
-    display: flex;
-  }
-</style>
diff --git a/src/views/military/modules/statistics/Prewarn.data.ts b/src/views/military/modules/statistics/Prewarn.data.ts
deleted file mode 100644
index 6bc132c..0000000
--- a/src/views/military/modules/statistics/Prewarn.data.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
-//列表数据
-export const columns: BasicColumn[] = [
-   {
-    title: '日期',
-    align:"center",
-    sorter: true,
-    dataIndex: 'createTime'
-   },
-   {
-    title: '地点',
-    align:"center",
-    dataIndex: 'cameraLoc'
-   },
-   {
-    title: '预警类型',
-    align:"center",
-    dataIndex: 'warnType_dictText'
-   },
-   {
-    title: '预警级别',
-    align:"center",
-    dataIndex: 'warnLevel_dictText'
-   },
-   {
-    title: '预警内容',
-    align:"center",
-    dataIndex: 'warnContent'
-   },
-   {
-    title: '处置方式',
-    align:"center",
-    dataIndex: 'dealWay_dictText'
-   },
-   {
-    title: '处理状态',
-    align:"center",
-    dataIndex: 'dealStatus_dictText'
-   },
-   {
-    title: '处理方式',
-    align:"center",
-    dataIndex: 'dealType_dictText'
-   },
-   {
-    title: '负责人',
-    align:"center",
-    dataIndex: 'director'
-   },
-   {
-    title: '图片',
-    align:"center",
-    dataIndex: 'imgUrl',
-    customRender:render.renderImage,
-   },
-   {
-    title: '录像',
-    align:"center",
-    dataIndex: 'videoUrl'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-     {
-      label: "创建日期",
-      field: "createTime",
-      component: 'RangePicker',
-      componentProps: {
-          showTime:true
-      },
-      colProps: {span: 6},
-	},
-	{
-      label: "预警类型",
-      field: "warnType",
-      component: 'JDictSelectTag',
-      componentProps:{
-          dictCode:"ms_warn_type"
-      },
-      colProps: {span: 6},
- 	},
-	{
-      label: "预警级别",
-      field: "warnLevel",
-      component: 'JDictSelectTag',
-      componentProps:{
-          dictCode:"ms_warn_level"
-      },
-      colProps: {span: 6},
- 	},
-	{
-      label: "处理状态",
-      field: "dealStatus",
-      component: 'JDictSelectTag',
-      componentProps:{
-          dictCode:"ms_warn_status"
-      },
-      colProps: {span: 6},
- 	},
-	{
-      label: "处置类型",
-      field: "dealType",
-      component: 'JDictSelectTag',
-      componentProps:{
-          dictCode:"ms_deal_type"
-      },
-      colProps: {span: 6},
- 	},
-	{
-      label: "事件编号",
-      field: "eventSerialNum",
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '预警类型',
-    field: 'warnType',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"ms_warn_type"
-     },
-  },
-  {
-    label: '预警级别',
-    field: 'warnLevel',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"ms_warn_level"
-     },
-  },
-  {
-    label: '预警内容',
-    field: 'warnContent',
-    component: 'Input',
-  },
-  {
-    label: '处置方式）',
-    field: 'dealWay',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"ms_deal_way"
-     },
-  },
-  {
-    label: '处理状态',
-    field: 'dealStatus',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"ms_warn_status"
-     },
-  },
-  {
-    label: '相机位置（发生地点）',
-    field: 'cameraLoc',
-    component: 'Input',
-  },
-  {
-    label: '录像',
-    field: 'videoUrl',
-    component: 'Input',
-  },
-  {
-    label: '负责人',
-    field: 'director',
-    component: 'Input',
-  },
-  {
-    label: '现场照片',
-    field: 'imgUrl',
-     component: 'JImageUpload',
-     componentProps:{
-      },
-  },
-  {
-    label: '处置类型',
-    field: 'dealType',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"ms_deal_type"
-     },
-  },
-  {
-    label: '类型',
-    field: 'kind',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:""
-     },
-  },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
-];
-//子表单数据
-//子表表格配置
-export const msWarnDealLogColumns: JVxeColumn[] = [
-    {
-      title: '负责人',
-      key: 'director',
-      type: JVxeTypes.input,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '创建日期',
-      key: 'createTime',
-      type: JVxeTypes.datetime,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '处置方式',
-      key: 'dealWay',
-      type: JVxeTypes.inputNumber,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-        validateRules: [
-          { required: true, message: '${title}不能为空' },
-        ],
-    },
-    {
-      title: '处置类型',
-      key: 'dealType',
-      type: JVxeTypes.inputNumber,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-        validateRules: [
-          { required: true, message: '${title}不能为空' },
-        ],
-    },
-    {
-      title: '处置结果',
-      key: 'dealResult',
-      type: JVxeTypes.input,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-        validateRules: [
-          { required: true, message: '${title}不能为空' },
-        ],
-    },
-    {
-      title: '处置备注',
-      key: 'remark',
-      type: JVxeTypes.input,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-  ]
diff --git a/src/views/military/modules/statistics/PrewarnList.vue b/src/views/military/modules/statistics/PrewarnList.vue
deleted file mode 100644
index c7ce32f..0000000
--- a/src/views/military/modules/statistics/PrewarnList.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-<!-- 
-  预警历史查询
-
-  功能划分
-  统计分析 -> 预警历史查询
- -->
-<template>
-  <div>
-    <!--查询区域-->
-    <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-row :gutter="24">
-          <a-col :lg="6">
-            <a-form-item label="日期" name="createTime_begin">
-              <a-date-picker
-                style="margin-bottom: 24px"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择开始日期"
-                v-model:value="queryParam.createTime_begin"
-              />
-              <span class="query-group-split-cust">~</span>
-              <a-form-item name="createTime_end">
-                <a-date-picker value-format="YYYY-MM-DD" placeholder="请选择结束日期" v-model:value="queryParam.createTime_end" />
-              </a-form-item>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="警示类型" name="warnType">
-              <j-dict-select-tag placeholder="请选择警示类型" v-model:value="queryParam.warnType" dictCode="ms_warn_type" />
-            </a-form-item>
-          </a-col>
-          <!-- <template v-if="toggleSearchStatus"> -->
-          <a-col :lg="6">
-            <a-form-item label="警示级别" name="warnLevel">
-              <j-dict-select-tag placeholder="请选择警示级别" v-model:value="queryParam.warnLevel" dictCode="ms_warn_level" />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="处理状态" name="dealStatus">
-              <j-dict-select-tag placeholder="请选择处理状态" v-model:value="queryParam.dealStatus" dictCode="ms_warn_status" />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item label="处理方式" name="dealType">
-              <j-dict-select-tag placeholder="请选择处理方式" v-model:value="queryParam.dealType" dictCode="ms_deal_type" />
-            </a-form-item>
-          </a-col>
-          <!-- </template> -->
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-                <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
-                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
-                  {{ toggleSearchStatus ? '收起' : '展开' }}
-                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-                </a> -->
-              </a-col>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button
-            >批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
-
-        <LineMulti :chartData="multiData" height="30vh" :option="multiOption" type="line"></LineMulti>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{ text }">
-        <div v-html="text"></div>
-      </template>
-      <!--省市区字段回显插槽-->
-      <template #pcaSlot="{ text }">
-        {{ getAreaTextByCode(text) }}
-      </template>
-      <template #fileSlot="{ text }">
-        <span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
-        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <PrewarnModal @register="registerModal" @success="handleSuccess"></PrewarnModal>
-  </div>
-</template>
-
-<script lang="ts" name="/-preWarn" setup>
-  import { ref, reactive, computed, unref, onMounted } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { useModal } from '/@/components/Modal';
-  import PrewarnModal from './components/PrewarnModal.vue';
-  import { columns, searchFormSchema } from './Prewarn.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Prewarn.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import LineMulti from '/@/components/chart/LineMulti.vue';
-  import { defHttp } from '/@/utils/http/axios';
-
-  const formRef = ref();
-  const queryParam = reactive<any>({});
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
-  const [registerModal, { openModal }] = useModal();
-  //注册table数据
-  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
-    tableProps: {
-      title: '预警信息表',
-      api: list,
-      columns,
-      showIndexColumn: true,
-      canResize: false,
-      useSearchForm: false,
-      showTableSetting: false,
-      actionColumn: {
-        width: 120,
-        fixed: 'right',
-      },
-      beforeFetch: (params) => {
-        return Object.assign(params, queryParam);
-      },
-    },
-    exportConfig: {
-      name: '预警历史表',
-      url: getExportUrl,
-      params: queryParam,
-    },
-    importConfig: {
-      url: getImportUrl,
-      success: handleSuccess,
-    },
-  });
-
-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
-
-  onMounted(() => {
-    initEchartData();
-  });
-
-  /**
-   * 新增事件
-   */
-  function handleAdd() {
-    openModal(true, {
-      isUpdate: false,
-      showFooter: true,
-    });
-  }
-  /**
-   * 编辑事件
-   */
-  function handleEdit(record: Recordable) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-      showFooter: true,
-    });
-  }
-  /**
-   * 详情
-   */
-  function handleDetail(record: Recordable) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-      showFooter: false,
-    });
-  }
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
-  }
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
-  /**
-   * 成功回调
-   */
-  function handleSuccess() {
-    (selectedRowKeys.value = []) && reload();
-  }
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-    ];
-  }
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-    ];
-  }
-
-  //趋势图
-  const multiOption = {
-    title: { text: '报警事件趋势图', left: 'center' },
-  };
-  const multiData = ref([{ type: '2021-06-03', prewarnNum: 1 }]);
-
-  function initEchartData() {
-    defHttp
-      .get(
-        {
-          url: '/military/prewarn/getPrewarnStatistics',
-        },
-        { isTransformResponse: false }
-      )
-      // getAction(this.url.prewarnStatistics)
-      .then((res) => {
-        if (res.success) {
-          multiData.value = res.result;
-        }
-      });
-  }
-
-  /* ----------------------以下为原生查询需要添加的-------------------------- */
-  const toggleSearchStatus = ref<boolean>(false);
-  const labelCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 7 },
-  });
-  const wrapperCol = reactive({
-    xs: { span: 24 },
-    sm: { span: 16 },
-  });
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-</script>
-<style lang="less" scoped>
-  .jeecg-basic-table-form-container {
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-
-    .query-group-cust {
-      width: calc(50% - 15px);
-      min-width: 100px !important;
-    }
-
-    .query-group-split-cust {
-      width: 30px;
-      display: inline-block;
-      text-align: center;
-    }
-  }
-
-  :deep(.ant-form-item-control-input-content) {
-    display: flex;
-  }
-</style>
diff --git a/src/views/military/modules/statistics/components/MsBayonetStatisticsForm.vue b/src/views/military/modules/statistics/components/MsBayonetStatisticsForm.vue
deleted file mode 100644
index 23d37d0..0000000
--- a/src/views/military/modules/statistics/components/MsBayonetStatisticsForm.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
-      <a-row>
-        <a-col :span="8">
-          <a-form-item label="姓名" v-bind="validateInfos.name">
-            <a-input v-model:value="formData.name" placeholder="请输入姓名" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="卡口" v-bind="validateInfos.labelId">
-            <!-- <j-dict-select-tag v-model:value="formData.labelId" dictCode="" :string-to-number="true" placeholder="请选择卡口"
-              :disabled="disabled" /> -->
-            <a-select v-model:value="formData.labelId" :disabled="disabled">
-              <a-select-option v-for="(item, index) in labelSelect" :value="item.id" :key="item.id">
-                {{ item.labelName }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="身份证号" v-bind="validateInfos.idCard">
-            <a-input v-model:value="formData.idCard" placeholder="请输入身份证号" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="属性" v-bind="validateInfos.attr">
-            <j-dict-select-tag
-              v-model:value="formData.attr"
-              dictCode="ms_person_attr"
-              :string-to-number="true"
-              placeholder="请选择属性"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="联系电话" v-bind="validateInfos.phone">
-            <a-input v-model:value="formData.phone" placeholder="请输入联系电话" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="车牌号" v-bind="validateInfos.carsNo">
-            <a-input v-model:value="formData.carsNo" placeholder="请输入车牌号" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="人员状态" v-bind="validateInfos.perStatus">
-            <!-- <a-input-number v-model:value="formData.perStatus" placeholder="请输入人员状态" style="width: 100%" disabled /> -->
-            <j-dict-select-tag
-              disabled
-              v-model:value="formData.perStatus"
-              dictCode="ms_person_status"
-              :string-to-number="true"
-              placeholder="请输入人员状态"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="进入时间" v-bind="validateInfos.enterTime">
-            <a-date-picker
-              placeholder="请选择进入时间"
-              v-model:value="formData.enterTime"
-              showTime
-              value-format="YYYY-MM-DD HH:mm:ss"
-              style="width: 100%"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="离开时间" v-bind="validateInfos.leaveTime">
-            <a-date-picker
-              placeholder="请选择离开时间"
-              v-model:value="formData.leaveTime"
-              showTime
-              value-format="YYYY-MM-DD HH:mm:ss"
-              style="width: 100%"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-
-        <a-col :span="8">
-          <a-form-item label="性别" v-bind="validateInfos.sex">
-            <j-dict-select-tag v-model:value="formData.sex" dictCode="sex" placeholder="请选择性别" :disabled="disabled" />
-          </a-form-item>
-        </a-col>
-
-        <a-col :span="8">
-          <a-form-item label="年龄" v-bind="validateInfos.age">
-            <a-input-number v-model:value="formData.age" placeholder="请输入年龄" style="width: 100%" :disabled="disabled" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="紧急电话" v-bind="validateInfos.emergencyPhone">
-            <a-input v-model:value="formData.emergencyPhone" placeholder="请输入紧急联系电话" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-spin>
-</template>
-
-<script lang="ts" setup>
-  import { ref, reactive, nextTick, computed, onMounted } from 'vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../MsBayonetStatistics.api';
-  import { Form } from 'ant-design-vue';
-
-  const props = defineProps({
-    formDisabled: { type: Boolean, default: false },
-    formData: { type: Object, default: () => {} },
-    formBpm: { type: Boolean, default: true },
-  });
-  const labelSelect: any = ref(); //卡口
-  const formRef = ref();
-  const useForm = Form.useForm;
-  const emit = defineEmits(['register', 'ok']);
-  const formData = reactive<Record<string, any>>({
-    id: '',
-    name: '',
-    idCard: '',
-    attr: undefined,
-    phone: '',
-    carsNo: '',
-    enterTime: '',
-    leaveTime: '',
-    sex: undefined,
-    age: undefined,
-    emergencyPhone: '',
-    labelId: '',
-    perStatus: undefined,
-  });
-  const { createMessage } = useMessage();
-  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
-  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
-  const confirmLoading = ref<boolean>(false);
-  //表单验证
-  const validatorRules = {
-    name: [{ required: true, message: '请输入姓名!' }],
-    idCard: [
-      { required: true, message: '请输入身份证号!' },
-      {
-        pattern:
-          /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$|^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/,
-        message: '请输入正确的身份证号码!',
-        trigger: 'blur',
-      },
-    ],
-    attr: [{ required: true, message: '请输入属性（个人还是团体）!' }],
-    phone: [
-      { required: true, message: '请输入联系电话!' },
-      { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!' },
-    ],
-    enterTime: [{ required: true, message: '请输入进入时间!' }],
-    labelId: [{ required: true, message: '请输入卡口!' }],
-    emergencyPhone: [{ required: false }, { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!' }],
-    approved: [{ required: false }, { pattern: /^-?\d+$/, message: '请输入整数!' }],
-    carsNo: [
-      { required: false },
-      {
-        pattern: /[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领]{1}[A-Z]{1}[A-Z0-9]{5,6}/,
-        message: '请输入正确车牌!',
-        trigger: 'blur',
-      },
-    ],
-  };
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
-
-  // 表单禁用
-  const disabled = computed(() => {
-    if (props.formBpm === true) {
-      if (props.formData.disabled === false) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    return props.formDisabled;
-  });
-
-  onMounted(() => {
-    getLabelList();
-  });
-
-  function getLabelList() {
-    defHttp
-      .get(
-        {
-          url: '/military/msMapLabel/list',
-          params: { pageNo: 1, pageSize: 1000, labelAttr: 2 },
-        },
-        { isTransformResponse: false }
-      )
-      // getAction(this.url.getLabelListUrl, { pageNo: 1, pageSize: 1000, labelAttr: 2 })
-      .then((res) => {
-        if (res.success) {
-          labelSelect.value = res.result.records;
-        }
-      });
-  }
-
-  /**
-   * 新增
-   */
-  function add() {
-    edit({
-      attr: 1, //个人
-      perStatus: 1, //已进入
-    });
-  }
-
-  /**
-   * 编辑
-   */
-  function edit(record) {
-    nextTick(() => {
-      resetFields();
-      //赋值
-      Object.assign(formData, record);
-    });
-  }
-
-  /**
-   * 提交数据
-   */
-  async function submitForm() {
-    // 触发表单验证
-    await validate();
-    confirmLoading.value = true;
-    const isUpdate = ref<boolean>(false);
-    //时间格式化
-    let model = formData;
-    if (model.id) {
-      isUpdate.value = true;
-    }
-    //循环数据
-    for (let data in model) {
-      //如果该数据是数组并且是字符串类型
-      if (model[data] instanceof Array) {
-        let valueType = getValueType(formRef.value.getProps, data);
-        //如果是字符串类型的需要变成以逗号分割的字符串
-        if (valueType === 'string') {
-          model[data] = model[data].join(',');
-        }
-      }
-    }
-    await saveOrUpdate(model, isUpdate.value)
-      .then((res) => {
-        if (res.success) {
-          createMessage.success(res.message);
-          emit('ok');
-        } else {
-          createMessage.warning(res.message);
-        }
-      })
-      .finally(() => {
-        confirmLoading.value = false;
-      });
-  }
-
-  defineExpose({
-    add,
-    edit,
-    submitForm,
-  });
-</script>
-
-<style lang="less" scoped>
-  .antd-modal-form {
-    min-height: 400px !important;
-    overflow-y: auto;
-    padding: 24px 24px 24px 24px;
-  }
-</style>
diff --git a/src/views/military/modules/statistics/components/MsBayonetStatisticsModal.vue b/src/views/military/modules/statistics/components/MsBayonetStatisticsModal.vue
deleted file mode 100644
index e7f6196..0000000
--- a/src/views/military/modules/statistics/components/MsBayonetStatisticsModal.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
- * @Author: Fuyuu 1805498209@qq.com
- * @Date: 2023-11-24 10:15:24
- * @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2023-11-29 11:00:49
- * @FilePath: \dt-admin-pc\src\views\military\modules\statistics\components\msBayonetStatisticsModal.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<template>
-  <a-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    @ok="handleOk"
-    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
-    @cancel="handleCancel"
-    cancelText="关闭"
-  >
-    <MsBayonetStatisticsForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsBayonetStatisticsForm>
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, nextTick } from 'vue';
-  import MsBayonetStatisticsForm from './MsBayonetStatisticsForm.vue';
-
-  const title = ref<string>('');
-  const width = ref<number>(1200);
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
-
-  /**
-   * 新增
-   */
-  function add() {
-    title.value = '新增';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.add();
-    });
-  }
-
-  /**
-   * 编辑
-   * @param record
-   */
-  function edit(record) {
-    title.value = disableSubmit.value ? '详情' : '编辑';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.edit(record);
-    });
-  }
-
-  /**
-   * 确定按钮点击事件
-   */
-  function handleOk() {
-    registerForm.value.submitForm();
-  }
-
-  /**
-   * form保存回调事件
-   */
-  function submitCallback() {
-    handleCancel();
-    emit('success');
-  }
-
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-  }
-
-  defineExpose({
-    add,
-    edit,
-    disableSubmit,
-  });
-</script>
-
-<style>
-  /**隐藏样式-modal确定按钮 */
-  .jee-hidden {
-    display: none !important;
-  }
-</style>
diff --git a/src/views/military/modules/statistics/components/MsPrewarnDaystatisticsModal.vue b/src/views/military/modules/statistics/components/MsPrewarnDaystatisticsModal.vue
deleted file mode 100644
index 4eb715f..0000000
--- a/src/views/military/modules/statistics/components/MsPrewarnDaystatisticsModal.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
- * @Author: Fuyuu 1805498209@qq.com
- * @Date: 2023-11-24 10:15:24
- * @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2023-11-29 11:15:54
- * @FilePath: \dt-admin-pc\src\views\military\modules\statistics\components\msPrewarnDaystatisticsModal.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<template>
-  <a-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    @ok="handleOk"
-    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
-    @cancel="handleCancel"
-    cancelText="关闭"
-  >
-    <MsPrewarnDaystatisticsForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></MsPrewarnDaystatisticsForm>
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, nextTick } from 'vue';
-  import MsPrewarnDaystatisticsForm from './MsPrewarnDaystatisticsForm.vue';
-
-  const title = ref<string>('');
-  const width = ref<number>(800);
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
-
-  /**
-   * 新增
-   */
-  function add() {
-    title.value = '新增';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.add();
-    });
-  }
-
-  /**
-   * 编辑
-   * @param record
-   */
-  function edit(record) {
-    title.value = disableSubmit.value ? '详情' : '编辑';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.edit(record);
-    });
-  }
-
-  /**
-   * 确定按钮点击事件
-   */
-  function handleOk() {
-    registerForm.value.submitForm();
-  }
-
-  /**
-   * form保存回调事件
-   */
-  function submitCallback() {
-    handleCancel();
-    emit('success');
-  }
-
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-  }
-
-  defineExpose({
-    add,
-    edit,
-    disableSubmit,
-  });
-</script>
-
-<style>
-  /**隐藏样式-modal确定按钮 */
-  .jee-hidden {
-    display: none !important;
-  }
-</style>
diff --git a/src/views/military/modules/statistics/components/PrewarnForm.vue b/src/views/military/modules/statistics/components/PrewarnForm.vue
deleted file mode 100644
index b6b2134..0000000
--- a/src/views/military/modules/statistics/components/PrewarnForm.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<template>
-  <a-spin :spinning="loading">
-    <a-form v-bind="formItemLayout">
-      <a-row>
-        <a-col :span="12">
-          <a-form-item label="预警类型" v-bind="validateInfos.warnType">
-            <j-dict-select-tag
-              v-model:value="formData.warnType"
-              dictCode="ms_warn_type"
-              :string-to-number="true"
-              placeholder="请选择预警类型"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="预警级别" v-bind="validateInfos.warnLevel">
-            <j-dict-select-tag
-              v-model:value="formData.warnLevel"
-              dictCode="ms_warn_level"
-              :string-to-number="true"
-              placeholder="请选择预警级别"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="预警内容" v-bind="validateInfos.warnContent">
-            <a-input v-model:value="formData.warnContent" placeholder="请输入预警内容" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="处置方式" v-bind="validateInfos.dealWay">
-            <j-dict-select-tag
-              v-model:value="formData.dealWay"
-              dictCode="ms_deal_way"
-              :string-to-number="true"
-              placeholder="请选择处置方式"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="处理状态" v-bind="validateInfos.dealStatus">
-            <j-dict-select-tag
-              v-model:value="formData.dealStatus"
-              dictCode="ms_warn_status"
-              :string-to-number="true"
-              placeholder="请选择处理状态"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="发生地点" v-bind="validateInfos.cameraLoc">
-            <a-input v-model:value="formData.cameraLoc" placeholder="请输入发生地点" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="录像" v-bind="validateInfos.videoUrl">
-            <a-input v-model:value="formData.videoUrl" placeholder="请输入录像" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="负责人" v-bind="validateInfos.director">
-            <a-input v-model:value="formData.director" placeholder="请输入负责人" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="现场照片" v-bind="validateInfos.imgUrl">
-            <j-image-upload v-model:value="formData.imgUrl" :disabled="disabled"></j-image-upload>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="处置类型" v-bind="validateInfos.dealType">
-            <j-dict-select-tag
-              v-model:value="formData.dealType"
-              dictCode="ms_deal_type"
-              :string-to-number="true"
-              placeholder="请选择处置类型"
-              :disabled="disabled"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="类型" v-bind="validateInfos.kind">
-            <j-dict-select-tag v-model:value="formData.kind" dictCode="" :string-to-number="true" placeholder="请选择类型" :disabled="disabled" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-
-    <!-- 子表单区域 -->
-    <a-tabs v-model:activeKey="activeKey" animated>
-      <a-tab-pane tab="历史处置信息" key="msWarnDealLog" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="msWarnDealLogTableRef"
-          :loading="msWarnDealLogTable.loading"
-          :columns="msWarnDealLogTable.columns"
-          :dataSource="msWarnDealLogTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          :toolbar="true"
-        />
-      </a-tab-pane>
-    </a-tabs>
-  </a-spin>
-</template>
-
-<script lang="ts">
-  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { queryMsWarnDealLogListByMainId, queryDataById, saveOrUpdate } from '../Prewarn.api';
-  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
-  import { msWarnDealLogColumns } from '../Prewarn.data';
-  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
-  import { Form } from 'ant-design-vue';
-  const useForm = Form.useForm;
-
-  export default defineComponent({
-    name: 'PreWarnForm',
-    components: {
-      JDictSelectTag,
-      JImageUpload,
-      JVxeTable,
-    },
-    props: {
-      formDisabled: {
-        type: Boolean,
-        default: false,
-      },
-      formData: { type: Object, default: () => {} },
-      formBpm: { type: Boolean, default: true },
-    },
-    emits: ['success'],
-    setup(props, { emit }) {
-      const loading = ref(false);
-      const msWarnDealLogTableRef = ref();
-      const msWarnDealLogTable = reactive<Record<string, any>>({
-        loading: false,
-        columns: msWarnDealLogColumns,
-        dataSource: [],
-      });
-      const activeKey = ref('msWarnDealLog');
-      const formData = reactive<Record<string, any>>({
-        id: '',
-        warnType: '',
-        warnLevel: '',
-        warnContent: '',
-        dealWay: '',
-        dealStatus: '',
-        cameraLoc: '',
-        videoUrl: '',
-        director: '',
-        imgUrl: '',
-        dealType: '',
-        kind: '',
-      });
-
-      //表单验证
-      const validatorRules = reactive({});
-      const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
-      const dbData = {};
-      const formItemLayout = {
-        labelCol: { xs: { span: 24 }, sm: { span: 5 } },
-        wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
-      };
-
-      // 表单禁用
-      const disabled = computed(() => {
-        if (props.formBpm === true) {
-          if (props.formData.disabled === false) {
-            return false;
-          } else {
-            return true;
-          }
-        }
-        return props.formDisabled;
-      });
-
-      function add() {
-        resetFields();
-        msWarnDealLogTable.dataSource = [];
-      }
-
-      async function edit(row) {
-        //主表数据
-        await queryMainData(row.id);
-        //子表数据
-        const msWarnDealLogDataList = await queryMsWarnDealLogListByMainId(row['id']);
-        msWarnDealLogTable.dataSource = [...msWarnDealLogDataList];
-      }
-
-      async function queryMainData(id) {
-        const row = await queryDataById(id);
-        Object.keys(row).map((k) => {
-          formData[k] = row[k];
-        });
-      }
-
-      const { getSubFormAndTableData, transformData } = useValidateAntFormAndTable(activeKey, {
-        msWarnDealLog: msWarnDealLogTableRef,
-      });
-
-      async function getFormData() {
-        await validate();
-        return transformData(toRaw(formData));
-      }
-
-      async function submitForm() {
-        const mainData = await getFormData();
-        const subData = await getSubFormAndTableData();
-        const values = Object.assign({}, dbData, mainData, subData);
-        console.log('表单提交数据', values);
-        const isUpdate = values.id ? true : false;
-        await saveOrUpdate(values, isUpdate);
-        //关闭弹窗
-        emit('success');
-      }
-
-      function setFieldsValue(values) {
-        if (values) {
-          Object.keys(values).map((k) => {
-            formData[k] = values[k];
-          });
-        }
-      }
-
-      /**
-       * 值改变事件触发-树控件回调
-       * @param key
-       * @param value
-       */
-      function handleFormChange(key, value) {
-        formData[key] = value;
-      }
-
-      return {
-        msWarnDealLogTableRef,
-        msWarnDealLogTable,
-        validatorRules,
-        validateInfos,
-        activeKey,
-        loading,
-        formData,
-        setFieldsValue,
-        handleFormChange,
-        formItemLayout,
-        disabled,
-        getFormData,
-        submitForm,
-        add,
-        edit,
-      };
-    },
-  });
-</script>
diff --git a/src/views/military/modules/statistics/components/PrewarnModal.vue b/src/views/military/modules/statistics/components/PrewarnModal.vue
deleted file mode 100644
index 17bffe6..0000000
--- a/src/views/military/modules/statistics/components/PrewarnModal.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
- * @Author: Fuyuu 1805498209@qq.com
- * @Date: 2023-11-24 10:15:24
- * @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2023-11-29 11:26:42
- * @FilePath: \dt-admin-pc\src\views\military\modules\statistics\components\prewarnModal.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="896" @ok="handleSubmit">
-    <PrewarnForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></PrewarnForm>
-  </BasicModal>
-</template>
-
-<script lang="ts">
-  import { ref, unref } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import PrewarnForm from './PrewarnForm.vue';
-
-  export default {
-    name: 'TestCgMainVxeModal',
-    components: {
-      BasicModal,
-      PrewarnForm,
-    },
-    emits: ['register', 'success'],
-    setup(_p, { emit }) {
-      const formComponent = ref();
-      const isUpdate = ref(true);
-      const formDisabled = ref(false);
-      const title = ref('');
-
-      //表单赋值
-      const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-        setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
-        isUpdate.value = !!data?.isUpdate;
-        title.value = data?.isUpdate ? '编辑' : '新增';
-        formDisabled.value = !data?.showFooter;
-        if (unref(isUpdate)) {
-          console.log('data', data);
-          formComponent.value.edit(data.record);
-        } else {
-          formComponent.value.add();
-        }
-      });
-
-      function handleSubmit() {
-        formComponent.value.submitForm();
-      }
-
-      function submitSuccess() {
-        emit('success');
-        closeModal();
-      }
-
-      return {
-        registerModal,
-        title,
-        formComponent,
-        formDisabled,
-        handleSubmit,
-        submitSuccess,
-      };
-    },
-  };
-</script>
-<style lang="less" scoped>
-  /** 时间和数字输入框样式 */
-  :deep(.ant-input-number) {
-    width: 100%;
-  }
-
-  :deep(.ant-calendar-picker) {
-    width: 100%;
-  }
-</style>
diff --git a/src/views/military/modules/statistics/prewarnAnalysis/prewarnDayStatistics/MsPrewarnDaystatisticsList.vue b/src/views/military/modules/statistics/prewarnAnalysis/prewarnDayStatistics/MsPrewarnDaystatisticsList.vue
index d54a207..af6018e 100644
--- a/src/views/military/modules/statistics/prewarnAnalysis/prewarnDayStatistics/MsPrewarnDaystatisticsList.vue
+++ b/src/views/military/modules/statistics/prewarnAnalysis/prewarnDayStatistics/MsPrewarnDaystatisticsList.vue
@@ -1,8 +1,8 @@
 <!-- 
   预警日统计
 
-  功能划分
-  统计分析 -> 预警日统计
+  目录位置：统计分析 -> 预警分析 -> 预警日统计
+  功能概述：使用图表和表格统计预警日统计数据，包含日期、预警级别、预警类型等基础信息，同时可进行多条件筛选
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/statistics/prewarnAnalysis/prewarnHistory/PrewarnList.vue b/src/views/military/modules/statistics/prewarnAnalysis/prewarnHistory/PrewarnList.vue
index 510b8a2..761a768 100644
--- a/src/views/military/modules/statistics/prewarnAnalysis/prewarnHistory/PrewarnList.vue
+++ b/src/views/military/modules/statistics/prewarnAnalysis/prewarnHistory/PrewarnList.vue
@@ -240,7 +240,7 @@
 
   //趋势图
   const multiOption = {
-    title: { text: '报警事件趋势图', left: 'center' },
+    title: { text: '预警事件趋势图', left: 'center' },
   };
   const multiData = ref([{ type: '2021-06-03', prewarnNum: 1 }]);
 
diff --git a/src/views/military/modules/statistics/PrewarnMonth.api.ts b/src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/PrewarnMonth.api.ts
similarity index 100%
rename from src/views/military/modules/statistics/PrewarnMonth.api.ts
rename to src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/PrewarnMonth.api.ts
diff --git a/src/views/military/modules/statistics/PrewarnMonth.data.ts b/src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/PrewarnMonth.data.ts
similarity index 100%
rename from src/views/military/modules/statistics/PrewarnMonth.data.ts
rename to src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/PrewarnMonth.data.ts
diff --git a/src/views/military/modules/statistics/PrewarnMonthList.vue b/src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/PrewarnMonthList.vue
similarity index 98%
rename from src/views/military/modules/statistics/PrewarnMonthList.vue
rename to src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/PrewarnMonthList.vue
index 00f0654..a50a53e 100644
--- a/src/views/military/modules/statistics/PrewarnMonthList.vue
+++ b/src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/PrewarnMonthList.vue
@@ -1,8 +1,8 @@
 <!-- 
   预警月统计
 
-  功能划分
-  统计分析 -> 预警月统计
+  目录位置：统计分析 -> 预警分析 -> 预警月统计
+  功能概述：使用图表和表格统计预警月统计数据，包含日期、预警级别、预警类型等基础信息，同时可进行多条件筛选
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/statistics/components/PrewarnMonthForm.vue b/src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/components/PrewarnMonthForm.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/PrewarnMonthForm.vue
rename to src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/components/PrewarnMonthForm.vue
diff --git a/src/views/military/modules/statistics/components/PrewarnMonthModal.vue b/src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/components/PrewarnMonthModal.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/PrewarnMonthModal.vue
rename to src/views/military/modules/statistics/prewarnAnalysis/prewarnMonthStatistics/components/PrewarnMonthModal.vue
diff --git a/src/views/military/modules/statistics/DayStatistics.api.ts b/src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/DayStatistics.api.ts
similarity index 100%
rename from src/views/military/modules/statistics/DayStatistics.api.ts
rename to src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/DayStatistics.api.ts
diff --git a/src/views/military/modules/statistics/DayStatistics.data.ts b/src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/DayStatistics.data.ts
similarity index 100%
rename from src/views/military/modules/statistics/DayStatistics.data.ts
rename to src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/DayStatistics.data.ts
diff --git a/src/views/military/modules/statistics/DayStatisticsList.vue b/src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/DayStatisticsList.vue
similarity index 98%
rename from src/views/military/modules/statistics/DayStatisticsList.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/DayStatisticsList.vue
index 67d74f2..f0d9234 100644
--- a/src/views/military/modules/statistics/DayStatisticsList.vue
+++ b/src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/DayStatisticsList.vue
@@ -1,8 +1,8 @@
 <!-- 
   报警日统计
 
-  功能划分
-  统计分析 -> 报警日统计
+  目录位置：统计分析 -> 报警分析 -> 报警日统计
+  功能概述：使用图表和表格统计报警日统计数据，包含日期、报警级别、报警类型等基础信息，同时可进行多条件筛选
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/statistics/components/DayStatisticsForm.vue b/src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/components/DayStatisticsForm.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/DayStatisticsForm.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/components/DayStatisticsForm.vue
diff --git a/src/views/military/modules/statistics/components/DayStatisticsModal.vue b/src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/components/DayStatisticsModal.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/DayStatisticsModal.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnDayStatistics/components/DayStatisticsModal.vue
diff --git a/src/views/military/modules/statistics/Warn.api.ts b/src/views/military/modules/statistics/warnAnalysis/warnHistory/Warn.api.ts
similarity index 100%
rename from src/views/military/modules/statistics/Warn.api.ts
rename to src/views/military/modules/statistics/warnAnalysis/warnHistory/Warn.api.ts
diff --git a/src/views/military/modules/statistics/Warn.data.ts b/src/views/military/modules/statistics/warnAnalysis/warnHistory/Warn.data.ts
similarity index 100%
rename from src/views/military/modules/statistics/Warn.data.ts
rename to src/views/military/modules/statistics/warnAnalysis/warnHistory/Warn.data.ts
diff --git a/src/views/military/modules/statistics/WarnList.vue b/src/views/military/modules/statistics/warnAnalysis/warnHistory/WarnList.vue
similarity index 97%
rename from src/views/military/modules/statistics/WarnList.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnHistory/WarnList.vue
index cf86dd8..edab1dd 100644
--- a/src/views/military/modules/statistics/WarnList.vue
+++ b/src/views/military/modules/statistics/warnAnalysis/warnHistory/WarnList.vue
@@ -1,8 +1,8 @@
 <!-- 
-  报警信息查询
+  报警历史查询
 
-  功能划分
-  统计分析 -> 报警信息查询
+  目录位置：统计分析 -> 报警分析 -> 报警历史查询
+  功能概述：使用图表和表格统计报警历史数据，包含编号、事件、入侵位置等基础信息，同时可进行多条件筛选
  -->
 <template>
   <div>
@@ -139,7 +139,7 @@
   import { useUserStore } from '/@/store/modules/user';
   import LineMulti from '/@/components/chart/LineMulti.vue';
   import { defHttp } from '/@/utils/http/axios';
-  import MsAlarmSettingsModal from '/@/views/military/modules/equipment/alarm/components/MsAlarmSettingsModal.vue';
+  import MsAlarmSettingsModal from '/@/views/military/modules/alarmManage/alarmSetting/components/MsAlarmSettingsModal.vue';
   import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
 
   import { getToken } from '/@/utils/auth';
diff --git a/src/views/military/modules/statistics/components/WarnForm.vue b/src/views/military/modules/statistics/warnAnalysis/warnHistory/components/WarnForm.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/WarnForm.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnHistory/components/WarnForm.vue
diff --git a/src/views/military/modules/statistics/components/WarnModal.vue b/src/views/military/modules/statistics/warnAnalysis/warnHistory/components/WarnModal.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/WarnModal.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnHistory/components/WarnModal.vue
diff --git a/src/views/military/modules/statistics/WarnMonth.api.ts b/src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/WarnMonth.api.ts
similarity index 100%
rename from src/views/military/modules/statistics/WarnMonth.api.ts
rename to src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/WarnMonth.api.ts
diff --git a/src/views/military/modules/statistics/WarnMonth.data.ts b/src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/WarnMonth.data.ts
similarity index 100%
rename from src/views/military/modules/statistics/WarnMonth.data.ts
rename to src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/WarnMonth.data.ts
diff --git a/src/views/military/modules/statistics/WarnMonthList.vue b/src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/WarnMonthList.vue
similarity index 98%
rename from src/views/military/modules/statistics/WarnMonthList.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/WarnMonthList.vue
index 29d4393..3d19201 100644
--- a/src/views/military/modules/statistics/WarnMonthList.vue
+++ b/src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/WarnMonthList.vue
@@ -1,8 +1,8 @@
 <!-- 
   报警月统计
 
-  功能划分
-  统计分析 -> 报警月统计
+  目录位置：统计分析 -> 报警分析 -> 报警月统计
+  功能概述：使用图表和表格统计报警月统计数据，包含日期、报警级别、报警类型等基础信息，同时可进行多条件筛选
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/statistics/components/WarnMonthForm.vue b/src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/components/WarnMonthForm.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/WarnMonthForm.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/components/WarnMonthForm.vue
diff --git a/src/views/military/modules/statistics/components/WarnMonthModal.vue b/src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/components/WarnMonthModal.vue
similarity index 100%
rename from src/views/military/modules/statistics/components/WarnMonthModal.vue
rename to src/views/military/modules/statistics/warnAnalysis/warnMonthStatistics/components/WarnMonthModal.vue