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

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/20230626.zip b/20230626.zip
new file mode 100644
index 0000000..1eb27ab
--- /dev/null
+++ b/20230626.zip
Binary files differ

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/20230626.zip b/20230626.zip
new file mode 100644
index 0000000..1eb27ab
--- /dev/null
+++ b/20230626.zip
Binary files differ
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/20230626.zip b/20230626.zip
new file mode 100644
index 0000000..1eb27ab
--- /dev/null
+++ b/20230626.zip
Binary files differ
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 9fb36c8..ea89666 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -91,6 +91,9 @@
     listQuery.value.offset = 1
   }
   list.value = []
+  if (!listQuery.value.measureStatus) {
+    listQuery.value.measureStatus = '2' // 待检测
+  }
   getDeptMeasureList(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
@@ -253,13 +256,14 @@
   }
 })
 onMounted(async () => {
-  if (window.sessionStorage.getItem('deptMeasureActive') != null) {
-    active.value = window.sessionStorage.getItem('deptMeasureActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
-  }
   getDict().then(() => {
+    if (window.sessionStorage.getItem('deptMeasureActive') != null) {
+      active.value = window.sessionStorage.getItem('deptMeasureActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '待检测')!.id as string
+      console.log('active.value', active.value)
+    }
     fetchData(true)
   })
   // nextTick(() => {

diff --git a/.env.production b/.env.production
index ff5a80a..0fca4ad 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:21609
+# VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
+VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/20230626.zip b/20230626.zip
new file mode 100644
index 0000000..1eb27ab
--- /dev/null
+++ b/20230626.zip
Binary files differ
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 75232c3..2609e4a 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 9fb36c8..ea89666 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -91,6 +91,9 @@
     listQuery.value.offset = 1
   }
   list.value = []
+  if (!listQuery.value.measureStatus) {
+    listQuery.value.measureStatus = '2' // 待检测
+  }
   getDeptMeasureList(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
@@ -253,13 +256,14 @@
   }
 })
 onMounted(async () => {
-  if (window.sessionStorage.getItem('deptMeasureActive') != null) {
-    active.value = window.sessionStorage.getItem('deptMeasureActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
-  }
   getDict().then(() => {
+    if (window.sessionStorage.getItem('deptMeasureActive') != null) {
+      active.value = window.sessionStorage.getItem('deptMeasureActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '待检测')!.id as string
+      console.log('active.value', active.value)
+    }
     fetchData(true)
   })
   // nextTick(() => {
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 621618b..8e40674 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -88,6 +88,9 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  if (!listQuery.value.measureStatus) {
+    listQuery.value.measureStatus = '2' // 待检测
+  }
   getMyMeasureList(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
@@ -284,14 +287,13 @@
 })
 
 onMounted(async () => {
-  // await getDict()
-  if (window.sessionStorage.getItem('myMeasureActive') != null) {
-    active.value = window.sessionStorage.getItem('myMeasureActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
-  }
   getDict().then(() => {
+    if (window.sessionStorage.getItem('myMeasureActive') != null) {
+      active.value = window.sessionStorage.getItem('myMeasureActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
+    }
     fetchData(true)
   })
   // nextTick(() => {