add(dms): 新增了机台信息相关接口和类型定义

- 新增了机台信息相关接口和类型定义
- 修改了报警详情信息相关去除了多余的分号

src/api/dms/baseAlarmDetail/index.ts

@@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios';
 import { BaseAlarmDetailVO, BaseAlarmDetailForm, BaseAlarmDetailQuery } from '@/api/dms/baseAlarmDetail/types';
 
 /**
- * 查询报警详情信息;列表
+ * 查询报警详情信息列表
  * @param query
  * @returns {*}
  */
@@ -17,7 +17,7 @@ export const listBaseAlarmDetail = (query?: BaseAlarmDetailQuery): AxiosPromise<
 };
 
 /**
- * 查询报警详情信息;详细
+ * 查询报警详情信息详细
  * @param alarmDetailId
  */
 export const getBaseAlarmDetail = (alarmDetailId: string | number): AxiosPromise<BaseAlarmDetailVO> => {
@@ -28,7 +28,7 @@ export const getBaseAlarmDetail = (alarmDetailId: string | number): AxiosPromise
 };
 
 /**
- * 新增报警详情信息;
+ * 新增报警详情信息
  * @param data
  */
 export const addBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
@@ -40,7 +40,7 @@ export const addBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
 };
 
 /**
- * 修改报警详情信息;
+ * 修改报警详情信息
  * @param data
  */
 export const updateBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
@@ -52,7 +52,7 @@ export const updateBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
 };
 
 /**
- * 删除报警详情信息;
+ * 删除报警详情信息
  * @param alarmDetailId
  */
 export const delBaseAlarmDetail = (alarmDetailId: string | number | Array<string | number>) => {
@@ -64,7 +64,7 @@ export const delBaseAlarmDetail = (alarmDetailId: string | number | Array<string
 
 
 /**
- * 下拉框查询报警详情信息;列表
+ * 下拉框查询报警详情信息列表
  * @param query
  * @returns {*}
  */

src/api/dms/dmsBaseMachineInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProdBaseMachineInfoVO, ProdBaseMachineInfoForm, ProdBaseMachineInfoQuery } from '@/api/dms/dmsBaseMachineInfo/types';
+
+/**
+ * 查询机台信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseMachineInfoIn = (query?: ProdBaseMachineInfoQuery): AxiosPromise<ProdBaseMachineInfoVO[]> => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询机台信息详细
+ * @param machineId
+ */
+export const getDmsBaseMachineInfo  = (machineId: string | number): AxiosPromise<ProdBaseMachineInfoVO> => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo/' + machineId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增机台信息
+ * @param data
+ */
+/*export const addProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo',
+    method: 'post',
+    data: data
+  });
+};*/
+
+/**
+ * 修改机台信息
+ * @param data
+ */
+/*export const updateProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo',
+    method: 'put',
+    data: data
+  });
+};*/
+
+/**
+ * 删除机台信息
+ * @param machineId
+ */
+/*export const delDmsBaseMachineInfo  = (machineId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo/' + machineId,
+    method: 'delete'
+  });
+};*/
+
+
+/**
+ * 下拉框查询机台信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseMachineInfoList  (query) {
+    return request({
+        url: '/dms/dmsBaseMachineInfo/getDmsBaseMachineInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/dms/dmsBaseMachineInfo/types.ts

@@ -0,0 +1,193 @@
+export interface ProdBaseMachineInfoVO {
+  /**
+   * 主键标识
+   */
+  machineId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation: string;
+
+  /**
+   * 机台类型
+   */
+  machineType: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec: string;
+
+  /**
+   * 供应商
+   */
+  supplierId: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface ProdBaseMachineInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  machineId?: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber?: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation?: string;
+
+  /**
+   * 机台类型
+   */
+  machineType?: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec?: string;
+
+  /**
+   * 供应商
+   */
+  supplierId?: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  baseMachineProcessList?: [];
+
+}
+
+export interface ProdBaseMachineInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  machineId?: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber?: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation?: string;
+
+  /**
+   * 机台类型
+   */
+  machineType?: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec?: string;
+
+  /**
+   * 供应商
+   */
+  supplierId?: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/views/dms/baseAlarmDetail/index.vue

@@ -86,7 +86,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
-    <!-- 添加或修改报警详情信息;对话框 -->
+    <!-- 添加或修改报警详情信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="baseAlarmDetailFormRef" :model="form" :rules="rules" label-width="80px">
 <!--        <el-form-item label="报警详细信息ID" prop="alarmDetailId">
@@ -224,7 +224,7 @@ const data = reactive<PageData<BaseAlarmDetailForm, BaseAlarmDetailQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询报警详情信息;列表 */
+/** 查询报警详情信息列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listBaseAlarmDetail(queryParams.value);
@@ -268,7 +268,7 @@ const handleSelectionChange = (selection: BaseAlarmDetailVO[]) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加报警详情信息;";
+  dialog.title = "添加报警详情信息";
 }
 
 /** 修改按钮操作 */
@@ -278,7 +278,7 @@ const handleUpdate = async (row?: BaseAlarmDetailVO) => {
   const res = await getBaseAlarmDetail(_alarmDetailId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改报警详情信息;";
+  dialog.title = "修改报警详情信息";
 }
 
 /** 提交按钮 */
@@ -301,7 +301,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: BaseAlarmDetailVO) => {
   const _alarmDetailIds = row?.alarmDetailId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除报警详情信息;编号为"' + _alarmDetailIds + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除报警详情信息编号为"' + _alarmDetailIds + '"的数据项？').finally(() => loading.value = false);
   await delBaseAlarmDetail(_alarmDetailIds);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();