Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-14 8114ef9bf2704a2bc05a15a36ab677808195a274

Merge remote-tracking branch 'origin/master'

 UI-Project/src/lang/en.js

@@ -710,6 +710,18 @@
          finegrinding: '精磨',
      },
      hellow: {
          hollowCountOutOne: '中空一线玻璃数量',
          hollowCountOutTwo: '中空二线玻璃数量',
          hollowTotalAreaOutOne: '中空一线玻璃面积',
          hollowTotalAreaOutTwo: '中空二线玻璃面积',
          countIn: '钢化前大理片笼玻璃数量',
          countOut: '钢化玻璃数量',
          countOutOne: '切割一线玻璃数量',
          countOutTwo: '切割二线玻璃数量',
          totalAreaIn: '钢化前大理片笼玻璃面积',
          totalAreaOut: '钢化玻璃面积',
          totalAreaOutOne: '切割一线玻璃面积',
          totalAreaOutTwo: '切割二线玻璃面积',
          freeone: '一线空闲状态：',
          freetwo: '二线空闲状态：',
          casFour: '气体4',

 UI-Project/src/lang/py.js

@@ -708,6 +708,18 @@
        finegrinding: '精磨',
    },
    hellow: {
        hollowCountOutOne: '中空一线玻璃数量',
        hollowCountOutTwo: '中空二线玻璃数量',
        hollowTotalAreaOutOne: '中空一线玻璃面积',
        hollowTotalAreaOutTwo: '中空二线玻璃面积',
        countIn: '钢化前大理片笼玻璃数量',
        countOut: '钢化玻璃数量',
        countOutOne: '切割一线玻璃数量',
        countOutTwo: '切割二线玻璃数量',
        totalAreaIn: '钢化前大理片笼玻璃面积',
        totalAreaOut: '钢化玻璃面积',
        totalAreaOutOne: '切割一线玻璃面积',
        totalAreaOutTwo: '切割二线玻璃面积',
        freeone: '一线空闲状态：',
        freetwo: '二线空闲状态：',
        casFour: '气体4',

 UI-Project/src/lang/zh.js

@@ -317,7 +317,7 @@
          takemessage:'是否拿走该条信息？',
          breakage:'破损',
          takeout:'拿走',
          glasstype:'玻璃类型',
          glasstype:'玻璃膜系',
          line:'线路',
          status:'状态',
          time:'时间段',
@@ -709,6 +709,18 @@
          finegrinding: '精磨',
      },
    hellow: {
        hollowCountOutOne: '中空一线玻璃数量',
        hollowCountOutTwo: '中空二线玻璃数量',
        hollowTotalAreaOutOne: '中空一线玻璃面积',
        hollowTotalAreaOutTwo: '中空二线玻璃面积',
        countIn: '钢化前大理片笼玻璃数量',
        countOut: '钢化玻璃数量',
        countOutOne: '切割一线玻璃数量',
        countOutTwo: '切割二线玻璃数量',
        totalAreaIn: '钢化前大理片笼玻璃面积',
        totalAreaOut: '钢化玻璃面积',
        totalAreaOutOne: '切割一线玻璃面积',
        totalAreaOutTwo: '切割二线玻璃面积',
        freeone: '一线空闲状态：',
        freetwo: '二线空闲状态：',
        casFour: '气体4',

 UI-Project/src/views/Caching/cachingbeforehistory.vue

@@ -173,6 +173,7 @@
      endTime: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        currentPage2.value = 1;
        ElMessage.success(response.message);
        tableDatax.value = response.data.records;
        totalRecords.value = response.data.total/2 || 0

 UI-Project/src/views/Caching/cachingunhistory.vue

@@ -174,6 +174,7 @@
        endTime: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        currentPage2.value = 1;
        ElMessage.success(response.message);
        tableDatax.value = response.data.records;
        totalRecords.value = response.data.total/2 || 0

 UI-Project/src/views/Returns/upreturnhistory.vue

@@ -6,18 +6,12 @@
    <el-input v-model="rawGlassThickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.thickness')" />
    <el-input v-model="rawGlassfilmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.coatingtypesbe')" />
    <el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
    <el-select 
            :placeholder="$t('searchOrder.taskstatus')"
             clearable
             style="width: 270px;margin-left: 10px;"  
             v-model="taskStateList">
               <el-option
                v-for="item in optionsa"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
          </el-select>
    <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
        style="width: 200px;margin-left: 10px;">
        <el-option :label="$t('searchOrder.empty')" value="0"></el-option>
        <el-option :label="$t('film.execution')" value="1"></el-option>
        <el-option :label="$t('searchOrder.endtask')" value="2"></el-option>
      </el-select>
            <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" :start-placeholder="$t('reportmanage.starttime')" 
             style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
              :end-placeholder="$t('reportmanage.endtime')">
@@ -28,7 +22,8 @@
      <el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" />
      <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" />
      <el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" />
      <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
    <el-table-column prop="rawGlassFilmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
    <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
      <el-table-column prop="totalCount" align="center" :label="$t('basicData.tonumber')" min-width="80" />
      <el-table-column prop="finishCount" align="center" :label="$t('basicData.finishnumber')" min-width="80" />
      <el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80" />
@@ -44,7 +39,7 @@
        </el-tag>  
      </template> 
          </el-table-column>
          <el-table-column
          <!-- <el-table-column
            align="center"
            :label="$t('sorter.taskRunning')"
            min-width="80"
@@ -55,7 +50,7 @@
          {{ getStatusTexta(scope.row.taskRunning) }}  
        </el-tag>  
      </template> 
          </el-table-column>
          </el-table-column> -->
          <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
          <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
        </el-table>
@@ -87,7 +82,7 @@
const globalDate = inject('globalDate');
const router = useRouter()
const timeRange = ref([])
const taskStateList = reactive([]);
const selectValuesa = reactive([]);
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
@@ -107,9 +102,9 @@
        rawGlassThickness: '',
        rawGlassWidth: '',
        rawGlassfilmsId: '',
        slot: '',
        slot: 0,
        station: 1,
        taskStateList: '',
        taskStateList: [],
        beginDate: startTime,
        endDate: getglobalDate
    })
