Browse Source

开发加热,选择加热区功能

feature/layout_0214^2
LiLongLong 6 months ago
parent
commit
81a9e4484f
  1. 0
      src/services/task/index.ts
  2. 4
      src/views/graphite/components/HeatPosition.vue
  3. 5
      src/views/graphite/components/mock.ts
  4. 44
      src/views/graphite/index.vue
  5. 2
      vite.config.ts

0
src/services/task/index.ts

4
src/views/graphite/components/HeatPosition.vue

@ -210,13 +210,13 @@ const onHandleTube = (tubeInfo: any) => {
border-radius: 0.5rem;
.craft_executing_modal {
position: absolute;
position: relative;
width: 10rem;
height: 18rem;
background: rgba(2, 86, 255, 0.12);
opacity: 0.5;
z-index: 9999;
margin-top: -2rem;
margin-top: -11rem;
.loading {
margin-left: 4.2rem;
margin-top: 4rem;

5
src/views/graphite/components/mock.ts

@ -0,0 +1,5 @@
export const graphiteMock = {
heatAreaStatus : [true, false,true, false,true, false],//加热区状态
}

44
src/views/graphite/index.vue

@ -2,7 +2,7 @@
<div class="graphite_home component-page overflow-auto" id="heatArea">
<div class="heat_area" >
<div v-for="(item, index) in heatList" :key="item">
<HeatPosition :heatInfo="item" :tubeIndex="index + 1" @onSelectedTray="onSelectedTray"></HeatPosition>
<HeatPosition :heatInfo="{...item, index}" :tubeIndex="index + 1" @onSelectedTray="onSelectedTray"></HeatPosition>
</div>
<!--执行中状态的遮罩层-->
</div>
@ -18,7 +18,7 @@
<van-button size="large" class="btn_size op_exec_craft">执行工艺</van-button>
<van-button size="large" class="btn_size op_add_liquid" @click="onAddLiquid">添加溶液</van-button>
<van-button size="large" class="btn_size op_shake_up">摇匀</van-button>
<van-button size="large" class="btn_size op_move_heat">移至加热</van-button>
<van-button size="large" class="btn_size op_move_heat" @click="onMoveToHeat">移至加热</van-button>
<van-button size="large" class="btn_size op_move_act">移至加液</van-button>
<van-button size="large" class="btn_size op_move_exception">移至特殊</van-button>
<van-button size="large" class="btn_size op_start_heat">开始加热</van-button>
@ -40,24 +40,30 @@
</template>
<script lang="ts" setup>
import { ref, onMounted } from "vue";
import { ElMessage } from "element-plus";
import { HeatPosition, TakePickture, AddLiquid } from "./components";
import OverlayModal from "@/components/OverlayModal.vue";
import CraftList from "@/views/graphite/components/CraftList.vue";
import { graphiteMock } from './components/mock'
import { useStatusStore } from "@/stores/status";
import { getConfig } from "@/services/sysConfig/sysConfig";
import { useSettingStore } from "@/stores/setting";
const settingStore = useSettingStore();
console.log('settingStore---', settingStore.heatAreaConfig)
//
const useStatus = useStatusStore()
const heatList: any = ref([]);
const craftVisible = ref(false);
const tubeRackList = ['A-1','A-2', 'A-3','A-4','A-5','A-5']
onMounted(() => {
for(let i = 0; i < 6; i++){
heatList.value.push({
id: i + 1,
state:i == 0 ? 1 : null,
name: tubeRackList[i]
});
}
//6
heatList.value = settingStore.heatAreaConfig
});
//
const selectedTrayList = ref<any>([]);
const currentIndex = ref();
const selectedTrayObj:any = {}
const onSelectedTray = (data:any) => {
if(selectedTrayObj[data.id]){
@ -82,6 +88,26 @@ const changeVisible = () => {
const onChooseCaft = () => {
craftVisible.value = true;
};
//
const onMoveToHeat = () => {
//1
if(selectedTrayList.value.length != 1){
ElMessage.error('只能选择一个加热区')
return;
}
let selectedData = selectedTrayList.value[0]
//2
let heatAearStatus:any = useStatus.status || graphiteMock.heatAreaStatus
if(!heatAearStatus[selectedData.index]){
ElMessage.error('选择的加热区已有试管架,重新选择加热区')
return;
}
//
}
</script>
<style lang="scss" scoped>
@use "@/assets/style/mixin.scss" as *;

2
vite.config.ts

@ -18,7 +18,7 @@ export default defineConfig({
port: 5174,
proxy: {
'/api': {
target: 'http://192.168.1.200:8080',
target: 'http://192.168.1.119:8080',
changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, ''),
},

Loading…
Cancel
Save