wangfei
2024-12-26 1e6d58b2f620f96f2e2dbff01413a9c2967ede13
掰片模块三个页面及功能
6个文件已修改
669 ■■■■ 已修改文件
UI-Project/src/lang/en.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/py.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/zh.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Identify/identifwu.vue 196 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Identify/identifwutwo.vue 254 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Identify/identify.vue 213 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/en.js
@@ -87,6 +87,8 @@
          layoutSequence:'Serial Number',
      },
      sorter:{
          onesort:'一线掰片',
          twosort:'二线掰片',
          inPlace:'到位',
          ninPlace:'未到位',
          emptymissions:'空任务',
UI-Project/src/lang/py.js
@@ -87,6 +87,8 @@
        layoutSequence:'Серийн номер',
    },
    sorter: {
        onesort:'一线掰片',
        twosort:'二线掰片',
        inPlace:'到位',
        ninPlace:'未到位',
        emptymissions:'空任务',
UI-Project/src/lang/zh.js
@@ -87,6 +87,8 @@
          layoutSequence:'序号',
      },
      sorter:{
          onesort:'一线掰片',
          twosort:'二线掰片',
          inPlace:'到位',
          ninPlace:'未到位',
          emptymissions:'空任务',
UI-Project/src/views/Identify/identifwu.vue
@@ -1,47 +1,30 @@
<template>
  <div style="height: 500px;">
    <div style="display: flex;">
      <el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" placeholder="请输入工程号"
                @blur="handleBlur"/>
      <el-pagination
          v-model:current-page="currentPage"
          :page-size="pageSize"
          :size="size"
          :disabled="disabled"
          layout="prev, pager, next, jumper"
          :total="totalPages"
          @current-change="handleCurrentChange"
      />
    </div>
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
      <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
        <div style="position: relative;">
          <div
              v-for="(rect, index) in adjustedRects"
              :key="rect.glass_id"
              :key="rect.glassId"
              class="rect"
              @click="showDialog(rect.glass_id)"
              @click="showDialog(rect.glassId)"
              :style="{ position: 'absolute',
      top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
      backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.glass_state)
       }"
          >
            <!-- 箭头 -->
            <!-- <div id="arrow"></div>
            <div id="line"></div>   -->
              top: `${rect.yAxis}px`, left: `${rect.xAxis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
              backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
               }">
            <div class="centered-text">
              <div>{{ rect.glass_id }}</div>
              <div>{{ rect.glassId }}</div>
              <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
            </div>
          </div>
        </div>
      </el-scrollbar>
      <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
        <el-button :disabled="currentGlassRect?.glass_state === 8 || currentGlassRect?.glass_state === 9" type="warning"
        <el-button :disabled="currentGlassRect?.state === 8 || currentGlassRect?.state === 9" type="warning"
                   plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
          {{ $t('order.dilapidation') }}
        </el-button>
        <el-button :disabled="currentGlassRect?.glass_state === 9 || currentGlassRect?.glass_state === 8" type="danger"
        <el-button :disabled="currentGlassRect?.state === 9 || currentGlassRect?.state === 8" type="danger"
                   plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
          <el-icon class="el-icon--right">
            <Upload/>
@@ -54,40 +37,25 @@
</template>
<script setup lang="ts">
import {ElMessage} from 'element-plus'
import {computed, onMounted, onUnmounted, ref} from 'vue';
import {onBeforeUnmount, computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {useI18n} from 'vue-i18n'
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const blind = ref(false)
const olWidth = ref();
const olHeight = ref();
const glass_id = ref();
const inputValue = ref('');
const currentGlassId = ref(null); // 存储当前点击矩形的 glass_id
const currentstate = ref(null);
const currentGlassId = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
let webSocket: WebSocket | null = null;
const totalPages = ref(0);
const pageSize = ref(1);
const currentPage = ref('');
const disabled = false;
const size = 'small';
const rawData = ref([]);
// const handleBind = (row) => {
//   blind.value = true; // 打开绑定架子对话框
// };
// 显示对话框并设置当前 glass_id
let socket = null;
const currentGlassRect = computed(() => {
  return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
  return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
});
function showDialog(glassId: number) {
  currentGlassId.value = glassId;
  blind.value = true;
  adjustedRects.value = adjustedRects.value.map(rect =>
      rect.glass_id === glassId ? {...rect, isActive: true} : rect
      rect.glassId === glassId ? {...rect, isActive: true} : rect
  );
}
const handleDialogClose = () => {
@@ -102,111 +70,42 @@
    const response = await request.post('/cacheGlass/taskCache/identControls', {
      glassId: currentGlassId.value,
      state: 8,
      line: 1001,
      line: 1,
      remark: '掰片',
      workingProcedure: '切割',
    })
    if (response.code == 200) {
      ElMessage.success(response.message);
      // window.location.reload()
      blind.value = false;
      updateRectStatus(currentGlassId.value, 8);
      findEngineering()
    } else {
      // 请求失败,显示错误消息
      ElMessage.error(response.msg);
    }
  } catch (error) {
    // 处理错误
    console.error(error);
  }
}
// 人工拿走
const handleManualTake = async () => {
  try {
    // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
    //   console.log(url);
    //   const response = await request.post(url)
    const response = await request.post('/cacheGlass/taskCache/identControls', {
      glassId: currentGlassId.value,
      state: 9,
      line: 1001,
      line: 1,
      workingProcedure: '切割',
      remark: '掰片',
    })
    if (response.code == 200) {
      // 绑定成功,处理逻辑
      ElMessage.success(response.message);
      // window.location.reload()
      blind.value = false;
      updateRectStatus(currentGlassId.value, 9);
      findEngineering()
    } else {
      // 请求失败,显示错误消息
      ElMessage.error(response.msg);
    }
  } catch (error) {
    // 处理错误
    console.error(error);
  }
}
const handleBlur = async () => {
  if (inputValue.value) {
    var url = "/cacheGlass/taskCache/cutTerritory?current=" + inputValue.value;
    const response = await request.post(url)
    if (response.code === 200) {
      const rawRects = response.data[0];
      rawData.value = response.data;
      totalPages.value = rawData.value.length;
      const scaleFactor = 1621.78 / 6000;
      const scaleFactory = 750 / 3300;
      adjustedRects.value = rawRects.map(rect => ({
        ...rect,
        x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
        y_axis: rect.y_axis * scaleFactory,
        width: rect.width * scaleFactor,
        widtha: rect.width,
        heighta: rect.height,
        height: rect.height * scaleFactory,
        glass_state: rect.glass_state
      }));
      // 如果WebSocket已连接,则关闭
      if (webSocket) {
        webSocket.close();
        webSocket = null;
      }
      currentPage.value = 1;
    }
  } else {
    connectWebSocket();
  }
};
const findEngineering = async () => {
  if (inputValue.value) {
    var url = "/cacheGlass/taskCache/cutTerritory?current=" + inputValue.value;
    const response = await request.post(url)
    if (response.code === 200) {
      rawData.value = response.data;
    }
  } else {
  }
};
const handleCurrentChange = (val: number) => {
  currentPage.value = val;
  // window.localStorage.setItem('pagenumber', currentPage.value).
  const page = currentPage.value - 1
  const scaleFactor = 1621.78 / 6000;
  const scaleFactory = 750 / 3300;
  adjustedRects.value = rawData.value[page]?.map(rect => ({
    // adjustedRects.value = rawRects.map(rect => ({
    ...rect,
    x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
    y_axis: rect.y_axis * scaleFactory,
    width: rect.width * scaleFactor,
    widtha: rect.width,
    heighta: rect.height,
    height: rect.height * scaleFactory,
    glass_state: rect.glass_state
  }));
};
function getRectColor(state: number): string {
  switch (state) {
    case 0:
@@ -226,47 +125,43 @@
// 更新矩形状态
function updateRectStatus(glassId: string, status: number) {
  adjustedRects.value.forEach(rect => {
    if (rect.glass_id === glassId) {
      rect.glass_state = status; // 更新矩形的状态
    if (rect.glassId === glassId) {
      rect.state = status; // 更新矩形的状态
    }
  });
}
const connectWebSocket = () => {
  if (!webSocket) {
    const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
    webSocket = new WebSocket(socketUrl);
    webSocket.onmessage = (event) => {
      const data = JSON.parse(event.data);
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/currentCutDrawingOne`;
const handleMessage = (data: any) => {
      const scaleFactor = 1621.78 / 6000;
      const scaleFactory = 750 / 3300;
      if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
        const newRects = data.currentCutTerritory[0].map(rect => {
          const existingRect = adjustedRects.value.find(r => r.glass_id === rect.glass_id);
          const existingRect = adjustedRects.value.find(r => r.glassId === rect.glassId);
          if (existingRect) {
            return {
              ...existingRect,
              x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
              y_axis: rect.y_axis * scaleFactory,
              xAxis: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              width: rect.width * scaleFactor,
              height: rect.height * scaleFactory,
              widtha: rect.width,
              heighta: rect.height,
              glass_state: rect.glass_state,
              state: rect.state,
              // 保持 isActive 状态不变
            };
          } else {
            // 如果不存在,则添加新矩形,默认 isActive 为 false
            return {
              ...rect,
              x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
              y_axis: rect.y_axis * scaleFactory,
              xAxis: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              width: rect.width * scaleFactor,
              height: rect.height * scaleFactory,
              widtha: rect.width,
              heighta: rect.height,
              glass_state: rect.glass_state,
              state: rect.state,
              isActive: false,
              glass_id: rect.glass_id,
              glassId: rect.glassId,
            };
          }
        });
@@ -274,19 +169,12 @@
      } else if (data.currentCutTerritory == '') {
        adjustedRects.value = [];
      }
    };
  }
};
}
onMounted(() => {
  // 初始时,如果输入框为空,则连接WebSocket
  if (!inputValue.value) {
    connectWebSocket();
  }
  socket = initializeWebSocket(socketUrl, handleMessage);
});
onUnmounted(() => {
  if (webSocket) {
    webSocket.close();
  }
onBeforeUnmount(() => {
  closeWebSocket();
});
</script>
<style scoped>
@@ -301,22 +189,6 @@
  align-items: center;
  height: 100%; /* 确保div占据整个矩形的高度 */
  font-size: small;
}
#rect {
  position: relative; /* 确保箭头可以相对于矩形定位 */
  /* 其他样式 */
}
#arrow {
  position: absolute;
  top: 70%; /* 箭头位于矩形中间 */
  left: 200px; /* 箭头在矩形左侧一些距离 */
  transform: translateY(-50%); /* 垂直居中 */
  width: 0;
  height: 0;
  border-top: 10px solid transparent; /* 上边框 */
  border-bottom: 10px solid transparent; /* 下边框 */
  border-right: 20px solid #911005; /* 右边框,形成箭头 */
  /* 根据需要调整边框大小和颜色 */
}
#line {
  position: absolute;