@@ -140,20 +135,32 @@
};
const historicala = async (page) => {
  try { 
let pslot= ''
let celllist=[]
if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
  if(selectValuesa[0]!=""){
    celllist=[selectValuesa[0]];
  }
}
if(slot.value != ""){
  pslot = slot.value
}else{
  pslot = '0'
}
  let page = window.localStorage.getItem('pagenumber')
  let startTime = window.localStorage.getItem('startTime')
      const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
        pageNo: page,
        pageSize: 20,
        rawGlassHeight: '',
        rawGlassThickness: '',
        rawGlassWidth: '',
        rawGlassfilmsId: '',
        slot: '',
        rawGlassHeight: rawGlassHeight.value,
        rawGlassThickness: rawGlassThickness.value,
        rawGlassWidth: rawGlassWidth.value,
        rawGlassfilmsId: rawGlassfilmsId.value,
        slot: pslot,
        station: 1,
        taskStateList: '',
        beginDate: startTime,
        endDate: getglobalDate
        taskStateList: celllist,
        beginDate: (timeRange.value && timeRange.value[0]) || '',
        endDate: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        ElMessage.success(response.message);
@@ -176,6 +183,18 @@
// 历史查询点击
const sethistorical = async () => {
  try { 
let pslot= ''
let celllist=[]
if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
  if(selectValuesa[0]!=""){
    celllist=[selectValuesa[0]];
  }
}
if(slot.value != ""){
  pslot = slot.value
}else{
  pslot = '0'
}
  let startTime = window.localStorage.getItem('startTime')
  let page = window.localStorage.getItem('pagenumber')
  console.log(page);
@@ -186,13 +205,14 @@
        rawGlassThickness: rawGlassThickness.value,
        rawGlassWidth: rawGlassWidth.value,
        rawGlassfilmsId: rawGlassfilmsId.value,
        slot: slot.value,
        slot: pslot,
        station: 1,
        taskStateList: '',
        taskStateList: celllist,
        beginDate: (timeRange.value && timeRange.value[0]) || '',
        endDate: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        currentPage2.value = 1
        ElMessage.success(response.message);
        const formattedData = response.data.records.map(record => ({
        ...record,
@@ -238,7 +258,7 @@
    case 1: 
      return 'success';  
    case 2: 
      return 'success';  
      return 'info';  
  }  
}
function getStatusTextb(taskState: number) {
@@ -267,20 +287,6 @@
    return t('basicData.up');
  }  
}
const optionsa = [
  {
    value: 0,
    label: t('searchOrder.empty'),
  },
  {
    value: 1,
    label: t('film.execution'),
  },
  {
    value: 2,
    label: t('searchOrder.endtask'),
  }
]
onMounted(() => {
  parseAndSetTime();
  historical();

 UI-Project/src/views/Returns/upreturnhistory2.vue

@@ -1,78 +1,73 @@
<template>  
    <div>  
  <div style="display: flex;width: 1770px;">
    <el-input v-model="rawGlassWidth" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.width')" />
    <el-input v-model="rawGlassHeight" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.height')" />
    <el-input v-model="rawGlassThickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.thickness')" />
    <el-input v-model="rawGlassfilmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.coatingtypesbe')" />
    <el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
    <el-select 
            :placeholder="$t('searchOrder.taskstatus')"
             clearable
             style="width: 270px;margin-left: 10px;"  
             v-model="taskStateList">
               <el-option
                v-for="item in optionsa"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
          </el-select>
            <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" :start-placeholder="$t('reportmanage.starttime')" 
             style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
              :end-placeholder="$t('reportmanage.endtime')">
            </el-date-picker>
          <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
     </div>
        <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
      <el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" />
      <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" />
      <el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" />
      <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
      <el-table-column prop="totalCount" align="center" :label="$t('basicData.tonumber')" min-width="80" />
      <el-table-column prop="finishCount" align="center" :label="$t('basicData.finishnumber')" min-width="80" />
      <el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80" />
          <el-table-column
            align="center"
            :label="$t('film.taskstatus')"
            min-width="80"
            prop="taskState"
          >
          <template #default="scope">  
        <el-tag :type="getStatusTypeb(scope.row.taskState)">  
          {{ getStatusTextb(scope.row.taskState) }}  
        </el-tag>  
      </template> 
          </el-table-column>
          <el-table-column
            align="center"
            :label="$t('sorter.taskRunning')"
            min-width="80"
            prop="taskRunning"
          >
          <template #default="scope">  
        <el-tag :type="getStatusTypea(scope.row.taskRunning)">  
          {{ getStatusTexta(scope.row.taskRunning) }}  
        </el-tag>  
      </template> 
          </el-table-column>
          <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
          <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
        </el-table>
  <div style="margin-top: 20px;margin-left: 40%;">
        <el-pagination
          v-model:current-page="currentPage2"
          :page-size="pageSize"
          :size="large"
          :disabled="disabled"
          layout="prev, pager, next, jumper"
          :total="totalRecords"
          @current-change="handlePageChange2"
          style="margin-top: 10px;"
      />
    </div>
  <div>  
<div style="display: flex;width: 1770px;">
  <el-input v-model="rawGlassWidth" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.width')" />
  <el-input v-model="rawGlassHeight" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.height')" />
  <el-input v-model="rawGlassThickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.thickness')" />
  <el-input v-model="rawGlassfilmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.coatingtypesbe')" />
  <el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
  <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
      style="width: 200px;margin-left: 10px;">
      <el-option :label="$t('searchOrder.empty')" value="0"></el-option>
      <el-option :label="$t('film.execution')" value="1"></el-option>
      <el-option :label="$t('searchOrder.endtask')" value="2"></el-option>
    </el-select>
          <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" :start-placeholder="$t('reportmanage.starttime')" 
           style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
            :end-placeholder="$t('reportmanage.endtime')">
          </el-date-picker>
        <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
   </div>
      <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
    <el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" />
    <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" />
    <el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" />
    <el-table-column prop="rawGlassFilmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
    <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
    <el-table-column prop="totalCount" align="center" :label="$t('basicData.tonumber')" min-width="80" />
    <el-table-column prop="finishCount" align="center" :label="$t('basicData.finishnumber')" min-width="80" />
    <el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80" />
        <el-table-column
          align="center"
          :label="$t('film.taskstatus')"
          min-width="80"
          prop="taskState"
        >
        <template #default="scope">  
      <el-tag :type="getStatusTypeb(scope.row.taskState)">  
        {{ getStatusTextb(scope.row.taskState) }}  
      </el-tag>  
    </template> 
        </el-table-column>
        <!-- <el-table-column
          align="center"
          :label="$t('sorter.taskRunning')"
          min-width="80"
          prop="taskRunning"
        >
        <template #default="scope">  
      <el-tag :type="getStatusTypea(scope.row.taskRunning)">  
        {{ getStatusTexta(scope.row.taskRunning) }}  
      </el-tag>  
    </template> 
        </el-table-column> -->
        <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
        <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
      </el-table>
<div style="margin-top: 20px;margin-left: 40%;">
      <el-pagination
        v-model:current-page="currentPage2"
        :page-size="pageSize"
        :size="large"
        :disabled="disabled"
        layout="prev, pager, next, jumper"
        :total="totalRecords"
        @current-change="handlePageChange2"
        style="margin-top: 10px;"
    />
  </div>
  </template>  
</div>
</template>  
<script lang="ts" setup>
import {useI18n} from 'vue-i18n'
import {useRouter} from "vue-router"
@@ -87,7 +82,7 @@
const globalDate = inject('globalDate');
const router = useRouter()
const timeRange = ref([])
const taskStateList = reactive([]);
const selectValuesa = reactive([]);
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
@@ -98,193 +93,204 @@
const slot = ref('');
let getglobalDate = window.localStorage.getItem('getglobalDate')
const historical = async () => {
  try {
  let startTime = window.localStorage.getItem('startTime')
      const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
        pageNo: 1,
        pageSize: 20,
        rawGlassHeight: '',
        rawGlassThickness: '',
        rawGlassWidth: '',
        rawGlassfilmsId: '',
        slot: '',
        station: 2,
        taskStateList: '',
        beginDate: startTime,
        endDate: getglobalDate
    })
      if (response.code == 200) {
try {
let startTime = window.localStorage.getItem('startTime')
    const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
      pageNo: 1,
      pageSize: 20,
      rawGlassHeight: '',
      rawGlassThickness: '',
      rawGlassWidth: '',
      rawGlassfilmsId: '',
      slot: 0,
      station: 2,
      taskStateList: [],
      beginDate: startTime,
      endDate: getglobalDate
  })
    if (response.code == 200) {
        currentPage2.value = 1
        ElMessage.success(response.message);
        const formattedData = response.data.records.map(record => ({
        ...record,
        formattedCreateTime: formatTimestamp(record.createTime),
        formattedUpdateTime: formatTimestamp(record.updateTime),
      }));
        // tableDatax.value = response.data.records;
        tableDatax.value = formattedData;
        console.log(response.data.pages);
        totalRecords.value = response.data.total/2 || 0
      } else {
        ElMessage.error(response.message);
    }
      const formattedData = response.data.records.map(record => ({
      ...record,
      formattedCreateTime: formatTimestamp(record.createTime),
      formattedUpdateTime: formatTimestamp(record.updateTime),
    }));
      // tableDatax.value = response.data.records;
      tableDatax.value = formattedData;
      console.log(response.data.pages);
      totalRecords.value = response.data.total/2 || 0
    } else {
      ElMessage.error(response.message);
  }
}
catch (error) {
    console.error(error);
  }
  console.error(error);
}
}
const handlePageChange2 = (newPage) => {
  currentPage2.value = newPage;
  console.log(currentPage2.value);
  window.localStorage.setItem('pagenumber', currentPage2.value)
  historicala(currentPage2.value);
currentPage2.value = newPage;
console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
const historicala = async (page) => {
  try { 
  let page = window.localStorage.getItem('pagenumber')
  let startTime = window.localStorage.getItem('startTime')
      const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
        pageNo: page,
        pageSize: 20,
        rawGlassHeight: '',
        rawGlassThickness: '',
        rawGlassWidth: '',
        rawGlassfilmsId: '',
        slot: '',
        station: 2,
        taskStateList: '',
        beginDate: startTime,
        endDate: getglobalDate
    })
      if (response.code == 200) {
        ElMessage.success(response.message);
        const formattedData = response.data.records.map(record => ({
        ...record,
        formattedCreateTime: formatTimestamp(record.createTime),
        formattedUpdateTime: formatTimestamp(record.updateTime),
      }));
        // tableDatax.value = response.data.records;
        tableDatax.value = formattedData;
        totalRecords.value = response.data.total/2 || 0
      } else {
        ElMessage.error(response.message);
    }
try { 
let pslot= ''
let celllist=[]
if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
if(selectValuesa[0]!=""){
  celllist=[selectValuesa[0]];
}
}
if(slot.value != ""){
pslot = slot.value
}else{
pslot = '0'
}
let page = window.localStorage.getItem('pagenumber')
let startTime = window.localStorage.getItem('startTime')
    const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
      pageNo: page,
      pageSize: 20,
      rawGlassHeight: rawGlassHeight.value,
      rawGlassThickness: rawGlassThickness.value,
      rawGlassWidth: rawGlassWidth.value,
      rawGlassfilmsId: rawGlassfilmsId.value,
      slot: pslot,
      station: 2,
      taskStateList: celllist,
      beginDate: (timeRange.value && timeRange.value[0]) || '',
      endDate: (timeRange.value && timeRange.value[1]) || '',
  })
    if (response.code == 200) {
      ElMessage.success(response.message);
      const formattedData = response.data.records.map(record => ({
      ...record,
      formattedCreateTime: formatTimestamp(record.createTime),
      formattedUpdateTime: formatTimestamp(record.updateTime),
    }));
      // tableDatax.value = response.data.records;
      tableDatax.value = formattedData;
      totalRecords.value = response.data.total/2 || 0
    } else {
      ElMessage.error(response.message);
  }
}
catch (error) {
    console.error(error);
  }
  console.error(error);
}
}
// 历史查询点击
const sethistorical = async () => {
  try { 
  let startTime = window.localStorage.getItem('startTime')
  let page = window.localStorage.getItem('pagenumber')
  console.log(page);
  const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
        pageNo: 1,
        pageSize: 20,
        rawGlassHeight: rawGlassHeight.value,
        rawGlassThickness: rawGlassThickness.value,
        rawGlassWidth: rawGlassWidth.value,
        rawGlassfilmsId: rawGlassfilmsId.value,
        slot: slot.value,
        station: 2,
        taskStateList: '',
        beginDate: (timeRange.value && timeRange.value[0]) || '',
        endDate: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        ElMessage.success(response.message);
        const formattedData = response.data.records.map(record => ({
        ...record,
        formattedCreateTime: formatTimestamp(record.createTime),
        formattedUpdateTime: formatTimestamp(record.updateTime),
      }));
        // tableDatax.value = response.data.records;
        tableDatax.value = formattedData;
        totalRecords.value = response.data.total/2 || 0
      } else {
        ElMessage.error(response.message);
    }
try { 
let pslot= ''
let celllist=[]
if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
if(selectValuesa[0]!=""){
  celllist=[selectValuesa[0]];
}
}
if(slot.value != ""){
pslot = slot.value
}else{
pslot = '0'
}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
console.log(page);
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
      pageNo: 1,
      pageSize: 20,
      rawGlassHeight: rawGlassHeight.value,
      rawGlassThickness: rawGlassThickness.value,
      rawGlassWidth: rawGlassWidth.value,
      rawGlassfilmsId: rawGlassfilmsId.value,
      slot: pslot,
      station: 2,
      taskStateList: celllist,
      beginDate: (timeRange.value && timeRange.value[0]) || '',
      endDate: (timeRange.value && timeRange.value[1]) || '',
  })
    if (response.code == 200) {
      ElMessage.success(response.message);
      const formattedData = response.data.records.map(record => ({
      ...record,
      formattedCreateTime: formatTimestamp(record.createTime),
      formattedUpdateTime: formatTimestamp(record.updateTime),
    }));
      // tableDatax.value = response.data.records;
      tableDatax.value = formattedData;
      totalRecords.value = response.data.total/2 || 0
    } else {
      ElMessage.error(response.message);
  }
}
catch (error) {
    console.error(error);
  }
  console.error(error);
}
}
// 格式化时间戳为年月日时间字符串的函数
function formatTimestamp(timestamp) {
  const date = new Date(timestamp);
  const year = date.getFullYear();
  const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1，并补零
  const day = String(date.getDate()).padStart(2, '0'); // 补零
  const hours = String(date.getHours()).padStart(2, '0'); // 补零（如果需要显示时间）
  const minutes = String(date.getMinutes()).padStart(2, '0'); // 补零（如果需要显示时间）
  const seconds = String(date.getSeconds()).padStart(2, '0'); // 补零（如果需要显示时间）
  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
const date = new Date(timestamp);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1，并补零
const day = String(date.getDate()).padStart(2, '0'); // 补零
const hours = String(date.getHours()).padStart(2, '0'); // 补零（如果需要显示时间）
const minutes = String(date.getMinutes()).padStart(2, '0'); // 补零（如果需要显示时间）
const seconds = String(date.getSeconds()).padStart(2, '0'); // 补零（如果需要显示时间）
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
// 格式化后端时间并计算一周前的时间
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
  const backendTime = new Date(getglobalDate);
  const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 减去7天
  console.log(formatTimestamp(oneWeekAgo));
  console.log(oneWeekAgo);
  timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
  window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 减去7天
console.log(formatTimestamp(oneWeekAgo));
console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
function getStatusTypeb(taskState: number) {  
  switch (taskState) {  
    case 0:
      return 'primary';  
    case 1: 
      return 'success';  
    case 2: 
      return 'success';  
  }  
switch (taskState) {  
  case 0:
    return 'primary';  
  case 1: 
    return 'success';  
  case 2: 
    return 'info';  
}  
}
function getStatusTextb(taskState: number) {
  switch (taskState) {
    case 0:  
      return t('searchOrder.empty');
    case 1:  
      return t('film.execution');
    case 2:  
      return t('searchOrder.endtask');
  }  
switch (taskState) {
  case 0:  
    return t('searchOrder.empty');
  case 1:  
    return t('film.execution');
  case 2:  
    return t('searchOrder.endtask');
}  
}
function getStatusTypea(taskRunning: number) {  
  switch (taskRunning) {  
    case 0: 
      return 'primary';  
    case 1: 
      return 'success';  
  }  
switch (taskRunning) {  
  case 0: 
    return 'primary';  
  case 1: 
    return 'success';  
}  
}  
function getStatusTexta(taskRunning: number) {
  switch (taskRunning) {
    case 0:  
      return t('basicData.untask');
    case 1:  
    return t('basicData.up');
  }  
switch (taskRunning) {
  case 0:  
    return t('basicData.untask');
  case 1:  
  return t('basicData.up');
}  
}
const optionsa = [
  {
    value: 0,
    label: t('searchOrder.empty'),
  },
  {
    value: 1,
    label: t('film.execution'),
  },
  {
    value: 2,
    label: t('searchOrder.endtask'),
  }
]
onMounted(() => {
  parseAndSetTime();
  historical();
parseAndSetTime();
historical();
});
  </script>
  <style scoped>  
  </style>
</script>
<style scoped>  
</style>

 UI-Project/src/views/Returns/upreturns.vue

@@ -31,6 +31,7 @@
const buttonEnabledStatus = ref({});
const globalDate = inject('globalDate');
import { inject } from 'vue';
import { tr } from "element-plus/es/locale";
const tableData = ref([])
const titleSelectJson = ref({
  engineerId: [],
@@ -83,42 +84,25 @@
  if (data.LoadOneState != null) {
    cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
  }
  if (data.list!=null) {
  tableDataa.value = data.list[0].slice(0, 2);
  }else {
    tableDataa.value = ''
  }
  if (data.stationOne != null) {
    // data.stationOne[0].forEach(station => {
    //   stationInfos[station.slot] = {
    //     hasValidDimension: station.patternHeight !== null && station.patternHeight !== '' ||
    //                        station.patternThickness !== null && station.patternThickness !== ''
    //   };
    //   console.log(station);
    //   console.log(stationInfos[station.slot]);
      
    // });
    data.stationOne[0].forEach((station) => {
  stationInfos[station.patternHeight] = {
    hasPatternHeight: station.patternHeight !== null && station.patternHeight !== '',
  };
  // buttonEnabledStatus.value[workstationId] = hasValidDimension;
      console.log(station);
      console.log(stationInfos[station.patternHeight]);
});
      if(station.patternThickness !== undefined){
        station.haspatternThickness=false;
      }else{
        station.haspatternThickness=true;
      }
      // stationInfos[station.patternThickness] = {
      //   haspatternThickness: station.patternThickness !== undefined,
      // };
    });
    
    console.log(data.stationOne);
    if (data.list != null) {
      tableDataa.value = data.list[0].slice(0, 2);
    } else {
      tableDataa.value = [];
    }
  }
  // if (data.stationOne != null) {
  //   // 初始化按钮状态对象
  //   buttonEnabledStatus.value = {};
  //   data.stationOne[0].forEach((station, index) => {
  //     const workstationId = station.workstationId;
  //     const hasValidDimension = station.patternHeight !== null && station.patternHeight !== '' ||
  //                               station.patternThickness !== null && station.patternThickness !== '';
  //     buttonEnabledStatus.value[workstationId] = hasValidDimension;
  //     console.log(station.workstationId);
      
  //   });
  // }
  if(data.loadTask1!=null){
  tableData.value = data.loadTask1[0]
  window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
@@ -132,13 +116,6 @@
  canSelectProjectc.value = false;
  tableData.value = '';
}
};
// 检查按钮是否可用
// const isButtonEnabled = (slot: string) => {
//   return buttonEnabledStatus.value[slot] || false;
// };
const isButtonEnabled = (patternHeight: string) => {
  return stationInfos[patternHeight]?.hasValidDimension ?? false;
};
onBeforeUnmount(() => {
  closeWebSocket();
@@ -529,7 +506,7 @@
            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
            <el-table-column fixed="right" :label="$t('film.operate')" align="center">
            <template #default="scope">
          <el-button size="mini" :disabled="!isButtonEnabled(scope.row.patternHeight)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
          <el-button size="mini" :disabled="(!stationInfos[scope.row.patternThickness])" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
            </template>
        </el-table-column>
          </el-table>

 UI-Project/src/views/Slicecage/slicecage.vue

@@ -777,12 +777,6 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
const handleMessage = (data) => {
  if (cageInfo && cageInfo.createTime) {
    cageInfo.formattedCreateTime = formatTimestamp(cageInfo.createTime);
  }
  if (cageInfo && cageInfo.updateTime) {
    cageInfo.formattedupdateTime = formatTimestamp(cageInfo.updateTime);
  }
  if(data.bigStorageSummary!=null){
    tableDatass.value = data.bigStorageSummary[0]
  }else{
@@ -1451,7 +1445,7 @@
     marginwidth="2000px"
     marginheight="2000px"
     width="100%" 
     height="700px" 
     height="750px" 
     frameborder="0"
     ></iframe>
  </el-dialog>

 UI-Project/src/views/Slicecage/slicecagehistory.vue

@@ -21,8 +21,42 @@
             style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
              :end-placeholder="$t('reportmanage.endtime')">
            </el-date-picker>
          <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
          <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="handleClick()">{{$t('reportmanage.inquire')}}</el-button>
     </div>
     <div style="margin-bottom: 10px;margin-top: 20px;margin-left: 20px;">
      <el-form>
        <el-row style="margin-top: -15px;margin-bottom: -2px;">
          <el-col :span="4">
              <div id="dt" style="font-size: 15px;">
              <el-form-item :label="$t('hellow.countIn')"  style="width: 14vw">
                {{ countIn }}
              </el-form-item>
              </div>
          </el-col>
          <el-col :span="5">
            <div id="dta" style="font-size: 15px;">
          <el-form-item :label="$t('hellow.countOut')" style="width: 14vw">
                {{ countOut }}
              </el-form-item>
              </div>
          </el-col>
          <el-col :span="4">
              <div id="dt" style="font-size: 15px;">
              <el-form-item :label="$t('hellow.totalAreaIn')" style="width: 14vw">
                {{ totalAreaIn }}
              </el-form-item>
              </div>
          </el-col>
          <el-col :span="4">
              <div id="dt" style="font-size: 15px;">
              <el-form-item :label="$t('hellow.totalAreaOut')" style="width: 14vw">
                {{ totalAreaOut }}
              </el-form-item>
              </div>
          </el-col>
        </el-row>
      </el-form>
    </div>
        <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
      <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
      <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="80" />
@@ -86,6 +120,10 @@
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
const countIn = ref(0)
const countOut = ref(0)
const totalAreaIn = ref(0)
const totalAreaOut = ref(0)
const glassId = ref('');
const startSlot = ref('');
const targetSlot = ref('');
@@ -124,11 +162,39 @@
    console.error(error);
  }
}
const Daily = async () => {
  try {
  let startTime = window.localStorage.getItem('startTime')
      const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigDailyProduction", {
        pageNo: 1,
        pageSize: 20,
        glassId: glassId.value,
        startSlot: 0,
        targetSlot: 0,
        taskStateList: [],
        taskTypeList: [],
        beginDate: startTime,
        endDate: getglobalDate
    })
      if (response.code == 200) {
        countIn.value = response.data.countIn
        countOut.value = response.data.countOut
        totalAreaIn.value = response.data.totalAreaIn
        totalAreaOut.value = response.data.totalAreaOut
      } else {
        ElMessage.error(response.message);
    }
}
catch (error) {
    console.error(error);
  }
}
const handlePageChange2 = (newPage) => {
  currentPage2.value = newPage;
  console.log(currentPage2.value);
  window.localStorage.setItem('pagenumber', currentPage2.value)
  historicala(currentPage2.value);
  Dailya(currentPage2.value);
}; 
const historicala = async (page) => {
  try { 
@@ -189,6 +255,62 @@
    console.error(error);
  }
}
const Dailya = async (page) => {
  try { 
  let celllist=[]
  let stateList=[]
  let pstartSlot= ''
  let ptargetSlot=''
  if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
    if(selectValuesa[0]!=""){
      celllist=[selectValuesa[0]];
    }
  }
  if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
    if(selectValuesa[1]!=""){
      stateList=[selectValuesa[1]];
    }
  }
  if(startSlot.value != ""){
    pstartSlot = startSlot.value
  }else{
    pstartSlot = '0'
  }
  if(targetSlot.value != ""){
    ptargetSlot = targetSlot.value
  }else{
    ptargetSlot = '0'
  }
  let page = window.localStorage.getItem('pagenumber')
  let startTime = window.localStorage.getItem('startTime')
      const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigDailyProduction", {
        pageNo: page,
        pageSize: 20,
        glassId: glassId.value,
        startSlot: pstartSlot,
        targetSlot: ptargetSlot,
        taskStateList: celllist,
        taskTypeList: stateList,
        beginDate: (timeRange.value && timeRange.value[0]) || '',
        endDate: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        countIn.value = response.data.countIn
        countOut.value = response.data.countOut
        totalAreaIn.value = response.data.totalAreaIn
        totalAreaOut.value = response.data.totalAreaOut
      } else {
        ElMessage.error(response.message);
    }
}
catch (error) {
    console.error(error);
  }
}
const handleClick = async () => {
  await sethistorical();
  await Dailyhistorical();
};
// 历史查询点击
const sethistorical = async () => {
  try { 
@@ -238,6 +360,56 @@
      }));
        // tableDatax.value = response.data.records;
        tableDatax.value = formattedData;
      } else {
        ElMessage.error(response.message);
    }
}
catch (error) {
    console.error(error);
  }
}
const Dailyhistorical = async () => {
  try { 
  let celllist=[]
  let stateList=[]
  let pstartSlot= ''
  let ptargetSlot=''
  if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
    if(selectValuesa[0]!=""){
      celllist=[selectValuesa[0]];
    }
  }
  if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
    if(selectValuesa[1]!=""){
      stateList=[selectValuesa[1]];
    }
  }
  if(startSlot.value != ""){
    pstartSlot = startSlot.value
  }else{
    pstartSlot = '0'
  }
  if(targetSlot.value != ""){
    ptargetSlot = targetSlot.value
  }else{
    ptargetSlot = '0'
  }
  const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigDailyProduction", {
        pageNo: 1,
        pageSize: 20,
        glassId: glassId.value,
        startSlot: pstartSlot,
        targetSlot: ptargetSlot,
        taskStateList: celllist,
        taskTypeList: stateList,
        beginDate: (timeRange.value && timeRange.value[0]) || '',
        endDate: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        countIn.value = response.data.countIn
        countOut.value = response.data.countOut
        totalAreaIn.value = response.data.totalAreaIn
        totalAreaOut.value = response.data.totalAreaOut
      } else {
        ElMessage.error(response.message);
    }
