From 2c1b2295fecc92c4f69a9bc369f0c6aae008a08a Mon Sep 17 00:00:00 2001
From: jiejie <2405793769@qq.com>
Date: Mon, 18 Dec 2023 19:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E7=BB=9C=E5=8D=8F?=
=?UTF-8?q?=E8=AE=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../equipmentManage/info/DtDeviceInfo.data.ts | 33 +++-
.../protocolType/DtDeviceDataProtocol.api.ts | 64 +++++++
.../protocolType/DtDeviceDataProtocol.data.ts | 99 ++++++++++
.../protocolType/DtDeviceDataProtocolList.vue | 173 ++++++++++++++++++
.../protocolType/DtDeviceNetProtocol.api.ts | 64 +++++++
.../protocolType/DtDeviceNetProtocol.data.ts | 99 ++++++++++
.../protocolType/DtDeviceNetProtocolList.vue | 173 ++++++++++++++++++
.../components/DtDeviceDataProtocolForm.vue | 70 +++++++
.../components/DtDeviceDataProtocolModal.vue | 66 +++++++
.../components/DtDeviceNetProtocolForm.vue | 70 +++++++
.../components/DtDeviceNetProtocolModal.vue | 66 +++++++
11 files changed, 970 insertions(+), 7 deletions(-)
create mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.api.ts
create mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.data.ts
create mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocolList.vue
create mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.api.ts
create mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.data.ts
create mode 100644 src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocolList.vue
create mode 100644 src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolForm.vue
create mode 100644 src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolModal.vue
create mode 100644 src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolForm.vue
create mode 100644 src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolModal.vue
diff --git a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
index 0549f21..9c5df44 100644
--- a/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
+++ b/src/views/military/modules/equipmentManage/info/DtDeviceInfo.data.ts
@@ -59,9 +59,14 @@ export const columns: BasicColumn[] = [
dataIndex: 'deviceUrl'
},
{
- title: '协议类型',
+ title: '网络协议',
align: "center",
- dataIndex: 'protocol_dictText'
+ dataIndex: 'netProtocol'
+ },
+ {
+ title:'数据协议类型',
+ align:"center",
+ dataIndex:"dataProtocol"
},
{
title: 'ip地址',
@@ -210,7 +215,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'protocol',
component: 'JDictSelectTag',
componentProps: {
- dictCode: "dt_deveice_protocol_type,protocol_name,protocol_type"
+ dictCode: "dt_device_data_protocol,protocol_name,protocol_type"
},
colProps: { span: 6 },
},
@@ -319,16 +324,30 @@ export const formSchema: FormSchema[] = [
},
},
{
- label: '协议类型',
- field: 'protocol',
+ label: '网络协议',
+ field: 'netProtocol',
component: 'JDictSelectTag',
componentProps: {
- dictCode: "dt_deveice_protocol_type,protocol_name,protocol_type",
+ dictCode: "dt_device_net_protocol,protocol_name,protocol_type",
+ stringToNumber: true
+ },
+ dynamicRules: ({ model, schema }) => {
+ return [
+ { required: true, message: '网络协议不能为空!' },
+ ];
+ },
+ },
+ {
+ label: '数据协议类型',
+ field: 'dataProtocol',
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"dt_device_data_protocol,protocol_name,protocol_type",
stringToNumber: true
},
dynamicRules: ({ model, schema }) => {
return [
- { required: true, message: '协议类型不能为空!' },
+ { required: true, message: '数据协议类型不能为空!' },
];
},
},
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.api.ts b/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.api.ts
new file mode 100644
index 0000000..4dabc05
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.api.ts
@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+ list = '/military/dtDeviceDataProtocol/list',
+ save='/military/dtDeviceDataProtocol/add',
+ edit='/military/dtDeviceDataProtocol/edit',
+ deleteOne = '/military/dtDeviceDataProtocol/delete',
+ deleteBatch = '/military/dtDeviceDataProtocol/deleteBatch',
+ importExcel = '/military/dtDeviceDataProtocol/importExcel',
+ exportXls = '/military/dtDeviceDataProtocol/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});
+
+/**
+ * 删除单个
+ */
+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});
+}
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.data.ts b/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.data.ts
new file mode 100644
index 0000000..4904ccf
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocol.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: '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: 'Input',
+ 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
+ },
+];
+
+
+
+/**
+* 流程表单调用这个方法获取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/protocolType/DtDeviceDataProtocolList.vue b/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocolList.vue
new file mode 100644
index 0000000..350aca1
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeviceDataProtocolList.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getAreaTextByCode(text) }}
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.api.ts b/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.api.ts
new file mode 100644
index 0000000..7567a63
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.api.ts
@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+ list = '/military/dtDeviceNetProtocol/list',
+ save='/military/dtDeviceNetProtocol/add',
+ edit='/military/dtDeviceNetProtocol/edit',
+ deleteOne = '/military/dtDeviceNetProtocol/delete',
+ deleteBatch = '/military/dtDeviceNetProtocol/deleteBatch',
+ importExcel = '/military/dtDeviceNetProtocol/importExcel',
+ exportXls = '/military/dtDeviceNetProtocol/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});
+
+/**
+ * 删除单个
+ */
+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});
+}
diff --git a/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.data.ts b/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.data.ts
new file mode 100644
index 0000000..6d9f553
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocol.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: '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: 'Input',
+ 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
+ },
+];
+
+
+
+/**
+* 流程表单调用这个方法获取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/protocolType/DtDeviceNetProtocolList.vue b/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocolList.vue
new file mode 100644
index 0000000..c1f15ba
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/DtDeviceNetProtocolList.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getAreaTextByCode(text) }}
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolForm.vue b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolForm.vue
new file mode 100644
index 0000000..a242693
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolForm.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolModal.vue b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolModal.vue
new file mode 100644
index 0000000..bd62da9
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceDataProtocolModal.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolForm.vue b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolForm.vue
new file mode 100644
index 0000000..be29830
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolForm.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolModal.vue b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolModal.vue
new file mode 100644
index 0000000..16b1f04
--- /dev/null
+++ b/src/views/military/modules/equipmentManage/protocolType/components/DtDeviceNetProtocolModal.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file