大屏添加历史任务按钮

ZengTao

2025-03-17 a7c479daff0e44988f174f8c93fb41f30fdc48e1

大屏添加历史任务按钮

 UI-Project/src/lang/zh.js

@@ -571,14 +571,13 @@
          historicaltasks1:'原片仓储',
          historicaltasks2:'上片一线',
          historicaltasks3:'上片二线',
          historicaltasks4:'磨边任务',
          historicaltasks5:'卧式一线',
          historicaltasks6:'卧式二线',
          historicaltasks7:'钢化大理片',
          historicaltasks8:'中空一线',
          historicaltasks9:'中空二线',
          historicaltasks10:'中空大理片',
          historicaltasks11:'生产统计',
          historicaltasks4:'卧式一线',
          historicaltasks5:'卧式二线',
          historicaltasks6:'钢化大理片',
          historicaltasks7:'中空一线',
          historicaltasks8:'中空二线',
          historicaltasks9:'中空大理片',
          historicaltasks10:'生产统计',
          date:'日期',
          countOutOne: '切割一线数量',
          totalAreaOutOne: '切割一线面积',

 UI-Project/src/views/largescreendisplay/screendisplay.vue

@@ -385,27 +385,25 @@
const iframe4 = ref(false);
const handlehistorical4 = () => {
  iframe4.value = true;
  
  iframeUrl4.value =`${window.location.origin}/#/StockBasicData/stockhistory`;;
  iframeUrl4.value =`${window.location.origin}/#/Caching/cachingbeforehistory`;
};
const iframeUrl5 = ref('');
const iframe5 = ref(false);
const handlehistorical5 = () => {
  iframe5.value = true;
  iframeUrl5.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
  iframeUrl5.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
  iframeUrl5.value = `${window.location.origin}/#/Caching/cachingunhistory`;
};
const iframeUrl6 = ref('');
const iframe6 = ref(false);
const handlehistorical6 = () => {
  iframe6.value = true;
  iframeUrl6.value =  `${window.location.origin}/#/Slicecage/slicecagehistory`;
  iframeUrl6.value = `${window.location.origin}/#/Slicecage/slicecagehistory`;
};
const iframeUrl7 = ref('');
const iframe7 = ref(false);
const handlehistorical7 = () => {
  iframe7.value = true;
  iframeUrl7.value = `${window.location.origin}/#/hollow/hellowquiptwohistory`;
  iframeUrl7.value = `${window.location.origin}/#/hollow/hellowquiphistory`;
};
const iframeUrl8 = ref('');
const iframe8 = ref(false);
@@ -417,7 +415,13 @@
const iframe9 = ref(false);
const handlehistorical9 = () => {
  iframe9.value = true;
  iframeUrl9.value = `${window.location.origin}/#/largescreendisplay/statistics`;
  iframeUrl9.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
};
const iframeUrl10 = ref('');
const iframe10 = ref(false);
const handlehistorical10 = () => {
  iframe10.value = true;
  iframeUrl10.value = `${window.location.origin}/#/largescreendisplay/statistics`;
};
</script>
<template>
@@ -443,11 +447,17 @@
    <el-dialog v-model="iframe7" top="10vh" width="95%">
      <iframe :src="iframeUrl7" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe8" top="10vh" width="95%">
      <iframe :src="iframeUrl8" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe9" top="10vh" width="95%">
      <iframe :src="iframeUrl9" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe10" top="10vh" width="95%">
      <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
    </el-dialog>
    <!-- 生产统计 -->
    <div style="height: 190px;width: 88%;float: right;position: absolute;" @click="handlehistorical9">
    <div style="height: 100px;width: 88%;float: right;position: absolute;" @click="handlehistorical10">
      <el-table height="100" ref="table" :data="productionVO"
        :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
        <el-table-column prop="date" align="center" :label="$t('large.date')" min-width="70" />
@@ -562,17 +572,18 @@
        style="position: relative;width: 110px;height: 100px;top: 603px;left: 297px;"></div>
    </div>
    <!-- 订单情况 -->
    <div style="height: 190px;width: 48%;float: right;">
      <!-- <div>
        <el-button style="margin-top: 5px;margin-left: 50px;" id="searchButton" type="info" @click="handlehistorical1">{{ $t('large.historicaltasks1') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical2">{{ $t('large.historicaltasks2') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical3">{{ $t('large.historicaltasks3') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical4">{{ $t('large.historicaltasks4') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical5">{{ $t('large.historicaltasks5') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical7">{{ $t('large.historicaltasks7') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical6">{{ $t('large.historicaltasks6') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical8">{{ $t('large.historicaltasks8') }}</el-button>
      </div> -->
    <div style="height: 190px;width: 52%;float: right;">
      <div>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical1">{{ $t('large.historicaltasks1') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical2">{{ $t('large.historicaltasks2') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical3">{{ $t('large.historicaltasks3') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical4">{{ $t('large.historicaltasks4') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical5">{{ $t('large.historicaltasks5') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical6">{{ $t('large.historicaltasks6') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical7">{{ $t('large.historicaltasks7') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical8">{{ $t('large.historicaltasks8') }}</el-button>
        <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical9">{{ $t('large.historicaltasks9') }}</el-button>
      </div>
      <el-table height="700" ref="table" :data="orderDTOS"
        :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
        <el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java

@@ -82,7 +82,7 @@
//        2将空格子的尺寸置为初始尺寸
        this.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
                .set(HollowBigStorageCage::getRemainWidth, slotWidth)
                .notIn(HollowBigStorageCage::getSlot, "select distinct slot from hollow_big_storage_cage_details where state in( 100 , 102 , 103 ,104)"));
                .notInSql(HollowBigStorageCage::getSlot, "select distinct slot from hollow_big_storage_cage_details where state in( 100 , 102 , 103 ,104)"));
//        3、将不在笼内的流程卡的关系表重置
//        仅获取理片笼内的流程卡信息避免玻璃
        List<FlowCardVirtualSlotDTO> list = hollowBigStorageCageDetailsService.queryFlowCardIdsAndLayer();