diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 450f9d9..7207f63 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -142,6 +142,7 @@
         ruleForm.value.attachment = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 450f9d9..7207f63 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -142,6 +142,7 @@
         ruleForm.value.attachment = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 243fe69..560be02 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -156,6 +156,7 @@
         }
 
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 450f9d9..7207f63 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -142,6 +142,7 @@
         ruleForm.value.attachment = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 243fe69..560be02 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -156,6 +156,7 @@
         }
 
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 7c911e7..f76feab 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -23,6 +23,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -213,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 450f9d9..7207f63 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -142,6 +142,7 @@
         ruleForm.value.attachment = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 243fe69..560be02 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -156,6 +156,7 @@
         }
 
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 7c911e7..f76feab 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -23,6 +23,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -213,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index bd43ea9..c88a10a 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -342,6 +342,7 @@
       if (res.code === 200) {
         ruleForm.value.attachments = ruleForm.value.attachments ? `${ruleForm.value.attachments},${res.data[0]}` : res.data[0]
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 450f9d9..7207f63 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -142,6 +142,7 @@
         ruleForm.value.attachment = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 243fe69..560be02 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -156,6 +156,7 @@
         }
 
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 7c911e7..f76feab 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -23,6 +23,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -213,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index bd43ea9..c88a10a 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -342,6 +342,7 @@
       if (res.code === 200) {
         ruleForm.value.attachments = ruleForm.value.attachments ? `${ruleForm.value.attachments},${res.data[0]}` : res.data[0]
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 18c7523..5eee17a 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -102,6 +102,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -280,8 +284,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 450f9d9..7207f63 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -142,6 +142,7 @@
         ruleForm.value.attachment = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 243fe69..560be02 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -156,6 +156,7 @@
         }
 
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 7c911e7..f76feab 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -23,6 +23,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -213,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index bd43ea9..c88a10a 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -342,6 +342,7 @@
       if (res.code === 200) {
         ruleForm.value.attachments = ruleForm.value.attachments ? `${ruleForm.value.attachments},${res.data[0]}` : res.data[0]
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 18c7523..5eee17a 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -102,6 +102,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -280,8 +284,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 499a4ec..53b1411 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -239,6 +239,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {

diff --git a/.env.development b/.env.development
index 52b6555..c701b87 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,9 @@
 VITE_APP_TITLE = 计量信息系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..29589d8 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://111.198.10.15:21710"
 }
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index 55c19b0..9aafdd0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -76,11 +76,11 @@
 // 删除
 export function delPlan(id: string) {
   return request({
-    url: '/plan/approval/delete',
+    url: `/plan/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 // 取消
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 3897ab8..f71ee79 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -91,7 +91,7 @@
   // position: absolute;
   // z-index: 99999;
   width: 18%;
-  height: 140px;
+  height: 170px;
   font-size: 26px;
   font-weight: 700;
   border: 6px solid #04419c;
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 0e5a959..61077df 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -208,17 +208,17 @@
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典名称" prop="dictName" class="required">
-            <el-input v-model="formData.dictName" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictName" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
           <el-form-item label="字典编码" prop="dictCode" class="required">
-            <el-input v-model="formData.dictCode" type="text" placeholder="必填" clearable />
+            <el-input v-model.trim="formData.dictCode" type="text" placeholder="必填" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" class="grid-cell">
           <el-form-item label="字典描述" prop="tips" class="required">
-            <el-input v-model="formData.dictTips" type="text" placeholder="非必填" clearable />
+            <el-input v-model.trim="formData.dictTips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
         <div class="dict-detail">
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 1cfb494..6c9383f 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -1,12 +1,12 @@
 <!-- 标签列表 -->
 <script lang="ts" setup name="Label">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ILabelItem, IUseStateList, IlistQuery } from './label'
+import type { ILabelItem, IUseStateList, IlistQuery, dictType } from './label'
 import { getDictByCode } from '@/api/system/dict'
 import { batchImportLabel, delLabel, getLabelList, importLabel } from '@/api/system/label'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
-const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
+const useStateList = ref<dictType[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
   rfid: '',
   equipmentNo: '',
@@ -97,6 +97,7 @@
       if (res.code === 200) {
         ElMessage.success('上传成功')
         loading.close()
+        fileRef.value.value = ''
         fetchData(true)
       }
       else {
@@ -204,9 +205,9 @@
           <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id"
+              :value="item.value"
             />
           </el-select>
         </search-item>
diff --git a/src/views/system/signature/addDDialog.vue b/src/views/system/signature/addDDialog.vue
index 3665c35..a3bc743 100644
--- a/src/views/system/signature/addDDialog.vue
+++ b/src/views/system/signature/addDDialog.vue
@@ -174,6 +174,7 @@
         ruleFormRef.value?.clearValidate('minioFileName')
         ruleForm.minioFileName = res.data[0]
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index f424501..1db2528 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -34,6 +34,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -137,8 +141,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 7108668..4d28bbc 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -57,6 +57,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 
 const columns = ref([
@@ -299,8 +303,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index c3979ce..3749947 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -28,6 +28,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -101,6 +105,8 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
@@ -159,8 +165,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index d60efca..c2cd193 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -42,14 +42,14 @@
   decisionItem: '', // 可选决策项
   equipmentIds: [], // 关联设备id
   id: '',
-  month: '', // month
+  month: 0, // month
   planCategory: '0', // 计划分类（字典值，原始/追加）
   planName: '', // 计划名称
   planNo: '', // 计划编号
   planType: '', // 计划类型（字典值，年/季/月）
   processId: '', // 流程实例id
   remark: '', // 备注
-  season: '', // 季度
+  season: 0, // 季度
   taskId: '', // 任务id
   updateTime: '', // 更新时间
   year: '', // 年份
@@ -302,10 +302,10 @@
               <el-input v-model.trim="ruleForm.planName" placeholder="计划名称" disabled />
             </el-form-item>
             <el-form-item v-if="typeFlag === '1'" label="计划名称" prop="season">
-              {{ currentYear }}年第<el-input v-model.trim="ruleForm.season" style="width: 40px;" /> 季度计量计划
+              {{ currentYear }}年第<el-input-number v-model="ruleForm.season" :min="1" :max="4" controls-position="right" style="width: 100px;" /> 季度计量计划
             </el-form-item>
             <el-form-item v-if="typeFlag === '2'" label="计划名称" prop="month">
-              {{ currentYear }}年<el-input v-model.trim="ruleForm.month" style="width: 40px;" /> 月月度计量计划
+              {{ currentYear }}年<el-input-number v-model="ruleForm.month" :min="1" :max="12" controls-position="right" style="width: 100px;" /> 月月度计量计划
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 081735b..bfa7fff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -43,6 +43,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 const columns = ref([
   {
@@ -123,6 +127,8 @@
   listQuery.offset = 1
   listQuery.limit = 20
   listQuery.planName = ''
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
   listQuery.planNo = ''
   listQuery.planCategory = ''
   search()
@@ -311,8 +317,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 5f1d9c0..61432c3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,6 +31,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -67,6 +73,11 @@
     value: 'usageStatusName',
     align: 'center',
   },
+  {
+    text: '证书有效期',
+    value: 'certificateValid',
+    align: 'center',
+  },
 ])
 // 获取使用状态列表
 const useStatusList = ref()
@@ -164,6 +175,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -177,7 +199,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -186,8 +209,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index d508fb1..5935b12 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -44,7 +44,7 @@
   },
   {
     text: '计量标识',
-    value: 'meterIdentify',
+    value: 'meterIdentifyName',
     required: false,
     isSelect: false, // 是否下拉框
     isBtn: false,
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 004ba11..e7690a9 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -196,6 +196,7 @@
         list.value[currentIndex.value].appendixDescn = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 5dc4ad6..0c6e779 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -21,6 +21,10 @@
     listQuery.createStartTime = newVal[0]
     listQuery.createEndTime = newVal[1]
   }
+  else {
+    listQuery.createStartTime = ''
+    listQuery.createEndTime = ''
+  }
 })
 const columns = ref([
   {
@@ -153,8 +157,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index 16bedf7..437b148 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -103,6 +103,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -143,7 +147,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index a99aff4..8633a27 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -4,6 +4,8 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getInfoListPage } from '@/api/eqpt/device/info'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const $props = defineProps({
   // 使用状态列表
   // 主要用于 状态管理时 过滤不同的设备使用状态
@@ -43,6 +45,10 @@
     listQuery.value.certificateValidStart = newVal[0]
     listQuery.value.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -177,6 +183,17 @@
   fetchData() // 获取人员列表
 }
 defineExpose({ initDialog })
+// 加载组织机构树形下拉
+const deptTreeList = ref()
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+fetchDeptTree()
 </script>
 
 <template>
@@ -190,7 +207,8 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.deptIds" placeholder="所属岗位" clearable />
+        <!-- <el-input v-model.trim="listQuery.deptIds" placeholder="使用岗位" clearable /> -->
+        <dept-select v-model="listQuery.deptIds" :data="deptTreeList" placeholder="使用岗位" style="width: 100%;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -199,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/info/components/certificateTable.vue b/src/views/tested/device/info/components/certificateTable.vue
index 5307546..a701125 100644
--- a/src/views/tested/device/info/components/certificateTable.vue
+++ b/src/views/tested/device/info/components/certificateTable.vue
@@ -137,6 +137,7 @@
         //  res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d17d646..b162157 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -390,6 +390,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 480b6f2..6b5a5a5 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -159,6 +159,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidEnd = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -287,6 +291,7 @@
     importDevice(fd, $props.equipmentType).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
+        fileRef.value.value = ''
         loading.close()
         fetchData(true)
       }
@@ -479,8 +484,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index b3d04a2..2d2ec88 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -96,6 +96,10 @@
     listQuery.certificateValidStart = newVal[0]
     listQuery.certificateValidStart = newVal[1]
   }
+  else {
+    listQuery.certificateValidStart = ''
+    listQuery.certificateValidStart = ''
+  }
 }, {
   deep: true,
 })
@@ -207,7 +211,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="range" type="datetimerange" value-format="YYYY-MM-DD"
+          v-model="range" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 450f9d9..7207f63 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -142,6 +142,7 @@
         ruleForm.value.attachment = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 243fe69..560be02 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -156,6 +156,7 @@
         }
 
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 7c911e7..f76feab 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -23,6 +23,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 }, {
   deep: true,
 })
@@ -213,8 +217,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index bd43ea9..c88a10a 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -342,6 +342,7 @@
       if (res.code === 200) {
         ruleForm.value.attachments = ruleForm.value.attachments ? `${ruleForm.value.attachments},${res.data[0]}` : res.data[0]
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 18c7523..5eee17a 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -102,6 +102,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -280,8 +284,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 499a4ec..53b1411 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -239,6 +239,7 @@
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
         loading.close()
       }
       else {
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index e2ed430..b0b62a4 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -96,6 +96,10 @@
     listQuery.createTimeStart = newVal[0]
     listQuery.createTimeEnd = newVal[1]
   }
+  else {
+    listQuery.createTimeStart = ''
+    listQuery.createTimeEnd = ''
+  }
 })
 // 重置
 const reset = () => {
@@ -274,8 +278,8 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
         />
       </search-item>
     </search-area>