UI-Project/src/views/Identify/identifwutwo.vue
@@ -1,47 +1,30 @@
<template>
  <div style="height: 500px;">
    <div style="display: flex;">
      <el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" placeholder="请输入工程号"
                @blur="handleBlur"/>
      <el-pagination
          v-model:current-page="currentPage"
          :page-size="pageSize"
          :size="size"
          :disabled="disabled"
          layout="prev, pager, next, jumper"
          :total="totalPages"
          @current-change="handleCurrentChange"
      />
    </div>
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
      <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
        <div style="position: relative;">
          <div
              v-for="(rect, index) in adjustedRects"
              :key="rect.glass_id"
              :key="rect.glassId"
              class="rect"
              @click="showDialog(rect.glass_id)"
              @click="showDialog(rect.glassId)"
              :style="{ position: 'absolute',
      top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
      backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.glass_state)
       }"
          >
            <!-- 箭头 -->
            <!-- <div id="arrow"></div>
            <div id="line"></div>   -->
              top: `${rect.yAxis}px`, left: `${rect.xAxis}px`, width: `${rect.edgWidth}px`, height: `${rect.edgHeight}px`,
              backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
               }">
            <div class="centered-text">
              <div>{{ rect.glass_id }}</div>
              <div>{{ rect.glassId }}</div>
              <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
            </div>
          </div>
        </div>
      </el-scrollbar>
      <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
        <el-button :disabled="currentGlassRect?.glass_state === 8 || currentGlassRect?.glass_state === 9" type="warning"
        <el-button :disabled="currentGlassRect?.state === 8 || currentGlassRect?.state === 9" type="warning"
                   plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
          {{ $t('order.dilapidation') }}
        </el-button>
        <el-button :disabled="currentGlassRect?.glass_state === 9 || currentGlassRect?.glass_state === 8" type="danger"
        <el-button :disabled="currentGlassRect?.state === 9 || currentGlassRect?.state === 8" type="danger"
                   plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
          <el-icon class="el-icon--right">
            <Upload/>
