sige 1 year ago
parent
commit
cc4cb09b12
  1. 2
      src/src/main/java/com/my/graphiteDigesterBg/resource/ResHeatingTubeRackSlot.java
  2. 1
      src/web/src/App.vue
  3. 2
      src/web/src/pages/main/Page.vue
  4. 9
      src/web/src/pages/main/contents/OperationTubeRackPreset.vue

2
src/src/main/java/com/my/graphiteDigesterBg/resource/ResHeatingTubeRackSlot.java

@ -89,7 +89,7 @@ public class ResHeatingTubeRackSlot {
} }
} }
if ( indexes.size() < count ) { if ( indexes.size() < count ) {
throw new RuntimeException("No enough empty tube");
throw new RuntimeException("异常处理区试管空位不足");
} }
for ( var index : indexes ) { for ( var index : indexes ) {
this.tubeStatusList.set(index, TUBE_STATUS_USED); this.tubeStatusList.set(index, TUBE_STATUS_USED);

1
src/web/src/App.vue

@ -20,6 +20,7 @@ onMounted(mounted);
// mounted // mounted
function mounted() { function mounted() {
document.title = "全自动石墨消解仪";
let accessToken = window.localStorage.getItem('accessToken'); let accessToken = window.localStorage.getItem('accessToken');
accessToken = accessToken ? accessToken : null; accessToken = accessToken ? accessToken : null;
appStore.setAccessToken(accessToken); appStore.setAccessToken(accessToken);

2
src/web/src/pages/main/Page.vue

@ -65,6 +65,7 @@
<noti-handler-task-start-reset-error-tube-rack-take-out /> <noti-handler-task-start-reset-error-tube-rack-take-out />
<noti-handler-task-sample-take-out-tube-rack /> <noti-handler-task-sample-take-out-tube-rack />
<noti-handler-task-digestion-step-take-out /> <noti-handler-task-digestion-step-take-out />
<noti-handler-task-digestion-step-checking />
</template> </template>
<script setup> <script setup>
import { ref,onMounted, onUnmounted } from 'vue'; import { ref,onMounted, onUnmounted } from 'vue';
@ -86,6 +87,7 @@ import NotiHandlerTaskSampleAddTubeRackStatusConfirm from './contents/notificati
import NotiHandlerTaskStartResetErrorTubeRackTakeOut from './contents/notification/TaskStartResetErrorTubeRackTakeOut.vue'; import NotiHandlerTaskStartResetErrorTubeRackTakeOut from './contents/notification/TaskStartResetErrorTubeRackTakeOut.vue';
import NotiHandlerTaskSampleTakeOutTubeRack from './contents/notification/TaskSampleTakeOutTubeRack.vue'; import NotiHandlerTaskSampleTakeOutTubeRack from './contents/notification/TaskSampleTakeOutTubeRack.vue';
import NotiHandlerTaskDigestionStepTakeOut from './contents/notification/TaskDigestionStepTakeOut.vue'; import NotiHandlerTaskDigestionStepTakeOut from './contents/notification/TaskDigestionStepTakeOut.vue';
import NotiHandlerTaskDigestionStepChecking from './contents/notification/TaskDigestionStepChecking.vue';
/** @var {AppStore} */ /** @var {AppStore} */
const appStore = useAppStore(); const appStore = useAppStore();
/** @var {Ref<string>} */ /** @var {Ref<string>} */

9
src/web/src/pages/main/contents/OperationTubeRackPreset.vue

@ -42,8 +42,15 @@ const presetId = ref(null);
// display modal // display modal
async function actionModalShow() { async function actionModalShow() {
presetList.value = [];
let client = ApiClient.getClient(); let client = ApiClient.getClient();
presetList.value = await client.digestionPresetList();
let list = await client.digestionPresetList();
for ( let item of list ) {
if ( 'error' === item.type ) {
continue;
}
presetList.value.push(item);
}
enable.value = true; enable.value = true;
} }

Loading…
Cancel
Save