diff --git a/.env b/.env
index 1783b63..e51db6e 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-VITE_API_HOST=192.168.1.119
+VITE_API_HOST=192.168.1.125
VITE_API_PORT=8080
VITE_WS_PATH=/ws
\ No newline at end of file
diff --git a/src/views/debug/debug.vue b/src/views/debug/debug.vue
index 6017478..fed227f 100644
--- a/src/views/debug/debug.vue
+++ b/src/views/debug/debug.vue
@@ -46,10 +46,18 @@
@@ -204,7 +214,8 @@ const x = ref(0);
const y = ref(0);
const z = ref(0);
-const pumpId = ref(1);
+const tubeNum = ref(1);
+const solutionId = ref(1);
const pumpAmount = ref(10);
const shakeUpSpeed = ref(5);
@@ -239,9 +250,9 @@ function onCmdClick(command: OperationCmd) {
} else if (command === "downTray") {
params = { areaId: selectedAreaForTray.value, height: trayHeight.value };
} else if (command === "moveMachineArm") {
- params = { x: x.value, y: y.value, z: z.value };
+ params = { position: `${x.value},${y.value},${z.value}` };
} else if (command === "injectFluid") {
- params = { areaId: pumpId.value, volume: pumpAmount.value };
+ params = { tubeNum: tubeNum.value, solutionId: solutionId.value, flowRate: pumpAmount.value };
} else if (command === "startHeat") {
params = { areaId: selectedAreaForHeat.value, temperature: heatTemperature.value };
} else if (command === "stopHeat") {
diff --git a/src/views/expeRecord/components/ExpeDetail.vue b/src/views/expeRecord/components/ExpeDetail.vue
new file mode 100644
index 0000000..32b880e
--- /dev/null
+++ b/src/views/expeRecord/components/ExpeDetail.vue
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/src/views/expeRecord/index.vue b/src/views/expeRecord/index.vue
index f15ef92..b5fb3d8 100644
--- a/src/views/expeRecord/index.vue
+++ b/src/views/expeRecord/index.vue
@@ -12,7 +12,7 @@
-
+
时间
-
用户名
-
实验记录
+
操作员
+
实验名称
{{ record.startTime }}
{{ userStore.userIdMap[record.createUser].nickname }}
-
{{ record.name }}
+
{{ record.name }}
+
详情
@@ -103,4 +104,7 @@ function onDeleteRecords() {
}
});
}
+function onDetailClick(item: ExperienceRecord) {
+ showToast('点了')
+}
diff --git a/src/views/logRecord/index.vue b/src/views/logRecord/index.vue
index 5a95c34..8f86f6d 100644
--- a/src/views/logRecord/index.vue
+++ b/src/views/logRecord/index.vue
@@ -11,7 +11,7 @@
时间
- 用户名
+ 操作员
操作记录
diff --git a/vite.config.ts b/vite.config.ts
index ad98a7a..a81163d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -17,11 +17,11 @@ export default defineConfig({
host: "0.0.0.0",
port: 5174,
proxy: {
- '/api': {
- target: 'http://192.168.1.119:8080',
- changeOrigin: true,
- // rewrite: (path) => path.replace(/^\/api/, ''),
+ "/api": {
+ target: "http://192.168.1.125:8080",
+ changeOrigin: true,
+ // rewrite: (path) => path.replace(/^\/api/, ''),
},
- },
+ },
},
});