From 795cd3affad471d6285a70979f7cbcd9646ce713 Mon Sep 17 00:00:00 2001
From: Lxq <19852720163@163.com>
Date: Mon, 1 Jun 2026 10:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc_autoplc_front/src/views/flowinfo/index.vue | 1092 ----------------
 .../src/views/manage-log/index.vue            |   66 +-
 .../src/views/plcdevicecontrol/index.vue      | 1127 -----------------
 rc_autoplc_front/src/views/position/index.vue |  412 ------
 .../src/views/recordinfo/index.vue            |    2 +-
 .../src/views/statusmonitor/index.vue         |   25 +-
 6 files changed, 77 insertions(+), 2647 deletions(-)
 delete mode 100644 rc_autoplc_front/src/views/flowinfo/index.vue
 delete mode 100644 rc_autoplc_front/src/views/plcdevicecontrol/index.vue
 delete mode 100644 rc_autoplc_front/src/views/position/index.vue

diff --git a/rc_autoplc_front/src/views/flowinfo/index.vue b/rc_autoplc_front/src/views/flowinfo/index.vue
deleted file mode 100644
index 25857d7..0000000
--- a/rc_autoplc_front/src/views/flowinfo/index.vue
+++ /dev/null
@@ -1,1092 +0,0 @@
-<template>
-  <div class="flowinfo-page">
-    <el-breadcrumb separator="/" style="margin-bottom: 16px">
-      <el-breadcrumb-item><router-link to="/home">首页</router-link></el-breadcrumb-item>
-      <el-breadcrumb-item>流程管理</el-breadcrumb-item>
-      <el-breadcrumb-item>标准流程管理</el-breadcrumb-item>
-    </el-breadcrumb>
-    <!-- 搜索栏 -->
-    <el-card class="search-card" shadow="never">
-      <div class="search-bar">
-        <el-form :inline="true" :model="queryForm" label-width="100px">
-          <el-form-item label="标准流程名称">
-            <el-input
-              v-model="queryForm.flowName"
-              placeholder="输入标准流程名称"
-              clearable
-              style="width: 200px"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button v-permission="'tb:goodcontrolselect'" type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="resetSearch">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <div class="toolbar">
-          <el-button v-permission="'tb:goodcontroladd'" type="primary" @click="handleAdd">
-            <el-icon><Plus /></el-icon>
-            新增流程
-          </el-button>
-        </div>
-      </div>
-    </el-card>
-
-    <!-- 流程信息列表 -->
-    <el-card shadow="never">
-      <el-table
-        :data="tableData"
-        stripe
-        border
-        style="width: 100%"
-        v-loading="loading"
-      >
-        <el-table-column
-          prop="flowIndex"
-          label="标准流程序号"
-          width="130"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="flowName"
-          label="标准流程名称"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="busyCode"
-          label="业务编号"
-          min-width="120"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="goodsCode"
-          label="样品编号"
-          min-width="120"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="goodsName"
-          label="样品名称"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="checkCode"
-          label="检样编号"
-          min-width="120"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="programName"
-          label="项目名称"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="testMethod"
-          label="检测方法"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="scanNum"
-          label="扫描编号"
-          min-width="120"
-          :formatter="formatCell"
-        />
-        <el-table-column label="操作" width="260" fixed="right">
-          <template #default="scope">
-            <el-button
-              v-permission="'tb:goodcontrolupdSOP'"
-              :type="scope.row.hasWorkflow ? 'success' : 'warning'"
-              link
-              :loading="scope.row.workflowLoading"
-              @click="handleConfigWorkflow(scope.row)"
-            >
-              {{ scope.row.hasWorkflow ? '编辑流程' : '配置流程' }}
-            </el-button>
-            <el-button v-permission="'tb:goodcontrolchooseSC'" type="info" link @click="handleSelectGoods(scope.row)">选择样品</el-button>
-            <el-button v-permission="'tb:goodcontrolupd'" type="primary" link @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button v-permission="'tb:goodcontroldel'" type="danger" link @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="pagination">
-        <el-pagination
-          v-model:current-page="pagination.pageNum"
-          v-model:page-size="pagination.pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-          background
-          @current-change="handleCurrentChange"
-          @size-change="handleSizeChange"
-        />
-      </div>
-    </el-card>
-
-    <!-- 新增/编辑抽屉 -->
-    <el-drawer
-      v-model="drawerVisible"
-      :title="drawerTitle"
-      direction="rtl"
-      size="600px"
-      :before-close="handleDrawerClose"
-    >
-      <el-form
-        ref="formRef"
-        :model="formData"
-        :rules="formRules"
-        label-width="120px"
-        label-position="left"
-      >
-        <el-form-item label="标准流程序号" prop="flowIndex">
-          <el-input
-            v-model="formData.flowIndex"
-            placeholder="请输入标准流程序号"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="标准流程名称" prop="flowName">
-          <el-input
-            v-model="formData.flowName"
-            placeholder="请输入标准流程名称"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="业务编号">
-          <el-input
-            v-model="formData.busyCode"
-            placeholder="请输入业务编号"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="样品编号">
-          <el-input
-            v-model="formData.goodsCode"
-            placeholder="请输入样品编号"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="样品名称">
-          <el-input
-            v-model="formData.goodsName"
-            placeholder="请输入样品名称"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="检样编号">
-          <el-input
-            v-model="formData.checkCode"
-            placeholder="请输入检样编号"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="项目名称">
-          <el-input
-            v-model="formData.programName"
-            placeholder="请输入项目名称"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="检测方法">
-          <el-input
-            v-model="formData.testMethod"
-            placeholder="请输入检测方法"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="扫描编号">
-          <el-input
-            v-model="formData.scanNum"
-            placeholder="请输入扫描编号"
-            clearable
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="drawer-footer">
-          <el-button @click="handleDrawerClose">取消</el-button>
-          <el-button type="primary" @click="handleSubmit" :loading="submitting">
-            确定
-          </el-button>
-        </div>
-      </template>
-    </el-drawer>
-
-    <!-- 选择样品对话框 -->
-    <el-dialog
-      v-model="goodsSelectDialogVisible"
-      title="选择样品"
-      width="1000px"
-      :before-close="handleGoodsSelectDialogClose"
-    >
-      <el-table
-        ref="goodsTableRef"
-        v-loading="goodsSelectLoading"
-        :data="goodsSelectTableData"
-        border
-        stripe
-        style="width: 100%"
-        @selection-change="handleGoodsSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column
-          type="index"
-          label="序号"
-          width="60"
-          :index="getGoodsIndex"
-        />
-        <el-table-column
-          prop="goodsName"
-          label="样品名称"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="goodsType"
-          label="样品基质类型"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="incomeTime"
-          label="采样时间"
-          min-width="120"
-          :formatter="formatDate"
-        />
-        <el-table-column
-          prop="goodFrom"
-          label="采样地点"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="goalDetect"
-          label="目标检测物"
-          min-width="150"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="barCode"
-          label="条形码"
-          min-width="120"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="goodsStatus"
-          label="样品状态"
-          width="120"
-          align="center"
-        >
-          <template #default="{ row }">
-            <el-tag :type="getGoodsStatusType(row.goodsStatus)" size="small">
-              {{ getGoodsStatusText(row.goodsStatus) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="desc"
-          label="描述"
-          min-width="150"
-          :formatter="formatCell"
-        />
-      </el-table>
-      <div class="pagination">
-        <el-pagination
-          v-model:current-page="goodsSelectPagination.pageNum"
-          v-model:page-size="goodsSelectPagination.pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="goodsSelectTotal"
-          background
-          @current-change="handleGoodsSelectCurrentChange"
-          @size-change="handleGoodsSelectSizeChange"
-        />
-      </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="handleGoodsSelectDialogClose">取消</el-button>
-          <el-button type="primary" @click="handleSaveGoodsBind" :loading="savingGoodsBind">
-            保存
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Plus } from '@element-plus/icons-vue'
-import {
-  flowInfoadd,
-  flowInfodel,
-  flowInfoupd,
-  flowInfolist,
-  flowInfobyid,
-} from '@/api/tb/flowinfo'
-import { stepInfolist } from '@/api/tb/stepinfo'
-import { goodsInfolist, goodsInfoupd } from '@/api/tb/goodsinfo'
-
-interface FlowInfoItem {
-  id?: number | string
-  flowIndex?: number | string
-  flowName?: string
-  busyCode?: string
-  goodsCode?: string
-  goodsName?: string
-  checkCode?: string
-  programName?: string
-  testMethod?: string
-  scanNum?: string
-  islandIdList?: string
-  hasWorkflow?: boolean
-  workflowLoading?: boolean
-}
-
-interface GoodsInfoItem {
-  id?: number | string
-  goodsName?: string
-  goodsType?: string
-  incomeTime?: string
-  goodFrom?: string
-  goalDetect?: string
-  barCode?: string
-  goodsStatus?: number
-  desc?: string
-  flowId?: number | string
-}
-
-const router = useRouter()
-const loading = ref(false)
-const submitting = ref(false)
-const tableData = ref<FlowInfoItem[]>([])
-const total = ref(0)
-
-// 选择样品相关
-const goodsSelectDialogVisible = ref(false)
-const goodsSelectLoading = ref(false)
-const savingGoodsBind = ref(false)
-const goodsSelectTableData = ref<GoodsInfoItem[]>([])
-const goodsSelectTotal = ref(0)
-const goodsSelectPagination = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const goodsTableRef = ref()
-const selectedGoods = ref<GoodsInfoItem[]>([])
-const boundGoods = ref<GoodsInfoItem[]>([])
-const currentFlowForGoods = ref<FlowInfoItem | null>(null)
-
-// 查询表单
-const queryForm = reactive({
-  flowName: '',
-})
-
-// 分页
-const pagination = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-
-// 抽屉相关
-const drawerVisible = ref(false)
-const drawerTitle = ref('新增流程')
-const isEdit = ref(false)
-const formRef = ref<FormInstance>()
-
-// 表单数据
-const formData = reactive<FlowInfoItem>({
-  id: undefined,
-  flowIndex: '',
-  flowName: '',
-  busyCode: '',
-  goodsCode: '',
-  goodsName: '',
-  checkCode: '',
-  programName: '',
-  testMethod: '',
-  scanNum: '',
-})
-
-// 表单验证规则
-const formRules: FormRules = {
-  flowIndex: [
-    { required: true, message: '请输入标准流程序号', trigger: 'blur' },
-    {
-      validator: (_rule, value, callback) => {
-        // required 规则已经处理了空值，这里只处理非空值
-        const strValue = String(value).trim()
-        // 检查是否为数字（包括整数和小数）
-        if (!/^\d+(\.\d+)?$/.test(strValue)) {
-          callback(new Error('标准流程序号必须为数字'))
-          return
-        }
-        // 检查是否为非负数字
-        const numValue = Number(strValue)
-        if (numValue < 0) {
-          callback(new Error('标准流程序号必须为非负数'))
-          return
-        }
-        callback()
-      },
-      trigger: 'blur',
-    },
-  ],
-  flowName: [
-    { required: true, message: '请输入标准流程名称', trigger: 'blur' },
-  ],
-}
-
-// 格式化单元格
-const formatCell = (_row: any, _column: any, value: any) => {
-  if (value === 0) return 0
-  return value === undefined || value === null || value === '' ? '暂无' : value
-}
-
-// 格式化日期（只显示年月日）
-const formatDate = (_row: any, _column: any, value: any) => {
-  if (!value) return '暂无'
-  try {
-    const date = new Date(value)
-    const year = date.getFullYear()
-    const month = String(date.getMonth() + 1).padStart(2, '0')
-    const day = String(date.getDate()).padStart(2, '0')
-    return `${year}-${month}-${day}`
-  } catch (error) {
-    return value
-  }
-}
-
-// 获取样品状态类型
-const getGoodsStatusType = (status: number | null | undefined) => {
-  if (status === 0) return 'primary' // 待处理 - 蓝色
-  if (status === 1) return 'success' // 处理成功 - 绿色
-  if (status === 4) return 'danger' // 处理失败 - 红色
-  return 'info'
-}
-
-// 获取样品状态文本
-const getGoodsStatusText = (status: number | null | undefined) => {
-  if (status === 0) return '待处理'
-  if (status === 1) return '处理成功'
-  if (status === 4) return '处理失败'
-  return '未知'
-}
-
-// 获取样品序号
-const getGoodsIndex = (index: number) => {
-  return (goodsSelectPagination.pageNum - 1) * goodsSelectPagination.pageSize + index + 1
-}
-
-// 获取流程信息列表
-const getFlowInfoList = async () => {
-  try {
-    loading.value = true
-    const params: any = {
-      pageNum: pagination.pageNum,
-      pageSize: pagination.pageSize,
-    }
-    
-    // 添加查询条件（过滤空值）
-    if (queryForm.flowName && queryForm.flowName.trim()) {
-      params.flowName = queryForm.flowName.trim()
-    }
-    
-    const res: any = await flowInfolist(params)
-    
-    const data = res?.data ?? res ?? {}
-    
-    // 兼容多种返回格式
-    const recordsFromData =
-      data.records ||
-      data.list ||
-      data.rows ||
-      data.items ||
-      (Array.isArray(data.data) ? data.data : undefined)
-
-    const records = Array.isArray(recordsFromData)
-      ? recordsFromData
-      : Array.isArray(data)
-        ? data
-        : []
-
-    const totalValue =
-      data.total ?? data.count ?? data.totalCount ?? records.length ?? 0
-
-    tableData.value = records.map((item: any) => ({
-      ...item,
-      hasWorkflow: false,
-      workflowLoading: false,
-    }))
-    total.value = Number(totalValue) || 0
-
-    // 查询每条标准流程是否已配置流程
-    await Promise.all(
-      tableData.value.map(async (row) => {
-        if (!row.id) return
-        row.workflowLoading = true
-        try {
-          const res: any = await stepInfolist({
-            flowId: row.id,
-            pageNum: 1,
-            pageSize: 1,
-          })
-          const data = res?.data ?? res ?? {}
-          const records =
-            data.records ||
-            data.list ||
-            data.rows ||
-            data.items ||
-            (Array.isArray(data.data) ? data.data : [])
-          row.hasWorkflow = Array.isArray(records) && records.length > 0
-        } catch (error) {
-          console.error(`查询流程配置状态失败(${row.id}):`, error)
-          row.hasWorkflow = false
-        } finally {
-          row.workflowLoading = false
-        }
-      })
-    )
-  } catch (error) {
-    console.error('获取流程信息列表失败:', error)
-    ElMessage.error('获取流程信息列表失败')
-    tableData.value = []
-    total.value = 0
-  } finally {
-    loading.value = false
-  }
-}
-
-// 查询
-const handleSearch = () => {
-  pagination.pageNum = 1
-  getFlowInfoList()
-}
-
-// 重置查询
-const resetSearch = () => {
-  queryForm.flowName = ''
-  handleSearch()
-}
-
-// 分页大小改变
-const handleSizeChange = (size: number) => {
-  pagination.pageSize = size
-  getFlowInfoList()
-}
-
-// 当前页改变
-const handleCurrentChange = (page: number) => {
-  pagination.pageNum = page
-  getFlowInfoList()
-}
-
-// 重置表单
-const resetForm = () => {
-  formData.id = undefined
-  formData.flowIndex = ''
-  formData.flowName = ''
-  formData.busyCode = ''
-  formData.goodsCode = ''
-  formData.goodsName = ''
-  formData.checkCode = ''
-  formData.programName = ''
-  formData.testMethod = ''
-  formData.scanNum = ''
-  formRef.value?.clearValidate()
-}
-
-// 打开新增抽屉
-const handleAdd = () => {
-  isEdit.value = false
-  drawerTitle.value = '新增流程'
-  resetForm()
-  drawerVisible.value = true
-}
-
-// 编辑流程信息
-const handleEdit = async (row: FlowInfoItem) => {
-  try {
-    if (!row.id) {
-      ElMessage.warning('缺少流程信息ID')
-      return
-    }
-    
-    loading.value = true
-    const res: any = await flowInfobyid(row.id)
-    
-    if (res.code === '0' || res.code === 0) {
-      const data = res.data || res || row
-      formData.id = data.id ?? row.id
-      const flowIndexValue = data.flowIndex ?? row.flowIndex
-      formData.flowIndex = flowIndexValue !== undefined && flowIndexValue !== null ? String(flowIndexValue) : ''
-      formData.flowName = data.flowName ?? row.flowName ?? ''
-      formData.busyCode = data.busyCode ?? row.busyCode ?? ''
-      formData.goodsCode = data.goodsCode ?? row.goodsCode ?? ''
-      formData.goodsName = data.goodsName ?? row.goodsName ?? ''
-      formData.checkCode = data.checkCode ?? row.checkCode ?? ''
-      formData.programName = data.programName ?? row.programName ?? ''
-      formData.testMethod = data.testMethod ?? row.testMethod ?? ''
-      formData.scanNum = data.scanNum ?? row.scanNum ?? ''
-      
-      isEdit.value = true
-      drawerTitle.value = '编辑流程'
-      drawerVisible.value = true
-    } else {
-      ElMessage.error(res.message || res.msg || '获取流程信息失败')
-    }
-  } catch (error) {
-    console.error('获取流程信息失败:', error)
-    ElMessage.error('获取流程信息失败')
-  } finally {
-    loading.value = false
-  }
-}
-
-// 跳转到流程创建/编辑
-const handleConfigWorkflow = (row: FlowInfoItem) => {
-  if (!row.id) {
-    ElMessage.warning('缺少流程信息ID')
-    return
-  }
-  router.push({
-    name: 'step-info',
-    query: {
-      flowId: row.id,
-      flowIndex: row.flowIndex ?? '',
-      flowName: row.flowName ?? '',
-      mode: row.hasWorkflow ? 'edit' : 'create',
-    },
-  })
-}
-
-// 删除流程信息
-const handleDelete = async (row: FlowInfoItem) => {
-  if (!row.id) {
-    ElMessage.warning('缺少流程信息ID')
-    return
-  }
-  
-  try {
-    await ElMessageBox.confirm(
-      `确定要删除流程信息"${row.flowName || '未命名'}"吗？`,
-      '提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }
-    )
-    
-    loading.value = true
-    const res: any = await flowInfodel(row.id)
-    
-    if (res.code === '0' || res.code === 0) {
-      ElMessage.success('删除成功')
-      getFlowInfoList()
-    } else {
-      ElMessage.error(res.message || res.msg || '删除失败')
-    }
-  } catch (error: any) {
-    if (error !== 'cancel') {
-      console.error('删除流程信息失败:', error)
-      ElMessage.error('删除流程信息失败')
-    }
-  } finally {
-    loading.value = false
-  }
-}
-
-// 提交表单
-const handleSubmit = async () => {
-  if (!formRef.value) return
-  
-  try {
-    await formRef.value.validate()
-    submitting.value = true
-    
-    // 将 flowIndex 字符串转换为数字
-    const flowIndexNum = formData.flowIndex !== '' && formData.flowIndex !== undefined && formData.flowIndex !== null
-      ? Number(String(formData.flowIndex).trim())
-      : undefined
-    
-    const submitData: any = {
-      flowIndex: flowIndexNum,
-      flowName: formData.flowName,
-      busyCode: formData.busyCode || undefined,
-      goodsCode: formData.goodsCode || undefined,
-      goodsName: formData.goodsName || undefined,
-      checkCode: formData.checkCode || undefined,
-      programName: formData.programName || undefined,
-      testMethod: formData.testMethod || undefined,
-      scanNum: formData.scanNum || undefined,
-    }
-    
-    // 移除空字符串字段
-    Object.keys(submitData).forEach((key) => {
-      if (submitData[key] === '' || submitData[key] === null) {
-        delete submitData[key]
-      }
-    })
-    
-    let res: any
-    if (isEdit.value && formData.id) {
-      // 编辑 - 需传入流程信息ID,其他字段可选(非空则更新)
-      res = await flowInfoupd({
-        id: formData.id,
-        ...submitData,
-      })
-    } else {
-      // 新增
-      res = await flowInfoadd(submitData)
-    }
-    
-    if (res.code === '0' || res.code === 0) {
-      ElMessage.success(isEdit.value ? '编辑成功' : '新增成功')
-      drawerVisible.value = false
-      getFlowInfoList()
-    } else {
-      ElMessage.error(res.message || res.msg || (isEdit.value ? '编辑失败' : '新增失败'))
-    }
-  } catch (error: any) {
-    if (error !== false) {
-      console.error('提交失败:', error)
-      ElMessage.error('提交失败，请检查表单')
-    }
-  } finally {
-    submitting.value = false
-  }
-}
-
-// 关闭抽屉
-const handleDrawerClose = () => {
-  drawerVisible.value = false
-  resetForm()
-}
-
-// 加载已绑定的样品
-const loadBoundGoods = async (flowId: number | string) => {
-  try {
-    const res: any = await goodsInfolist({
-      pageNum: 1,
-      pageSize: 1000,
-    })
-    const allGoods = res?.data ?? res ?? {}
-    const recordsFromData =
-      allGoods.records ||
-      allGoods.list ||
-      allGoods.rows ||
-      allGoods.items ||
-      (Array.isArray(allGoods.data) ? allGoods.data : undefined)
-    const allGoodsList = Array.isArray(recordsFromData)
-      ? recordsFromData
-      : Array.isArray(allGoods)
-        ? allGoods
-        : []
-    if (Array.isArray(allGoodsList)) {
-      boundGoods.value = allGoodsList.filter((goods: any) => 
-        goods.flowId && (goods.flowId === flowId || goods.flowId === String(flowId))
-      )
-    }
-  } catch (error) {
-    console.error('加载已绑定样品失败:', error)
-    boundGoods.value = []
-  }
-}
-
-// 获取样品列表（选择弹框用）
-const getGoodsInfoListForSelect = async () => {
-  try {
-    goodsSelectLoading.value = true
-    const params: any = {
-      pageNum: goodsSelectPagination.pageNum,
-      pageSize: goodsSelectPagination.pageSize,
-    }
-
-    const res: any = await goodsInfolist(params)
-    const data = res?.data ?? res ?? {}
-
-    const recordsFromData =
-      data.records ||
-      data.list ||
-      data.rows ||
-      data.items ||
-      (Array.isArray(data.data) ? data.data : undefined)
-
-    const records = Array.isArray(recordsFromData)
-      ? recordsFromData
-      : Array.isArray(data)
-        ? data
-        : []
-
-    const totalValue =
-      data.total ?? data.count ?? data.totalCount ?? records.length ?? 0
-
-    // 过滤样品：只显示flowId为0或空，或者flowId等于当前流程ID的样品
-    if (currentFlowForGoods.value?.id) {
-      const currentFlowId = currentFlowForGoods.value.id
-      goodsSelectTableData.value = records.filter((goods: any) => {
-        const flowId = goods.flowId
-        return (
-          !flowId ||
-          flowId === 0 ||
-          flowId === '0' ||
-          flowId === currentFlowId ||
-          flowId === String(currentFlowId)
-        )
-      })
-      // 重新计算总数（实际应该后端过滤，这里简化处理）
-      goodsSelectTotal.value = records.filter((goods: any) => {
-        const flowId = goods.flowId
-        return (
-          !flowId ||
-          flowId === 0 ||
-          flowId === '0' ||
-          flowId === currentFlowId ||
-          flowId === String(currentFlowId)
-        )
-      }).length
-    } else {
-      goodsSelectTableData.value = records
-      goodsSelectTotal.value = Number(totalValue) || 0
-    }
-  } catch (error) {
-    console.error('获取样品列表失败:', error)
-    ElMessage.error('获取样品列表失败')
-    goodsSelectTableData.value = []
-    goodsSelectTotal.value = 0
-  } finally {
-    goodsSelectLoading.value = false
-  }
-}
-
-// 打开选择样品对话框
-const handleSelectGoods = async (row: FlowInfoItem) => {
-  if (!row.id) {
-    ElMessage.warning('缺少流程信息ID')
-    return
-  }
-
-  currentFlowForGoods.value = row
-  selectedGoods.value = []
-  boundGoods.value = []
-  goodsSelectPagination.pageNum = 1
-  goodsSelectPagination.pageSize = 10
-
-  // 加载已绑定的样品
-  await loadBoundGoods(row.id)
-
-  goodsSelectDialogVisible.value = true
-  await getGoodsInfoListForSelect()
-
-  // 等待DOM更新后设置已选中的样品
-  await new Promise(resolve => setTimeout(resolve, 100))
-  if (goodsTableRef.value && boundGoods.value.length > 0) {
-    const boundGoodsIds = boundGoods.value.map((g: any) => g.id)
-    goodsSelectTableData.value.forEach((goods: any) => {
-      if (boundGoodsIds.includes(goods.id)) {
-        goodsTableRef.value.toggleRowSelection(goods, true)
-      }
-    })
-  }
-}
-
-// 样品选择变化
-const handleGoodsSelectionChange = (selection: GoodsInfoItem[]) => {
-  selectedGoods.value = selection
-}
-
-// 样品分页变化（页码）
-const handleGoodsSelectCurrentChange = (page: number) => {
-  goodsSelectPagination.pageNum = page
-  getGoodsInfoListForSelect().then(() => {
-    // 等待DOM更新后重新设置已选中的样品
-    setTimeout(() => {
-      if (goodsTableRef.value && boundGoods.value.length > 0) {
-        const boundGoodsIds = boundGoods.value.map((g: any) => g.id)
-        goodsSelectTableData.value.forEach((goods: any) => {
-          if (boundGoodsIds.includes(goods.id)) {
-            goodsTableRef.value.toggleRowSelection(goods, true)
-          }
-        })
-      }
-    }, 100)
-  })
-}
-
-// 样品分页变化（每页大小）
-const handleGoodsSelectSizeChange = (size: number) => {
-  goodsSelectPagination.pageSize = size
-  getGoodsInfoListForSelect().then(() => {
-    // 等待DOM更新后重新设置已选中的样品
-    setTimeout(() => {
-      if (goodsTableRef.value && boundGoods.value.length > 0) {
-        const boundGoodsIds = boundGoods.value.map((g: any) => g.id)
-        goodsSelectTableData.value.forEach((goods: any) => {
-          if (boundGoodsIds.includes(goods.id)) {
-            goodsTableRef.value.toggleRowSelection(goods, true)
-          }
-        })
-      }
-    }, 100)
-  })
-}
-
-// 保存样品绑定
-const handleSaveGoodsBind = async () => {
-  if (!currentFlowForGoods.value || !currentFlowForGoods.value.id) {
-    ElMessage.warning('缺少流程信息ID，无法保存')
-    return
-  }
-
-  const flowId = currentFlowForGoods.value.id
-
-  try {
-    savingGoodsBind.value = true
-
-    // 获取当前选中的样品ID列表
-    const selectedGoodsIds = selectedGoods.value.map((g: any) => g.id)
-
-    // 获取之前已绑定的样品ID列表
-    const previousBoundGoodsIds = boundGoods.value.map((g: any) => g.id)
-
-    // 需要绑定的样品（新增的）
-    const goodsToBind = selectedGoodsIds.filter((id: any) => !previousBoundGoodsIds.includes(id))
-
-    // 需要解绑的样品（取消选中的）
-    const goodsToUnbind = previousBoundGoodsIds.filter((id: any) => !selectedGoodsIds.includes(id))
-
-    // 执行绑定操作
-    const bindPromises = goodsToBind.map((goodsId: any) => {
-      const goods = goodsSelectTableData.value.find((g: any) => g.id === goodsId) ||
-                    boundGoods.value.find((g: any) => g.id === goodsId)
-      if (goods) {
-        return goodsInfoupd({
-          id: goodsId,
-          flowId: flowId,
-        })
-      }
-      return Promise.resolve()
-    })
-
-    // 执行解绑操作
-    const unbindPromises = goodsToUnbind.map((goodsId: any) => {
-      const goods = goodsSelectTableData.value.find((g: any) => g.id === goodsId) ||
-                    boundGoods.value.find((g: any) => g.id === goodsId)
-      if (goods) {
-        return goodsInfoupd({
-          id: goodsId,
-          flowId: 0, // 解绑时设置为0
-        })
-      }
-      return Promise.resolve()
-    })
-
-    // 执行所有操作
-    const allPromises = [...bindPromises, ...unbindPromises]
-    if (allPromises.length > 0) {
-      const results = await Promise.all(allPromises)
-      // 检查是否有失败的请求
-      const failedResults = results.filter((res: any) => {
-        if (!res) return false
-        const data = res.data || res
-        return data && (data.code !== '0' && data.code !== 0 && data.code !== undefined && !data.success)
-      })
-      if (failedResults.length > 0) {
-        const firstFailed = failedResults[0]
-        const errorData = firstFailed?.data || firstFailed
-        throw new Error(errorData?.message || errorData?.msg || '部分样品绑定/解绑失败')
-      }
-    }
-
-    ElMessage.success('保存成功')
-    goodsSelectDialogVisible.value = false
-    selectedGoods.value = []
-    boundGoods.value = []
-    if (goodsTableRef.value) {
-      goodsTableRef.value.clearSelection()
-    }
-  } catch (error: any) {
-    console.error('保存样品绑定失败:', error)
-    let errorMessage = '保存样品绑定失败'
-    if (error?.message) {
-      errorMessage = error.message
-    } else if (error?.response?.data?.message) {
-      errorMessage = error.response.data.message
-    } else if (error?.response?.data?.msg) {
-      errorMessage = error.response.data.msg
-    } else if (typeof error === 'string') {
-      errorMessage = error
-    }
-    ElMessage.error(errorMessage)
-  } finally {
-    savingGoodsBind.value = false
-  }
-}
-
-// 关闭选择样品对话框
-const handleGoodsSelectDialogClose = () => {
-  goodsSelectDialogVisible.value = false
-  selectedGoods.value = []
-  boundGoods.value = []
-  if (goodsTableRef.value) {
-    goodsTableRef.value.clearSelection()
-  }
-}
-
-// 初始化
-onMounted(() => {
-  getFlowInfoList()
-})
-</script>
-
-<style lang="scss" scoped>
-.flowinfo-page {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.search-card {
-  padding-bottom: 4px;
-}
-
-.search-bar {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 8px;
-}
-
-.toolbar {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.pagination {
-  margin-top: 16px;
-  display: flex;
-  justify-content: flex-end;
-}
-
-.drawer-footer {
-  display: flex;
-  justify-content: flex-end;
-  gap: 10px;
-}
-
-.dialog-footer {
-  display: flex;
-  justify-content: flex-end;
-  gap: 10px;
-}
-</style>
-
-
diff --git a/rc_autoplc_front/src/views/manage-log/index.vue b/rc_autoplc_front/src/views/manage-log/index.vue
index 8d9279c..64133f3 100644
--- a/rc_autoplc_front/src/views/manage-log/index.vue
+++ b/rc_autoplc_front/src/views/manage-log/index.vue
@@ -8,13 +8,13 @@
 
     <el-card class="search-card" shadow="never">
       <div class="search-bar">
-        <el-form :inline="true" :model="queryForm" label-width="90px">
-          <el-form-item label="日志类型">
+        <el-form :inline="true" :model="queryForm" label-width="72px" class="search-form">
+          <el-form-item label="日志类型" class="search-item search-item--log-type">
             <el-select
               v-model="queryForm.logType"
               placeholder="请选择日志类型"
               clearable
-              style="width: 280px"
+              class="search-select search-select--log-type"
             >
               <el-option
                 v-for="item in logTypeOptions"
@@ -25,13 +25,13 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="操作人">
+          <el-form-item label="操作人" class="search-item search-item--operator">
             <el-select
               v-model="queryForm.createId"
               placeholder="请选择操作人"
               clearable
               filterable
-              style="width: 200px"
+              class="search-select search-select--operator"
             >
               <el-option
                 v-for="item in userOptions"
@@ -42,7 +42,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="录入时间">
+          <el-form-item label="录入时间" class="search-item search-item--time">
             <el-date-picker
               v-model="queryForm.logWritetimeRange"
               type="datetimerange"
@@ -51,16 +51,16 @@
               end-placeholder="结束时间"
               format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
-              style="width: 360px"
+              class="search-range"
             />
           </el-form-item>
 
-          <el-form-item>
+          <el-form-item class="search-actions">
             <el-button type="primary" @click="handleSearch">查询</el-button>
             <el-button @click="resetSearch">重置</el-button>
           </el-form-item>
 
-          <el-form-item style="margin-left: 84px">
+          <el-form-item class="search-export">
             <el-button v-permission="'sys:managelog:excel'" type="success" :loading="exportLoading" @click="handleExport">导出日志</el-button>
           </el-form-item>
         </el-form>
@@ -419,11 +419,53 @@ onMounted(async () => {
 }
 
 .search-bar {
+  overflow-x: hidden;
+}
+
+.search-form {
   display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  flex-wrap: wrap;
+  align-items: center;
+  flex-wrap: nowrap;
+  width: 100%;
   gap: 8px;
+  white-space: nowrap;
+}
+
+.search-item {
+  margin-bottom: 0;
+  flex: 0 0 auto;
+}
+
+.search-item--log-type,
+.search-item--operator {
+  flex-shrink: 1;
+}
+
+.search-item--time {
+  flex: 1 1 420px;
+  min-width: 280px;
+}
+
+.search-select--log-type {
+  width: 220px;
+}
+
+.search-select--operator {
+  width: 180px;
+}
+
+.search-range {
+  width: 100%;
+  max-width: 420px;
+}
+
+.search-actions,
+.search-export {
+  margin-left: 0;
+}
+
+.search-export {
+  margin-right: 0;
 }
 
 .pagination {
diff --git a/rc_autoplc_front/src/views/plcdevicecontrol/index.vue b/rc_autoplc_front/src/views/plcdevicecontrol/index.vue
deleted file mode 100644
index dd77a4c..0000000
--- a/rc_autoplc_front/src/views/plcdevicecontrol/index.vue
+++ /dev/null
@@ -1,1127 +0,0 @@
-<template>
-  <div class="plc-device-control-page">
-    <el-breadcrumb separator="/" style="margin-bottom: 16px">
-      <el-breadcrumb-item><router-link to="/home">首页</router-link></el-breadcrumb-item>
-      <el-breadcrumb-item>流程管理</el-breadcrumb-item>
-      <el-breadcrumb-item>PLC设备控制</el-breadcrumb-item>
-    </el-breadcrumb>
-
-    <!-- 搜索栏 -->
-    <el-card class="search-card" shadow="never">
-      <el-form :inline="true" :model="queryForm" label-width="100px">
-        <el-form-item label="设备名称">
-          <el-input
-            v-model="queryForm.devName"
-            placeholder="输入设备名称"
-            clearable
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item label="设备状态">
-          <el-select
-            v-model="queryForm.status"
-            placeholder="请选择设备状态"
-            clearable
-            style="width: 200px"
-          >
-            <el-option label="未连接" :value="0" />
-            <el-option label="就绪" :value="10" />
-            <el-option label="执行中" :value="11" />
-            <el-option label="暂停中" :value="12" />
-            <el-option label="已停止" :value="19" />
-            <el-option label="故障中" :value="20" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="运行模式">
-          <el-select
-            v-model="queryForm.model"
-            placeholder="请选择运行模式"
-            clearable
-            style="width: 200px"
-          >
-            <el-option label="手动模式" :value="0" />
-            <el-option label="自动模式" :value="1" />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-          <el-button @click="resetSearch">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <!-- PLC设备卡片列表 -->
-    <el-card shadow="never">
-      <div v-loading="loading" class="device-cards-container">
-        <div v-if="deviceList.length === 0 && !loading" class="empty-state">
-          <el-empty description="暂无PLC设备数据" />
-        </div>
-        <div v-else class="device-cards-grid">
-          <div
-            v-for="device in deviceList"
-            :key="device.id"
-            class="device-card"
-          >
-            <!-- 设备名称和状态 -->
-            <div class="card-header">
-              <div class="device-name">{{ device.devName || '未命名设备' }}</div>
-              <div class="device-status">
-                <span class="status-text">{{ getStatusText(device.status) }}</span>
-                <span
-                  class="status-dot"
-                  :style="{ backgroundColor: getStatusColor(device.status) }"
-                ></span>
-              </div>
-            </div>
-
-            <!-- 设备信息区域 -->
-            <div class="card-body">
-              <!-- 左侧：PLC设备图片 -->
-              <div class="device-image-wrapper">
-                <img
-                  src="@/assets/image/plc.jpg"
-                  alt="PLC设备"
-                  class="device-image"
-                />
-              </div>
-
-              <!-- 右侧：设备详细信息 -->
-              <div class="device-info">
-                <div class="info-item">
-                  <span class="info-label">型号:</span>
-                  <span class="info-value">{{ device.devModel || '暂无' }}</span>
-                </div>
-                <div class="info-item">
-                  <span class="info-label">IP地址:</span>
-                  <span class="info-value">{{ device.ipAddr || '暂无' }}</span>
-                </div>
-                <div class="info-item">
-                  <span class="info-label">协议:</span>
-                  <span class="info-value">{{ device.protocolType || '暂无' }}</span>
-                </div>
-                <div class="info-item">
-                  <span class="info-label">运行模式:</span>
-                  <span class="info-value">{{ getModelText(device.realRunModel) }}</span>
-                </div>
-              </div>
-            </div>
-
-            <!-- 操作按钮区域 -->
-            <div class="card-footer">
-              <!-- 运行模式切换按钮 -->
-              <el-button
-                v-if="device.ipAddr"
-                type="info"
-                size="small"
-                plain
-                :loading="device.modelLoading"
-                :disabled="device.status !== 10"
-                @click="handleToggleModel(device)"
-              >
-                {{ Number(device.realRunModel ?? 0) === 0 ? '自动模式' : '手动模式' }}
-              </el-button>
-              <el-button
-                v-if="device.status === 0 || device.status === undefined || device.status === null"
-                type="success"
-                size="small"
-                :loading="device.connecting"
-                @click="handleConnect(device)"
-              >
-                连接
-              </el-button>
-              <el-button
-                v-else-if="device.status === 10 || device.status === 19"
-                type="primary"
-                size="small"
-                @click="handleExecute(device)"
-              >
-                执行
-              </el-button>
-              <template v-else-if="device.status === 11">
-                <el-button
-                  type="warning"
-                  size="small"
-                  :loading="device.statusLoading"
-                  @click="handlePause(device)"
-                >
-                  暂停
-                </el-button>
-                <el-button
-                  class="btn-stop"
-                  size="small"
-                  :loading="device.statusLoading"
-                  @click="handleStop(device)"
-                >
-                  停止
-                </el-button>
-              </template>
-              <template v-else-if="device.status === 12">
-                <el-button
-                  type="success"
-                  size="small"
-                  :loading="device.connecting || device.statusLoading"
-                  @click="handleContinue(device)"
-                >
-                  继续
-                </el-button>
-                <el-button
-                  class="btn-stop"
-                  size="small"
-                  :loading="device.statusLoading"
-                  @click="handleStop(device)"
-                >
-                  停止
-                </el-button>
-              </template>
-              <template v-else-if="device.status === 20">
-                <el-button
-                  type="danger"
-                  size="small"
-                  :loading="device.statusLoading"
-                  @click="handleResetError(device)"
-                >
-                  故障复位
-                </el-button>
-              </template>
-              <template v-else>
-                <el-button
-                  type="success"
-                  size="small"
-                  :loading="device.connecting"
-                  @click="handleConnect(device)"
-                >
-                  连接
-                </el-button>
-              </template>
-              
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- 分页 -->
-      <div class="pagination" v-if="total > 0">
-        <el-pagination
-          v-model:current-page="pagination.pageNum"
-          v-model:page-size="pagination.pageSize"
-          layout="total, prev, pager, next, jumper"
-          :total="total"
-          background
-          @current-change="handleCurrentChange"
-        />
-      </div>
-    </el-card>
-
-    <!-- 执行国标：选择标准流程对话框 -->
-    <el-dialog
-      v-model="executeDialogVisible"
-      title="选择标准流程"
-      width="1000px"
-      destroy-on-close
-    >
-      <el-table
-        :data="flowTableData"
-        stripe
-        border
-        style="width: 100%"
-        v-loading="flowLoading"
-      >
-        <el-table-column prop="flowIndex" label="标准流程序号" width="140" />
-        <el-table-column prop="flowName" label="标准流程名称" min-width="220" />
-        <el-table-column prop="busyCode" label="业务编号" min-width="140" />
-        <el-table-column prop="programName" label="项目名称" min-width="180" />
-        <el-table-column label="操作" width="140" fixed="right">
-          <template #default="scope">
-            <el-button type="primary" link @click="handleRunFlow(scope.row)">执行</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div class="dialog-pagination" v-if="flowTotal > 0">
-        <el-pagination
-          v-model:current-page="flowPagination.pageNum"
-          v-model:page-size="flowPagination.pageSize"
-          :page-sizes="[10, 20, 50]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="flowTotal"
-          background
-          @size-change="handleFlowSizeChange"
-          @current-change="handleFlowCurrentChange"
-        />
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { devInfolist } from '@/api/tb/devinfo'
-import {
-  plcConnect,
-  plcGetAll,
-  plcGetModel,
-  plcPause,
-  plcPlcStatus,
-  plcResetError,
-  plcRun,
-  plcRunFlow,
-  plcSetModel,
-  plcStop,
-} from '@/api/tb/plcdevicecontrol'
-import { flowInfolist } from '@/api/tb/flowinfo'
-import { goodsInfolist } from '@/api/tb/goodsinfo'
-import { stepInfolist } from '@/api/tb/stepinfo'
-
-// 加载状态
-const loading = ref(false)
-
-// 设备列表
-const deviceList = ref<any[]>([])
-const total = ref(0)
-
-// 执行国标对话框
-const executeDialogVisible = ref(false)
-const flowLoading = ref(false)
-const flowTableData = ref<any[]>([])
-const flowTotal = ref(0)
-const flowPagination = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-const currentPlcDevice = ref<any>(null)
-
-const normalizeListResponse = (res: any) => {
-  const data = res?.data ?? res ?? {}
-  return (
-    data.records ||
-    data.list ||
-    data.rows ||
-    data.items ||
-    (Array.isArray(data.data) ? data.data : []) ||
-    []
-  )
-}
-
-// 查询表单
-const queryForm = reactive({
-  devName: '',
-  status: undefined as number | undefined,
-  model: undefined as number | undefined,
-})
-
-// 分页
-const pagination = reactive({
-  pageNum: 1,
-  pageSize: 9,
-})
-
-// 状态文本映射（PLC 状态：10 就绪、11 执行中、12 暂停中、19 已停止、20 故障中）
-// 其中 0 表示“未连接”（前端根据是否有连接对象判断）
-const statusTextMap: Record<number, string> = {
-  0: '未连接',
-  10: '就绪',
-  11: '执行中',
-  12: '暂停中',
-  19: '已停止',
-  20: '故障中',
-}
-
-// 状态颜色映射
-const statusColorMap: Record<number, string> = {
-  0: '#909399', // 灰色 - 未连接
-  10: '#67C23A', // 绿色 - 就绪
-  11: '#409EFF', // 蓝色 - 执行中
-  12: '#E6A23C', // 黄色 - 暂停中
-  19: '#303133', // 黑色 - 已停止
-  20: '#F56C6C', // 红色 - 故障中
-}
-
-// 获取状态文本
-const getStatusText = (status: number | undefined): string => {
-  if (status === undefined || status === null) {
-    return '未连接'
-  }
-  return statusTextMap[status] || '未知'
-}
-
-// 获取状态颜色
-const getStatusColor = (status: number | undefined): string => {
-  if (status === undefined || status === null) {
-    return statusColorMap[0] || '#909399'
-  }
-  return statusColorMap[status] || statusColorMap[0] || '#909399'
-}
-
-// 运行模式文本映射
-const modelTextMap: Record<number, string> = {
-  0: '手动模式',
-  1: '自动模式',
-}
-
-// 获取运行模式文本
-const getModelText = (model: number | undefined | null): string => {
-  if (model === undefined || model === null) {
-    return '暂无'
-  }
-  // 确保是数字类型
-  const numModel = Number(model)
-  if (isNaN(numModel)) {
-    return '暂无'
-  }
-  return modelTextMap[numModel] || '暂无'
-}
-
-// 解析后端返回的 PLC 状态值（优先 res.data，其次 res）
-const parsePlcStatusValue = (res: any): number | null => {
-  const raw = (res && typeof res === 'object' && 'data' in res) ? (res as any).data : res
-  const n = Number(raw)
-  return Number.isFinite(n) ? n : null
-}
-
-// 拉取单个PLC实时状态并写回 device.status
-const refreshDeviceStatus = async (device: any) => {
-  if (!device?.ipAddr) return
-  try {
-    device.statusLoading = true
-    const res: any = await plcPlcStatus(device.ipAddr)
-    const statusVal = parsePlcStatusValue(res)
-    if (statusVal !== null) {
-      device.status = statusVal
-    }
-  } catch (e: any) {
-    // 静默处理错误：如果是设备未连接、停止失败等常见错误，不弹出提示
-    const errorMsg = e?.message || e?.msg || String(e || '')
-    const shouldSilent = 
-      errorMsg.includes('停止失败') || 
-      errorMsg.includes('未连接') || 
-      errorMsg.includes('连接失败') ||
-      errorMsg.includes('获取状态失败') ||
-      errorMsg.includes('刷新')
-    
-    if (!shouldSilent) {
-      console.warn('刷新PLC状态失败:', e)
-    } else {
-      // 静默处理，只记录到控制台
-      console.debug('刷新PLC状态失败（已静默处理）:', errorMsg)
-    }
-  } finally {
-    device.statusLoading = false
-  }
-}
-
-// 同时刷新状态和运行模式（用于操作后刷新）
-const refreshDeviceStatusAndModel = async (device: any) => {
-  await Promise.all([
-    refreshDeviceStatus(device),
-    refreshDeviceModel(device),
-  ])
-}
-
-// 拉取列表中所有PLC实时状态（用于页面初始化/列表刷新后）
-const refreshDeviceStatusList = async (list: any[]) => {
-  if (!list || list.length === 0) return
-  // 分批处理，每批3个设备，避免并发过多导致页面卡顿
-  const batchSize = 3
-  for (let i = 0; i < list.length; i += batchSize) {
-    const batch = list.slice(i, i + batchSize)
-    await Promise.allSettled(batch.map((d) => refreshDeviceStatus(d)))
-    // 每批之间稍作延迟，避免请求过于密集
-    if (i + batchSize < list.length) {
-      await new Promise(resolve => setTimeout(resolve, 50))
-    }
-  }
-}
-
-// 解析后端返回的 PLC 运行模式值（优先 res.data，其次 res）
-const parsePlcModelValue = (res: any): number | null => {
-  const raw = (res && typeof res === 'object' && 'data' in res) ? (res as any).data : res
-  
-  // 严格处理：如果 raw 是 null 或 undefined，直接返回 null（表示无法获取）
-  if (raw === null || raw === undefined) {
-    return null
-  }
-  
-  const n = Number(raw)
-  // 只有当转换后的值是有效的数字（0 或 1）时才返回
-  return Number.isFinite(n) && (n === 0 || n === 1) ? n : null
-}
-
-// 拉取单个PLC实时运行模式并写回 device.realRunModel
-const refreshDeviceModel = async (device: any) => {
-  if (!device?.ipAddr) return
-  try {
-    device.modelLoading = true
-    const res: any = await plcGetModel(device.ipAddr)
-    const modelVal = parsePlcModelValue(res)
-    if (modelVal !== null) {
-      device.realRunModel = modelVal
-    }
-  } catch (e: any) {
-    // 静默处理错误：如果是设备未连接、停止失败等常见错误，不弹出提示
-    const errorMsg = e?.message || e?.msg || String(e || '')
-    const shouldSilent = 
-      errorMsg.includes('停止失败') || 
-      errorMsg.includes('未连接') || 
-      errorMsg.includes('连接失败') ||
-      errorMsg.includes('获取模式失败') ||
-      errorMsg.includes('刷新')
-    
-    if (!shouldSilent) {
-      console.warn('刷新PLC运行模式失败:', e)
-    } else {
-      // 静默处理，只记录到控制台
-      console.debug('刷新PLC运行模式失败（已静默处理）:', errorMsg)
-    }
-  } finally {
-    device.modelLoading = false
-  }
-}
-
-// 拉取列表中所有PLC实时运行模式（用于页面初始化/列表刷新后）
-const refreshDeviceModelList = async (list: any[]) => {
-  if (!list || list.length === 0) return
-  // 分批处理，每批3个设备，避免并发过多导致页面卡顿
-  const batchSize = 3
-  for (let i = 0; i < list.length; i += batchSize) {
-    const batch = list.slice(i, i + batchSize)
-    await Promise.allSettled(batch.map((d) => refreshDeviceModel(d)))
-    // 每批之间稍作延迟，避免请求过于密集
-    if (i + batchSize < list.length) {
-      await new Promise(resolve => setTimeout(resolve, 50))
-    }
-  }
-}
-
-// 获取当前所有已建立的 PLC 连接对象，返回已连接 IP 的集合
-const getConnectedIpSet = async (): Promise<Set<string>> => {
-  const connectedIpSet = new Set<string>()
-  try {
-    const res: any = await plcGetAll()
-    // swagger 返回结构为：
-    // { code: 0, message: '操作成功', data: { 'ip1': { ... }, 'ip2': { ... } } }
-    const rawData = res?.data ?? res ?? {}
-    const data = (rawData && typeof rawData === 'object' && 'data' in rawData)
-      ? (rawData as any).data
-      : rawData
-
-    const collectIp = (item: any, keyFromMap?: string) => {
-      // 优先使用 map 的 key 作为 IP（Swagger 示例中 key 即为 IP）
-      if (keyFromMap) {
-        connectedIpSet.add(String(keyFromMap))
-        return
-      }
-      if (!item) return
-      const ip =
-        item.ipAddr ??
-        item.ip ??
-        item.address ??
-        (typeof item === 'string' ? item : undefined)
-      if (ip) {
-        connectedIpSet.add(String(ip))
-      }
-    }
-
-    if (Array.isArray(data)) {
-      data.forEach((item) => collectIp(item))
-    } else if (data && typeof data === 'object') {
-      // 典型结构：{ '192.168.0.10': { ... }, '192.168.0.11': { ... } }
-      Object.entries(data).forEach(([key, value]) => {
-        collectIp(value, key)
-      })
-    }
-  } catch (e) {
-    console.warn('获取PLC连接对象列表失败:', e)
-  }
-
-  return connectedIpSet
-}
-
-// 获取设备列表
-const getDeviceList = async () => {
-  try {
-    loading.value = true
-    const params: any = {
-      pageNum: pagination.pageNum,
-      pageSize: pagination.pageSize,
-      devModel: 'PLC', // 只查询PLC设备
-    }
-
-    // 设备名称模糊查询
-    if (queryForm.devName) {
-      params.devName = queryForm.devName
-    }
-
-    // 运行模式精确查询
-    if (queryForm.model !== undefined && queryForm.model !== null) {
-      params.runModel = queryForm.model
-    }
-
-    const res: any = await devInfolist(params)
-
-    const data = res?.data ?? res ?? {}
-
-    // 兼容多种返回格式
-    const recordsFromData =
-      data.records ||
-      data.list ||
-      data.rows ||
-      data.items ||
-      (Array.isArray(data.data) ? data.data : undefined)
-
-    const records = Array.isArray(recordsFromData)
-      ? recordsFromData
-      : Array.isArray(data)
-        ? data
-        : []
-
-    // 再次过滤，确保只显示PLC设备
-    let plcRecords = records.filter((item: any) => item.devModel === 'PLC')
-
-    // 根据运行模式过滤（如果查询条件包含运行模式）
-    // 运行模式数据直接从数据库返回的 runModel 字段读取
-    if (queryForm.model !== undefined && queryForm.model !== null) {
-      plcRecords = plcRecords.filter(
-        (device: any) => {
-          const runModel = device.runModel ?? null
-          // 确保类型匹配（可能是字符串或数字）
-          return Number(runModel) === queryForm.model
-        }
-      )
-    }
-
-    const totalValue =
-      data.total ?? data.count ?? data.totalCount ?? plcRecords.length ?? 0
-
-    // 初始化前端运行状态字段：页面状态以 plcPlcStatus 为准，运行模式以 plcGetModel 为准
-    plcRecords = plcRecords.map((d: any) => ({
-      ...d,
-      // status: 0 表示“未连接”，只有已存在连接对象的设备，才会再去获取 10/11/12/19/20 等实时状态
-      status: 0,
-      realRunModel: undefined, // 从接口获取的实时运行模式（0-手动，1-自动）
-      connecting: false,
-      statusLoading: false,
-      modelLoading: false,
-      runState: undefined, // 不再使用 runState 驱动按钮
-    }))
-
-    // 先获取所有 PLC 的连接对象列表，判断哪些设备“已连接”
-    const connectedIpSet = await getConnectedIpSet()
-
-    // 仅对“已连接”的设备获取实时状态和运行模式；未连接设备保持 status=0、realRunModel=undefined
-    const connectedDevices = plcRecords.filter(
-      (d: any) => d.ipAddr && connectedIpSet.has(String(d.ipAddr))
-    )
-
-    await Promise.all([
-      refreshDeviceStatusList(connectedDevices),
-      refreshDeviceModelList(connectedDevices),
-    ])
-
-    // 按“实时状态”过滤（仅影响当前页展示）
-    if (queryForm.status !== undefined && queryForm.status !== null) {
-      plcRecords = plcRecords.filter((device: any) => Number(device.status ?? 0) === queryForm.status)
-    }
-
-    deviceList.value = plcRecords
-    total.value = queryForm.status !== undefined && queryForm.status !== null
-      ? plcRecords.length
-      : (Number(totalValue) || plcRecords.length)
-  } catch (error) {
-    console.error('获取PLC设备列表失败:', error)
-    ElMessage.error('获取PLC设备列表失败')
-  } finally {
-    loading.value = false
-  }
-}
-
-// 查询
-const handleSearch = () => {
-  pagination.pageNum = 1
-  getDeviceList()
-}
-
-// 重置查询
-const resetSearch = () => {
-  queryForm.devName = ''
-  queryForm.status = undefined
-  queryForm.model = undefined
-  handleSearch()
-}
-
-// 分页大小改变
-const handleSizeChange = (size: number) => {
-  pagination.pageSize = size
-  getDeviceList()
-}
-
-// 当前页改变
-const handleCurrentChange = (page: number) => {
-  pagination.pageNum = page
-  getDeviceList()
-}
-
-// 连接PLC设备
-const handleConnect = async (device: any) => {
-  if (!device.ipAddr) {
-    ElMessage.warning('设备IP地址不存在，无法连接')
-    return
-  }
-
-  try {
-    // 设置连接中状态
-    device.connecting = true
-
-    const params = {
-      ipAddr: device.ipAddr,
-      port: device.port || 102, // 默认端口102（S7协议常用端口）
-      rack: 0,
-      slot: 0,
-    }
-
-    // 注意：失败提示已由 axios 响应拦截器统一处理，这里避免重复弹窗
-    const res: any = await plcConnect(params)
-    const connObj = res?.data ?? null
-    if (connObj) {
-      ElMessage.success('PLC设备连接成功')
-    } else {
-      ElMessage.error('PLC设备连接失败：未获取到连接对象')
-    }
-    // 连接成功或失败后：第二次获取状态和运行模式
-    await refreshDeviceStatusAndModel(device)
-  } catch (error: any) {
-    console.error('连接PLC设备失败:', error)
-    // 失败提示交给拦截器处理（包含业务错误码与网络错误），这里不再重复提示
-  } finally {
-    device.connecting = false
-  }
-}
-
-// 执行按钮逻辑（暂留空）
-const handleExecute = (device: any) => {
-  // 打开选择标准流程对话框
-  currentPlcDevice.value = device
-  executeDialogVisible.value = true
-  flowPagination.pageNum = 1
-  loadFlowList()
-}
-
-// 加载标准流程（需要同时存在样品与步骤才显示）
-const loadFlowList = async () => {
-  try {
-    flowLoading.value = true
-    const res: any = await flowInfolist({
-      pageNum: flowPagination.pageNum,
-      pageSize: flowPagination.pageSize,
-    })
-
-    const data = res?.data ?? res ?? {}
-    const records = normalizeListResponse(res)
-    const totalValue = data.total ?? data.count ?? data.totalCount ?? records.length ?? 0
-
-    // 过滤：必须存在 flowId 对应的样品信息 & 步骤信息
-    const checks = await Promise.all(
-      (records || []).map(async (flow: any) => {
-        const flowId = flow?.id
-        if (!flowId) return null
-
-        const [goodsRes, stepRes] = await Promise.all([
-          goodsInfolist({ flowId, pageNum: 1, pageSize: 1 }),
-          stepInfolist({ flowId, pageNum: 1, pageSize: 1 }),
-        ])
-
-        const goodsArr = normalizeListResponse(goodsRes)
-        const stepArr = normalizeListResponse(stepRes)
-
-        if (Array.isArray(goodsArr) && goodsArr.length > 0 && Array.isArray(stepArr) && stepArr.length > 0) {
-          return flow
-        }
-        return null
-      })
-    )
-
-    flowTableData.value = checks.filter(Boolean)
-    // total 这里沿用后端 total（分页），过滤后可能比 total 小；符合“只显示满足条件的记录”
-    flowTotal.value = Number(totalValue) || 0
-  } catch (e) {
-    console.error('加载标准流程失败:', e)
-  } finally {
-    flowLoading.value = false
-  }
-}
-
-const handleFlowSizeChange = (size: number) => {
-  flowPagination.pageSize = size
-  flowPagination.pageNum = 1
-  loadFlowList()
-}
-
-const handleFlowCurrentChange = (page: number) => {
-  flowPagination.pageNum = page
-  loadFlowList()
-}
-
-// 获取指定标准流程下的样品主键数组
-const getGoodsIdsByFlowId = async (flowId: number | string) => {
-  const goodsRes: any = await goodsInfolist({
-    flowId,
-    pageNum: 1,
-    pageSize: 10000,
-  })
-  const goodsArr = normalizeListResponse(goodsRes)
-  const ids = (goodsArr || [])
-    .map((g: any) => g?.id)
-    .filter((id: any) => id !== undefined && id !== null)
-  return ids
-}
-
-// 对话框内执行按钮：确认后调用 plcRunFlow
-const handleRunFlow = async (flowRow: any) => {
-  const device = currentPlcDevice.value
-  if (!device?.ipAddr) {
-    ElMessage.warning('当前PLC的IP地址为空，无法执行')
-    return
-  }
-  const flowId = flowRow?.id
-  if (!flowId) {
-    ElMessage.warning('标准流程主键为空，无法执行')
-    return
-  }
-
-  try {
-    await ElMessageBox.confirm(
-      `确定执行【${flowRow.flowName || '该标准流程'}】吗？`,
-      '提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }
-    )
-  } catch {
-    // 用户取消
-    return
-  }
-
-  try {
-    const goodsIds = await getGoodsIdsByFlowId(flowId)
-    if (!goodsIds || goodsIds.length === 0) {
-      ElMessage.warning('该标准流程未查询到样品信息，无法执行')
-      return
-    }
-
-    await plcRunFlow({
-      plcIp: device.ipAddr,
-      flowId,
-      goodsIds,
-    })
-
-    ElMessage.success('执行指令已发送')
-    executeDialogVisible.value = false
-  } catch (e) {
-    console.error('执行国标失败:', e)
-    // 失败提示交给拦截器处理，避免重复弹窗
-  } finally {
-    // 发送成功或失败后：第三次获取状态和运行模式
-    await refreshDeviceStatusAndModel(device)
-  }
-}
-
-// 暂停：调用 plcPause，之后刷新状态和运行模式
-const handlePause = async (device: any) => {
-  if (!device?.ipAddr) {
-    ElMessage.warning('设备IP地址不存在，无法暂停')
-    return
-  }
-  try {
-    await plcPause(device.ipAddr)
-  } catch (e) {
-    console.error('暂停PLC失败:', e)
-  } finally {
-    await refreshDeviceStatusAndModel(device)
-  }
-}
-
-// 继续：暂停中(12)点击继续，调用 plcRun 接口继续运行
-const handleContinue = async (device: any) => {
-  if (!device?.ipAddr) {
-    ElMessage.warning('设备IP地址不存在，无法继续')
-    return
-  }
-  try {
-    device.statusLoading = true
-    await plcRun(device.ipAddr)
-  } catch (e) {
-    console.error('继续执行失败:', e)
-  } finally {
-    device.statusLoading = false
-    await refreshDeviceStatusAndModel(device)
-  }
-}
-
-// 停止：调用 plcStop，之后刷新状态和运行模式
-const handleStop = async (device: any) => {
-  if (!device?.ipAddr) {
-    ElMessage.warning('设备IP地址不存在，无法停止')
-    return
-  }
-  try {
-    await plcStop(device.ipAddr)
-  } catch (e) {
-    console.error('停止PLC失败:', e)
-  } finally {
-    await refreshDeviceStatusAndModel(device)
-  }
-}
-
-// 故障复位：调用 plcResetError，之后刷新状态和运行模式
-const handleResetError = async (device: any) => {
-  if (!device?.ipAddr) {
-    ElMessage.warning('设备IP地址不存在，无法故障复位')
-    return
-  }
-  try {
-    await plcResetError(device.ipAddr)
-    ElMessage.success('故障复位指令已发送')
-  } catch (e) {
-    console.error('故障复位失败:', e)
-  } finally {
-    await refreshDeviceStatusAndModel(device)
-  }
-}
-
-// 切换运行模式：调用 plcSetModel，切换后刷新状态和运行模式
-const handleToggleModel = async (device: any) => {
-  if (!device?.ipAddr) {
-    ElMessage.warning('设备IP地址不存在，无法切换模式')
-    return
-  }
-
-  // 检查设备状态是否为10（就绪），只有就绪状态才能切换运行模式
-  const currentStatus = Number(device.status)
-  if (currentStatus !== 10) {
-    const deviceName = device.devName || '未命名设备'
-    const statusText = getStatusText(device.status)
-    ElMessage.warning(`${deviceName}当前状态为${statusText}，只有就绪状态才能切换运行模式`)
-    return
-  }
-
-  // 检查是否已获取到运行模式
-  if (device.realRunModel === null || device.realRunModel === undefined) {
-    const deviceName = device.devName || '未命名设备'
-    ElMessage.warning(`未获取到${deviceName}运行模式，请稍后再试`)
-    return
-  }
-
-  // 获取当前模式（从接口获取的实时模式），切换为相反模式
-  const currentModel = Number(device.realRunModel)
-  const newModel = currentModel === 0 ? 1 : 0
-  const deviceName = device.devName || '未命名设备'
-  const newModelText = newModel === 0 ? '手动' : '自动'
-
-  // 显示确认对话框
-  try {
-    await ElMessageBox.confirm(
-      `确定将${deviceName}切换为${newModelText}模式吗？`,
-      '提示',
-      {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }
-    )
-  } catch {
-    // 用户取消操作
-    return
-  }
-
-  // 用户确认后执行切换
-  try {
-    device.modelLoading = true
-    await plcSetModel({
-      ipAddr: device.ipAddr,
-      model: newModel,
-    })
-    ElMessage.success(`已切换为${newModelText}模式`)
-    // 切换成功后：刷新状态和运行模式
-    await refreshDeviceStatusAndModel(device)
-  } catch (e) {
-    console.error('切换运行模式失败:', e)
-    // 错误提示已由拦截器处理
-  } finally {
-    device.modelLoading = false
-  }
-}
-
-// 初始化
-onMounted(() => {
-  getDeviceList()
-})
-</script>
-
-<style lang="scss" scoped>
-.plc-device-control-page {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.search-card {
-  padding-bottom: 4px;
-}
-
-.device-cards-container {
-  min-height: 400px;
-}
-
-.empty-state {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  min-height: 400px;
-}
-
-.device-cards-grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 20px;
-  padding: 10px 0;
-}
-
-.device-card {
-  background: #fff;
-  border: 1px solid #e6e6e6;
-  border-radius: 8px;
-  padding: 16px;
-  transition: all 0.3s;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
-
-  &:hover {
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-    transform: translateY(-2px);
-  }
-}
-
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 16px;
-  padding-bottom: 12px;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.device-name {
-  font-size: 16px;
-  font-weight: 600;
-  color: #303133;
-}
-
-.device-status {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-}
-
-.status-text {
-  font-size: 14px;
-  color: #606266;
-}
-
-.status-dot {
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  display: inline-block;
-}
-
-.card-body {
-  display: flex;
-  gap: 25px;
-  align-items: flex-start;
-}
-
-.device-image-wrapper {
-  flex-shrink: 0;
-  display: flex;
-  align-items: flex-start;
-}
-
-.device-image {
-  width: 80px;
-  height: auto;
-  object-fit: contain;
-  margin-top: 15px;
-}
-
-.device-info {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.info-item {
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-}
-
-.info-label {
-  color: #909399;
-  margin-right: 8px;
-  min-width: 50px;
-}
-
-.info-value {
-  color: #303133;
-  flex: 1;
-}
-
-.card-footer {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  margin-top: 16px;
-  padding-top: 12px;
-  border-top: 1px solid #f0f0f0;
-  gap: 8px;
-}
-
-.btn-stop {
-  background: #303133;
-  border-color: #303133;
-  color: #fff;
-}
-.btn-stop:hover,
-.btn-stop:focus {
-  background: #1f2022;
-  border-color: #1f2022;
-  color: #fff;
-}
-
-.dialog-pagination {
-  margin-top: 16px;
-  display: flex;
-  justify-content: flex-end;
-}
-
-.pagination {
-  margin-top: 20px;
-  display: flex;
-  justify-content: flex-end;
-}
-
-@media (max-width: 1200px) {
-  .device-cards-grid {
-    grid-template-columns: repeat(2, 1fr);
-  }
-}
-
-@media (max-width: 768px) {
-  .device-cards-grid {
-    grid-template-columns: 1fr;
-  }
-}
-</style>
-
diff --git a/rc_autoplc_front/src/views/position/index.vue b/rc_autoplc_front/src/views/position/index.vue
deleted file mode 100644
index 9282b04..0000000
--- a/rc_autoplc_front/src/views/position/index.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<template>
-  <div class="position-page">
-    <el-breadcrumb separator="/" style="margin-bottom: 16px">
-      <el-breadcrumb-item><router-link to="/home">首页</router-link></el-breadcrumb-item>
-      <el-breadcrumb-item>系统管理</el-breadcrumb-item>
-      <el-breadcrumb-item>职位管理</el-breadcrumb-item>
-    </el-breadcrumb>
-    <el-card class="search-card" shadow="never">
-      <div class="search-bar">
-        <el-form :inline="true" :model="queryForm" label-width="80px">
-          <el-form-item label="职位名称">
-            <el-input
-              v-model="queryForm.posiName"
-              placeholder="输入名称"
-              clearable
-              style="width: 200px"
-            />
-          </el-form-item>
-          <el-form-item label="职位编码">
-            <el-input
-              v-model="queryForm.posiCode"
-              placeholder="输入职位编码"
-              clearable
-              style="width: 200px"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button v-permission="'sys:positionselect'" type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="resetSearch">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <div class="toolbar">
-          <el-button v-permission="'sys:positionadd'" type="primary" @click="openDrawer('create')">新增职位</el-button>
-        </div>
-      </div>
-    </el-card>
-
-    <el-card shadow="never">
-      <el-table
-        :data="tableData"
-        stripe
-        border
-        style="width: 100%"
-        v-loading="loading"
-      >
-        <el-table-column type="index" label="序号" width="70" />
-        <el-table-column
-          prop="posiName"
-          label="职位名称"
-          min-width="180"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="posiCode"
-          label="职位编码"
-          min-width="180"
-          :formatter="formatCell"
-        />
-        <el-table-column
-          prop="remark"
-          label="备注"
-          min-width="200"
-          :formatter="formatCell"
-        />
-        <el-table-column label="操作" width="180" fixed="right">
-          <template #default="scope">
-            <el-button v-permission="'sys:positionupd'" type="primary" link @click="openDrawer('edit', scope.row)">编辑</el-button>
-            <el-button v-permission="'sys:positiondel'" type="danger" link @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="pagination">
-        <el-pagination
-          v-model:current-page="pagination.pageNum"
-          v-model:page-size="pagination.pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-          background
-          @current-change="handleCurrentChange"
-          @size-change="handleSizeChange"
-        />
-      </div>
-    </el-card>
-
-    <el-drawer
-      v-model="drawerVisible"
-      :title="drawerTitle"
-      direction="rtl"
-      :size="420"
-    >
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-        class="drawer-form"
-      >
-        <el-form-item v-if="isEdit" label="职位ID">
-          <el-input v-model="form.id" disabled />
-        </el-form-item>
-        <el-form-item label="职位名称" prop="posiName">
-          <el-input v-model="form.posiName" placeholder="请输入职位名称" />
-        </el-form-item>
-        <el-form-item label="职位编码" prop="posiCode">
-          <el-input v-model="form.posiCode" placeholder="请输入职位编码" />
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入备注"
-            :rows="3"
-            maxlength="200"
-            show-word-limit
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="drawer-footer">
-          <el-button @click="drawerVisible = false">取消</el-button>
-          <el-button type="primary" :loading="submitLoading" @click="submitForm">
-            {{ isEdit ? '更新' : '提交' }}
-          </el-button>
-        </div>
-      </template>
-    </el-drawer>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { positionadd, positionbyid, positiondel, positionlist, positionupd } from '@/api/system/position'
-
-interface PositionItem {
-  id?: number | string
-  posiName: string
-  posiCode: string
-  remark?: string
-  remarks?: string
-  createTime?: string
-  updateTime?: string
-  creator?: string
-  updater?: string
-  delFlag?: boolean
-}
-
-const loading = ref(false)
-const submitLoading = ref(false)
-const tableData = ref<PositionItem[]>([])
-const total = ref(0)
-
-const queryForm = reactive({
-  posiName: '',
-  posiCode: '',
-})
-
-const pagination = reactive({
-  pageNum: 1,
-  pageSize: 10,
-})
-
-const drawerVisible = ref(false)
-const drawerTitle = ref('新增职位')
-const isEdit = ref(false)
-
-const formRef = ref<FormInstance>()
-const form = reactive<PositionItem>({
-  id: undefined,
-  posiName: '',
-  posiCode: '',
-  remark: '',
-})
-
-const rules: FormRules = {
-  posiName: [{ required: true, message: '请输入职位名称', trigger: 'blur' }],
-  posiCode: [{ required: true, message: '请输入职位编码', trigger: 'blur' }],
-}
-
-const resetForm = () => {
-  form.id = undefined
-  form.posiName = ''
-  form.posiCode = ''
-  form.remark = ''
-  formRef.value?.clearValidate()
-}
-
-const formatCell = (_row: any, _column: any, value: any) => {
-  if (value === 0) return 0
-  return value === undefined || value === null || value === '' ? '暂无' : value
-}
-
-const loadList = async () => {
-  loading.value = true
-  try {
-    // 构建查询参数，过滤空字符串
-    const params: any = {
-      pageNum: pagination.pageNum,
-      pageSize: pagination.pageSize,
-    }
-    if (queryForm.posiName && queryForm.posiName.trim()) {
-      params.posiName = queryForm.posiName.trim()
-    }
-    if (queryForm.posiCode && queryForm.posiCode.trim()) {
-      params.posiCode = queryForm.posiCode.trim()
-    }
-    
-    const res: any = await positionlist(params)
-    
-    console.log('职位列表API返回数据:', res)
-    
-    // 根据Swagger文档，返回格式为: { code: 0, message: "string", data: { records: [], total: 0 } }
-    // request拦截器返回的是整个响应体，所以res就是 { code: 0, message: "string", data: {...} }
-    // 需要从res.data中获取分页数据
-    let pageData = res?.data
-    
-    // 如果res.data不存在，可能是直接返回了分页数据
-    if (!pageData && (res?.records || res?.total !== undefined)) {
-      pageData = res
-    }
-    
-    // 兼容多种返回格式
-    const recordsFromData =
-      pageData?.records ||
-      pageData?.list ||
-      pageData?.rows ||
-      pageData?.items ||
-      (Array.isArray(pageData?.data) ? pageData.data : undefined)
-
-    const records = Array.isArray(recordsFromData)
-      ? recordsFromData
-      : Array.isArray(pageData)
-        ? pageData
-        : Array.isArray(res?.data)
-          ? res.data
-          : []
-
-    const totalValue =
-      pageData?.total ?? 
-      pageData?.count ?? 
-      pageData?.totalCount ?? 
-      res?.total ??
-      (Array.isArray(records) ? records.length : 0)
-
-    tableData.value = records
-    total.value = Number(totalValue) || 0
-    
-    console.log('解析后的数据:', { 
-      records: records.length, 
-      total: total.value,
-      pageData: pageData,
-      firstRecord: records[0]
-    })
-  } catch (error: any) {
-    console.error('load position list error', error)
-    const errorMsg = error?.message || error?.msg || '加载职位列表失败'
-    ElMessage.error(errorMsg)
-    tableData.value = []
-    total.value = 0
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleSearch = () => {
-  pagination.pageNum = 1
-  loadList()
-}
-
-const resetSearch = () => {
-  queryForm.posiName = ''
-  queryForm.posiCode = ''
-  handleSearch()
-}
-
-const handleSizeChange = (size: number) => {
-  pagination.pageSize = size
-  loadList()
-}
-
-const handleCurrentChange = (page: number) => {
-  pagination.pageNum = page
-  loadList()
-}
-
-const openDrawer = async (mode: 'create' | 'edit', row?: PositionItem) => {
-  resetForm()
-  isEdit.value = mode === 'edit'
-  drawerTitle.value = isEdit.value ? '编辑职位' : '新增职位'
-  drawerVisible.value = true
-
-  if (isEdit.value && row?.id != null) {
-    try {
-      const res: any = await positionbyid(row.id)
-      const data = res?.data || res || {}
-      form.id = data.id ?? row.id
-      form.posiName = data.posiName ?? row.posiName
-      form.posiCode = data.posiCode ?? row.posiCode
-      form.remark =
-        data.remark ??
-        data.remarks ??
-        row.remark ??
-        (row as any)?.remarks ??
-        ''
-    } catch (error) {
-      ElMessage.error('获取职位详情失败')
-      drawerVisible.value = false
-    }
-  }
-}
-
-const submitForm = () => {
-  formRef.value?.validate(async (valid) => {
-    if (!valid) return
-    submitLoading.value = true
-    try {
-      if (isEdit.value) {
-        // 同步备注的两种字段名，兼容后端不同写法
-        await positionupd({ ...form, remarks: form.remark })
-        ElMessage.success('更新成功')
-      } else {
-        await positionadd({ ...form, remarks: form.remark })
-        ElMessage.success('新增成功')
-      }
-      drawerVisible.value = false
-      loadList()
-    } catch (error) {
-      console.error('submit position error', error)
-      ElMessage.error(isEdit.value ? '更新失败' : '新增失败')
-    } finally {
-      submitLoading.value = false
-    }
-  })
-}
-
-const handleDelete = (row: PositionItem) => {
-  if (!row.id) {
-    ElMessage.warning('缺少职位ID')
-    return
-  }
-  ElMessageBox.confirm(`确认删除职位「${row.posiName}」吗？`, '提示', {
-    type: 'warning',
-  })
-    .then(async () => {
-      if (row.id == null) {
-        ElMessage.warning('缺少职位ID，无法删除')
-        return
-      }
-      try {
-        await positiondel(row.id)
-        ElMessage.success('删除成功')
-        loadList()
-      } catch (error) {
-        console.error('delete position error', error)
-        ElMessage.error('删除失败')
-      }
-    })
-    .catch(() => {})
-}
-
-onMounted(() => {
-  loadList()
-})
-</script>
-
-<style scoped>
-.position-page {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.search-card {
-  padding-bottom: 4px;
-}
-
-.search-bar {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 8px;
-}
-
-.toolbar {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.pagination {
-  margin-top: 16px;
-  display: flex;
-  justify-content: flex-end;
-}
-
-.drawer-footer {
-  display: flex;
-  justify-content: flex-end;
-  gap: 10px;
-}
-</style>
-
-
-
-
-
-
-
-
diff --git a/rc_autoplc_front/src/views/recordinfo/index.vue b/rc_autoplc_front/src/views/recordinfo/index.vue
index 13a1c6e..1c4d372 100644
--- a/rc_autoplc_front/src/views/recordinfo/index.vue
+++ b/rc_autoplc_front/src/views/recordinfo/index.vue
@@ -29,7 +29,7 @@
             <el-button type="primary" @click="handleSearch">查询</el-button>
             <el-button @click="resetSearch">重置</el-button>
           </el-form-item>
-          <el-form-item style="margin-left: 276px" >
+          <el-form-item style="margin-right: auto" >
             <el-button v-permission="'tb:exceptionrecord:excel'" type="success" :loading="exportLoading" @click="handleExport">导出记录</el-button>
           </el-form-item>
         </el-form>
diff --git a/rc_autoplc_front/src/views/statusmonitor/index.vue b/rc_autoplc_front/src/views/statusmonitor/index.vue
index c1c2875..6ccd644 100644
--- a/rc_autoplc_front/src/views/statusmonitor/index.vue
+++ b/rc_autoplc_front/src/views/statusmonitor/index.vue
@@ -46,9 +46,14 @@
                 >
                   <span class="action-badge-label">绑定动作</span>
                   <span class="action-badge-name">{{ getActionName(action) }}</span>
-                  <el-tag :type="getStatusTag(getActionStatus(action))" size="small" effect="light" round>
-                    {{ getStatusText(getActionStatus(action)) }}
-                  </el-tag>
+                  <div class="action-status-wrap">
+                    <el-tag :type="getStatusTag(getActionStatus(action))" size="small" effect="light" round>
+                      {{ getStatusText(getActionStatus(action)) }}
+                    </el-tag>
+                    <span v-if="getActionRecordCount(action) > 0" class="record-dot action-badge-record-dot">
+                      {{ getActionRecordCount(action) }}
+                    </span>
+                  </div>
                 </div>
                 <span v-if="getIslandActionList(item).length > 2" class="action-badge-more">
                   +{{ getIslandActionList(item).length - 2 }}
@@ -619,6 +624,7 @@ onMounted(loadData)
 }
 
 .action-badge {
+  position: relative;
   display: inline-flex;
   align-items: center;
   gap: 8px;
@@ -644,6 +650,19 @@ onMounted(loadData)
   text-overflow: ellipsis;
 }
 
+.action-status-wrap {
+  position: relative;
+  flex: 0 0 auto;
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.action-badge-record-dot {
+  position: static;
+  margin-left: 4px;
+}
+
 .action-badge-more {
   display: inline-flex;
   align-items: center;