Sfoglia il codice sorgente

fix:配置文件修改,以及房间预约

张旭伟 3 settimane fa
parent
commit
f45534e849
2 ha cambiato i file con 29 aggiunte e 9 eliminazioni
  1. 9 9
      .env.development
  2. 20 0
      src/view/instr/calendar.vue

+ 9 - 9
.env.development

@@ -10,19 +10,19 @@
 # 本地环境
 ENV = development
 # 本地环境接口地址
-VITE_API_URL = http://192.168.0.216:9957/
+VITE_API_URL = http://192.168.0.216:9960/
 VITE_API_WECHAT = /wechat/
 VITE_TENANT = default
 
 # 微服务地址
-VITE_ADMIN = dashoo.labsop.admin-50000
-VITE_WORKFLOW = dashoo.labsop.workflow-50000
-VITE_FINANCE = dashoo.labsop.finance-50000
-VITE_SCI = dashoo.labsop.scientific-50000
-VITE_INSTR_ADMIN = dashoo.labsop.apparatus-50000
-VITE_LEARNING = dashoo.labsop.learning-50000
-VITE_PLATFORM_API = dashoo.labsop.platform-50000
-VITE_LABORATORY: dashoo.labsop.laboratory-50000
+VITE_ADMIN = dashoo.labsop.admin-53000
+VITE_WORKFLOW = dashoo.labsop.workflow-53000
+VITE_FINANCE = dashoo.labsop.finance-53000
+VITE_SCI = dashoo.labsop.scientific-53000
+VITE_INSTR_ADMIN = dashoo.labsop.apparatus-53000
+VITE_LEARNING = dashoo.labsop.learning-53000
+VITE_PLATFORM_API = dashoo.labsop.platform-53000
+VITE_LABORATORY: dashoo.labsop.laboratory-53000
 
 #公共配置
 VITE_UPLOAD = http://192.168.0.218:9933/weedfs/upload

+ 20 - 0
src/view/instr/calendar.vue

@@ -85,8 +85,20 @@
     selected: [],
     calendar: [],
   })
+  const instRoomType = ref(10)
+  const getInstDetails = async () => {
+    try {
+      const [err, res]: ToResponse = await to(instApi.getDetail({ id: instId.value }));
+      if (!err && res?.data) {
+        instRoomType.value = res.data.instRoomType || 10;
+      }
+    } catch (error) {
+      console.error('获取仪器详情失败:', error);
+    }
+  }
   // 获取系统设置时间间隔
   const getTimeSplit = async () => {
+    await getInstDetails()
     const [err, res]: ToResponse = await to(
       instApi.getSettingDetail({
         instId: Number(instId.value),
@@ -108,6 +120,13 @@
       instId: instId.value,
       date: currentDate,
       dateType: 'week',
+      currentUser: false,
+    }
+    if (instRoomType.value == 20) {
+        // 这里需要获取当前用户ID,您需要根据实际情况获取当前用户ID
+        params.currentUser = true;
+        console.log('房间类型,只查看自己的预约记录');
+
     }
     await Promise.all([
       instApi.getAppointInfo({ ...params }),
@@ -275,6 +294,7 @@
   }
   onMounted(() => {
     instId.value = route.query.id ? +route.query.id : 0
+
     getTimeSplit()
   })
 </script>