update add工序、工位信息

src/api/mes/baseProcessInfo/index.ts

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseProcessInfoVO, BaseProcessInfoForm, BaseProcessInfoQuery } from '@/api/mes/baseProcessInfo/types';
+
+/**
+ * 查询工序信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseProcessInfo = (query?: BaseProcessInfoQuery): AxiosPromise<BaseProcessInfoVO[]> => {
+  return request({
+    url: '/mes/baseProcessInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询工序信息详细
+ * @param processId
+ */
+export const getBaseProcessInfo = (processId: string | number): AxiosPromise<BaseProcessInfoVO> => {
+  return request({
+    url: '/mes/baseProcessInfo/' + processId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增工序信息
+ * @param data
+ */
+export const addBaseProcessInfo = (data: BaseProcessInfoForm) => {
+  return request({
+    url: '/mes/baseProcessInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改工序信息
+ * @param data
+ */
+export const updateBaseProcessInfo = (data: BaseProcessInfoForm) => {
+  return request({
+    url: '/mes/baseProcessInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除工序信息
+ * @param processId
+ */
+export const delBaseProcessInfo = (processId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseProcessInfo/' + processId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询工序信息下拉框列表
+ * @param query
+ * @returns {*}
+ */
+export function getProcessInfoList(query) {
+  return request({
+    url: '/mes/baseProcessInfo/getProcessInfoList',
+    method: 'get',
+    params: query
+  });
+};

src/api/mes/baseProcessInfo/types.ts

@@ -0,0 +1,165 @@
+export interface BaseProcessInfoVO {
+  /**
+   * 主键标识
+   */
+  processId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 工序编号
+   */
+  processCode: string;
+
+  /**
+   * 工序名称
+   */
+  processName: string;
+
+  /**
+   * 工序类别（1生产工序 2质检工序）
+   */
+  processType: string;
+
+  /**
+   * 工序顺序
+   */
+  processQueue: number;
+
+  /**
+   * 单位生产时间（秒）;页面显示小时和分钟，就是标准工时，完成一个产品的制造所需的时间
+   */
+  productionTime: number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseProcessInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  processId?: string | number;
+
+  /**
+   * 工序编号
+   */
+  processCode?: string;
+
+  /**
+   * 工序名称
+   */
+  processName?: string;
+
+  /**
+   * 工序类别（1生产工序 2质检工序）
+   */
+  processType?: string;
+
+  /**
+   * 工序顺序
+   */
+  processQueue?: number;
+
+  /**
+   * 单位生产时间（秒）;页面显示小时和分钟，就是标准工时，完成一个产品的制造所需的时间
+   */
+  productionTime?: number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  productionTimeDays?: number;
+  productionTimeHours?: number;
+  productionTimeMinutes?: number;
+
+}
+
+export interface BaseProcessInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  processId?: string | number;
+
+  /**
+   * 工序编号
+   */
+  processCode?: string;
+
+  /**
+   * 工序名称
+   */
+  processName?: string;
+
+  /**
+   * 工序类别（1生产工序 2质检工序）
+   */
+  processType?: string;
+
+  /**
+   * 工序顺序
+   */
+  processQueue?: number;
+
+  /**
+   * 单位生产时间（秒）;页面显示小时和分钟，就是标准工时，完成一个产品的制造所需的时间
+   */
+  productionTime?: number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/mes/baseStationInfo/index.ts

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseStationInfoVO, BaseStationInfoForm, BaseStationInfoQuery } from '@/api/mes/baseStationInfo/types';
+
+/**
+ * 查询工位信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseStationInfo = (query?: BaseStationInfoQuery): AxiosPromise<BaseStationInfoVO[]> => {
+  return request({
+    url: '/mes/baseStationInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询工位信息详细
+ * @param stationId
+ */
+export const getBaseStationInfo = (stationId: string | number): AxiosPromise<BaseStationInfoVO> => {
+  return request({
+    url: '/mes/baseStationInfo/' + stationId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增工位信息
+ * @param data
+ */
+export const addBaseStationInfo = (data: BaseStationInfoForm) => {
+  return request({
+    url: '/mes/baseStationInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改工位信息
+ * @param data
+ */
+export const updateBaseStationInfo = (data: BaseStationInfoForm) => {
+  return request({
+    url: '/mes/baseStationInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除工位信息
+ * @param stationId
+ */
+export const delBaseStationInfo = (stationId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseStationInfo/' + stationId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询工位信息下拉框列表
+ * @param query
+ * @returns {*}
+ */
+export function getStationInfoList(query) {
+  return request({
+    url: '/mes/baseStationInfo/getStationInfoList',
+    method: 'get',
+    params: query
+  });
+};

src/api/mes/baseStationInfo/types.ts

@@ -0,0 +1,195 @@
+export interface BaseStationInfoVO {
+  /**
+   * 主键标识
+   */
+  stationId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 工位编号
+   */
+  stationCode: string;
+
+  /**
+   * 工位名称
+   */
+  stationName: string;
+
+  /**
+   * 工位类型(1生产工位 2质检工位)
+   */
+  stationType: string;
+
+  /**
+   * 所属工序
+   */
+  processId: string | number;
+
+  /**
+   * 单位生产时间（秒）
+   */
+  productionTime: number;
+
+  /**
+   * AGV编号
+   */
+  agvCode: string;
+
+  /**
+   * IP地址
+   */
+  ipAddress: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseStationInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  stationId?: string | number;
+
+  /**
+   * 工位编号
+   */
+  stationCode?: string;
+
+  /**
+   * 工位名称
+   */
+  stationName?: string;
+
+  /**
+   * 工位类型(1生产工位 2质检工位)
+   */
+  stationType?: string;
+
+  /**
+   * 所属工序
+   */
+  processId?: string | number;
+
+  /**
+   * 单位生产时间（秒）
+   */
+  productionTime?: number;
+
+  /**
+   * AGV编号
+   */
+  agvCode?: string;
+
+  /**
+   * IP地址
+   */
+  ipAddress?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  productionTimeDays?: number;
+  productionTimeHours?: number;
+  productionTimeMinutes?: number;
+
+}
+
+export interface BaseStationInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  stationId?: string | number;
+
+  /**
+   * 工位编号
+   */
+  stationCode?: string;
+
+  /**
+   * 工位名称
+   */
+  stationName?: string;
+
+  /**
+   * 工位类型(1生产工位 2质检工位)
+   */
+  stationType?: string;
+
+  /**
+   * 所属工序
+   */
+  processId?: string | number;
+
+  /**
+   * 单位生产时间（秒）
+   */
+  productionTime?: number;
+
+  /**
+   * AGV编号
+   */
+  agvCode?: string;
+
+  /**
+   * IP地址
+   */
+  ipAddress?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/plugins/index.ts

@@ -9,7 +9,14 @@ import animate from '@/animate';
 import { download as dl } from '@/utils/request';
 import { useDict } from '@/utils/dict';
 import { getConfigKey, updateConfigByKey } from '@/api/system/config';
-import { parseTime, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi';
+import {
+  parseTime,
+  addDateRange,
+  handleTree,
+  selectDictLabel,
+  selectDictLabels,
+  formatDayHourMinutes
+} from '@/utils/ruoyi';
 
 import { App } from 'vue';
 
@@ -40,4 +47,6 @@ export default function installPlugin(app: App) {
   app.config.globalProperties.selectDictLabel = selectDictLabel;
   app.config.globalProperties.selectDictLabels = selectDictLabels;
   app.config.globalProperties.animate = animate;
+
+  app.config.globalProperties.formatDayHourMinutes = formatDayHourMinutes;
 }

src/utils/ruoyi.ts

@@ -249,3 +249,24 @@ export const blobValidate = (data: any) => {
 export default {
   handleTree
 };
+
+// 秒转天、小时、分钟
+export const formatDayHourMinutes = (seconds: any) => {
+  if (seconds === 0){
+    return '';
+  }
+  const days = Math.floor(seconds / (24 * 60 * 60));
+  const hours = Math.floor((seconds % (24 * 60 * 60)) / 3600);
+  const minutes = Math.floor((seconds % 3600) / 60);
+  let result = '';
+  if (days > 0) {
+    result += `${days}天`;
+  }
+  if (hours > 0) {
+    result += `${hours}小时`;
+  }
+  if (minutes > 0) {
+    result += `${minutes}分钟`;
+  }
+  return result;
+}

src/views/mes/baseProcessInfo/index.vue

@@ -0,0 +1,352 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="工序名称" prop="processName">
+              <el-input v-model="queryParams.processName" placeholder="请输入工序名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工序类别" prop="processType">
+              <el-select v-model="queryParams.processType" placeholder="请选择工序类别" clearable >
+                <el-option v-for="dict in process_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:baseProcessInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseProcessInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseProcessInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseProcessInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseProcessInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="processId" v-if="columns[0].visible"/>
+        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>
+        <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[2].visible"/>
+        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[3].visible"/>
+        <el-table-column label="工序类别" align="center" prop="processType" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="process_type" :value="scope.row.processType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="工序顺序" align="center" prop="processQueue" v-if="columns[5].visible"/>
+        <el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[6].visible">
+          <template v-slot="scope">
+            <span>{{ formatDayHourMinutes(scope.row.productionTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
+        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[9].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[12].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[13].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseProcessInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseProcessInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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="baseProcessInfoFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="工序编号" prop="processCode">
+          <el-input v-model="form.processCode" placeholder="请输入工序编号" />
+        </el-form-item>
+        <el-form-item label="工序名称" prop="processName">
+          <el-input v-model="form.processName" placeholder="请输入工序名称" />
+        </el-form-item>
+        <el-form-item label="工序类别" prop="processType">
+          <el-select v-model="form.processType" placeholder="请选择工序类别">
+            <el-option
+                v-for="dict in process_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工序顺序" prop="processQueue">
+          <el-input v-model="form.processQueue" placeholder="请输入工序顺序" />
+        </el-form-item>
+        <el-form-item label="单位生产时间" prop="productionTime">
+          <el-input-number v-model="form.productionTimeDays" placeholder="请输入天数" :min="0" :max="10000"
+                           :controls="false" :style="{ width: '50px' }"/>
+          <span>&nbsp;天&nbsp;</span>
+          <el-input-number v-model="form.productionTimeHours" placeholder="请输入小时" :min="0" :max="23"
+                           :controls="false" :style="{ width: '50px' }"/>
+          <span>&nbsp;小时&nbsp;</span>
+          <el-input-number v-model="form.productionTimeMinutes" placeholder="请输入分钟" :min="0" :max="59"
+                           :controls="false" :style="{ width: '50px' }"/>
+          <span>&nbsp;分钟&nbsp;</span>
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseProcessInfo" lang="ts">
+import { listBaseProcessInfo, getBaseProcessInfo, delBaseProcessInfo, addBaseProcessInfo, updateBaseProcessInfo } from '@/api/mes/baseProcessInfo';
+import { BaseProcessInfoVO, BaseProcessInfoQuery, BaseProcessInfoForm } from '@/api/mes/baseProcessInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag, process_type } = toRefs<any>(proxy?.useDict('active_flag', 'process_type'));
+
+const baseProcessInfoList = ref<BaseProcessInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseProcessInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `工序编号`, visible: true },
+        { key: 3, label: `工序名称`, visible: true },
+        { key: 4, label: `工序类别`, visible: true },
+        { key: 5, label: `工序顺序`, visible: true },
+        { key: 6, label: `单位生产时间`, visible: true },
+        { key: 7, label: `激活标识`, visible: true },
+        { key: 8, label: `备注`, visible: false },
+        { key: 9, label: `创建部门`, visible: false },
+        { key: 10, label: `创建人`, visible: false },
+        { key: 11, label: `创建时间`, visible: true },
+        { key: 12, label: `更新人`, visible: false },
+        { key: 13, label: `更新时间`, visible: false },
+]);
+
+const initFormData: BaseProcessInfoForm = {
+  processId: undefined,
+  processCode: undefined,
+  processName: undefined,
+  processType: undefined,
+  processQueue: undefined,
+  productionTime: undefined,
+  activeFlag: '1',
+  remark: undefined,
+  productionTimeDays: 0,
+  productionTimeHours: 0,
+  productionTimeMinutes: 0,
+}
+const data = reactive<PageData<BaseProcessInfoForm, BaseProcessInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    processId: undefined,
+    processCode: undefined,
+    processName: undefined,
+    processType: undefined,
+    processQueue: undefined,
+    productionTime: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    processCode: [
+      { required: true, message: "工序编号不能为空", trigger: "blur" }
+    ],
+    processName: [
+      { required: true, message: "工序名称不能为空", trigger: "blur" }
+    ],
+    processType: [
+      { required: true, message: "工序类别不能为空", trigger: "change" }
+    ],
+    activeFlag: [
+      { required: true, message: "激活标识", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 天小时分钟转换为秒 */
+const convertToSeconds = () => {
+  const daysInSeconds = form.value.productionTimeDays * 24 * 60 * 60;
+  const hoursInSeconds = form.value.productionTimeHours * 60 * 60;
+  const minutesInSeconds = form.value.productionTimeMinutes * 60;
+  form.value.productionTime = daysInSeconds + hoursInSeconds + minutesInSeconds;
+}
+
+/** 秒转换为天小时分钟 */
+const convertToTime = () => {
+  const totalSeconds = form.value.productionTime;
+  const days = Math.floor(totalSeconds / (24 * 60 * 60));
+  const hours = Math.floor((totalSeconds % (24 * 60 * 60)) / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  // 更新到表单中
+  form.value.productionTimeDays = days;
+  form.value.productionTimeHours = hours;
+  form.value.productionTimeMinutes = minutes;
+}
+
+/** 查询工序信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseProcessInfo(queryParams.value);
+  baseProcessInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseProcessInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseProcessInfoVO[]) => {
+  ids.value = selection.map(item => item.processId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加工序信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseProcessInfoVO) => {
+  reset();
+  const _processId = row?.processId || ids.value[0]
+  const res = await getBaseProcessInfo(_processId);
+  Object.assign(form.value, res.data);
+  convertToTime();
+  dialog.visible = true;
+  dialog.title = "修改工序信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseProcessInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      convertToSeconds();
+      if (form.value.processId) {
+        await updateBaseProcessInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseProcessInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseProcessInfoVO) => {
+  const _processIds = row?.processId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除工序信息编号为"' + _processIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseProcessInfo(_processIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/baseProcessInfo/export', {
+    ...queryParams.value
+  }, `baseProcessInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/mes/baseProdLineInfo/index.vue

@@ -177,7 +177,6 @@ const dialog = reactive<DialogOption>({
 const getWorkshopListSelect = async () => {
   let res = await getWorkshopList(null);
   workshopInfoList.value = res.data;
-  console.log("workshopInfoList.value",workshopInfoList.value, res);
 };
 
 // 列显隐信息

src/views/mes/baseStationInfo/index.vue

@@ -0,0 +1,413 @@
+<template>
+  <div class='p-2'>
+    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
+                :leave-active-class='proxy?.animate.searchAnimate.leave'>
+      <div v-show='showSearch' class='mb-[10px]'>
+        <el-card shadow='hover'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
+            <el-form-item label='工位名称' prop='stationName'>
+              <el-input v-model='queryParams.stationName' placeholder='请输入工位名称' clearable @keyup.enter='handleQuery' />
+            </el-form-item>
+            <el-form-item label='工位类型' prop='stationType'>
+              <el-select v-model='queryParams.stationType' placeholder='请选择工位类型' clearable>
+                <el-option v-for='dict in station_type' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='所属工序' prop='processId'>
+              <el-select v-model="queryParams.processId" placeholder="请选择所属工序" clearable @keyup.enter='handleQuery' >
+                <el-option
+                  v-for="item in processInfoList"
+                  :key="item.processId"
+                  :label="item.processName"
+                  :value="item.processId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow='never'>
+      <template #header>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['mes:baseStationInfo:add']">新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['mes:baseStationInfo:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['mes:baseStationInfo:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['mes:baseStationInfo:export']">导出
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading='loading' :data='baseStationInfoList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='主键标识' align='center' prop='stationId' v-if='columns[0].visible' />
+        <el-table-column label='租户编号' align='center' prop='tenantId' v-if='columns[1].visible' />
+        <el-table-column label='工位编号' align='center' prop='stationCode' v-if='columns[2].visible' />
+        <el-table-column label='工位名称' align='center' prop='stationName' v-if='columns[3].visible' />
+        <el-table-column label='工位类型' align='center' prop='stationType' v-if='columns[4].visible'>
+          <template #default='scope'>
+            <dict-tag :options='station_type' :value='scope.row.stationType' />
+          </template>
+        </el-table-column>
+        <el-table-column label='所属工序' align='center' prop='processName' v-if='columns[5].visible' />
+        <el-table-column label='单位生产时间' align='center' prop='productionTime' v-if='columns[6].visible' >
+          <template v-slot="scope">
+            <span>{{ formatDayHourMinutes(scope.row.productionTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label='AGV编号' align='center' prop='agvCode' v-if='columns[7].visible' />
+        <el-table-column label='IP地址' align='center' prop='ipAddress' v-if='columns[8].visible' />
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[9].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[10].visible' />
+        <el-table-column label='创建部门' align='center' prop='createDept' v-if='columns[11].visible' />
+        <el-table-column label='创建人' align='center' prop='createBy' v-if='columns[12].visible' />
+        <el-table-column label='创建时间' align='center' prop='createTime' width='180' v-if='columns[13].visible'>
+          <template #default='scope'>
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label='更新人' align='center' prop='updateBy' v-if='columns[14].visible' />
+        <el-table-column label='更新时间' align='center' prop='updateTime' width='180' v-if='columns[15].visible'>
+          <template #default='scope'>
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
+          <template #default='scope'>
+            <el-tooltip content='修改' placement='top'>
+              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
+                         v-hasPermi="['mes:baseStationInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['mes:baseStationInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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='baseStationInfoFormRef' :model='form' :rules='rules' label-width='100px'>
+        <el-form-item label='工位编号' prop='stationCode'>
+          <el-input v-model='form.stationCode' placeholder='请输入工位编号' />
+        </el-form-item>
+        <el-form-item label='工位名称' prop='stationName'>
+          <el-input v-model='form.stationName' placeholder='请输入工位名称' />
+        </el-form-item>
+        <el-form-item label='工位类型' prop='stationType'>
+          <el-select v-model='form.stationType' placeholder='请选择工位类型'>
+            <el-option
+              v-for='dict in station_type'
+              :key='dict.value'
+              :label='dict.label'
+              :value='dict.value'
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label='所属工序' prop='processId'>
+          <el-select v-model="form.processId" placeholder="请选择所属工序">
+            <el-option
+              v-for="item in processInfoList"
+              :key="item.processId"
+              :label="item.processName"
+              :value="item.processId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label='单位生产时间' prop='productionTime'>
+          <el-input-number v-model="form.productionTimeDays" placeholder="请输入天数" :min="0" :max="10000"
+                           :controls="false" :style="{ width: '50px' }"/>
+          <span>&nbsp;天&nbsp;</span>
+          <el-input-number v-model="form.productionTimeHours" placeholder="请输入小时" :min="0" :max="23"
+                           :controls="false" :style="{ width: '50px' }"/>
+          <span>&nbsp;小时&nbsp;</span>
+          <el-input-number v-model="form.productionTimeMinutes" placeholder="请输入分钟" :min="0" :max="59"
+                           :controls="false" :style="{ width: '50px' }"/>
+          <span>&nbsp;分钟&nbsp;</span>
+        </el-form-item>
+        <el-form-item label='AGV编号' prop='agvCode'>
+          <el-input v-model='form.agvCode' placeholder='请输入AGV编号' />
+        </el-form-item>
+        <el-form-item label='IP地址' prop='ipAddress'>
+          <el-input v-model='form.ipAddress' placeholder='请输入IP地址' />
+        </el-form-item>
+        <el-form-item label='激活标识' prop='activeFlag'>
+          <el-radio-group v-model='form.activeFlag'>
+            <el-radio
+              v-for='dict in station_type'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name='BaseStationInfo' lang='ts'>
+import {
+  listBaseStationInfo,
+  getBaseStationInfo,
+  delBaseStationInfo,
+  addBaseStationInfo,
+  updateBaseStationInfo
+} from '@/api/mes/baseStationInfo';
+import { BaseStationInfoVO, BaseStationInfoQuery, BaseStationInfoForm } from '@/api/mes/baseStationInfo/types';
+import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { station_type, active_flag } = toRefs<any>(proxy?.useDict('station_type', 'active_flag'));
+
+const baseStationInfoList = ref<BaseStationInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseStationInfoFormRef = ref<ElFormInstance>();
+let processInfoList = ref([]);
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+/** 查询工位下拉树结构 */
+const getProcessInfoListSelect = async () => {
+  let res = await getProcessInfoList(null);
+  processInfoList.value = res.data;
+};
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `工位编号`, visible: true },
+  { key: 3, label: `工位名称`, visible: true },
+  { key: 4, label: `工位类型`, visible: true },
+  { key: 5, label: `所属工序`, visible: true },
+  { key: 6, label: `单位生产时间`, visible: true },
+  { key: 7, label: `AGV编号`, visible: true },
+  { key: 8, label: `IP地址`, visible: true },
+  { key: 9, label: `激活标识`, visible: true },
+  { key: 10, label: `备注`, visible: true },
+  { key: 11, label: `创建部门`, visible: false },
+  { key: 12, label: `创建人`, visible: false },
+  { key: 13, label: `创建时间`, visible: false },
+  { key: 14, label: `更新人`, visible: false },
+  { key: 15, label: `更新时间`, visible: false }
+]);
+
+const initFormData: BaseStationInfoForm = {
+  stationId: undefined,
+  stationCode: undefined,
+  stationName: undefined,
+  stationType: undefined,
+  processId: undefined,
+  productionTime: undefined,
+  agvCode: undefined,
+  ipAddress: undefined,
+  activeFlag: '1',
+  remark: undefined,
+  productionTimeDays: 0,
+  productionTimeHours: 0,
+  productionTimeMinutes: 0,
+};
+const data = reactive<PageData<BaseStationInfoForm, BaseStationInfoQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    stationId: undefined,
+    stationCode: undefined,
+    stationName: undefined,
+    stationType: undefined,
+    processId: undefined,
+    productionTime: undefined,
+    agvCode: undefined,
+    ipAddress: undefined,
+    activeFlag: undefined,
+    params: {}
+  },
+  rules: {
+    stationCode: [
+      { required: true, message: '工位编号不能为空', trigger: 'blur' }
+    ],
+    stationName: [
+      { required: true, message: '工位名称不能为空', trigger: 'blur' }
+    ],
+    stationType: [
+      { required: true, message: '工位类型不能为空', trigger: 'change' }
+    ],
+    processId: [
+      { required: true, message: '所属工序不能为空', trigger: 'blur' }
+    ],
+    activeFlag: [
+      { required: true, message: '激活标识不能为空', trigger: 'change' }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询工位信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseStationInfo(queryParams.value);
+  baseStationInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  baseStationInfoFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseStationInfoVO[]) => {
+  ids.value = selection.map(item => item.stationId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加工位信息';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseStationInfoVO) => {
+  reset();
+  const _stationId = row?.stationId || ids.value[0];
+  const res = await getBaseStationInfo(_stationId);
+  Object.assign(form.value, res.data);
+  convertToTime();
+  dialog.visible = true;
+  dialog.title = '修改工位信息';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseStationInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      convertToSeconds();
+      if (form.value.stationId) {
+        await updateBaseStationInfo(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addBaseStationInfo(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 天小时分钟转换为秒 */
+const convertToSeconds = () => {
+  const daysInSeconds = form.value.productionTimeDays * 24 * 60 * 60;
+  const hoursInSeconds = form.value.productionTimeHours * 60 * 60;
+  const minutesInSeconds = form.value.productionTimeMinutes * 60;
+  form.value.productionTime = daysInSeconds + hoursInSeconds + minutesInSeconds;
+}
+
+/** 秒转换为天小时分钟 */
+const convertToTime = () => {
+  const totalSeconds = form.value.productionTime;
+  const days = Math.floor(totalSeconds / (24 * 60 * 60));
+  const hours = Math.floor((totalSeconds % (24 * 60 * 60)) / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  // 更新到表单中
+  form.value.productionTimeDays = days;
+  form.value.productionTimeHours = hours;
+  form.value.productionTimeMinutes = minutes;
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseStationInfoVO) => {
+  const _stationIds = row?.stationId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除工位信息编号为"' + _stationIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseStationInfo(_stationIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/baseStationInfo/export', {
+    ...queryParams.value
+  }, `baseStationInfo_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getProcessInfoListSelect();
+  getList();
+});
+</script>