Browse Source

调试命令参数调整

feature/layout_0214
zhangjiming 5 months ago
parent
commit
62cc19a7fe
  1. 2
      .env
  2. 25
      src/views/debug/debug.vue
  3. 8
      src/views/expeRecord/components/ExpeDetail.vue
  4. 12
      src/views/expeRecord/index.vue
  5. 2
      src/views/logRecord/index.vue
  6. 10
      vite.config.ts

2
.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

25
src/views/debug/debug.vue

@ -46,10 +46,18 @@
</div>
<div class="frame">
<div class="flex items-center gap-4 flex-wrap">
<label for="">加液泵编号:</label>
<input type="number" v-model="pumpId" class="rounded-sm px-2" placeholder="输入加液泵编号" />
<label for="">选择液体:</label>
<el-select v-model="solutionId" placeholder="Select" style="width: 120px">
<el-option
v-for="item in settingStore.availableLiquids"
:key="item.id"
:label="item.name"
:value="item.id" />
</el-select>
<label for="">试管编号:</label>
<input type="number" v-model="tubeNum" class="rounded-sm px-2 w-12" placeholder="输入加液泵编号" />
<label for="">注入量:</label>
<input type="number" v-model="pumpAmount" class="rounded-sm px-2" placeholder="输入注入量" />
<input type="number" v-model="pumpAmount" class="rounded-sm px-2 w-16" placeholder="输入注入量" />
<span>ml</span>
<!-- <label for="">当前容量</label>
<span class="text-warn">50</span> -->
@ -79,7 +87,9 @@
</div>
<div>
<label for="">当前温度</label>
<span class="text-warn">{{ (statusStore.status?.heater || []).map(h => h.temperature).join(",") }}</span>
<span class="text-warn">{{
(statusStore.status?.heater || []).map(h => h.temperature).join(",")
}}</span>
</div>
</div>
@ -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") {

8
src/views/expeRecord/components/ExpeDetail.vue

@ -0,0 +1,8 @@
<template>
</template>
<script setup lang="ts">
import type { ExperienceRecord } from "@/services/experience/experienceList";
const props = defineProps<{ record: ExperienceRecord }>();
</script>

12
src/views/expeRecord/index.vue

@ -12,7 +12,7 @@
<section>
<header class="h-10 flex items-center bg-[#000]/[0.02] text-xs pr-3 text-text">
<div class="w-10 self-stretch flex justify-center items-center">
<div class="w-10 self-stretch flex justify-center items-center" @click="onSelectAll">
<img
class="w-4 h-4"
:src="
@ -25,8 +25,8 @@
alt="icon" />
</div>
<p class="w-[10rem]">时间</p>
<p class="w-[8rem]">用户名</p>
<p>实验记录</p>
<p class="w-[8rem]">操作员</p>
<p>实验名称</p>
</header>
<div
v-for="record in recordList"
@ -38,7 +38,8 @@
</div>
<p class="w-[10rem]">{{ record.startTime }}</p>
<p class="w-[8rem]">{{ userStore.userIdMap[record.createUser].nickname }}</p>
<p class="flex-auto">{{ record.name }}</p>
<p class="w-[10rem]">{{ record.name }}</p>
<p class="text-primary underline leading-[3rem] text-sm px-2" @click.stop="onDetailClick(record)">详情</p>
</div>
</section>
@ -103,4 +104,7 @@ function onDeleteRecords() {
}
});
}
function onDetailClick(item: ExperienceRecord) {
showToast('点了')
}
</script>

2
src/views/logRecord/index.vue

@ -11,7 +11,7 @@
<img class="w-4 h-4" src="@/assets/Icon-unselect.svg" alt="icon" />
</div>
<p class="w-[10rem]">时间</p>
<p class="w-[8rem]">用户名</p>
<p class="w-[8rem]">操作员</p>
<p>操作记录</p>
</header>
<div class="h-10 flex items-center text-xs pr-3 text-[#6e6e6e] border-b border-b-[#f8f8f8]">

10
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/, ''),
},
},
},
},
});
Loading…
Cancel
Save