diff --git a/.env.development b/.env.development
index cad65fb..aaa71a7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index cad65fb..aaa71a7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 4b2f0d6..35a2dbd 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index cad65fb..aaa71a7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 4b2f0d6..35a2dbd 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.test b/.env.test
index f83f6d1..cce95a8 100644
--- a/.env.test
+++ b/.env.test
@@ -3,6 +3,7 @@
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://127.0.0.1:8082
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index cad65fb..aaa71a7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 4b2f0d6..35a2dbd 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.test b/.env.test
index f83f6d1..cce95a8 100644
--- a/.env.test
+++ b/.env.test
@@ -3,6 +3,7 @@
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://127.0.0.1:8082
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9486425..d49e5f7 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -256,7 +256,14 @@
 
 // 点击编辑详情
 const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/order/${pageType}/${row.id}`)
+  console.log(row)
+
+  $router.push({
+    path: `/schedule/order/${pageType}/${row.id}`,
+    // query: {
+    //   statusName: row.statusName,
+    // },
+  })
 }
 
 fetchData(true)

diff --git a/.env.development b/.env.development
index cad65fb..aaa71a7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 4b2f0d6..35a2dbd 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.test b/.env.test
index f83f6d1..cce95a8 100644
--- a/.env.test
+++ b/.env.test
@@ -3,6 +3,7 @@
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://127.0.0.1:8082
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9486425..d49e5f7 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -256,7 +256,14 @@
 
 // 点击编辑详情
 const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/order/${pageType}/${row.id}`)
+  console.log(row)
+
+  $router.push({
+    path: `/schedule/order/${pageType}/${row.id}`,
+    // query: {
+    //   statusName: row.statusName,
+    // },
+  })
 }
 
 fetchData(true)
diff --git a/src/views/measure/bench/bench-interface.ts b/src/views/measure/bench/bench-interface.ts
index 46d5d84..89cfd1e 100644
--- a/src/views/measure/bench/bench-interface.ts
+++ b/src/views/measure/bench/bench-interface.ts
@@ -12,3 +12,18 @@
 export interface ICertificatReturn {
   lastValidDate: number
 }
+
+// 我的证书返回值
+export interface IValidReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate: number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+

diff --git a/.env.development b/.env.development
index cad65fb..aaa71a7 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@
 # VITE_APP_API_BASEURL = http://111.198.10.15:11309
 # VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.production b/.env.production
