wangfei
2025-03-26 e553bf03da95027fc26ac06384e17ef43dd3ccf4
UI-Project/src/views/Returns/upreturnhistory.vue
@@ -19,8 +19,8 @@
          <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="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="70" />
      <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="70" />
      <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" />
@@ -39,18 +39,6 @@
        </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>
@@ -117,7 +105,6 @@
      }));
        // 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);
@@ -129,7 +116,6 @@
}
const handlePageChange2 = (newPage) => {
  currentPage2.value = newPage;
  console.log(currentPage2.value);
  window.localStorage.setItem('pagenumber', currentPage2.value)
  historicala(currentPage2.value);
};
@@ -197,7 +183,6 @@
}
  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,
@@ -247,8 +232,6 @@
  const backendTime = new Date(getglobalDate);
  const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 减去7天
  oneWeekAgo.setHours(0, 0, 0, 0);
  console.log(formatTimestamp(oneWeekAgo));
  console.log(oneWeekAgo);
  timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
  window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -278,14 +261,6 @@
      return 'primary';  
    case 1: 
      return 'success';  
  }
}
function getStatusTexta(taskRunning: number) {
  switch (taskRunning) {
    case 0:
      return t('basicData.untask');
    case 1:
    return t('basicData.up');
  }  
}
onMounted(() => {