diff --git a/src/services/experience/experienceList.ts b/src/services/experience/experienceList.ts index 5f2556f..8776fb0 100644 --- a/src/services/experience/experienceList.ts +++ b/src/services/experience/experienceList.ts @@ -1,17 +1,24 @@ import type { BaseResponse } from "../httpRequest"; import httpRequest from "../httpRequest"; +export type ExperienceStep = { + id: number; + startTime: string; + stepDescription: string; +}; + export type ExperienceRecord = { - id: number; - name: string; - startTime: string; - createUser: number; + id: number; + name: string; + startTime: string; + createUser: number; + steps: ExperienceStep[]; }; export function getExperienceRecords(params: { pageNum: number; pageSize: number }) { - return httpRequest>({ url: "/api/tasks/list", params }); + return httpRequest>({ url: "/api/tasks/list", params }); } export function deleteExperienceRecords(ids: string) { - return httpRequest({ url: `/api/tasks/${ids}`, method: "DELETE" }); + return httpRequest({ url: `/api/tasks/${ids}`, method: "DELETE" }); } diff --git a/src/services/globalCmd/globalCmd.ts b/src/services/globalCmd/globalCmd.ts index 023ffe7..ef7d62c 100644 --- a/src/services/globalCmd/globalCmd.ts +++ b/src/services/globalCmd/globalCmd.ts @@ -106,7 +106,7 @@ export const CmdDescMap: { [k in OperationCmd]: string } = { stopShakeUp: "结束摇匀", startHeat: "开始加热", stopHeat: "停止加热", - keepHeat: "恒温", + // keepHeat: "恒温", takePhoto: "拍照", // moveToUnusual: "移至异常区", moveToHeatArea: "移至加热区", @@ -129,7 +129,7 @@ export type OperationCmd = | "stopShakeUp" // 结束摇匀 | "startHeat" // 开始加热 | "stopHeat" // 停止加热 - | "keepHeat" // 恒温 + // | "keepHeat" // 恒温 | "takePhoto" // 拍照 // | "moveToUnusual" // 移至异常区 | "moveToHeatArea" // 移至加热区 diff --git a/src/views/addLiquid/addLiquid.vue b/src/views/addLiquid/addLiquid.vue index f9afe5d..b227008 100644 --- a/src/views/addLiquid/addLiquid.vue +++ b/src/views/addLiquid/addLiquid.vue @@ -22,7 +22,7 @@
-
+
-.liquid-container { - background-image: url("@/assets/container.svg"); - background-size: cover; - background-position: center; -} - diff --git a/src/views/components/Liquid.vue b/src/views/components/Liquid.vue index 618115b..17a2c8f 100644 --- a/src/views/components/Liquid.vue +++ b/src/views/components/Liquid.vue @@ -7,7 +7,7 @@ v-for="container in settingStore.heatContainerWithLiquid" :key="container.id" class="flex flex-col items-center justify-center"> -
+
- + diff --git a/src/views/expeRecord/components/ExpeDetail.vue b/src/views/expeRecord/components/ExpeDetail.vue index 32b880e..c715b42 100644 --- a/src/views/expeRecord/components/ExpeDetail.vue +++ b/src/views/expeRecord/components/ExpeDetail.vue @@ -1,8 +1,29 @@ diff --git a/src/views/expeRecord/index.vue b/src/views/expeRecord/index.vue index b5fb3d8..5c36af3 100644 --- a/src/views/expeRecord/index.vue +++ b/src/views/expeRecord/index.vue @@ -1,7 +1,9 @@ @@ -57,6 +61,7 @@ import { onMounted, ref } from "vue"; import { deleteExperienceRecords, getExperienceRecords, type ExperienceRecord } from "@/services/experience/experienceList"; import { showToast } from "vant"; import { useUserStore } from "@/stores/user"; +import ExpeDetail from "./components/ExpeDetail.vue"; const userStore = useUserStore(); const showEditDialog = ref(false); @@ -64,6 +69,8 @@ const showEditDialog = ref(false); const recordList = ref([]); const selectedIds = ref([]); +const recordForEdit = ref(); + function getRecords() { getExperienceRecords({ pageNum: 1, pageSize: 9999 }).then(res => { if (res.success) { @@ -105,6 +112,7 @@ function onDeleteRecords() { }); } function onDetailClick(item: ExperienceRecord) { - showToast('点了') + recordForEdit.value = item; + showEditDialog.value = true; } diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue index 71da295..b70074c 100644 --- a/src/views/graphite/index.vue +++ b/src/views/graphite/index.vue @@ -726,7 +726,6 @@ const onSendCmd = (command:OperationCmd,params:any)=> { .graphite_home { background: #f6f6f6; display: flex; - gap: 1rem; // @media (min-width: $md) { flex-direction: column; align-items: stretch; @@ -734,6 +733,7 @@ const onSendCmd = (command:OperationCmd,params:any)=> { .picture_area { display: flex; flex-direction: column-reverse; + margin: 0 12px; } @media (min-width: $lg) { flex-direction: row;