index 4b2f0d6..35a2dbd 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.env.test b/.env.test
index f83f6d1..cce95a8 100644
--- a/.env.test
+++ b/.env.test
@@ -3,6 +3,7 @@
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://127.0.0.1:8082
+# VITE_APP_API_BASEURL = http://192.168.83.213:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9486425..d49e5f7 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -256,7 +256,14 @@
 
 // 点击编辑详情
 const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/order/${pageType}/${row.id}`)
+  console.log(row)
+
+  $router.push({
+    path: `/schedule/order/${pageType}/${row.id}`,
+    // query: {
+    //   statusName: row.statusName,
+    // },
+  })
 }
 
 fetchData(true)
diff --git a/src/views/measure/bench/bench-interface.ts b/src/views/measure/bench/bench-interface.ts
index 46d5d84..89cfd1e 100644
--- a/src/views/measure/bench/bench-interface.ts
+++ b/src/views/measure/bench/bench-interface.ts
@@ -12,3 +12,18 @@
 export interface ICertificatReturn {
   lastValidDate: number
 }
+
+// 我的证书返回值
+export interface IValidReturn {
+  certificateName:	string
+  count:	string
+  date:	string
+  lastValidDate: number
+  name:	string
+  notQualified:	number
+  qualified:	number
+  qualifiedCount:	number
+  trainCount:	number
+  validDate:	string
+}
+
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 0b59abe..16c437a 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup name="MeasureBench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
-import type { ICertificatReturn, IPlanReturn, ITrainLogStatistic } from './bench-interface'
+import dayjs from 'dayjs'
+import { stringLiteral } from '@babel/types'
+import type { ICertificatReturn, IPlanReturn, IValidReturn } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/measure/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -14,7 +16,7 @@
 // 每个展示块高度
 const blockHeight = ref(300)
 const blockWidth = ref(400)
-const { username } = useUserStore()
+const { username } = useUserStore() // 账户
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -22,61 +24,49 @@
   { id: '4', text: '实验室', url: '/measureDept/ks' },
   { id: '5', text: '工程组', url: '/measureDept/gcz' },
   { id: '6', text: '计量人员', url: '/person/list' },
-])
-const tableData = ref([])
-const meterageTableData = ref([])
+]) // 按钮组
+const tableData = ref([]) // 培训计划表格数据
+const meterAdmin = ref(false) // 是否计量负责人
+const meterageTableData = ref([]) // 计量人间表格数据
 const columns = ref([
   { text: '培训名称', value: 'planName' },
   { text: '负责人', value: 'director', width: '120' },
   { text: '培训时间', value: 'trainTime', width: '180' },
-])
+])// 培训计划
 const meterageColumns = ref([
   { text: '文件名称', value: 'fileName' },
   { text: '类别', value: 'fileTypeName', width: '110' },
   { text: '发布时间', value: 'publishTime', width: '180' },
-])
+])// 计量文件
 const CertificateColumns = ref([
   { text: '证书名称', value: 'certificateName' },
   { text: '到期时间', value: 'validDate', width: '180' },
-])
+])// 我的证书
 const CertificatesColumns = ref([
   { text: '证书名称', value: 'certificateName' },
   { text: '人员名称', value: 'name', width: '110' },
   { text: '到期时间', value: 'validDate', width: '180' },
-])
-const StatisticxAxis: Ref<string[]> = ref([])
-const StatisticData: Ref<lineDataI[]> = ref([])
-const StaffSStatisticData: Ref<lineDataI[]> = ref([])
-const maxStaffCount = ref(10)
-const StaffSStatisticxAxis: Ref<string[]> = ref([])
-const TrainLogSList: Ref<pieDataI[]> = ref([])
-const TrainLogTitle = ref(0)
-const CertificateList = ref([])
-// 我的证书返回值
-interface validReturn {
-  certificateName:	string
-  count:	string
-  date:	string
-  lastValidDate:	number
-  name:	string
-  notQualified:	number
-  qualified:	number
-  qualifiedCount:	number
-  trainCount:	number
-  validDate:	string
-}
+])// 证书预警
+const StatisticxAxis: Ref<string[]> = ref([]) // 培训计划x轴
+const StatisticData: Ref<lineDataI[]> = ref([]) // 培训计划数据
+const StaffSStatisticData: Ref<lineDataI[]> = ref([]) // 计量人员数据
+const maxStaffCount = ref(10) // 计量人员最大值
+const StaffSStatisticxAxis: Ref<string[]> = ref([]) // 计量人员x轴
+const TrainLogSList: Ref<pieDataI[]> = ref([]) // 培训考核合格率以及不合格率
+const TrainLogTitle = ref(0) // 培训考核饼图中间的考核人次
+const CertificateList = ref([]) // 证书列表表格数据
 
-const CertificateObject = ref<validReturn>({
-  certificateName:	'',
-  count:	'',
-  date:	'',
-  lastValidDate:	0,
-  name:	'',
-  notQualified:	0,
-  qualified:	0,
-  qualifiedCount:	0,
-  trainCount:	0,
-  validDate:	'',
+const CertificateObject = ref<IValidReturn>({
+  certificateName:	'', // certificateName
+  count:	'', // 人数
+  date:	'', // 时间
+  lastValidDate:	0, // 最近到期时间
+  name:	'', // 人员名称
+  notQualified:	0, // 不合格
+  qualified:	0, // 合格
+  qualifiedCount:	0, // 合格总人次
+  trainCount:	0, // 考核总人次
+  validDate:	'', // validDate
 })
 
 // 培训计划列表
@@ -121,13 +111,25 @@
 // 证书列表
 function fetchCertificates() {
   const param = {
-    account: username,
+    account: username, // 账户
   }
   getCertificateStatistic(param).then((res) => {
-    CertificateList.value = res.data
-    CertificateObject.value = res.data.sort((nex: ICertificatReturn, max: ICertificatReturn) => {
-      return nex.lastValidDate - max.lastValidDate
-    })[0]
+    if (res.data.length) {
+      CertificateList.value = res.data // 表格数据
+      meterAdmin.value = res.data[0].meterAdmin // 是否是计量负责人
+      if (!meterAdmin.value) { // 非计量负责人找最近到期时间
+        // expireList数组中均为已到期的证书记录
+        const expireList = res.data.filter((item: ICertificatReturn) => typeof item.lastValidDate === 'number')
+        // 按照到期时间排序-找到最近的到期时间
+        if (expireList.length) {
+          CertificateObject.value = expireList.sort((nex: ICertificatReturn, max: ICertificatReturn) => {
+            if (`${nex.lastValidDate}` && `${max.lastValidDate}`) {
+              return nex.lastValidDate - max.lastValidDate
+            }
+          })[0]
+        }
+      }
+    }
   })
 }
 
@@ -137,17 +139,35 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
-    const result: ITrainLogStatistic = res.data
-    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const result = res.data
+    let total = 0 // 总人数
+    let notQualifiedCount = 0// 不合格人数
+    let qualifiedCount = 0 // 合格人数
+    if (meterAdmin.value) { // 是计量负责人--计算全部人次的考核合格率
+      total = result.trainCount // 总人数
+      // 不合格人数
+      notQualifiedCount = total - result.qualifiedCount
+      // 合格人数
+      qualifiedCount = result.qualifiedCount
+      TrainLogTitle.value = total // 考核总人次
+    }
+    else {
+      // 总人数
+      total = result.notQualified + result.qualified
+      // 不合格人数
+      notQualifiedCount = result.notQualified
+      // 合格人数
+      qualifiedCount = result.qualified
+      TrainLogTitle.value = total // 考核总人次
+    }
     // 合格率：合格总人次/考核总人次
-    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const qualifiedRate = ((qualifiedCount / total) * 100).toFixed(2)
     // 不合格率：不合格总人次/考核总人次
-    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
+    const notQualifiedRate = ((notQualifiedCount / total) * 100).toFixed(2)
     TrainLogSList.value = [
-      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
-      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
+      { name: `合  格   ${qualifiedCount}人 - ${qualifiedRate}%`, value: qualifiedCount },
+      { name: `不合格   ${notQualifiedCount}人 - ${notQualifiedRate}%`, value: notQualifiedCount },
     ]
-    TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
@@ -171,6 +191,7 @@
     effectiveStartTime: '', // 实施时间
     effectiveEndTime: '', // 实施时间
     effectiveStatus: '', // 实施状态
+    fileType: '',
     limit: 20,
     offset: 1,
   }
@@ -190,12 +211,12 @@
   calcBlockSize()
 })
 
-onMounted(() => {
+onMounted(async () => {
+  await fetchCertificates() // 证书列表
   calcBlockSize() // 计算各区域宽高
   fetchMyTrainLog() // 获取我的培训考核
   getFileList() // 计量文件
   getStatisticList() // 培训计划列表
-  fetchCertificates() // 证书列表
   fetchStaffStatistic() // 计量人员统计
 })
 </script>
@@ -268,7 +289,7 @@
             <div style="flex: 1; margin-top: 10px;">
               <bench-col
                 v-if="proxy.hasPerm('/workbench/meterTrain/train')"
-                title="我的培训考核"
+                :title="meterAdmin ? '培训考核' : '我的培训考核'"
                 icon="icon-book"
                 height="100%"
               >
@@ -322,7 +343,7 @@
         </el-col>
         <el-col :span="8">
           <bench-col
-            v-if="proxy.hasPerm('/workbench/person/remind')"
+            v-if="!meterAdmin"
             title="我的证书"
             icon="icon-certi"
             :height="blockHeight"
@@ -350,21 +371,19 @@
               </el-table>
               <div class="validDate">
                 <div class="validDate-top">
-                  <span class="validate-text">{{ CertificateObject.lastValidDate
-                  }}<span style="font-size: 12px;">天</span></span>
+                  <span class="validate-text">
+                    {{ CertificateObject.lastValidDate }}
+                    <span style="font-size: 12px;">天</span>
+                  </span>
                 </div>
-                <div class="validDate-bottom">
-                  最近到期时间 <br>
-                  <span>{{ CertificateObject.validDate || '无' }}</span>
+                <div style="font-size: 14px; font-weight: 600;">
+                  最近到期时间
                 </div>
               </div>
             </div>
           </bench-col>
           <bench-col
-            v-if="
-              proxy.hasPerm('/workbench/person/certificate')
-                && !proxy.hasPerm('/workbench/person/remind')
-            "
+            v-if="meterAdmin"
             title="证书预警"
             icon="icon-certi"
             path-url="/person/remind"
@@ -378,6 +397,7 @@
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
+              :height="blockHeight - 60"
             >
               <el-table-column
                 v-for="item in CertificatesColumns"