Merge remote-tracking branch 'origin/master'

zhoushihao

2025-09-22 d41ce9c4703807bf2607a74b8305c1d78aed4ec1

 UI-Project/src/views/hollow/hollowequipmenthree.vue

@@ -15,16 +15,8 @@
    <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
          {{ $t('hellow.starttask') }}
        </el-button>
        <el-button style="margin-left: 10px;" id="searchButton" type="info" @click="handleBindd">{{
            $t('hellow.taskdet')
          }}
        </el-button>
        <el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBindc">{{
            $t('hellow.stopproject')
          }}
        </el-button>
        <el-button style="margin-left: 10px;" :disabled="listFlow.length > 0 ? false : true" id="searchButton" type="warning" @click="handleBinde">{{
          $t('searchOrder.printlabels')
        }}
        </el-button>
  </div>
@@ -34,8 +26,28 @@
        <i :style="{ marginTop: '2px', backgroundColor: freethree, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
       </div>
      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
        <el-table height="650" ref="table" :data="tableDataa"
                  :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
        <el-tabs v-model="activeTab" type="card">
    <el-tab-pane 
      v-for="tab in tabList" 
      :key="tab.title"
      :label="tab.title"
      :name="tab.title"
    >
    <div style="margin-bottom: 10px;">  
     <el-button style="margin-left: 10px;" type="info" @click="handleDelete(tab.title)">{{
          $t('hellow.taskdet')
        }}
        </el-button> 
        <el-button style="margin-left: 10px;" id="searchButton" type="warning" @click="handleBinde(tab.tableDataa)">{{
          $t('searchOrder.printlabels')
        }}
        </el-button>
  </div>  
      <!-- 动态表格 -->
      <el-table 
        :data="tab.tableDataa"
        :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
      >
          <el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center"/>
          <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center"/>
          <el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center"/>
@@ -46,10 +58,12 @@
          <el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
          <el-table-column prop="state" :label="$t('hellow.state')" align="center">
            <template #default="scope">
              {{ scope.row.state == -1 ? "等待出片" : "出片完成" }}
              {{ scope.row.state == -1 ? $t('hellow.waitingout') : $t('hellow.finishout') }}
            </template>
          </el-table-column>
        </el-table>
    </el-tab-pane>
  </el-tabs>
      <!-- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
      <div style="margin-top: 5px;margin-right: 5px;">{{ $t('hellow.line') }}</div>
    <el-pagination
@@ -441,17 +455,6 @@
      <print-custom-label-x-j id="childLabel" :faceOrientation="stateValue" :lableType="1" :list="listFlow"
        :lastList='lastList' :type="tag.name" style="width: 100%;height: 100%" />
    </el-dialog>
  <!-- 删除任务 -->
  <el-dialog v-model="blindd" top="30vh" width="25%" :title="$t('hellow.hollowtaskdet')">
    <template #footer>
      <div id="dialog-footer">
        <el-button type="primary" @click="handled">
          {{ $t('basicData.confirm') }}
        </el-button>
        <el-button @click="blindd = false">{{ $t('basicData.cancel') }}</el-button>
      </div>
    </template>
  </el-dialog>
  <!-- 预览 -->
  <el-dialog v-model="dialogFormVisiblee" top="24vh" width="25%" :title="$t('hellow.reviewproject')" >
    <div style="margin-left: 50px;margin-bottom: 10px;">
