From 01e02b56061114fabfb29bcd8e7b0d90e1124b1f Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Fri, 14 Feb 2025 17:59:53 +0800
Subject: [PATCH] merge master

---
 src/views/graphite/components/HeatPosition.vue | 637 +++++++++++++------------
 src/views/graphite/index.vue                   |  73 +--
 src/views/login/index.vue                      |   1 -
 3 files changed, 338 insertions(+), 373 deletions(-)

diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index 9dd68e0..5fbbfb0 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -1,360 +1,361 @@
 <template>
-    <div class="heat_main"  :style="`${posIndex === currentIndex && isSelect ? 'border:2px solid #275EFB' : ''}`">
-      <section class="heat_pos_text">
-          <div class="pos_text">{{ `A-${posIndex || ''}` }}</div>
-          <div class="pos_text pos_state">已放置</div>
-      </section>
+  <div
+    class="heat_main"
+    :style="`${
+      posIndex === currentIndex && isSelect
+        ? 'box-sizing: border-box;border:5px solid #275EFB'
+        : 'box-sizing: border-box'
+    }`"
+  >
+    <section class="heat_pos_text">
+      <div class="pos_text">{{ `A-${posIndex || ""}` }}</div>
+      <div class="pos_text pos_state">已放置</div>
+    </section>
 
-      <section class="heat_pos" :style="`background:${(trayInfo?.id) ? '#384D5D':''}`" @click.stop="onSelectTray">
+    <section
+      class="heat_pos"
+      :style="`background:${trayInfo?.id ? '#384D5D' : ''}`"
+    >
+      <div v-for="(isActive, index) in ballStates" :key="index">
         <div
-          v-for="(isActive, index) in ballStates"
-          :key="index"
-        >
-          <div class="inner-circle" :style="`background: ${trayInfo?.id ? '#F2652D': ''}`"></div>
-        </div>
-        <!--执行中状态的遮罩层-->
-        <div class="craft_executing_modal" v-if="trayInfo.state == 1">
-          <div class="loading">
-            <img :src="LoadingSvg"/>
-          </div>
-          <div class="tray_craft">
-            工艺名称
-          </div>
-          <div class="tray_exce">
-            工艺执行中
-          </div>
+          class="inner-circle"
+          :style="`background: ${trayInfo?.id ? '#F2652D' : ''}`"
+        ></div>
+      </div>
+      <!--执行中状态的遮罩层-->
+      <div class="craft_executing_modal" v-if="trayInfo.state == 1">
+        <div class="loading">
+          <img :src="LoadingSvg" />
         </div>
-      </section>
-
-      <section class="heat_footer">
-        <div class="heat_temperature" @click="setTemperature">
-          <template v-if="trayInfo?.id">
-            <div class="target_temp">目标温度: {{ trayInfo.trayTempVale }}℃</div>
-            <div class="heating">加热中</div>
-          </template>
-          <template v-else >
-            <div class="target_temp set_temp">设置目标温度</div>
-          </template>
+        <div class="tray_craft">工艺名称</div>
+        <div class="tray_exce">工艺执行中</div>
+      </div>
+    </section>
+
+    <section class="heat_footer">
+      <div class="heat_temperature" @click="setTemperature">
+        <template v-if="trayInfo?.id">
+          <div class="target_temp">目标温度: {{ trayInfo.trayTempVale }}℃</div>
+          <div class="heating">加热中</div>
+        </template>
+        <template v-else>
+          <div class="target_temp set_temp">设置目标温度</div>
+        </template>
+      </div>
+
+      <div class="heat_opt">
+        <div class="temp_text">120℃</div>
+        <div class="heat_choose">
+          <van-button
+            type="primary"
+            class="btn"
+            @click="
+              () => {
+                onChooseCraft;
+              }
+            "
+            >选 择</van-button
+          >
         </div>
+      </div>
+    </section>
 
-<<<<<<< HEAD
-        <div class="flex items-center py-4 justify-between px-2">
-          <div class="temp_text">120℃</div>
-          <button class="btn-light text-sm px-4" @click="()=>{onChooseCraft()}">选择</button>
-=======
-        <div class="heat_opt">
-          <div class="temp_text">120℃</div>
-          <div class="heat_choose">
-            <van-button type="primary" class="btn" @click="()=>{onChooseCraft}">选  择</van-button>
+    <OverlayModal :visible="tempVisivle">
+      <div class="set_temp_modal_content">
+        <h3 class="set_temp_title">设定温度</h3>
+        <section class="temp_label">
+          <div class="text-xl">
+            目标温度：<input
+              type="number"
+              v-model="trayTempVale"
+              class="temp_input"
+              placeholder="请输入温度"
+            />
           </div>
->>>>>>> f47c7cc (优化退出登录)
-        </div>
-      </section>
-
-      <OverlayModal :visible="tempVisivle">
-        <div class="set_temp_modal_content">
-          <h3 class="set_temp_title">设定温度</h3>
-          <section class="temp_label">
-            <div class="text-xl ">
-              目标温度：<input type="number" v-model="trayTempVale" class="temp_input" placeholder="请输入温度"/>
-            </div>
-            <div class="text-xl temp_status flex">
-              <div>到达温度后</div>
-              <van-radio-group v-model="trayTempType" shape="square" class="flex temp_radio">
-                <van-radio name="1">保持温度</van-radio>
-                <van-radio name="2">停止加热</van-radio>
-              </van-radio-group>
-            </div>
-          </section>
-          
-          <footer
-            class="h-[5.625rem] flex justify-center items-center text-sm font-medium gap-x-5">
-            <button class="btn-dark px-10 py-2 w-15" @click="onConfirm">确定</button>
-            <button class="btn-light px-10 py-2" @click="tempVisivle = false">取消</button>
-          </footer>
-        </div>
-      </OverlayModal>
-      <!--选择工艺-->
-      <OverlayModal :visible="craftVisible">
-          <CraftList @changeVisible="changeVisible"></CraftList>
-      </OverlayModal>
-
-    </div>
-  </template>
-  
-  <script lang="ts" setup>
-  import { computed, ref, watch, onMounted, onBeforeUnmount } from 'vue'
-  import OverlayModal from '@/components/OverlayModal.vue';
-  import CraftList from './CraftList.vue';
-  import LoadingSvg from '@/assets/loading.svg';
-    const ballStates = ref([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16])
-    const props = defineProps({
-      heatInfo:Object,
-      posIndex:Number
-    })
-    const emits = defineEmits(['onSelectedTray'])
-
-    onMounted(()=>{
-    })
-
-    const craftVisible = ref(false)
-
-    //设置温度
-    const trayTempType = ref(false)
-    const tempVisivle = ref(false)
-    //托盘信息
-    const trayInfo = ref(props.heatInfo || {})
-    const trayTempVale = ref(trayInfo.value.trayTempVale || '')
-    const formulaList:any = ref([])
-
-    //选中托盘
-    const isSelect = ref(false)
-    const currentIndex = ref()
-    const selectedTrayList = ref<any>([])
-    const onSelectTray = () => {
-        if(currentIndex.value !== props.posIndex ){
-            isSelect.value = true;
-        }else{
-            isSelect.value = !isSelect.value
-        }
-        currentIndex.value = props.posIndex;
-        
-        emits("onSelectedTray", props.heatInfo)
-        
-    }
+          <div class="text-xl temp_status flex">
+            <div>到达温度后</div>
+            <van-radio-group
+              v-model="trayTempType"
+              shape="square"
+              class="flex temp_radio"
+            >
+              <van-radio name="1">保持温度</van-radio>
+              <van-radio name="2">停止加热</van-radio>
+            </van-radio-group>
+          </div>
+        </section>
 
+        <footer
+          class="h-[5.625rem] flex justify-center items-center text-sm font-medium gap-x-5"
+        >
+          <button class="btn-dark px-10 py-2 w-15" @click="onConfirm">
+            确定
+          </button>
+          <button class="btn-light px-10 py-2" @click="tempVisivle = false">
+            取消
+          </button>
+        </footer>
+      </div>
+    </OverlayModal>
+    <!--选择工艺-->
+    <OverlayModal :visible="craftVisible">
+      <CraftList @changeVisible="changeVisible"></CraftList>
+    </OverlayModal>
+  </div>
+</template>
 
-    const changeVisible = () => {
-        craftVisible.value = false;
-    }
-    //选择工艺
-    const onChooseCraft = () => {
-        craftVisible.value = true;
-    }
-    const setTemperature = () => {
-      tempVisivle.value = true;
-    }
+<script lang="ts" setup>
+import { computed, ref, watch, onMounted, onBeforeUnmount } from "vue";
+import OverlayModal from "@/components/OverlayModal.vue";
+import CraftList from "./CraftList.vue";
+import LoadingSvg from "@/assets/loading.svg";
+const ballStates = ref([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
+const props = defineProps({
+  heatInfo: Object,
+  posIndex: Number,
+});
+const emits = defineEmits(["onSelectedTray"]);
 
-    const onConfirm = () => {
-      trayInfo.value.id = 3;
-      trayInfo.value.trayTempVale = trayTempVale;
-      tempVisivle.value = false;
-    }
+onMounted(() => {});
 
-  </script>
-  
-  <style lang="scss" scoped>
-    @use "@/assets/style/mixin.scss" as *;
-  .heat_main{
-    border: 1px solid #E9F3FF;
-    width: 11.5rem;
-    height: 18.125rem;
-    border-radius: 10px;
-    background: #E9F3FF;
-<<<<<<< HEAD
-=======
-    margin-top: 3.5rem;
-    padding:3px;
-    
-    
->>>>>>> f47c7cc (优化退出登录)
+const craftVisible = ref(false);
+
+//设置温度
+const trayTempType = ref(false);
+const tempVisivle = ref(false);
+//托盘信息
+const trayInfo = ref(props.heatInfo || {});
+const trayTempVale = ref(trayInfo.value.trayTempVale || "");
+const formulaList: any = ref([]);
+
+//选中托盘
+const isSelect = ref(false);
+const currentIndex = ref();
+const selectedTrayList = ref<any>([]);
+const onSelectTray = () => {
+  if (currentIndex.value !== props.posIndex) {
+    isSelect.value = true;
+  } else {
+    isSelect.value = !isSelect.value;
   }
-  .heat_pos_text{
+  currentIndex.value = props.posIndex;
+
+  emits("onSelectedTray", props.heatInfo);
+};
+
+const changeVisible = () => {
+  craftVisible.value = false;
+};
+//选择工艺
+const onChooseCraft = () => {
+  craftVisible.value = true;
+};
+const setTemperature = () => {
+  tempVisivle.value = true;
+};
+
+const onConfirm = () => {
+  trayInfo.value.id = 3;
+  trayInfo.value.trayTempVale = trayTempVale;
+  tempVisivle.value = false;
+};
+</script>
+
+<style lang="scss" scoped>
+@use "@/assets/style/mixin.scss" as *;
+.heat_main {
+  border: 1px solid #e9f3ff;
+  width: 11.5rem;
+  height: 18.125rem;
+  border-radius: 10px;
+  background: #e9f3ff;
+  margin-top: 0.5rem;
+}
+.heat_pos_text {
+  display: flex;
+  height: 1.75rem;
+  padding-left: 0.875rem;
+  padding-right: 0.75rem;
+  .pos_text {
+    font-size: 0.8125rem;
+    font-weight: 500;
+    line-height: normal;
     display: flex;
-    height: 1.75rem;
-    padding-left: .875rem;
-    padding-right: .75rem;
-    .pos_text{
-      font-size: .8125rem;
-      font-weight: 500;
-      line-height: normal;
-      display: flex;
-      align-items: center;
-      color: #4D6882;
+    align-items: center;
+    color: #4d6882;
+  }
+
+  .pos_state {
+    margin-left: 50%;
+  }
+}
+.heat_pos {
+  width: 10.375rem;
+  height: 10.375rem;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  gap: 0.625rem;
+  flex-direction: row;
+  border: 2px solid #7592a8;
+  padding-top: 0.5rem;
+  border-radius: 0.5rem;
+  margin-left: 5px;
+  .craft_executing_modal {
+    position: absolute;
+    width: 10rem;
+    height: 18rem;
+    background: rgba(2, 86, 255, 0.12);
+    opacity: 0.5;
+    z-index: 9999;
+    margin-top: -2rem;
+    .loading {
+      margin-left: 4.2rem;
+      margin-top: 4rem;
+    }
+    .tray_craft {
+      font-size: 1rem;
+      margin-top: 0.5rem;
+      margin-left: 3rem;
+      font-weight: bold;
+      color: #4d6882;
     }
 
-    .pos_state{
-      margin-left:50%
+    .tray_exce {
+      font-size: 1.2rem;
+      margin-left: 1.8rem;
+      font-weight: bold;
+      color: #4d6882;
     }
   }
-  .heat_pos{
+}
+.inner-circle {
+  border-radius: 50%;
+  width: 1.625rem;
+  height: 1.625rem;
+  background-color: rgb(212, 212, 212);
+}
+.heat_footer {
+  height: 5.625rem;
+  width: 102.5rem;
+  margin-top: 0.25rem;
+  .heat_temperature {
+    height: 1.625rem;
     width: 10.375rem;
-    height: 10.375rem;
+    background: #ffffff;
+    box-shadow: inset 2px 2px 4px 0px rgba(204, 204, 204, 0.3);
+    border-radius: 5px;
     display: flex;
+    align-items: center;
     justify-content: center;
-    flex-wrap: wrap;
-    margin-left: 5px;
-    gap: .625rem;
-    flex-direction: row;
-    border: 2px solid #7592A8;
-    margin-left: .5rem;
-    padding-top: .5rem;
-    border-radius: 0.5rem;
-    
-    .craft_executing_modal{
-      position: absolute;
-      width: 10rem;
-      height: 18rem;
-      background: rgba(2, 86, 255, 0.12);
-      opacity: 0.5;
-      z-index: 9999;
-      margin-top: -2rem;
-      .loading{
-        margin-left: 4.2rem;
-        margin-top: 4rem;
-      }
-      .tray_craft{
-        font-size: 1rem;
-        margin-top: 0.5rem;
-        margin-left: 3rem;
-        font-weight: bold;
-        color: #4D6882;
-      }
-
-      .tray_exce{
-        font-size: 1.2rem;
-        margin-left: 1.8rem;
-        font-weight: bold;
-        color: #4D6882;
-      }
-
-      
+    .target_temp {
+      color: #384d5d;
+      font-size: 0.75rem;
     }
 
+    .heating {
+      color: #fe0a0a;
+      font-size: 0.85rem;
+      margin-left: 1rem;
+    }
   }
-  .inner-circle {
-    border-radius: 50%;
-    width: 1.625rem;
-    height: 1.625rem;
-    background-color: rgb(212, 212, 212);
+
+  .heat_opt {
+    margin: 1rem;
   }
-  .heat_footer{
-<<<<<<< HEAD
-    margin-top: 10px;
-    margin-left: 5px;
-=======
-    height: 5.625rem;
-    width: 102.5rem;
-    margin-top: .25rem;
->>>>>>> f47c7cc (优化退出登录)
-    .heat_temperature{
-      height: 1.625rem;
-      width: 10.375rem;
-      background: #FFFFFF;
-      box-shadow: inset 2px 2px 4px 0px rgba(204, 204, 204, 0.3);
-      border-radius: 5px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-left: .375rem;
-      .target_temp{
-        color: #384D5D;
-        font-size: .75rem;
-      }
-
-      .heating{
-        color: #FE0A0A;
-        font-size: .85rem;
-        margin-left: 1rem;
-      }
-    }
 
-    .temp_text{
-      font-size: 1.125rem;
-      font-weight: bold;
-      color: #4D6882;
-    }
+  .temp_text {
+    font-size: 1.125rem;
+    font-weight: bold;
+    color: #4d6882;
   }
+}
 
-  .heat_overlay{
-    border: 1px solid #E9F3FF;
-    width: 9.375rem;
-    height: 15.5rem;
-    border-radius: 20px;
-    margin-top: 3.125rem;
-    position: absolute;
-    background: #d3d3d3;
-    margin-top: -10.375rem;
-    opacity: 0.8; 
+.heat_overlay {
+  border: 1px solid #e9f3ff;
+  width: 9.375rem;
+  height: 15.5rem;
+  border-radius: 20px;
+  margin-top: 3.125rem;
+  position: absolute;
+  background: #d3d3d3;
+  margin-top: -10.375rem;
+  opacity: 0.8;
 
-    .heat_loading{
-      margin: 3.875rem;
-    }
+  .heat_loading {
+    margin: 3.875rem;
   }
+}
 
-  .heat_opt{
-  }
-  .heat_choose{
-    position: relative;
-    margin-left: 6.5rem;
-    z-index: 99;
-    margin-top: -1.3rem;
-    
-    .btn{
-      width: 3.75rem;
-      height: 1.875rem;
-      font-size: .625rem;
-      color:#1989FA;
-      background: #ffffff;
-    }
-  }
+.heat_choose {
+  position: relative;
+  margin-left: 5rem;
+  z-index: 99;
+  margin-top: -1.6rem;
 
-  .formula_picker{
-    width: 25rem;
-    margin: 20% 30%;
-  }
-  
-  .set_temp_modal{
-    display: flex;
-    justify-content: center;
-    align-items: center;
+  .btn {
+    width: 3.75rem;
+    height: 1.875rem;
+    font-size: 0.625rem;
+    color: #1989fa;
+    background: #ffffff;
   }
+}
 
-  .set_temp_modal_content{
-    width: 28.5rem;
-    height: 16.5rem;
-    background: #ffffff;
+.formula_picker {
+  width: 25rem;
+  margin: 20% 30%;
+}
 
-    .temp_label{
-      margin-left: 2.875rem;
-      margin-top: 1rem;
-    }
+.set_temp_modal {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 
-    .set_temp_title{
-      height: 1.875rem;
-      width: 5.25rem;
-      margin-top:1.875rem;
-      margin-left: 1.25rem;
-      font-size: 1.25rem;
-      font-weight: 500;
-      color: #40474E;
-    }
-  }
-  
-  .temp_input{
-    border: 1px solid #dadada;
-    font-size: 1.25rem;
-    width: 10rem;
-  }
+.set_temp_modal_content {
+  width: 28.5rem;
+  height: 16.5rem;
+  background: #ffffff;
 
-  .temp_status{
-    margin-top: 1.5rem;
-    display: flex;
-    gap: 20px;
+  .temp_label {
+    margin-left: 2.875rem;
+    margin-top: 1rem;
   }
 
-  .temp_radio{
+  .set_temp_title {
+    height: 1.875rem;
+    width: 5.25rem;
+    margin-top: 1.875rem;
+    margin-left: 1.25rem;
     font-size: 1.25rem;
-    display: flex;
-    gap: 20px;
+    font-weight: 500;
+    color: #40474e;
   }
+}
 
-  :deep(.van-radio__icon){
-    i{
-      font-size: 30px;
-      margin-top: -10px;
-    }
-  }
+.temp_input {
+  border: 1px solid #dadada;
+  font-size: 1.25rem;
+  width: 10rem;
+}
+
+.temp_status {
+  margin-top: 1.5rem;
+  display: flex;
+  gap: 20px;
+}
 
-  </style>
-  
\ No newline at end of file
+.temp_radio {
+  font-size: 1.25rem;
+  display: flex;
+  gap: 20px;
+}
+
+:deep(.van-radio__icon) {
+  i {
+    font-size: 30px;
+    margin-top: -10px;
+  }
+}
+</style>
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index 55ee1fd..bdb187a 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -1,11 +1,13 @@
 <template>
 	<div class="graphite_home component-page overflow-auto">
 		<div class="heat_area">
-			<div v-for="(item, index) in heatList" :key="item">
-				<HeatPosition :heatInfo="item" :posIndex="index + 1" @onSelectedTray="onSelectedTray"></HeatPosition>
-
+			<div v-for="(item, index) in heatList" :key="item" @click.stop="onSelectedTray(item, index)" :style="`${
+      index === currentIndex && isSelect
+        ? 'border:3px solid #275EFB'
+        : 'border:3px solid #ffffff'
+    }`">
+				<HeatPosition :heatInfo="item" :posIndex="index + 1"></HeatPosition>
 				<!-- <div class="craft_executing_modal">
-
                 </div> -->
 			</div>
 			<!--执行中状态的遮罩层-->
@@ -64,7 +66,16 @@ onMounted(() => {
 
 //选择的托盘
 const selectedTrayList = ref<any>([]);
-const onSelectedTray = (data = {}) => {
+const currentIndex = ref()
+const isSelect = ref(false);
+const onSelectedTray = (data = {}, index) => {
+	if (currentIndex.value !== index) {
+		isSelect.value = true;
+	} else {
+		isSelect.value = !isSelect.value;
+	}
+	currentIndex.value = index;
+
 	selectedTrayList.value.push(data);
 	console.log("selectedTrayList.value--", selectedTrayList.value);
 };
@@ -84,7 +95,6 @@ const onChooseCaft = () => {
 };
 </script>
 <style lang="scss" scoped>
-<<<<<<< HEAD
 @use "@/assets/style/mixin.scss" as *;
 
 .graphite_home {
@@ -102,42 +112,16 @@ const onChooseCaft = () => {
 	@media (min-width: $lg) {
 		flex-direction: row;
 		align-items: start;
+		
 		.picture_area {
 			display: flex;
 			flex-direction: column;
+			height: 47rem;
 		}
 	}
 }
 .heat_area {
 	margin: 5px 0;
-=======
-    @use "@/assets/style/mixin.scss" as *;
-    .graphite_home{
-        display: flex;
-        background: #F6F6F6;
-    }
-    .heat_area{
-        width: 79.25rem;
-        display: flex;
-        justify-content: center;
-        flex-wrap: wrap;
-        margin: 5px;
-        gap: 1.25rem;
-        flex-direction: row;
-        padding-bottom: 100px;
-        background: #FFFFFF;
-        border-radius: 20px;
-        .craft_executing_modal{
-            position: absolute;
-            width: 10.5rem;
-            height: 18rem;
-            background: rgb(230, 230, 230);
-            opacity: 0.5;
-            z-index: 9999;
-        }
-    }
->>>>>>> f47c7cc (优化退出登录)
-
 	background: #ffffff;
 	border-radius: 20px;
 
@@ -172,7 +156,6 @@ const onChooseCaft = () => {
 	}
 }
 
-<<<<<<< HEAD
 .picture_area {
 	display: flex;
 	flex-direction: column;
@@ -317,22 +300,4 @@ const onChooseCaft = () => {
 		background: #ffffff;
 	}
 }
-</style>
-=======
-    .liquid{
-        display: flex;
-        justify-content: center;
-        width: 100%;
-        height: 100%;
-        align-items: center;
-        .addLiquid{
-            width: 70.375rem;
-            height: 52rem;
-            background: #FFFFFF;
-        }
-    }
-    
-    
-
-</style>
->>>>>>> f47c7cc (优化退出登录)
+</style>
\ No newline at end of file
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 5a98673..50d0a69 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -70,7 +70,6 @@ const handleLogin = async () => {
     position: relative;
     width: 100vw;
     height: 100vh;
-    overflow: hidden;
 	background: linear-gradient(180deg, rgba(250, 252, 255, 0.51) 0%, rgba(255, 255, 255, 0.52) 100%);
 	.login_logo{
 		.logo_size{