From 03423661526f77727e6f2fd801d748190765a066 Mon Sep 17 00:00:00 2001
From: jiejie <2405793769@qq.com>
Date: Thu, 28 Dec 2023 17:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8D=8F=E8=AE=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DtDeviceDataProtocol.api.ts               |   0
 .../DtDeviceDataProtocol.data.ts              |   0
 .../DtDeviceDataProtocolList.vue              |   8 +
 .../components/DtDeviceDataProtocolForm.vue   |   0
 .../components/DtDeviceDataProtocolModal.vue  |   0
 .../DtDeviceNetProtocol.api.ts                |   0
 .../DtDeviceNetProtocol.data.ts               |   0
 .../DtDeviceNetProtocolList.vue               |   7 +
 .../components/DtDeviceNetProtocolForm.vue    |   0
 .../components/DtDeviceNetProtocolModal.vue   |   0
 .../protocolType/DtDeveiceProtocolType.api.ts |  72 -----
 .../DtDeveiceProtocolType.data.ts             |  90 -------
 .../DtDeveiceProtocolTypeList.vue             | 252 ------------------
 .../components/DtDeveiceProtocolTypeForm.vue  | 148 ----------
 .../components/DtDeveiceProtocolTypeModal.vue |  75 ------
 15 files changed, 15 insertions(+), 637 deletions(-)
 rename src/views/military/modules/equipmentManage/{protocolType => dataProtocol}/DtDeviceDataProtocol.api.ts (100%)
 rename src/views/military/modules/equipmentManage/{protocolType => dataProtocol}/DtDeviceDataProtocol.data.ts (100%)
 rename src/views/military/modules/equipmentManage/{protocolType => dataProtocol}/DtDeviceDataProtocolList.vue (97%)
 rename src/views/military/modules/equipmentManage/{protocolType => dataProtocol}/components/DtDeviceDataProtocolForm.vue (100%)
 rename src/views/military/modules/equipmentManage/{protocolType => dataProtocol}/components/DtDeviceDataProtocolModal.vue (100%)
 rename src/views/military/modules/equipmentManage/{protocolType => netProtocol}/DtDeviceNetProtocol.api.ts (100%)
 rename src/views/military/modules/equipmentManage/{protocolType => netProtocol}/DtDeviceNetProtocol.data.ts (100%)
 rename src/views/military/modules/equipmentManage/{protocolType => netProtocol}/DtDeviceNetProtocolList.vue (97%)
 rename src/views/military/modules/equipmentManage/{protocolType => netProtocol}/components/DtDeviceNetProtocolForm.vue (100%)
 rename src/views/military/modules/equipmentManage/{protocolType => netProtocol}/components/DtDeviceNetProtocolModal.vue (100%)
 delete mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.api.ts
 delete mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.data.ts
 delete mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolTypeList.vue
 delete mode 100644 src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeForm.vue
 delete mode 100644 src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeModal.vue

diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.api.ts b/src/views/military/modules/equipmentManage/dataProtocol/DtDeviceDataProtocol.api.ts
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.api.ts
rename to src/views/military/modules/equipmentManage/dataProtocol/DtDeviceDataProtocol.api.ts
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.data.ts b/src/views/military/modules/equipmentManage/dataProtocol/DtDeviceDataProtocol.data.ts
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.data.ts
rename to src/views/military/modules/equipmentManage/dataProtocol/DtDeviceDataProtocol.data.ts
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocolList.vue b/src/views/military/modules/equipmentManage/dataProtocol/DtDeviceDataProtocolList.vue
similarity index 97%
rename from src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocolList.vue
rename to src/views/military/modules/equipmentManage/dataProtocol/DtDeviceDataProtocolList.vue
index 350aca1..e46ef48 100644
--- a/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocolList.vue
+++ b/src/views/military/modules/equipmentManage/dataProtocol/DtDeviceDataProtocolList.vue
@@ -1,3 +1,11 @@
+
+
+<!-- 
+  设备通讯协议
+
+  目录位置：设备管理 -> 设备数据协议
+  功能概述：管理设备数据协议，编号名称
+ -->
 <template>
   <div>
     <!--引用表格-->
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolForm.vue b/src/views/military/modules/equipmentManage/dataProtocol/components/DtDeviceDataProtocolForm.vue
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolForm.vue
rename to src/views/military/modules/equipmentManage/dataProtocol/components/DtDeviceDataProtocolForm.vue
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolModal.vue b/src/views/military/modules/equipmentManage/dataProtocol/components/DtDeviceDataProtocolModal.vue
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolModal.vue
rename to src/views/military/modules/equipmentManage/dataProtocol/components/DtDeviceDataProtocolModal.vue
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.api.ts b/src/views/military/modules/equipmentManage/netProtocol/DtDeviceNetProtocol.api.ts
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.api.ts
rename to src/views/military/modules/equipmentManage/netProtocol/DtDeviceNetProtocol.api.ts
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.data.ts b/src/views/military/modules/equipmentManage/netProtocol/DtDeviceNetProtocol.data.ts
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.data.ts
rename to src/views/military/modules/equipmentManage/netProtocol/DtDeviceNetProtocol.data.ts
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocolList.vue b/src/views/military/modules/equipmentManage/netProtocol/DtDeviceNetProtocolList.vue
similarity index 97%
rename from src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocolList.vue
rename to src/views/military/modules/equipmentManage/netProtocol/DtDeviceNetProtocolList.vue
index c1f15ba..466d6f9 100644
--- a/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocolList.vue
+++ b/src/views/military/modules/equipmentManage/netProtocol/DtDeviceNetProtocolList.vue
@@ -1,3 +1,10 @@
+
+<!-- 
+  设备通讯协议
+
+  目录位置：设备管理 -> 设备网络协议
+  功能概述：管理设备网络协议，编号名称
+ -->
 <template>
   <div>
     <!--引用表格-->
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolForm.vue b/src/views/military/modules/equipmentManage/netProtocol/components/DtDeviceNetProtocolForm.vue
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolForm.vue
rename to src/views/military/modules/equipmentManage/netProtocol/components/DtDeviceNetProtocolForm.vue
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolModal.vue b/src/views/military/modules/equipmentManage/netProtocol/components/DtDeviceNetProtocolModal.vue
similarity index 100%
rename from src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolModal.vue
rename to src/views/military/modules/equipmentManage/netProtocol/components/DtDeviceNetProtocolModal.vue
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.api.ts b/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.api.ts
deleted file mode 100644
index 62e31fe..0000000
--- a/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.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/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
deleted file mode 100644
index 42e471b..0000000
--- a/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolType.data.ts
+++ /dev/null
@@ -1,90 +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: '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
deleted file mode 100644
index 2ee250e..0000000
--- a/src/views/military/modules/equipmentManage/protocolType/DtDeveiceProtocolTypeList.vue
+++ /dev/null
@@ -1,252 +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="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
deleted file mode 100644
index 189af0f..0000000
--- a/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeForm.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<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
deleted file mode 100644
index 4c5f2a2..0000000
--- a/src/views/military/modules/equipmentManage/protocolType/components/DtDeveiceProtocolTypeModal.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<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>