@@ -54,40 +37,65 @@
</template>
<script setup lang="ts">
import {ElMessage} from 'element-plus'
import {computed, onMounted, onUnmounted, ref} from 'vue';
import {onBeforeUnmount, computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {useI18n} from 'vue-i18n'
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const blind = ref(false)
const olWidth = ref();
const olHeight = ref();
const glass_id = ref();
const inputValue = ref('');
const currentGlassId = ref(null); // 存储当前点击矩形的 glass_id
const currentstate = ref(null);
const currentGlassId = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
let webSocket: WebSocket | null = null;
const totalPages = ref(0);
const pageSize = ref(1);
const currentPage = ref('');
const disabled = false;
const size = 'small';
const rawData = ref([]);
// const handleBind = (row) => {
//   blind.value = true; // 打开绑定架子对话框
// };
// 显示对话框并设置当前 glass_id
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/currentCutDrawingTwo`;
const handleMessage = (data: any) => {
      const scaleFactor = 1621.78 / 6000;
      const scaleFactory = 750 / 3300;
      if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
        const newRects = data.currentCutTerritory[0].map(rect => {
          const existingRect = adjustedRects.value.find(r => r.glassId === rect.glassId);
          if (existingRect) {
            return {
              ...existingRect,
              xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              edgWidth: rect.edgWidth * scaleFactor,
              edgHeight: rect.edgHeight * scaleFactory,
              widtha: rect.edgWidth,
              heighta: rect.edgHeight,
              state: rect.state,
              // 保持 isActive 状态不变
            };
          } else {
            // 如果不存在,则添加新矩形,默认 isActive 为 false
            return {
              ...rect,
              xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              edgWidth: rect.edgWidth * scaleFactor,
              edgHeight: rect.edgHeight * scaleFactory,
              widtha: rect.edgWidth,
              heighta: rect.edgHeight,
              state: rect.state,
              isActive: false,
              glassId: rect.glassId,
            };
          }
        });
        adjustedRects.value = newRects;
      } else if (data.currentCutTerritory == '') {
        adjustedRects.value = [];
      }
}
const currentGlassRect = computed(() => {
  return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
  return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
});
function showDialog(glassId: number) {
  currentGlassId.value = glassId;
  blind.value = true;
  adjustedRects.value = adjustedRects.value.map(rect =>
      rect.glass_id === glassId ? {...rect, isActive: true} : rect
      rect.glassId === glassId ? {...rect, isActive: true} : rect
  );
}
const handleDialogClose = () => {
@@ -102,111 +110,42 @@
    const response = await request.post('/cacheGlass/taskCache/identControls', {
      glassId: currentGlassId.value,
      state: 8,
      line: 1001,
      line: 2,
      remark: '掰片',
      workingProcedure: '切割',
    })
    if (response.code == 200) {
      ElMessage.success(response.message);
      // window.location.reload()
      blind.value = false;
      updateRectStatus(currentGlassId.value, 8);
      findEngineering()
    } else {
      // 请求失败,显示错误消息
      ElMessage.error(response.msg);
    }
  } catch (error) {
    // 处理错误
    console.error(error);
  }
}
// 人工拿走
const handleManualTake = async () => {
  try {
    // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
    //   console.log(url);
    //   const response = await request.post(url)
    const response = await request.post('/cacheGlass/taskCache/identControls', {
      glassId: currentGlassId.value,
      state: 9,
      line: 1001,
      line: 2,
      workingProcedure: '切割',
      remark: '掰片',
    })
    if (response.code == 200) {
      // 绑定成功,处理逻辑
      ElMessage.success(response.message);
      // window.location.reload()
      blind.value = false;
      updateRectStatus(currentGlassId.value, 9);
      findEngineering()
    } else {
      // 请求失败,显示错误消息
      ElMessage.error(response.msg);
    }
  } catch (error) {
    // 处理错误
    console.error(error);
  }
}
const handleBlur = async () => {
  if (inputValue.value) {
    var url = "/cacheGlass/taskCache/cutTerritory?current=" + inputValue.value;
    const response = await request.post(url)
    if (response.code === 200) {
      const rawRects = response.data[0];
      rawData.value = response.data;
      totalPages.value = rawData.value.length;
      const scaleFactor = 1621.78 / 6000;
      const scaleFactory = 750 / 3300;
      adjustedRects.value = rawRects.map(rect => ({
        ...rect,
        x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
        y_axis: rect.y_axis * scaleFactory,
        width: rect.width * scaleFactor,
        widtha: rect.width,
        heighta: rect.height,
        height: rect.height * scaleFactory,
        glass_state: rect.glass_state
      }));
      // 如果WebSocket已连接,则关闭
      if (webSocket) {
        webSocket.close();
        webSocket = null;
      }
      currentPage.value = 1;
    }
  } else {
    connectWebSocket();
  }
};
const findEngineering = async () => {
  if (inputValue.value) {
    var url = "/cacheGlass/taskCache/cutTerritory?current=" + inputValue.value;
    const response = await request.post(url)
    if (response.code === 200) {
      rawData.value = response.data;
    }
  } else {
  }
};
const handleCurrentChange = (val: number) => {
  currentPage.value = val;
  // window.localStorage.setItem('pagenumber', currentPage.value).
  const page = currentPage.value - 1
  const scaleFactor = 1621.78 / 6000;
  const scaleFactory = 750 / 3300;
  adjustedRects.value = rawData.value[page]?.map(rect => ({
    // adjustedRects.value = rawRects.map(rect => ({
    ...rect,
    x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
    y_axis: rect.y_axis * scaleFactory,
    width: rect.width * scaleFactor,
    widtha: rect.width,
    heighta: rect.height,
    height: rect.height * scaleFactory,
    glass_state: rect.glass_state
  }));
};
function getRectColor(state: number): string {
  switch (state) {
    case 0:
@@ -226,67 +165,16 @@
// 更新矩形状态
function updateRectStatus(glassId: string, status: number) {
  adjustedRects.value.forEach(rect => {
    if (rect.glass_id === glassId) {
      rect.glass_state = status; // 更新矩形的状态
    if (rect.glassId === glassId) {
      rect.state = status; // 更新矩形的状态
    }
  });
}
const connectWebSocket = () => {
  if (!webSocket) {
    const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
    webSocket = new WebSocket(socketUrl);
    webSocket.onmessage = (event) => {
      const data = JSON.parse(event.data);
      const scaleFactor = 1621.78 / 6000;
      const scaleFactory = 750 / 3300;
      if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
        const newRects = data.currentCutTerritory[0].map(rect => {
          const existingRect = adjustedRects.value.find(r => r.glass_id === rect.glass_id);
          if (existingRect) {
            return {
              ...existingRect,
              x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
              y_axis: rect.y_axis * scaleFactory,
              width: rect.width * scaleFactor,
              height: rect.height * scaleFactory,
              widtha: rect.width,
              heighta: rect.height,
              glass_state: rect.glass_state,
              // 保持 isActive 状态不变
            };
          } else {
            // 如果不存在,则添加新矩形,默认 isActive 为 false
            return {
              ...rect,
              x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
              y_axis: rect.y_axis * scaleFactory,
              width: rect.width * scaleFactor,
              height: rect.height * scaleFactory,
              widtha: rect.width,
              heighta: rect.height,
              glass_state: rect.glass_state,
              isActive: false,
              glass_id: rect.glass_id,
            };
          }
        });
        adjustedRects.value = newRects;
      } else if (data.currentCutTerritory == '') {
        adjustedRects.value = [];
      }
    };
  }
};
onMounted(() => {
  // 初始时,如果输入框为空,则连接WebSocket
  if (!inputValue.value) {
    connectWebSocket();
  }
  socket = initializeWebSocket(socketUrl, handleMessage);
});
onUnmounted(() => {
  if (webSocket) {
    webSocket.close();
  }
onBeforeUnmount(() => {
  closeWebSocket();
});
</script>
<style scoped>
@@ -301,22 +189,6 @@
  align-items: center;
  height: 100%; /* 确保div占据整个矩形的高度 */
  font-size: small;
}
#rect {
  position: relative; /* 确保箭头可以相对于矩形定位 */
  /* 其他样式 */
}
#arrow {
  position: absolute;
  top: 70%; /* 箭头位于矩形中间 */
  left: 200px; /* 箭头在矩形左侧一些距离 */
  transform: translateY(-50%); /* 垂直居中 */
  width: 0;
  height: 0;
  border-top: 10px solid transparent; /* 上边框 */
  border-bottom: 10px solid transparent; /* 下边框 */
  border-right: 20px solid #911005; /* 右边框,形成箭头 */
  /* 根据需要调整边框大小和颜色 */
}
#line {
  position: absolute;
UI-Project/src/views/Identify/identify.vue
@@ -1,8 +1,9 @@
<template>
  <div style="height: 500px;">
    <div style="display: flex;">
      <el-input v-model="inputValue" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
      <el-pagination
      <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
          <el-button type="primary" style="margin-left: 10px;margin-top: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
       <el-pagination
          v-model:current-page="currentPage"
          :page-size="pageSize"
          :size="size"
@@ -12,36 +13,45 @@
          @current-change="handleCurrentChange"
          style="margin-top: 10px;"
      />
    </div>
      </div>
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
      <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
  <div style="position: relative;">  
    <div
      v-for="(rect, index) in adjustedRects"  
      :key="rect.glass_id"
      :key="rect.glassId"
      class="rect"  
      @click="showDialog(rect.glass_id)"
      @click="showDialog(rect.glassId)"
      :style="{ position: 'absolute', 
      top: `${rect.y_axis}px`, left: `${rect.x_axis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
      backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.glass_state)
      top: `${rect.yaxis}px`, left: `${rect.xaxis}px`, width: `${rect.edgWidth}px`, height: `${rect.edgHeight}px`,
      backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
       }"  
    >
     <!-- 箭头 -->
     <!-- <div id="arrow"></div>
     <div id="line"></div>   -->
     <div  class="centered-text">
    <div>{{ rect.glass_id }}</div>
    <div>{{ rect.glassId }}</div>
    <div>{{ rect.widtha }}*{{ rect.heighta }}</div>  
  </div>
  </div> 
   </div>
      </el-scrollbar>
      <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
        <el-button :disabled="currentGlassRect?.glass_state === 8 || currentGlassRect?.glass_state === 9" type="warning"
        <el-select
            :placeholder="$t('workOrder.cway')"
             clearable
             style="width: 140px;margin-left: 10px;margin-bottom: 10px;"
             v-model="patternSequence">
               <el-option
                v-for="item in optionsb"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
          </el-select>
        <el-button :disabled="!patternSequence || currentGlassRect?.state === 8 || currentGlassRect?.state === 9" type="warning"
                   plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
          {{ $t('order.dilapidation') }}
        </el-button>
        <el-button :disabled="currentGlassRect?.glass_state === 9 || currentGlassRect?.glass_state === 8" type="danger"
        <el-button :disabled="!patternSequence || currentGlassRect?.state === 9 || currentGlassRect?.state === 8" type="danger"
                   plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
          <el-icon class="el-icon--right">
            <Upload/>