@@ -330,6 +502,7 @@
onMounted(() => {
  parseAndSetTime();
  historical();
  Daily()
});
  </script>
  <style scoped>  

 UI-Project/src/views/StockBasicData/stockBasicData.vue

@@ -183,8 +183,9 @@
          <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" />
          <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" />
          <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
          <el-table-column prop="glassType" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
          <el-table-column prop="filmsid" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
          <el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" />
          <el-table-column prop="createTime" align="center" :label="$t('workOrder.time')" min-width="120" />
          <el-table-column prop="state" :label="$t('workOrder.status')" align="center" width="200">
            <!-- <template #default="scope">
              {{ scope.row.status==0?"未磨边":scope.row.status==1?"磨边中":"已磨边" }}

 UI-Project/src/views/StockBasicData/stockhistory.vue

@@ -139,10 +139,10 @@
        pageNo: page,
        pageSize: 20,
        glassId: glassId.value,
        taskState: '',
        taskType: '',
        startTime: startTime,
        endTime: getglobalDate
        taskState: taskState.value,
        taskType: taskType.value,
        startTime: (timeRange.value && timeRange.value[0]) || '',
        endTime: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        ElMessage.success(response.message);
@@ -168,8 +168,8 @@
        glassId: glassId.value,
        taskState: taskState.value,
        taskType: taskType.value,
      startTime: (timeRange.value && timeRange.value[0]) || '',
      endTime: (timeRange.value && timeRange.value[1]) || '',
        startTime: (timeRange.value && timeRange.value[0]) || '',
        endTime: (timeRange.value && timeRange.value[1]) || '',
    })
      if (response.code == 200) {
        ElMessage.success(response.message);

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

@@ -21,8 +21,42 @@
           style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
            :end-placeholder="$t('reportmanage.endtime')">
          </el-date-picker>
        <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
        <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="handleClick()">{{$t('reportmanage.inquire')}}</el-button>
   </div>
  <div style="margin-bottom: 10px;margin-top: 20px;margin-left: 20px;">
      <el-form>
        <el-row style="margin-top: -15px;margin-bottom: -2px;">
          <el-col :span="4">
              <div id="dt" style="font-size: 15px;">
              <el-form-item :label="$t('hellow.hollowCountOutOne')"  style="width: 14vw">
                {{ hollowCountOutOne }}
              </el-form-item>
              </div>
          </el-col>
          <el-col :span="5">
            <div id="dta" style="font-size: 15px;">
          <el-form-item :label="$t('hellow.hollowCountOutTwo')" style="width: 14vw">
                {{ hollowCountOutTwo }}
              </el-form-item>
              </div>
          </el-col>
          <el-col :span="4">
              <div id="dt" style="font-size: 15px;">
              <el-form-item :label="$t('hellow.hollowTotalAreaOutOne')" style="width: 14vw">
                {{ hollowTotalAreaOutOne }}
              </el-form-item>
              </div>
          </el-col>
          <el-col :span="4">
              <div id="dt" style="font-size: 15px;">
              <el-form-item :label="$t('hellow.hollowTotalAreaOutTwo')" style="width: 14vw">
                {{ hollowTotalAreaOutTwo }}
              </el-form-item>
              </div>
          </el-col>
        </el-row>
      </el-form>
    </div>
      <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
    <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
    <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="80" />
@@ -86,6 +120,10 @@
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
const hollowCountOutOne = ref(0)
const hollowCountOutTwo = ref(0)
const hollowTotalAreaOutOne = ref(0)
const hollowTotalAreaOutTwo = ref(0)
const glassId = ref('');
const startSlot = ref('');
const targetSlot = ref('');
@@ -107,6 +145,33 @@
    targetSlot.value = '';
  }
};
const Daily = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
    const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowDailyProduction", {
      pageNo: 1,
      pageSize: 20,
      glassId: '',
      startSlot: 0,
      targetSlot: 0,
      taskStateList: [],
      taskTypeList: [],
      beginDate: startTime,
      endDate: getglobalDate
  })
    if (response.code == 200) {
      hollowCountOutOne.value = response.data.hollowCountOutOne
      hollowCountOutTwo.value = response.data.hollowCountOutTwo
      hollowTotalAreaOutOne.value = response.data.hollowTotalAreaOutOne
      hollowTotalAreaOutTwo.value = response.data.hollowTotalAreaOutTwo
    } else {
      ElMessage.error(response.message);
  }
}
catch (error) {
  console.error(error);
}
}
const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
@@ -144,6 +209,7 @@
console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
Dailya(currentPage2.value);
};
const historicala = async (page) => {
try { 
@@ -202,6 +268,62 @@
  console.error(error);
}
}
const Dailya = async (page) => {
try { 
let celllist=[]
let stateList=[]
let pstartSlot= ''
let ptargetSlot=''
if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
  if(selectValuesa[0]!=""){
    celllist=[selectValuesa[0]];
  }
}
if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
  if(selectValuesa[1]!=""){
    stateList=[selectValuesa[1]];
  }
}
if(startSlot.value != ""){
  pstartSlot = startSlot.value
}else{
  pstartSlot = '0'
}
if(targetSlot.value != ""){
  ptargetSlot = targetSlot.value
}else{
  ptargetSlot = '0'
}
let page = window.localStorage.getItem('pagenumber')
let startTime = window.localStorage.getItem('startTime')
    const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowDailyProduction", {
      pageNo: page,
      pageSize: 20,
      glassId: glassId.value,
      startSlot: pstartSlot,
      targetSlot: ptargetSlot,
      taskStateList: celllist,
      taskTypeList: stateList,
      beginDate: (timeRange.value && timeRange.value[0]) || '',
      endDate: (timeRange.value && timeRange.value[1]) || '',
  })
    if (response.code == 200) {
      hollowCountOutOne.value = response.data.hollowCountOutOne
      hollowCountOutTwo.value = response.data.hollowCountOutTwo
      hollowTotalAreaOutOne.value = response.data.hollowTotalAreaOutOne
      hollowTotalAreaOutTwo.value = response.data.hollowTotalAreaOutTwo
    } else {
      ElMessage.error(response.message);
  }
}
catch (error) {
  console.error(error);
}
}
const handleClick = async () => {
  await sethistorical();
  await Dailyhistorical();
};
// 历史查询
const sethistorical = async () => {
try { 
@@ -252,7 +374,61 @@
      }));
        // tableDatax.value = response.data.records;
        tableDatax.value = formattedData;
      console.log(tableDatax.value);
      console.log(formattedData);
      totalRecords.value = response.data.total/2 || 0
    } else {
      ElMessage.error(response.message);
  }
}
catch (error) {
  console.error(error);
}
}
const Dailyhistorical = async () => {
try { 
let startTime = window.localStorage.getItem('startTime')
let celllist=[]
let stateList=[]
let pstartSlot= ''
let ptargetSlot=''
if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
  if(selectValuesa[0]!=""){
    celllist=[selectValuesa[0]];
  }
}
if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
  if(selectValuesa[1]!=""){
    stateList=[selectValuesa[1]];
  }
}
if(startSlot.value != ""){
  pstartSlot = startSlot.value
}else{
  pstartSlot = '0'
}
if(targetSlot.value != ""){
  ptargetSlot = targetSlot.value
}else{
  ptargetSlot = '0'
}
let page = window.localStorage.getItem('pagenumber')
const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowDailyProduction", {
      pageNo: 1,
      pageSize: 20,
      glassId: glassId.value,
      startSlot: pstartSlot,
      targetSlot: ptargetSlot,
      taskStateList: celllist,
      taskTypeList: stateList,
      beginDate: (timeRange.value && timeRange.value[0]) || '',
      endDate: (timeRange.value && timeRange.value[1]) || '',
  })
    if (response.code == 200) {
      hollowCountOutOne.value = response.data.hollowCountOutOne
      hollowCountOutTwo.value = response.data.hollowCountOutTwo
      hollowTotalAreaOutOne.value = response.data.hollowTotalAreaOutOne
      hollowTotalAreaOutTwo.value = response.data.hollowTotalAreaOutTwo
    } else {
      ElMessage.error(response.message);
  }
