diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 3c829a9..9bfdfca 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -586,7 +586,7 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
             <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
             <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
@@ -624,7 +624,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table">
+          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
@@ -761,7 +761,7 @@
 
 <style lang="scss" scoped>
 .top {
-  z-index: 99999999;
+  z-index: 9;
 }
 
 .none {

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 3c829a9..9bfdfca 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -586,7 +586,7 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
             <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
             <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
@@ -624,7 +624,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table">
+          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
@@ -761,7 +761,7 @@
 
 <style lang="scss" scoped>
 .top {
-  z-index: 99999999;
+  z-index: 9;
 }
 
 .none {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 095d724..9e163b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -45,8 +45,8 @@
   if (value === '') {
     callback(new Error('检定周期必填且为有效数字'))
   }
-  else if (value.includes('-') || value.includes('+')) {
-    callback(new Error('检定周期必须为有效数字'))
+  else if (value.includes('-') || value.includes('+') || value.includes('.') || value === '0') {
+    callback(new Error('检定周期必须为有效正整数'))
   }
   else {
     callback()
@@ -250,9 +250,8 @@
               </el-input-number> -->
               <el-input
                 v-model="ruleForm.checkCycle"
-                clearable
                 type="number"
-                :min="0"
+                :min="1"
                 placeholder="检定周期"
               >
                 <template #append>

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 3c829a9..9bfdfca 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -586,7 +586,7 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
             <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
             <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
@@ -624,7 +624,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table">
+          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
@@ -761,7 +761,7 @@
 
 <style lang="scss" scoped>
 .top {
-  z-index: 99999999;
+  z-index: 9;
 }
 
 .none {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 095d724..9e163b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -45,8 +45,8 @@
   if (value === '') {
     callback(new Error('检定周期必填且为有效数字'))
   }
-  else if (value.includes('-') || value.includes('+')) {
-    callback(new Error('检定周期必须为有效数字'))
+  else if (value.includes('-') || value.includes('+') || value.includes('.') || value === '0') {
+    callback(new Error('检定周期必须为有效正整数'))
   }
   else {
     callback()
@@ -250,9 +250,8 @@
               </el-input-number> -->
               <el-input
                 v-model="ruleForm.checkCycle"
-                clearable
                 type="number"
-                :min="0"
+                :min="1"
                 placeholder="检定周期"
               >
                 <template #append>
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 7749709..2070fbd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -101,7 +101,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 3c829a9..9bfdfca 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -586,7 +586,7 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
             <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
             <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
@@ -624,7 +624,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table">
+          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
@@ -761,7 +761,7 @@
 
 <style lang="scss" scoped>
 .top {
-  z-index: 99999999;
+  z-index: 9;
 }
 
 .none {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 095d724..9e163b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -45,8 +45,8 @@
   if (value === '') {
     callback(new Error('检定周期必填且为有效数字'))
   }
-  else if (value.includes('-') || value.includes('+')) {
-    callback(new Error('检定周期必须为有效数字'))
+  else if (value.includes('-') || value.includes('+') || value.includes('.') || value === '0') {
+    callback(new Error('检定周期必须为有效正整数'))
   }
   else {
     callback()
@@ -250,9 +250,8 @@
               </el-input-number> -->
               <el-input
                 v-model="ruleForm.checkCycle"
-                clearable
                 type="number"
-                :min="0"
+                :min="1"
                 placeholder="检定周期"
               >
                 <template #append>
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 7749709..2070fbd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -101,7 +101,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6fc1d99..3b4f4bf 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -277,7 +277,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="batchImport" />
-        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('分包证书管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
         <icon-button icon="icon-print" title="打印" @click="printList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 3c829a9..9bfdfca 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -586,7 +586,7 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
             <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
             <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
@@ -624,7 +624,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table">
+          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
@@ -761,7 +761,7 @@
 
 <style lang="scss" scoped>
 .top {
-  z-index: 99999999;
+  z-index: 9;
 }
 
 .none {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 095d724..9e163b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -45,8 +45,8 @@
   if (value === '') {
     callback(new Error('检定周期必填且为有效数字'))
   }
-  else if (value.includes('-') || value.includes('+')) {
-    callback(new Error('检定周期必须为有效数字'))
+  else if (value.includes('-') || value.includes('+') || value.includes('.') || value === '0') {
+    callback(new Error('检定周期必须为有效正整数'))
   }
   else {
     callback()
@@ -250,9 +250,8 @@
               </el-input-number> -->
               <el-input
                 v-model="ruleForm.checkCycle"
-                clearable
                 type="number"
-                :min="0"
+                :min="1"
                 placeholder="检定周期"
               >
                 <template #append>
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 7749709..2070fbd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -101,7 +101,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6fc1d99..3b4f4bf 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -277,7 +277,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="batchImport" />
-        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('分包证书管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
         <icon-button icon="icon-print" title="打印" @click="printList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index b660b53..b144a8a 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 3c829a9..9bfdfca 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -586,7 +586,7 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
             <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
             <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
@@ -624,7 +624,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table">
+          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
@@ -761,7 +761,7 @@
 
 <style lang="scss" scoped>
 .top {
-  z-index: 99999999;
+  z-index: 9;
 }
 
 .none {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 095d724..9e163b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -45,8 +45,8 @@
   if (value === '') {
     callback(new Error('检定周期必填且为有效数字'))
   }
-  else if (value.includes('-') || value.includes('+')) {
-    callback(new Error('检定周期必须为有效数字'))
+  else if (value.includes('-') || value.includes('+') || value.includes('.') || value === '0') {
+    callback(new Error('检定周期必须为有效正整数'))
   }
   else {
     callback()
@@ -250,9 +250,8 @@
               </el-input-number> -->
               <el-input
                 v-model="ruleForm.checkCycle"
-                clearable
                 type="number"
-                :min="0"
+                :min="1"
                 placeholder="检定周期"
               >
                 <template #append>
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 7749709..2070fbd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -101,7 +101,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6fc1d99..3b4f4bf 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -277,7 +277,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="batchImport" />
-        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('分包证书管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
         <icon-button icon="icon-print" title="打印" @click="printList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index b660b53..b144a8a 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 494a317..dc1bbf9 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -272,6 +272,7 @@
   ruleForm.value.fax = subpackage.fax
   ruleForm.value.subcontractorCompanyName = subpackage.companyName
 }
+const radio = ref('基本信息')
 </script>
 
 <template>
@@ -308,165 +309,176 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form
-        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="126px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="评审表编号" prop="reviewNo">
-              <el-input v-model.trim="ruleForm.reviewNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="评审表名称" prop="reviewName">
-              <el-input v-model.trim="ruleForm.reviewName" placeholder="评审表名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="申请人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请时间" prop="createTime">
-              <el-date-picker
-                v-model="ruleForm.createTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="申请时间" class="normal-date" style="width: 100%;" disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="分包方编号" prop="subcontractorNo">
-              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="分包方编号" @focus="selectSubpackage">
-                <template v-if="!$route.path.includes('detail')" #append>
-                  <span @click="selectSubpackage">选择</span>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="分包机构名称" prop="subcontractorCompanyName">
-              <el-input v-model.trim="ruleForm.subcontractorCompanyName" placeholder="分包机构名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="机构负责人" prop="subcontractorDirectorName">
-              <el-input v-model.trim="ruleForm.subcontractorDirectorName" placeholder="机构负责人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="地址" prop="address">
-              <el-input v-model.trim="ruleForm.address" placeholder="地址" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="邮编" prop="postcode">
-              <el-input v-model.trim="ruleForm.postcode" placeholder="邮编" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真" prop="fax">
-              <el-input v-model.trim="ruleForm.fax" placeholder="传真" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系人" prop="contact">
-              <el-input v-model.trim="ruleForm.contact" placeholder="请输入联系人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系电话" prop="contactNumber">
-              <el-input v-model.trim="ruleForm.contactNumber" placeholder="请输入联系电话" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="预计开始时间" prop="predictStartTime">
-              <el-date-picker
-                v-model="ruleForm.predictStartTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="请选择开始时间" class="normal-date" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="预计结束时间" prop="predictEndTime">
-              <el-date-picker
-                v-model="ruleForm.predictEndTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="请选择结束时间" class="normal-date" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="分包原因" prop="subcontractReason">
-              <el-select v-model="ruleForm.subcontractReason" placeholder="请选择分包原因" style="width: 100%;">
-                <el-option v-for="item in reasonList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="预计费用" prop="predictPrice">
-              <el-input v-model.trim="ruleForm.predictPrice" placeholder="请输入预计费用" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="实验室认可情况" prop="labAccreditation">
-              <el-input v-model.trim="ruleForm.labAccreditation" placeholder="请输入实验室认可情况" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="溯源性" prop="traceability">
-              <el-input v-model.trim="ruleForm.traceability" placeholder="请输入溯源性" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="测试方法" prop="testMethod">
-              <el-input v-model.trim="ruleForm.testMethod" placeholder="请输入测试方法" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="技术能力" prop="technicalAbility">
-              <el-input v-model.trim="ruleForm.technicalAbility" placeholder="请输入技术能力" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <el-form-item label="附件" prop="attachment">
-              <show-photo :minio-file-name="ruleForm.attachment" />
-              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
-                上传
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="!$route.path.includes('create') && $route.query.statusName !== '全部' && $route.query.statusName !== '草稿箱'">
+      <el-radio-group v-model="radio">
+        <el-radio-button label="基本信息" />
+        <el-radio-button v-if="$route.query.statusName !== '全部' && $route.query.statusName !== '草稿箱'" label="审批详情" />
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <device-table ref="deviceRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
-    </detail-block-com>
+    <div v-show="radio === '基本信息'">
+      <detail-block-com>
+        <el-form
+          ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="126px" class="form"
+          :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        >
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="评审表编号" prop="reviewNo">
+                <el-input v-model.trim="ruleForm.reviewNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="评审表名称" prop="reviewName">
+                <el-input v-model.trim="ruleForm.reviewName" placeholder="评审表名称" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="申请人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="申请人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="申请时间" prop="createTime">
+                <el-date-picker
+                  v-model="ruleForm.createTime" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="申请时间" class="normal-date" style="width: 100%;" disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="分包方编号" prop="subcontractorNo">
+                <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="分包方编号" @focus="selectSubpackage">
+                  <template v-if="!$route.path.includes('detail')" #append>
+                    <span @click="selectSubpackage">选择</span>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="分包机构名称" prop="subcontractorCompanyName">
+                <el-input v-model.trim="ruleForm.subcontractorCompanyName" placeholder="分包机构名称" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="机构负责人" prop="subcontractorDirectorName">
+                <el-input v-model.trim="ruleForm.subcontractorDirectorName" placeholder="机构负责人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="地址" prop="address">
+                <el-input v-model.trim="ruleForm.address" placeholder="地址" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="邮编" prop="postcode">
+                <el-input v-model.trim="ruleForm.postcode" placeholder="邮编" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="传真" prop="fax">
+                <el-input v-model.trim="ruleForm.fax" placeholder="传真" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="contact">
+                <el-input v-model.trim="ruleForm.contact" placeholder="请输入联系人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="contactNumber">
+                <el-input v-model.trim="ruleForm.contactNumber" placeholder="请输入联系电话" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="预计开始时间" prop="predictStartTime">
+                <el-date-picker
+                  v-model="ruleForm.predictStartTime" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择开始时间" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="预计结束时间" prop="predictEndTime">
+                <el-date-picker
+                  v-model="ruleForm.predictEndTime" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择结束时间" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="分包原因" prop="subcontractReason">
+                <el-select v-model="ruleForm.subcontractReason" placeholder="请选择分包原因" style="width: 100%;">
+                  <el-option v-for="item in reasonList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="预计费用" prop="predictPrice">
+                <el-input v-model.trim="ruleForm.predictPrice" placeholder="请输入预计费用" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="实验室认可情况" prop="labAccreditation">
+                <el-input v-model.trim="ruleForm.labAccreditation" placeholder="请输入实验室认可情况" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="溯源性" prop="traceability">
+                <el-input v-model.trim="ruleForm.traceability" placeholder="请输入溯源性" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="测试方法" prop="testMethod">
+                <el-input v-model.trim="ruleForm.testMethod" placeholder="请输入测试方法" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="技术能力" prop="technicalAbility">
+                <el-input v-model.trim="ruleForm.technicalAbility" placeholder="请输入技术能力" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="24">
+              <el-form-item label="附件" prop="attachment">
+                <show-photo :minio-file-name="ruleForm.attachment" />
+                <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+                <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+                  上传
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <device-table ref="deviceRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
+      </detail-block-com>
+    </div>
+    <div v-if="radio === '审批详情'">
+      <approval-record-table :process-id="ruleForm.processId" />
+    </div>
   </app-container>
 </template>
 

diff --git a/.env.production b/.env.production
index 42e6649..c89e736 100644
--- a/.env.production
+++ b/.env.production
@@ -8,6 +8,8 @@
 # VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
+# VITE_APP_API_BASEURL = http://139.198.29.133:8082
+# VITE_METER_API_BASEURL = http://139.198.29.133:8083
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 199f233..d28f5ad 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -97,7 +97,7 @@
 // 获取数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index 94dfae5..0772b43 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 975fbcc..c624d0e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -85,18 +85,19 @@
 const listLoading = ref(true)
 
 // 获取列表数据
-const fetchData = (isNowPage = true) => {
+const fetchData = () => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
+  // if (!isNowPage) {
+  //   // 是否显示当前页，否则跳转第一页
+  //   listQuery.offset = 1
+  // }
   // console.log(getListPage)
+  console.log(listQuery, 'listQuery')
   getListPage(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
-    total.value = parseInt(response.data.total)
+    total.value = Number(response.data.total)
     listLoading.value = false
   }).catch((_) => {
     listLoading.value = false
@@ -119,7 +120,7 @@
 fetchTypeList()
 // 查询数据
 const search = () => {
-  fetchData(false)
+  fetchData()
 }
 // 重置
 const reset = () => {
@@ -135,6 +136,7 @@
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
+  console.log(val, 'val')
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/tested/dashboard/components/BarChartVertical.vue b/src/views/tested/dashboard/components/BarChartVertical.vue
index bf30593..cb47761 100644
--- a/src/views/tested/dashboard/components/BarChartVertical.vue
+++ b/src/views/tested/dashboard/components/BarChartVertical.vue
@@ -38,10 +38,10 @@
     type: Object,
     default: () => {
       return {
-        top: 30,
-        left: 20,
-        right: 20,
-        bottom: 25,
+        top: 20,
+        left: 5,
+        right: 5,
+        bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -303,9 +303,27 @@
             color: props.axisLineColor, // 轴线的颜色
           },
         },
+        // axisLabel: {
+        //   color: props.fontColor,
+        //   fontSize: 15,
+        // },
         axisLabel: {
           color: props.fontColor,
           fontSize: 15,
+          show: true, // 是否显示刻度标签，默认显示
+          // interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
+          rotate: -30, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
+          // inside: true, // 刻度标签是否朝内，默认朝外
+          // margin: 6, // 刻度标签与轴线之间的距离
+          formatter: (value: string) => {
+            console.log(value, 'value')
+            if (String(value).length > 6) {
+              return `${String(value).substring(0, 5)}...`
+            }
+            else {
+              return value
+            }
+          }, // 刻度标签的内容格式器
         },
         splitLine: {
           show: false,
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 3c829a9..9bfdfca 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -586,7 +586,7 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
             <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
             <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
@@ -624,7 +624,7 @@
             <div>在用设备类型</div>
             <div>在用设备计量标识</div>
           </div>
-          <div class="device-search-table">
+          <div class="device-search-table" style="z-index: 999999999999999;top: 5px;">
             <dept-select v-model="tableDept" placeholder="所属部门" style="width: 150px;" />
             <el-icon class="search" style="font-size: 28px;" @click="searchDeviceStatus">
               <search style=" margin-left: 8px;" />
@@ -761,7 +761,7 @@
 
 <style lang="scss" scoped>
 .top {
-  z-index: 99999999;
+  z-index: 9;
 }
 
 .none {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 095d724..9e163b4 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -45,8 +45,8 @@
   if (value === '') {
     callback(new Error('检定周期必填且为有效数字'))
   }
-  else if (value.includes('-') || value.includes('+')) {
-    callback(new Error('检定周期必须为有效数字'))
+  else if (value.includes('-') || value.includes('+') || value.includes('.') || value === '0') {
+    callback(new Error('检定周期必须为有效正整数'))
   }
   else {
     callback()
@@ -250,9 +250,8 @@
               </el-input-number> -->
               <el-input
                 v-model="ruleForm.checkCycle"
-                clearable
                 type="number"
-                :min="0"
+                :min="1"
                 placeholder="检定周期"
               >
                 <template #append>
diff --git a/src/views/tested/status/delay/components/list.vue b/src/views/tested/status/delay/components/list.vue
index 7749709..2070fbd 100644
--- a/src/views/tested/status/delay/components/list.vue
+++ b/src/views/tested/status/delay/components/list.vue
@@ -101,7 +101,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6fc1d99..3b4f4bf 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -277,7 +277,7 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="batchImport" />
-        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('分包证书管理模块')" />
+        <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
         <icon-button icon="icon-print" title="打印" @click="printList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index b660b53..b144a8a 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -77,7 +77,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 494a317..dc1bbf9 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -272,6 +272,7 @@
   ruleForm.value.fax = subpackage.fax
   ruleForm.value.subcontractorCompanyName = subpackage.companyName
 }
+const radio = ref('基本信息')
 </script>
 
 <template>
@@ -308,165 +309,176 @@
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form
-        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="126px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="评审表编号" prop="reviewNo">
-              <el-input v-model.trim="ruleForm.reviewNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="评审表名称" prop="reviewName">
-              <el-input v-model.trim="ruleForm.reviewName" placeholder="评审表名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="申请人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请时间" prop="createTime">
-              <el-date-picker
-                v-model="ruleForm.createTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="申请时间" class="normal-date" style="width: 100%;" disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="分包方编号" prop="subcontractorNo">
-              <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="分包方编号" @focus="selectSubpackage">
-                <template v-if="!$route.path.includes('detail')" #append>
-                  <span @click="selectSubpackage">选择</span>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="分包机构名称" prop="subcontractorCompanyName">
-              <el-input v-model.trim="ruleForm.subcontractorCompanyName" placeholder="分包机构名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="机构负责人" prop="subcontractorDirectorName">
-              <el-input v-model.trim="ruleForm.subcontractorDirectorName" placeholder="机构负责人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="地址" prop="address">
-              <el-input v-model.trim="ruleForm.address" placeholder="地址" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="邮编" prop="postcode">
-              <el-input v-model.trim="ruleForm.postcode" placeholder="邮编" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真" prop="fax">
-              <el-input v-model.trim="ruleForm.fax" placeholder="传真" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系人" prop="contact">
-              <el-input v-model.trim="ruleForm.contact" placeholder="请输入联系人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="联系电话" prop="contactNumber">
-              <el-input v-model.trim="ruleForm.contactNumber" placeholder="请输入联系电话" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="预计开始时间" prop="predictStartTime">
-              <el-date-picker
-                v-model="ruleForm.predictStartTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="请选择开始时间" class="normal-date" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="预计结束时间" prop="predictEndTime">
-              <el-date-picker
-                v-model="ruleForm.predictEndTime" type="date" format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD" placeholder="请选择结束时间" class="normal-date" style="width: 100%;"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="分包原因" prop="subcontractReason">
-              <el-select v-model="ruleForm.subcontractReason" placeholder="请选择分包原因" style="width: 100%;">
-                <el-option v-for="item in reasonList" :key="item.id" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="预计费用" prop="predictPrice">
-              <el-input v-model.trim="ruleForm.predictPrice" placeholder="请输入预计费用" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="实验室认可情况" prop="labAccreditation">
-              <el-input v-model.trim="ruleForm.labAccreditation" placeholder="请输入实验室认可情况" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="溯源性" prop="traceability">
-              <el-input v-model.trim="ruleForm.traceability" placeholder="请输入溯源性" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="测试方法" prop="testMethod">
-              <el-input v-model.trim="ruleForm.testMethod" placeholder="请输入测试方法" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="技术能力" prop="technicalAbility">
-              <el-input v-model.trim="ruleForm.technicalAbility" placeholder="请输入技术能力" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <el-form-item label="附件" prop="attachment">
-              <show-photo :minio-file-name="ruleForm.attachment" />
-              <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
-              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
-                上传
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="!$route.path.includes('create') && $route.query.statusName !== '全部' && $route.query.statusName !== '草稿箱'">
+      <el-radio-group v-model="radio">
+        <el-radio-button label="基本信息" />
+        <el-radio-button v-if="$route.query.statusName !== '全部' && $route.query.statusName !== '草稿箱'" label="审批详情" />
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <device-table ref="deviceRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
-    </detail-block-com>
+    <div v-show="radio === '基本信息'">
+      <detail-block-com>
+        <el-form
+          ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="126px" class="form"
+          :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        >
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="评审表编号" prop="reviewNo">
+                <el-input v-model.trim="ruleForm.reviewNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="评审表名称" prop="reviewName">
+                <el-input v-model.trim="ruleForm.reviewName" placeholder="评审表名称" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="申请人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="申请人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="申请时间" prop="createTime">
+                <el-date-picker
+                  v-model="ruleForm.createTime" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="申请时间" class="normal-date" style="width: 100%;" disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="分包方编号" prop="subcontractorNo">
+                <el-input v-model.trim="ruleForm.subcontractorNo" placeholder="分包方编号" @focus="selectSubpackage">
+                  <template v-if="!$route.path.includes('detail')" #append>
+                    <span @click="selectSubpackage">选择</span>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="分包机构名称" prop="subcontractorCompanyName">
+                <el-input v-model.trim="ruleForm.subcontractorCompanyName" placeholder="分包机构名称" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="机构负责人" prop="subcontractorDirectorName">
+                <el-input v-model.trim="ruleForm.subcontractorDirectorName" placeholder="机构负责人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="地址" prop="address">
+                <el-input v-model.trim="ruleForm.address" placeholder="地址" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="邮编" prop="postcode">
+                <el-input v-model.trim="ruleForm.postcode" placeholder="邮编" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="传真" prop="fax">
+                <el-input v-model.trim="ruleForm.fax" placeholder="传真" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系人" prop="contact">
+                <el-input v-model.trim="ruleForm.contact" placeholder="请输入联系人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系电话" prop="contactNumber">
+                <el-input v-model.trim="ruleForm.contactNumber" placeholder="请输入联系电话" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="预计开始时间" prop="predictStartTime">
+                <el-date-picker
+                  v-model="ruleForm.predictStartTime" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择开始时间" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="预计结束时间" prop="predictEndTime">
+                <el-date-picker
+                  v-model="ruleForm.predictEndTime" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择结束时间" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="分包原因" prop="subcontractReason">
+                <el-select v-model="ruleForm.subcontractReason" placeholder="请选择分包原因" style="width: 100%;">
+                  <el-option v-for="item in reasonList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="预计费用" prop="predictPrice">
+                <el-input v-model.trim="ruleForm.predictPrice" placeholder="请输入预计费用" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="实验室认可情况" prop="labAccreditation">
+                <el-input v-model.trim="ruleForm.labAccreditation" placeholder="请输入实验室认可情况" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="溯源性" prop="traceability">
+                <el-input v-model.trim="ruleForm.traceability" placeholder="请输入溯源性" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="测试方法" prop="testMethod">
+                <el-input v-model.trim="ruleForm.testMethod" placeholder="请输入测试方法" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="技术能力" prop="technicalAbility">
+                <el-input v-model.trim="ruleForm.technicalAbility" placeholder="请输入技术能力" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="24">
+              <el-form-item label="附件" prop="attachment">
+                <show-photo :minio-file-name="ruleForm.attachment" />
+                <input ref="fileRef" style="display: none;" type="file" @change="onFileChange">
+                <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+                  上传
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <device-table ref="deviceRef" :data="ruleForm.equipmentList" :status="dialogStatus" />
+      </detail-block-com>
+    </div>
+    <div v-if="radio === '审批详情'">
+      <approval-record-table :process-id="ruleForm.processId" />
+    </div>
   </app-container>
 </template>
 
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index 062bc0f..6de1157 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -71,7 +71,7 @@
 // 获取列表数据
 const fetchData = (isNowPage = true) => {
   list.value = []
-  total.value = 0
+  // total.value = 0
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页