@@ -61,11 +71,9 @@
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const blind = ref(false)
const olWidth = ref();
const olHeight = ref();
const glass_id = ref();
const inputValue = ref('');
const currentGlassId = ref(null); // 存储当前点击矩形的 glass_id
const engineerId = ref();
const patternSequence = ref();
const currentGlassId = ref(null);
const currentstate = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
@@ -76,15 +84,15 @@
const disabled = false;
const size = 'small';
const rawData = ref([]);
// 显示对话框并设置当前 glass_id
// 显示对话框并设置当前 glassId
const currentGlassRect = computed(() => {
  return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
  return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
}); 
function showDialog(glassId: number) {
  currentGlassId.value = glassId;  
  blind.value = true;  
  adjustedRects.value = adjustedRects.value.map(rect =>  
  rect.glass_id === glassId ? { ...rect, isActive: true } : rect
  rect.glassId === glassId ? { ...rect, isActive: true } : rect
  ); 
}  
const handleDialogClose = () => {  
@@ -97,18 +105,18 @@
const handleDamage = async () => {
  try  {
  const response = await request.post('/cacheGlass/taskCache/identControls', {
    glassId: currentGlassId.value,
    state: 8,
    line: 1001,
    workingProcedure: '切割',
      glassId: currentGlassId.value,
      state: 8,
      line: patternSequence.value,
      remark: '掰片',
      workingProcedure: '切割',
    })
    if (response.code == 200) {
      ElMessage.success(response.message);
      blind.value = false;
      patternSequence.value = ''
      updateRectStatus(currentGlassId.value, 8); 
      findEngineering()
    } else {
      // 请求失败,显示错误消息
      ElMessage.error(response.msg);
    }
}
@@ -121,16 +129,17 @@
const handleManualTake = async () => {
  try  {
  const response = await request.post('/cacheGlass/taskCache/identControls', {
    glassId: currentGlassId.value,
    state: 9,
    line: 1001,
    workingProcedure: '切割',
      glassId: currentGlassId.value,
      state: 9,
      line: patternSequence.value,
      workingProcedure: '切割',
      remark: '掰片',
    })
    if (response.code == 200) {
      ElMessage.success(response.message);
      blind.value = false;
      patternSequence.value = ''
      updateRectStatus(currentGlassId.value, 9); 
      findEngineering()
  } else {
      ElMessage.error(response.msg);
    }
@@ -139,61 +148,49 @@
    console.error(error);
  }
}
const handleBlur = async () => {
  if (inputValue.value) {
    var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
const sethistorical = async () => {
    var url="/cacheGlass/taskCache/queryCutDrawingByEngineerId?engineerId="+engineerId.value+ "&patternSequence=" + 1;
    const response = await request.post(url)
    if (response.code === 200) {
      const rawRects = response.data[0];
      const rawRects = response.data.currentCutDrawing;
      rawData.value = response.data;
      totalPages.value = rawData.value.length;
      totalPages.value = response.data.totalPatternSequence;
      const scaleFactor =  1621.78/6000; 
      const scaleFactory =  750/3300; 
      adjustedRects.value = rawRects.map(rect => ({  
        ...rect,
        x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
        y_axis: rect.y_axis * scaleFactory,
        width: rect.width * scaleFactor ,
        widtha: rect.width ,
        heighta: rect.height ,
        height: rect.height * scaleFactory,
        glass_state: rect.glass_state
      }));
      if (webSocket) {
        webSocket.close();
        webSocket = null;
      }
        xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxis: rect.yaxis * scaleFactory,
        width: rect.edgWidth * scaleFactor ,
        widtha: rect.edgWidth ,
        heighta: rect.edgHeight ,
        height: rect.edgHeight * scaleFactory,
        state: rect.state
      }));
       currentPage.value = 1;
    }  
  } else{
    connectWebSocket();
  }
};
const findEngineering = async () => {
  if (inputValue.value) {
    var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
};
const handleCurrentChange = async(val: number) => {
  currentPage.value = val;
  var url="/cacheGlass/taskCache/queryCutDrawingByEngineerId?engineerId="+engineerId.value+ "&patternSequence=" + currentPage.value;
    const response = await request.post(url)
    if (response.code === 200) {
      const rawRects = response.data.currentCutDrawing;
      console.log(response.data);
      rawData.value = response.data;
    }
  } else{
  }
};
const handleCurrentChange = (val: number) => {
  currentPage.value = val;
  const page = currentPage.value - 1
      const scaleFactor =  1621.78/6000; 
      const scaleFactory =  750/3300; 
      adjustedRects.value = rawData.value[page]?.map(rect => ({
      adjustedRects.value = rawRects.map(rect => ({
        ...rect,
        x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
        y_axis: rect.y_axis * scaleFactory,
        width: rect.width * scaleFactor ,
        widtha: rect.width ,
        heighta: rect.height ,
        height: rect.height * scaleFactory,
        glass_state: rect.glass_state
      }));
        xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxis: rect.yaxis * scaleFactory,
        width: rect.edgWidth * scaleFactor ,
        widtha: rect.edgWidth ,
        heighta: rect.edgHeight ,
        height: rect.edgHeight * scaleFactory,
        state: rect.state
      }));
    }
};
function getRectColor(state: number): string {
  switch (state) {
@@ -211,72 +208,24 @@
      return '#f3d19e';
  }
}
const optionsb = [
  {
    value: 1,
    label: t('sorter.onesort'),
  },
  {
    value: 2,
    label: t('sorter.twosort'),
  },
]
// 更新矩形状态  
function updateRectStatus(glassId: string, status: number) {  
  adjustedRects.value.forEach(rect => {  
    if (rect.glass_id === glassId) {
      rect.glass_state = status; // 更新矩形的状态
    if (rect.glassId === glassId) {
      rect.state = status; // 更新矩形的状态
    }  
  });  
}
const connectWebSocket = () => {
  if (!webSocket) {
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
    webSocket = new WebSocket(socketUrl);
    webSocket.onmessage = (event) => {
      const data = JSON.parse(event.data);
      const scaleFactor =  1621.78/6000;
      const scaleFactory =  750/3300;
      if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
      const newRects = data.currentCutTerritory[0].map(rect => {
        const existingRect = adjustedRects.value.find(r => r.glass_id === rect.glass_id);
        if (existingRect) {
          return {
            ...existingRect,
            x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
            y_axis: rect.y_axis * scaleFactory,
            width: rect.width * scaleFactor,
            height: rect.height * scaleFactory,
            widtha: rect.width,
            heighta: rect.height,
            glass_state: rect.glass_state,
            // 保持 isActive 状态不变
          };
        } else {
          // 如果不存在,则添加新矩形,默认 isActive 为 false
          return {
            ...rect,
            x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
            y_axis: rect.y_axis * scaleFactory,
            width: rect.width * scaleFactor,
            height: rect.height * scaleFactory,
            widtha: rect.width,
            heighta: rect.height,
            glass_state: rect.glass_state,
            isActive: false,
            glass_id: rect.glass_id,
          };
        }
      });
      adjustedRects.value = newRects;
     } else if (data.currentCutTerritory == '') {
      adjustedRects.value = [];
     }
    };
  }
};
onMounted(() => {
  // 初始时,如果输入框为空,则连接WebSocket
  if (!inputValue.value) {
    connectWebSocket();
  }
});
onUnmounted(() => {
  if (webSocket) {
    webSocket.close();
  }
});
</script>  
<style scoped>  
.rect {