@@ -527,7 +530,7 @@
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus'
import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed} from "vue";
import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance} from "vue";
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
@@ -536,8 +539,10 @@
const blinda = ref(false)
const blindb = ref(false)
const blindc = ref(false)
const blindd = ref(false)
const mulan = ref(false)
const activeTab = ref('')
const tabList = ref([])
const internalInstance = getCurrentInstance()
const tableDataa = ref([])
const tableDatab = ref([])
const tableDatac = ref([])
@@ -608,8 +613,17 @@
  fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
  const rawData = data.queueInfo[0]
  const formattedData = Object.entries(rawData).map(([key, data]) => ({  
    title: key,  
    tableDataa: Array.isArray(data) ? data : [data]  
  }));  
  tabList.value = formattedData;  
  if (tabList.value.length > 0) {  
    activeTab.value = tabList.value[0].title;  
  }
  internalInstance.ctx.$forceUpdate();  
  try {
    tableDataa.value = data.queueInfo[0];
    const allPageData = data;
    const currentPageKeyValue = currentPageKey.value;
    const currentPageData = allPageData[currentPageKeyValue];
@@ -657,8 +671,28 @@
  blindc.value = true;
};
// 删除任务 
const handleBindd = (row) => {
  blindd.value = true;
const handleDelete = async (flowCardId) => {
  try {
    const confirmResult = await ElMessageBox.confirm(  
      t('hellow.hollowtaskdet'), 
      t('workOrder.prompt'),  
      {  
        confirmButtonText: t('workOrder.yes'), 
        cancelButtonText: t('workOrder.cancel'),
        type: 'warning',  
      } 
    );
 if (confirmResult === 'confirm') {
      var url = "/hollowGlass/hollowGlassOutRelationInfo/deleteHollowTaskDetails?flowCardId=" + flowCardId + "&cell=" + 932;
      const response = await request.post(url)
    if (response.code === 200) {
      ElMessage.success(response.message);
      } else {
      ElMessage.error(response.msg);
      }  
    }  
  } catch (error) {
  }  
};
const removalMethodMap = {
  1: t('Mounting.removal'),
@@ -892,19 +926,6 @@
      dialogFormVisiblee.value = false
      selectedProjectNo.value = ''
      closeWebSocket(socket);
      const summary = response.data.reduce((map, item) => {
              const key = `${item.hollowSequence}`;
              if (!map[key]) {
                map[key] = {
                  printQuantity: 1,
                  order_number: item.glassType,
                  processId: item.flowCardId,
                  orderId:item.flowCardId.slice(0, 10)
                };
              }
              return map;
            }, {});
            listFlow.value = Object.values(summary);
  } else {
    }
  } catch (error) {
@@ -937,20 +958,12 @@
// 开始任务
const handlea = async () => {
  try {
    let flowCardId = window.localStorage.getItem('flowCardId')
    if (flowCardId !== '') {
    var url="/hollowGlass/hollowGlassOutRelationInfo/startTask?flowCardId="+flowCardId + "&cell=" + 932;
      var url = "/hollowGlass/hollowGlassOutRelationInfo/startTask?cell=" + 932 ;
    const response = await request.post(url)
      if (response.code == 200) {
        ElMessage.success(response.message);
        blinda.value = false;
      } else {
      }
    } else {
      ElMessage({
        type: 'info',
        message: t('basicData.infonull'),
      })
    }
  } catch (error) {
  }
@@ -958,20 +971,12 @@
// 暂停任务
const handlec = async () => {
  try {
    let flowCardId = window.localStorage.getItem('flowCardId')
    if (flowCardId !== '') {
    var url="/hollowGlass/hollowGlassOutRelationInfo/pauseTask?flowCardId="+flowCardId + "&cell=" + 932;
      var url = "/hollowGlass/hollowGlassOutRelationInfo/pauseTask?cell=" + 932;
    const response = await request.post(url)
      if (response.code == 200) {
        ElMessage.success(response.message);
        blindc.value = false;
      } else {
      }
    } else {
      ElMessage({
        type: 'info',
        message: t('basicData.infonull'),
      })
    }
  } catch (error) {
  }
@@ -1062,7 +1067,20 @@
]
const blinde = ref(false)
const labelPrint = ref(false);
const handleBinde = (row) => {
const handleBinde = (flowCard) => {
  const summary = flowCard.reduce((map, item) => {
        const key = `${item.hollowSequence}`;
        if (!map[key]) {
          map[key] = {
            printQuantity: 1,
            order_number: item.glassType,
            processId: item.flowCardId,
            orderId:item.flowCardId.slice(0, 10)
          };
        }
        return map;
      }, {});
      listFlow.value = Object.values(summary);
  blinde.value = true;
  getTags();
  hiprint.init();