From a75223c2c085ec2e4bcb22f6c12cc6fd3f60e828 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 24 Mar 2025 15:23:17 +0800 Subject: [PATCH] =?UTF-8?q?add(dms):=20=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=B0=83=E8=AF=95=E3=80=81=E9=85=8D=E5=A5=97=E3=80=81?= =?UTF-8?q?=E6=B6=A6=E6=BB=91=E6=A0=87=E5=87=86=E3=80=81=E6=B6=A6=E6=BB=91?= =?UTF-8?q?=E9=83=A8=E4=BD=8D=E3=80=81=E7=89=B9=E7=A7=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=8E=E7=9F=A5=E8=AF=86=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E3=80=81=E4=BF=9D=E5=85=BB=E3=80=81=E6=B6=A6?= =?UTF-8?q?=E6=BB=91=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E9=80=BB=E8=BE=91=E5=B7=B2=E5=AE=8C=E5=96=84=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E4=BB=94=E7=BB=86=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加设备调试信息列表页面，支持搜索、新增、修改、删除和导出功能 - 实现相关 API - 集成设备下拉框数据获取功能 - 修改表格列显示配置和表单验证规则 --- src/api/dms/baseDeviceCategory/index.ts | 12 +- src/api/dms/baseDeviceType/index.ts | 12 +- src/api/dms/dmsBaseDeviceDebugging/index.ts | 77 ++++ src/api/dms/dmsBaseDeviceDebugging/types.ts | 131 +++++++ src/api/dms/dmsBaseDeviceSupplies/index.ts | 77 ++++ src/api/dms/dmsBaseDeviceSupplies/types.ts | 117 ++++++ src/api/dms/dmsBaseLubeStandard/index.ts | 77 ++++ src/api/dms/dmsBaseLubeStandard/types.ts | 133 +++++++ src/api/dms/dmsBaseLubeStation/index.ts | 77 ++++ src/api/dms/dmsBaseLubeStation/types.ts | 148 ++++++++ .../dms/dmsBaseSpecialdeviceParam/index.ts | 77 ++++ .../dms/dmsBaseSpecialdeviceParam/types.ts | 147 ++++++++ src/api/dms/dmsKnowledgeLube/index.ts | 77 ++++ src/api/dms/dmsKnowledgeLube/types.ts | 162 +++++++++ src/api/dms/dmsKnowledgeMaint/index.ts | 77 ++++ src/api/dms/dmsKnowledgeMaint/types.ts | 162 +++++++++ src/api/dms/dmsKnowledgeRepair/index.ts | 77 ++++ src/api/dms/dmsKnowledgeRepair/types.ts | 147 ++++++++ .../dms/dmsBaseDeviceDebugging/index.vue | 323 +++++++++++++++++ src/views/dms/dmsBaseDeviceSupplies/index.vue | 307 ++++++++++++++++ src/views/dms/dmsBaseLubeStandard/index.vue | 312 ++++++++++++++++ src/views/dms/dmsBaseLubeStation/index.vue | 332 +++++++++++++++++ .../dms/dmsBaseSpecialdeviceParam/index.vue | 327 +++++++++++++++++ src/views/dms/dmsKnowledgeLube/index.vue | 338 +++++++++++++++++ src/views/dms/dmsKnowledgeMaint/index.vue | 339 ++++++++++++++++++ src/views/dms/dmsKnowledgeRepair/index.vue | 317 ++++++++++++++++ src/views/dms/dmsPlanMaint/index.vue | 10 +- src/views/dms/dmsPlanMaintDetail/index.vue | 4 +- 28 files changed, 4377 insertions(+), 19 deletions(-) create mode 100644 src/api/dms/dmsBaseDeviceDebugging/index.ts create mode 100644 src/api/dms/dmsBaseDeviceDebugging/types.ts create mode 100644 src/api/dms/dmsBaseDeviceSupplies/index.ts create mode 100644 src/api/dms/dmsBaseDeviceSupplies/types.ts create mode 100644 src/api/dms/dmsBaseLubeStandard/index.ts create mode 100644 src/api/dms/dmsBaseLubeStandard/types.ts create mode 100644 src/api/dms/dmsBaseLubeStation/index.ts create mode 100644 src/api/dms/dmsBaseLubeStation/types.ts create mode 100644 src/api/dms/dmsBaseSpecialdeviceParam/index.ts create mode 100644 src/api/dms/dmsBaseSpecialdeviceParam/types.ts create mode 100644 src/api/dms/dmsKnowledgeLube/index.ts create mode 100644 src/api/dms/dmsKnowledgeLube/types.ts create mode 100644 src/api/dms/dmsKnowledgeMaint/index.ts create mode 100644 src/api/dms/dmsKnowledgeMaint/types.ts create mode 100644 src/api/dms/dmsKnowledgeRepair/index.ts create mode 100644 src/api/dms/dmsKnowledgeRepair/types.ts create mode 100644 src/views/dms/dmsBaseDeviceDebugging/index.vue create mode 100644 src/views/dms/dmsBaseDeviceSupplies/index.vue create mode 100644 src/views/dms/dmsBaseLubeStandard/index.vue create mode 100644 src/views/dms/dmsBaseLubeStation/index.vue create mode 100644 src/views/dms/dmsBaseSpecialdeviceParam/index.vue create mode 100644 src/views/dms/dmsKnowledgeLube/index.vue create mode 100644 src/views/dms/dmsKnowledgeMaint/index.vue create mode 100644 src/views/dms/dmsKnowledgeRepair/index.vue diff --git a/src/api/dms/baseDeviceCategory/index.ts b/src/api/dms/baseDeviceCategory/index.ts index da99f08..bce0c72 100644 --- a/src/api/dms/baseDeviceCategory/index.ts +++ b/src/api/dms/baseDeviceCategory/index.ts @@ -31,36 +31,36 @@ export const getBaseDeviceCategoryInWMS = (deviceCategoryId: string | number): A * 新增设备大类信息 * @param data */ -export const addBaseDeviceCategoryInWMS = (data: BaseDeviceCategoryForm) => { +/*export const addBaseDeviceCategoryInWMS = (data: BaseDeviceCategoryForm) => { return request({ url: '/dms/baseDeviceCategory', method: 'post', data: data }); -}; +};*/ /** * 修改设备大类信息 * @param data */ -export const updateBaseDeviceCategoryInWMS = (data: BaseDeviceCategoryForm) => { +/*export const updateBaseDeviceCategoryInWMS = (data: BaseDeviceCategoryForm) => { return request({ url: '/dms/baseDeviceCategory', method: 'put', data: data }); -}; +};*/ /** * 删除设备大类信息 * @param deviceCategoryId */ -export const delBaseDeviceCategoryInWMS = (deviceCategoryId: string | number | Array) => { +/*export const delBaseDeviceCategoryInWMS = (deviceCategoryId: string | number | Array) => { return request({ url: '/dms/baseDeviceCategory/' + deviceCategoryId, method: 'delete' }); -}; +};*/ /** diff --git a/src/api/dms/baseDeviceType/index.ts b/src/api/dms/baseDeviceType/index.ts index ade89ec..e53c9bf 100644 --- a/src/api/dms/baseDeviceType/index.ts +++ b/src/api/dms/baseDeviceType/index.ts @@ -31,36 +31,36 @@ export const getBaseDeviceTypeInWMS = (deviceTypeId: string | number): AxiosProm * 新增设备类型信息 * @param data */ -export const addBaseDeviceTypeInWMS = (data: BaseDeviceTypeForm) => { +/*export const addBaseDeviceTypeInWMS = (data: BaseDeviceTypeForm) => { return request({ url: '/dms/baseDeviceType', method: 'post', data: data }); -}; +};*/ /** * 修改设备类型信息 * @param data */ -export const updateBaseDeviceTypeInWMS = (data: BaseDeviceTypeForm) => { +/*export const updateBaseDeviceTypeInWMS = (data: BaseDeviceTypeForm) => { return request({ url: '/dms/baseDeviceType', method: 'put', data: data }); -}; +};*/ /** * 删除设备类型信息 * @param deviceTypeId */ -export const delBaseDeviceTypeInWMS = (deviceTypeId: string | number | Array) => { +/*export const delBaseDeviceTypeInWMS = (deviceTypeId: string | number | Array) => { return request({ url: '/dms/baseDeviceType/' + deviceTypeId, method: 'delete' }); -}; +};*/ /** diff --git a/src/api/dms/dmsBaseDeviceDebugging/index.ts b/src/api/dms/dmsBaseDeviceDebugging/index.ts new file mode 100644 index 0000000..0a9e1bd --- /dev/null +++ b/src/api/dms/dmsBaseDeviceDebugging/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsBaseDeviceDebuggingVO, DmsBaseDeviceDebuggingForm, DmsBaseDeviceDebuggingQuery } from '@/api/dms/dmsBaseDeviceDebugging/types'; + +/** + * 查询设备调试信息列表 + * @param query + * @returns {*} + */ + +export const listDmsBaseDeviceDebugging = (query?: DmsBaseDeviceDebuggingQuery): AxiosPromise => { + return request({ + url: '/dms/dmsBaseDeviceDebugging/list', + method: 'get', + params: query + }); +}; + +/** + * 查询设备调试信息详细 + * @param deviceDebuggingId + */ +export const getDmsBaseDeviceDebugging = (deviceDebuggingId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsBaseDeviceDebugging/' + deviceDebuggingId, + method: 'get' + }); +}; + +/** + * 新增设备调试信息 + * @param data + */ +export const addDmsBaseDeviceDebugging = (data: DmsBaseDeviceDebuggingForm) => { + return request({ + url: '/dms/dmsBaseDeviceDebugging', + method: 'post', + data: data + }); +}; + +/** + * 修改设备调试信息 + * @param data + */ +export const updateDmsBaseDeviceDebugging = (data: DmsBaseDeviceDebuggingForm) => { + return request({ + url: '/dms/dmsBaseDeviceDebugging', + method: 'put', + data: data + }); +}; + +/** + * 删除设备调试信息 + * @param deviceDebuggingId + */ +export const delDmsBaseDeviceDebugging = (deviceDebuggingId: string | number | Array) => { + return request({ + url: '/dms/dmsBaseDeviceDebugging/' + deviceDebuggingId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询设备调试信息列表 + * @param query + * @returns {*} + */ +export function getDmsBaseDeviceDebuggingList (query) { + return request({ + url: '/dms/dmsBaseDeviceDebugging/getDmsBaseDeviceDebuggingList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsBaseDeviceDebugging/types.ts b/src/api/dms/dmsBaseDeviceDebugging/types.ts new file mode 100644 index 0000000..f03b7c3 --- /dev/null +++ b/src/api/dms/dmsBaseDeviceDebugging/types.ts @@ -0,0 +1,131 @@ +export interface DmsBaseDeviceDebuggingVO { + /** + * 主键ID + */ + deviceDebuggingId: string | number; + + /** + * 调试单号 + */ + workOrder: string; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId: string | number; + + /** + * 调试状态(0未调试 1调试中 2已完成) + */ + status: string; + + /** + * 调试时间 + */ + debugTime: string; + + /** + * 调试人员 + */ + debugPerson: string; + + /** + * 备注 + */ + remark: string; + + /** + * 设备名称 + */ + machineName: string;//JOIN + +} + +export interface DmsBaseDeviceDebuggingForm extends BaseEntity { + /** + * 主键ID + */ + deviceDebuggingId?: string | number; + + /** + * 调试单号 + */ + workOrder?: string; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId?: string | number; + + /** + * 调试状态(0未调试 1调试中 2已完成) + */ + status?: string; + + /** + * 调试时间 + */ + debugTime?: string; + + /** + * 调试人员 + */ + debugPerson?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 设备名称 + */ + machineName?: string;//JOIN + +} + +export interface DmsBaseDeviceDebuggingQuery extends PageQuery { + + /** + * 主键ID + */ + deviceDebuggingId?: string | number; + + /** + * 调试单号 + */ + workOrder?: string; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId?: string | number; + + /** + * 调试状态(0未调试 1调试中 2已完成) + */ + status?: string; + + /** + * 调试时间 + */ + debugTime?: string; + + /** + * 调试人员 + */ + debugPerson?: string; + + /** + * 日期范围参数 + */ + params?: any; + + /** + * 设备名称 + */ + machineName?: string;//JOIN +} + + + diff --git a/src/api/dms/dmsBaseDeviceSupplies/index.ts b/src/api/dms/dmsBaseDeviceSupplies/index.ts new file mode 100644 index 0000000..a329541 --- /dev/null +++ b/src/api/dms/dmsBaseDeviceSupplies/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsBaseDeviceSuppliesVO, DmsBaseDeviceSuppliesForm, DmsBaseDeviceSuppliesQuery } from '@/api/dms/dmsBaseDeviceSupplies/types'; + +/** + * 查询设备配套信息列表 + * @param query + * @returns {*} + */ + +export const listDmsBaseDeviceSupplies = (query?: DmsBaseDeviceSuppliesQuery): AxiosPromise => { + return request({ + url: '/dms/dmsBaseDeviceSupplies/list', + method: 'get', + params: query + }); +}; + +/** + * 查询设备配套信息详细 + * @param deviceSuppliesId + */ +export const getDmsBaseDeviceSupplies = (deviceSuppliesId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsBaseDeviceSupplies/' + deviceSuppliesId, + method: 'get' + }); +}; + +/** + * 新增设备配套信息 + * @param data + */ +export const addDmsBaseDeviceSupplies = (data: DmsBaseDeviceSuppliesForm) => { + return request({ + url: '/dms/dmsBaseDeviceSupplies', + method: 'post', + data: data + }); +}; + +/** + * 修改设备配套信息 + * @param data + */ +export const updateDmsBaseDeviceSupplies = (data: DmsBaseDeviceSuppliesForm) => { + return request({ + url: '/dms/dmsBaseDeviceSupplies', + method: 'put', + data: data + }); +}; + +/** + * 删除设备配套信息 + * @param deviceSuppliesId + */ +export const delDmsBaseDeviceSupplies = (deviceSuppliesId: string | number | Array) => { + return request({ + url: '/dms/dmsBaseDeviceSupplies/' + deviceSuppliesId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询设备配套信息列表 + * @param query + * @returns {*} + */ +export function getDmsBaseDeviceSuppliesList (query) { + return request({ + url: '/dms/dmsBaseDeviceSupplies/getDmsBaseDeviceSuppliesList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsBaseDeviceSupplies/types.ts b/src/api/dms/dmsBaseDeviceSupplies/types.ts new file mode 100644 index 0000000..cedb96d --- /dev/null +++ b/src/api/dms/dmsBaseDeviceSupplies/types.ts @@ -0,0 +1,117 @@ +export interface DmsBaseDeviceSuppliesVO { + /** + * 主键标识 + */ + deviceSuppliesId: string | number; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId: string | number; + + /** + * 配套信息名称 + */ + suppliesName: string; + + /** + * 类型（1耗材 2备件） + */ + suppliesType: string; + + /** + * 需要数量 + */ + requireAmount: number; + + /** + * 备注 + */ + remark: string; + + /** + * 设备名称 + */ + machineName: string;//JOIN + +} + +export interface DmsBaseDeviceSuppliesForm extends BaseEntity { + /** + * 主键标识 + */ + deviceSuppliesId?: string | number; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId?: string | number; + + /** + * 配套信息名称 + */ + suppliesName?: string; + + /** + * 类型（1耗材 2备件） + */ + suppliesType?: string; + + /** + * 需要数量 + */ + requireAmount?: number; + + /** + * 备注 + */ + remark?: string; + + /** + * 设备名称 + */ + machineName?: string;//JOIN + +} + +export interface DmsBaseDeviceSuppliesQuery extends PageQuery { + + /** + * 主键标识 + */ + deviceSuppliesId?: string | number; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId?: string | number; + + /** + * 配套信息名称 + */ + suppliesName?: string; + + /** + * 类型（1耗材 2备件） + */ + suppliesType?: string; + + /** + * 需要数量 + */ + requireAmount?: number; + + /** + * 日期范围参数 + */ + params?: any; + + + /** + * 设备名称 + */ + machineName?: string;//JOIN +} + + + diff --git a/src/api/dms/dmsBaseLubeStandard/index.ts b/src/api/dms/dmsBaseLubeStandard/index.ts new file mode 100644 index 0000000..4b13b20 --- /dev/null +++ b/src/api/dms/dmsBaseLubeStandard/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsBaseLubeStandardVO, DmsBaseLubeStandardForm, DmsBaseLubeStandardQuery } from '@/api/dms/dmsBaseLubeStandard/types'; + +/** + * 查询润滑标准信息列表 + * @param query + * @returns {*} + */ + +export const listDmsBaseLubeStandard = (query?: DmsBaseLubeStandardQuery): AxiosPromise => { + return request({ + url: '/dms/dmsBaseLubeStandard/list', + method: 'get', + params: query + }); +}; + +/** + * 查询润滑标准信息详细 + * @param lubeStandardId + */ +export const getDmsBaseLubeStandard = (lubeStandardId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsBaseLubeStandard/' + lubeStandardId, + method: 'get' + }); +}; + +/** + * 新增润滑标准信息 + * @param data + */ +export const addDmsBaseLubeStandard = (data: DmsBaseLubeStandardForm) => { + return request({ + url: '/dms/dmsBaseLubeStandard', + method: 'post', + data: data + }); +}; + +/** + * 修改润滑标准信息 + * @param data + */ +export const updateDmsBaseLubeStandard = (data: DmsBaseLubeStandardForm) => { + return request({ + url: '/dms/dmsBaseLubeStandard', + method: 'put', + data: data + }); +}; + +/** + * 删除润滑标准信息 + * @param lubeStandardId + */ +export const delDmsBaseLubeStandard = (lubeStandardId: string | number | Array) => { + return request({ + url: '/dms/dmsBaseLubeStandard/' + lubeStandardId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询润滑标准信息列表 + * @param query + * @returns {*} + */ +export function getDmsBaseLubeStandardList (query) { + return request({ + url: '/dms/dmsBaseLubeStandard/getDmsBaseLubeStandardList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsBaseLubeStandard/types.ts b/src/api/dms/dmsBaseLubeStandard/types.ts new file mode 100644 index 0000000..a350ba6 --- /dev/null +++ b/src/api/dms/dmsBaseLubeStandard/types.ts @@ -0,0 +1,133 @@ +export interface DmsBaseLubeStandardVO { + /** + * 主键标识 + */ + lubeStandardId: string | number; + + /** + * 标准编号 + */ + lubeStandardCode: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId: string | number; + + /** + * 润滑标准 + */ + lubeProtocol: string; + + /** + * 操作描述 + */ + operationDescription: string; + + /** + * 备注 + */ + remark: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag: string; + + + /** + * 设备类型 + */ + deviceTypeName: string;//JOIN + +} + +export interface DmsBaseLubeStandardForm extends BaseEntity { + /** + * 主键标识 + */ + lubeStandardId?: string | number; + + /** + * 标准编号 + */ + lubeStandardCode?: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 润滑标准 + */ + lubeProtocol?: string; + + /** + * 操作描述 + */ + operationDescription?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + +} + +export interface DmsBaseLubeStandardQuery extends PageQuery { + + /** + * 主键标识 + */ + lubeStandardId?: string | number; + + /** + * 标准编号 + */ + lubeStandardCode?: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 润滑标准 + */ + lubeProtocol?: string; + + /** + * 操作描述 + */ + operationDescription?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN +} + + + diff --git a/src/api/dms/dmsBaseLubeStation/index.ts b/src/api/dms/dmsBaseLubeStation/index.ts new file mode 100644 index 0000000..fcedef8 --- /dev/null +++ b/src/api/dms/dmsBaseLubeStation/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsBaseLubeStationVO, DmsBaseLubeStationForm, DmsBaseLubeStationQuery } from '@/api/dms/dmsBaseLubeStation/types'; + +/** + * 查询润滑部位信息列表 + * @param query + * @returns {*} + */ + +export const listDmsBaseLubeStation = (query?: DmsBaseLubeStationQuery): AxiosPromise => { + return request({ + url: '/dms/dmsBaseLubeStation/list', + method: 'get', + params: query + }); +}; + +/** + * 查询润滑部位信息详细 + * @param lubeStationId + */ +export const getDmsBaseLubeStation = (lubeStationId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsBaseLubeStation/' + lubeStationId, + method: 'get' + }); +}; + +/** + * 新增润滑部位信息 + * @param data + */ +export const addDmsBaseLubeStation = (data: DmsBaseLubeStationForm) => { + return request({ + url: '/dms/dmsBaseLubeStation', + method: 'post', + data: data + }); +}; + +/** + * 修改润滑部位信息 + * @param data + */ +export const updateDmsBaseLubeStation = (data: DmsBaseLubeStationForm) => { + return request({ + url: '/dms/dmsBaseLubeStation', + method: 'put', + data: data + }); +}; + +/** + * 删除润滑部位信息 + * @param lubeStationId + */ +export const delDmsBaseLubeStation = (lubeStationId: string | number | Array) => { + return request({ + url: '/dms/dmsBaseLubeStation/' + lubeStationId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询润滑部位信息列表 + * @param query + * @returns {*} + */ +export function getDmsBaseLubeStationList (query) { + return request({ + url: '/dms/dmsBaseLubeStation/getDmsBaseLubeStationList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsBaseLubeStation/types.ts b/src/api/dms/dmsBaseLubeStation/types.ts new file mode 100644 index 0000000..283dd1c --- /dev/null +++ b/src/api/dms/dmsBaseLubeStation/types.ts @@ -0,0 +1,148 @@ +export interface DmsBaseLubeStationVO { + /** + * 主键标识 + */ + lubeStationId: string | number; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId: string | number; + + /** + * 润滑标准ID，关联润滑标准信息主键 + */ + lubeStandardId: string | number; + + /** + * 部位编号 + */ + lubeStationCode: string; + + /** + * 部位名称 + */ + lubeStationName: string; + + /** + * 备注 + */ + remark: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag: string; + + + /** + * 设备类型 + */ + deviceTypeName: string;//JOIN + + /** + * 润滑标准 + */ + lubeStandardCode: string;//JOIN + +} + +export interface DmsBaseLubeStationForm extends BaseEntity { + /** + * 主键标识 + */ + lubeStationId?: string | number; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 润滑标准ID，关联润滑标准信息主键 + */ + lubeStandardId?: string | number; + + /** + * 部位编号 + */ + lubeStationCode?: string; + + /** + * 部位名称 + */ + lubeStationName?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + + /** + * 润滑标准 + */ + lubeStandardCode?: string;//JOIN + +} + +export interface DmsBaseLubeStationQuery extends PageQuery { + + /** + * 主键标识 + */ + lubeStationId?: string | number; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 润滑标准ID，关联润滑标准信息主键 + */ + lubeStandardId?: string | number; + + /** + * 部位编号 + */ + lubeStationCode?: string; + + /** + * 部位名称 + */ + lubeStationName?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + + /** + * 润滑标准 + */ + lubeStandardCode?: string;//JOIN + +} + + + diff --git a/src/api/dms/dmsBaseSpecialdeviceParam/index.ts b/src/api/dms/dmsBaseSpecialdeviceParam/index.ts new file mode 100644 index 0000000..76a47f0 --- /dev/null +++ b/src/api/dms/dmsBaseSpecialdeviceParam/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsBaseSpecialdeviceParamVO, DmsBaseSpecialdeviceParamForm, DmsBaseSpecialdeviceParamQuery } from '@/api/dms/dmsBaseSpecialdeviceParam/types'; + +/** + * 查询特种设备参数信息列表 + * @param query + * @returns {*} + */ + +export const listDmsBaseSpecialdeviceParam = (query?: DmsBaseSpecialdeviceParamQuery): AxiosPromise => { + return request({ + url: '/dms/dmsBaseSpecialdeviceParam/list', + method: 'get', + params: query + }); +}; + +/** + * 查询特种设备参数信息详细 + * @param specialdeviceParamId + */ +export const getDmsBaseSpecialdeviceParam = (specialdeviceParamId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsBaseSpecialdeviceParam/' + specialdeviceParamId, + method: 'get' + }); +}; + +/** + * 新增特种设备参数信息 + * @param data + */ +export const addDmsBaseSpecialdeviceParam = (data: DmsBaseSpecialdeviceParamForm) => { + return request({ + url: '/dms/dmsBaseSpecialdeviceParam', + method: 'post', + data: data + }); +}; + +/** + * 修改特种设备参数信息 + * @param data + */ +export const updateDmsBaseSpecialdeviceParam = (data: DmsBaseSpecialdeviceParamForm) => { + return request({ + url: '/dms/dmsBaseSpecialdeviceParam', + method: 'put', + data: data + }); +}; + +/** + * 删除特种设备参数信息 + * @param specialdeviceParamId + */ +export const delDmsBaseSpecialdeviceParam = (specialdeviceParamId: string | number | Array) => { + return request({ + url: '/dms/dmsBaseSpecialdeviceParam/' + specialdeviceParamId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询特种设备参数信息列表 + * @param query + * @returns {*} + */ +export function getDmsBaseSpecialdeviceParamList (query) { + return request({ + url: '/dms/dmsBaseSpecialdeviceParam/getDmsBaseSpecialdeviceParamList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsBaseSpecialdeviceParam/types.ts b/src/api/dms/dmsBaseSpecialdeviceParam/types.ts new file mode 100644 index 0000000..b0b4358 --- /dev/null +++ b/src/api/dms/dmsBaseSpecialdeviceParam/types.ts @@ -0,0 +1,147 @@ +export interface DmsBaseSpecialdeviceParamVO { + /** + * 主键标识 + */ + specialdeviceParamId: string | number; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId: string | number; + + /** + * 参数编号 + */ + paramCode: string; + + /** + * 参数名称 + */ + paramName: string; + + /** + * 参数值 + */ + paramValue: string; + + /** + * 参数单位 + */ + paramUnit: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag: string; + + /** + * 备注 + */ + remark: string; + + /** + * 设备类型 + */ + machineName: string;//JOIN + +} + +export interface DmsBaseSpecialdeviceParamForm extends BaseEntity { + /** + * 主键标识 + */ + specialdeviceParamId?: string | number; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId?: string | number; + + /** + * 参数编号 + */ + paramCode?: string; + + /** + * 参数名称 + */ + paramName?: string; + + /** + * 参数值 + */ + paramValue?: string; + + /** + * 参数单位 + */ + paramUnit?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 备注 + */ + remark?: string; + + + /** + * 设备类型 + */ + machineName?: string;//JOIN + +} + +export interface DmsBaseSpecialdeviceParamQuery extends PageQuery { + + /** + * 主键标识 + */ + specialdeviceParamId?: string | number; + + /** + * 设备ID，关联prod_base_machine_info的machine_id + */ + machineId?: string | number; + + /** + * 参数编号 + */ + paramCode?: string; + + /** + * 参数名称 + */ + paramName?: string; + + /** + * 参数值 + */ + paramValue?: string; + + /** + * 参数单位 + */ + paramUnit?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; + + /** + * 设备类型 + */ + machineName?: string;//JOIN +} + + + diff --git a/src/api/dms/dmsKnowledgeLube/index.ts b/src/api/dms/dmsKnowledgeLube/index.ts new file mode 100644 index 0000000..06ed76d --- /dev/null +++ b/src/api/dms/dmsKnowledgeLube/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsKnowledgeLubeVO, DmsKnowledgeLubeForm, DmsKnowledgeLubeQuery } from '@/api/dms/dmsKnowledgeLube/types'; + +/** + * 查询润滑知识库列表 + * @param query + * @returns {*} + */ + +export const listDmsKnowledgeLube = (query?: DmsKnowledgeLubeQuery): AxiosPromise => { + return request({ + url: '/dms/dmsKnowledgeLube/list', + method: 'get', + params: query + }); +}; + +/** + * 查询润滑知识库详细 + * @param knowledgeLubeId + */ +export const getDmsKnowledgeLube = (knowledgeLubeId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsKnowledgeLube/' + knowledgeLubeId, + method: 'get' + }); +}; + +/** + * 新增润滑知识库 + * @param data + */ +export const addDmsKnowledgeLube = (data: DmsKnowledgeLubeForm) => { + return request({ + url: '/dms/dmsKnowledgeLube', + method: 'post', + data: data + }); +}; + +/** + * 修改润滑知识库 + * @param data + */ +export const updateDmsKnowledgeLube = (data: DmsKnowledgeLubeForm) => { + return request({ + url: '/dms/dmsKnowledgeLube', + method: 'put', + data: data + }); +}; + +/** + * 删除润滑知识库 + * @param knowledgeLubeId + */ +export const delDmsKnowledgeLube = (knowledgeLubeId: string | number | Array) => { + return request({ + url: '/dms/dmsKnowledgeLube/' + knowledgeLubeId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询润滑知识库列表 + * @param query + * @returns {*} + */ +export function getDmsKnowledgeLubeList (query) { + return request({ + url: '/dms/dmsKnowledgeLube/getDmsKnowledgeLubeList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsKnowledgeLube/types.ts b/src/api/dms/dmsKnowledgeLube/types.ts new file mode 100644 index 0000000..dd60ef4 --- /dev/null +++ b/src/api/dms/dmsKnowledgeLube/types.ts @@ -0,0 +1,162 @@ +export interface DmsKnowledgeLubeVO { + /** + * 主键标识 + */ + knowledgeLubeId: string | number; + + /** + * 经验编号 + */ + experienceCode: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId: string | number; + + /** + * 润滑部位，关联dms_base_lube_station的lube_station_id + */ + lubeStationId: string | number; + + /** + * 润滑标准 + */ + protocolCode: string; + + /** + * 操作描述 + */ + operationsDescription: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag: string; + + /** + * 备注 + */ + remark: string; + + /** + * 设备类型 + */ + deviceTypeName: string;//JOIN + + /** + * 部位名称 + */ + lubeStationName?: string;//JOIN + +} + +export interface DmsKnowledgeLubeForm extends BaseEntity { + /** + * 主键标识 + */ + knowledgeLubeId?: string | number; + + /** + * 经验编号 + */ + experienceCode?: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 润滑部位，关联dms_base_lube_station的lube_station_id + */ + lubeStationId?: string | number; + + /** + * 润滑标准 + */ + protocolCode?: string; + + /** + * 操作描述 + */ + operationsDescription?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + + /** + * 部位名称 + */ + lubeStationName?: string;//JOIN + +} + +export interface DmsKnowledgeLubeQuery extends PageQuery { + + /** + * 主键标识 + */ + knowledgeLubeId?: string | number; + + /** + * 经验编号 + */ + experienceCode?: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 润滑部位，关联dms_base_lube_station的lube_station_id + */ + lubeStationId?: string | number; + + /** + * 润滑标准 + */ + protocolCode?: string; + + /** + * 操作描述 + */ + operationsDescription?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + + /** + * 部位名称 + */ + lubeStationName?: string;//JOIN + +} + + + diff --git a/src/api/dms/dmsKnowledgeMaint/index.ts b/src/api/dms/dmsKnowledgeMaint/index.ts new file mode 100644 index 0000000..87acd42 --- /dev/null +++ b/src/api/dms/dmsKnowledgeMaint/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsKnowledgeMaintVO, DmsKnowledgeMaintForm, DmsKnowledgeMaintQuery } from '@/api/dms/dmsKnowledgeMaint/types'; + +/** + * 查询保养知识库列表 + * @param query + * @returns {*} + */ + +export const listDmsKnowledgeMaint = (query?: DmsKnowledgeMaintQuery): AxiosPromise => { + return request({ + url: '/dms/dmsKnowledgeMaint/list', + method: 'get', + params: query + }); +}; + +/** + * 查询保养知识库详细 + * @param knowledgeMaintId + */ +export const getDmsKnowledgeMaint = (knowledgeMaintId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsKnowledgeMaint/' + knowledgeMaintId, + method: 'get' + }); +}; + +/** + * 新增保养知识库 + * @param data + */ +export const addDmsKnowledgeMaint = (data: DmsKnowledgeMaintForm) => { + return request({ + url: '/dms/dmsKnowledgeMaint', + method: 'post', + data: data + }); +}; + +/** + * 修改保养知识库 + * @param data + */ +export const updateDmsKnowledgeMaint = (data: DmsKnowledgeMaintForm) => { + return request({ + url: '/dms/dmsKnowledgeMaint', + method: 'put', + data: data + }); +}; + +/** + * 删除保养知识库 + * @param knowledgeMaintId + */ +export const delDmsKnowledgeMaint = (knowledgeMaintId: string | number | Array) => { + return request({ + url: '/dms/dmsKnowledgeMaint/' + knowledgeMaintId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询保养知识库列表 + * @param query + * @returns {*} + */ +export function getDmsKnowledgeMaintList (query) { + return request({ + url: '/dms/dmsKnowledgeMaint/getDmsKnowledgeMaintList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsKnowledgeMaint/types.ts b/src/api/dms/dmsKnowledgeMaint/types.ts new file mode 100644 index 0000000..c9c2de0 --- /dev/null +++ b/src/api/dms/dmsKnowledgeMaint/types.ts @@ -0,0 +1,162 @@ +export interface DmsKnowledgeMaintVO { + /** + * 主键标识 + */ + knowledgeMaintId: string | number; + + /** + * 经验编号 + */ + experienceCode: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId: string | number; + + /** + * 保养部位，关联dms_base_maint_station的maint_station_id + */ + maintStationId: string | number; + + /** + * 保养标准 + */ + maintProtocol: string; + + /** + * 操作描述 + */ + operationDescription: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag: string; + + /** + * 备注 + */ + remark: string; + + /** + * 设备类型 + */ + deviceTypeName: string;//JOIN + + /** + * 部位名称 + */ + maintStationName: string;//JOIN + +} + +export interface DmsKnowledgeMaintForm extends BaseEntity { + /** + * 主键标识 + */ + knowledgeMaintId?: string | number; + + /** + * 经验编号 + */ + experienceCode?: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 保养部位，关联dms_base_maint_station的maint_station_id + */ + maintStationId?: string | number; + + /** + * 保养标准 + */ + maintProtocol?: string; + + /** + * 操作描述 + */ + operationDescription?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + + /** + * 部位名称 + */ + maintStationName?: string;//JOIN + +} + +export interface DmsKnowledgeMaintQuery extends PageQuery { + + /** + * 主键标识 + */ + knowledgeMaintId?: string | number; + + /** + * 经验编号 + */ + experienceCode?: string; + + /** + * 设备类型ID，关联base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 保养部位，关联dms_base_maint_station的maint_station_id + */ + maintStationId?: string | number; + + /** + * 保养标准 + */ + maintProtocol?: string; + + /** + * 操作描述 + */ + operationDescription?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + + /** + * 部位名称 + */ + maintStationName?: string;//JOIN + +} + + + diff --git a/src/api/dms/dmsKnowledgeRepair/index.ts b/src/api/dms/dmsKnowledgeRepair/index.ts new file mode 100644 index 0000000..95bf5f3 --- /dev/null +++ b/src/api/dms/dmsKnowledgeRepair/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DmsKnowledgeRepairVO, DmsKnowledgeRepairForm, DmsKnowledgeRepairQuery } from '@/api/dms/dmsKnowledgeRepair/types'; + +/** + * 查询维修知识库列表 + * @param query + * @returns {*} + */ + +export const listDmsKnowledgeRepair = (query?: DmsKnowledgeRepairQuery): AxiosPromise => { + return request({ + url: '/dms/dmsKnowledgeRepair/list', + method: 'get', + params: query + }); +}; + +/** + * 查询维修知识库详细 + * @param knowledgeRepairId + */ +export const getDmsKnowledgeRepair = (knowledgeRepairId: string | number): AxiosPromise => { + return request({ + url: '/dms/dmsKnowledgeRepair/' + knowledgeRepairId, + method: 'get' + }); +}; + +/** + * 新增维修知识库 + * @param data + */ +export const addDmsKnowledgeRepair = (data: DmsKnowledgeRepairForm) => { + return request({ + url: '/dms/dmsKnowledgeRepair', + method: 'post', + data: data + }); +}; + +/** + * 修改维修知识库 + * @param data + */ +export const updateDmsKnowledgeRepair = (data: DmsKnowledgeRepairForm) => { + return request({ + url: '/dms/dmsKnowledgeRepair', + method: 'put', + data: data + }); +}; + +/** + * 删除维修知识库 + * @param knowledgeRepairId + */ +export const delDmsKnowledgeRepair = (knowledgeRepairId: string | number | Array) => { + return request({ + url: '/dms/dmsKnowledgeRepair/' + knowledgeRepairId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询维修知识库列表 + * @param query + * @returns {*} + */ +export function getDmsKnowledgeRepairList (query) { + return request({ + url: '/dms/dmsKnowledgeRepair/getDmsKnowledgeRepairList', + method: 'get', + params: query + }); +}; diff --git a/src/api/dms/dmsKnowledgeRepair/types.ts b/src/api/dms/dmsKnowledgeRepair/types.ts new file mode 100644 index 0000000..d007411 --- /dev/null +++ b/src/api/dms/dmsKnowledgeRepair/types.ts @@ -0,0 +1,147 @@ +export interface DmsKnowledgeRepairVO { + /** + * 主键标识 + */ + knowledgeRepairId: string | number; + + /** + * 经验编号 + */ + experienceCode: string; + + /** + * 设备类型ID，关联dm_base_device_type的device_type_id + */ + deviceTypeId: string | number; + + /** + * 故障描述 + */ + faultDescription: string; + + /** + * 涉及操作 + */ + designOperations: string; + + /** + * 操作描述 + */ + operationsDescription: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag: string; + + /** + * 备注 + */ + remark: string; + + /** + * 设备类型 + */ + deviceTypeName: string;//JOIN + +} + +export interface DmsKnowledgeRepairForm extends BaseEntity { + /** + * 主键标识 + */ + knowledgeRepairId?: string | number; + + /** + * 经验编号 + */ + experienceCode?: string; + + /** + * 设备类型ID，关联dm_base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 故障描述 + */ + faultDescription?: string; + + /** + * 涉及操作 + */ + designOperations?: string; + + /** + * 操作描述 + */ + operationsDescription?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + +} + +export interface DmsKnowledgeRepairQuery extends PageQuery { + + /** + * 主键标识 + */ + knowledgeRepairId?: string | number; + + /** + * 经验编号 + */ + experienceCode?: string; + + /** + * 设备类型ID，关联dm_base_device_type的device_type_id + */ + deviceTypeId?: string | number; + + /** + * 故障描述 + */ + faultDescription?: string; + + /** + * 涉及操作 + */ + designOperations?: string; + + /** + * 操作描述 + */ + operationsDescription?: string; + + /** + * 激活标识（1是 0否） + */ + activeFlag?: string; + + /** + * 日期范围参数 + */ + params?: any; + + /** + * 设备类型 + */ + deviceTypeName?: string;//JOIN + +} + + + diff --git a/src/views/dms/dmsBaseDeviceDebugging/index.vue b/src/views/dms/dmsBaseDeviceDebugging/index.vue new file mode 100644 index 0000000..b1e0cf5 --- /dev/null +++ b/src/views/dms/dmsBaseDeviceDebugging/index.vue @@ -0,0 +1,323 @@ + + + diff --git a/src/views/dms/dmsBaseDeviceSupplies/index.vue b/src/views/dms/dmsBaseDeviceSupplies/index.vue new file mode 100644 index 0000000..216472f --- /dev/null +++ b/src/views/dms/dmsBaseDeviceSupplies/index.vue @@ -0,0 +1,307 @@ + + + diff --git a/src/views/dms/dmsBaseLubeStandard/index.vue b/src/views/dms/dmsBaseLubeStandard/index.vue new file mode 100644 index 0000000..5d25d3e --- /dev/null +++ b/src/views/dms/dmsBaseLubeStandard/index.vue @@ -0,0 +1,312 @@ + + + diff --git a/src/views/dms/dmsBaseLubeStation/index.vue b/src/views/dms/dmsBaseLubeStation/index.vue new file mode 100644 index 0000000..91522d7 --- /dev/null +++ b/src/views/dms/dmsBaseLubeStation/index.vue @@ -0,0 +1,332 @@ + + + diff --git a/src/views/dms/dmsBaseSpecialdeviceParam/index.vue b/src/views/dms/dmsBaseSpecialdeviceParam/index.vue new file mode 100644 index 0000000..2a2d0ec --- /dev/null +++ b/src/views/dms/dmsBaseSpecialdeviceParam/index.vue @@ -0,0 +1,327 @@ + + + diff --git a/src/views/dms/dmsKnowledgeLube/index.vue b/src/views/dms/dmsKnowledgeLube/index.vue new file mode 100644 index 0000000..6a8a079 --- /dev/null +++ b/src/views/dms/dmsKnowledgeLube/index.vue @@ -0,0 +1,338 @@ + + + diff --git a/src/views/dms/dmsKnowledgeMaint/index.vue b/src/views/dms/dmsKnowledgeMaint/index.vue new file mode 100644 index 0000000..d3db243 --- /dev/null +++ b/src/views/dms/dmsKnowledgeMaint/index.vue @@ -0,0 +1,339 @@ + + + diff --git a/src/views/dms/dmsKnowledgeRepair/index.vue b/src/views/dms/dmsKnowledgeRepair/index.vue new file mode 100644 index 0000000..85d56d9 --- /dev/null +++ b/src/views/dms/dmsKnowledgeRepair/index.vue @@ -0,0 +1,317 @@ + + + diff --git a/src/views/dms/dmsPlanMaint/index.vue b/src/views/dms/dmsPlanMaint/index.vue index 3c972ad..288a32d 100644 --- a/src/views/dms/dmsPlanMaint/index.vue +++ b/src/views/dms/dmsPlanMaint/index.vue @@ -21,7 +21,7 @@ --> - + - +