@@ -330,6 +506,7 @@
onMounted(() => {
parseAndSetTime();
historical();
Daily()
});
</script>
<style scoped>  

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

@@ -964,7 +964,7 @@
     marginwidth="2000px"
     marginheight="2000px"
     width="100%" 
     height="700px" 
     height="750px" 
     frameborder="0"
     ></iframe>
  </el-dialog>

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -366,10 +366,12 @@
            result.put("title", reportingWorkJson);

            result.put("type", 0);
            if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
                result.put("isPatch", 1);
            } else {
                result.put("isPatch", 0);
            if (reportingWorkDetails.get(0).getDamageDetails() != null) {
                if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
                    result.put("isPatch", 1);
                } else {
                    result.put("isPatch", 0);
                }
            }
            result.put("userId", "admin");
            result.put("userName", "admin");

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/service/impl/LoadGlassDeviceTaskHistoryServiceImpl.java

@@ -31,8 +31,8 @@
        LambdaQueryWrapper<LoadGlassDeviceTaskHistory> wrapper = new LambdaQueryWrapper<LoadGlassDeviceTaskHistory>()
                .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
                .like(StringUtils.isNotBlank(request.getRawGlassHeight()), LoadGlassDeviceTaskHistory::getRawGlassHeight, request.getRawGlassHeight())
                .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
                .like(StringUtils.isNotBlank(request.getRawGlassWidth()), LoadGlassDeviceTaskHistory::getRawGlassWidth, request.getRawGlassWidth())
                .like(StringUtils.isNotBlank(request.getRawGlassThickness()), LoadGlassDeviceTaskHistory::getRawGlassThickness, request.getRawGlassThickness())
                .like(StringUtils.isNotBlank(request.getRawGlassfilmsId()), LoadGlassDeviceTaskHistory::getRawGlassFilmsId, request.getRawGlassfilmsId())
                .eq(request.getStation() != 0, LoadGlassDeviceTaskHistory::getStation, request.getStation())
                .eq(request.getSlot() != 0, LoadGlassDeviceTaskHistory::getSlot, request.getSlot())
                .in(CollectionUtil.isNotEmpty(request.getTaskStateList()), LoadGlassDeviceTaskHistory::getTaskState, request.getTaskStateList())