Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-03-31 4788208a9da7fb26800cd7d552b0cafe350feea6

Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

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

@@ -429,15 +429,16 @@
  iframeUrl10.value = `${window.location.origin}/#/largescreendisplay/statistics`;
};
const transposedData = computed(() => {
  const keys = Object.keys(productionVO.value[0] || {});
  const keys = Object.keys(fieldNames); // 按 fieldNames 的顺序
  return keys.map(key => {
    const row = { name: fieldNames[key] || key };
    productionVO.value.forEach((item, index) => {
      row[`value${index}`] = item[key];
      row[`value${index}`] = item[key] ?? ''; // 处理可能不存在的键
    });
    return row;
  });
});

const fieldNames = {
  date: t('large.date'),
  countOutOne: t('large.countOutOne'),
@@ -457,43 +458,43 @@
</script>
<template>
  <div style="height: 500px;">
    <el-dialog v-model="iframe1" top="5vh" width="95%">
    <el-dialog v-model="iframe1" top="5vh" width="95%" @close="iframeUrl1=''">
      <iframe :src="iframeUrl1" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe2" top="5vh" width="95%">
    <el-dialog v-model="iframe2" top="5vh" width="95%" @close="iframeUrl2=''">
      <iframe :src="iframeUrl2" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe3" top="5vh" width="95%">
    <el-dialog v-model="iframe3" top="5vh" width="95%" @close="iframeUrl3=''">
      <iframe :src="iframeUrl3" marginwidth="2000px" marginheight="2000px" width="100%" height="700"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe4" top="5vh" width="95%">
    <el-dialog v-model="iframe4" top="5vh" width="95%" @close="iframeUrl4=''">
      <iframe :src="iframeUrl4" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe5" top="5vh" width="95%">
    <el-dialog v-model="iframe5" top="5vh" width="95%" @close="iframeUrl5=''">
      <iframe :src="iframeUrl5" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe6" top="5vh" width="95%">
    <el-dialog v-model="iframe6" top="5vh" width="95%" @close="iframeUrl6=''">
      <iframe :src="iframeUrl6" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe7" top="5vh" width="95%">
    <el-dialog v-model="iframe7" top="5vh" width="95%" @close="iframeUrl7=''">
      <iframe :src="iframeUrl7" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe8" top="5vh" width="95%">
    <el-dialog v-model="iframe8" top="5vh" width="95%" @close="iframeUrl8=''">
      <iframe :src="iframeUrl8" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe9" top="5vh" width="95%">
    <el-dialog v-model="iframe9" top="5vh" width="95%" @close="iframeUrl9=''">
      <iframe :src="iframeUrl9" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
        frameborder="0"></iframe>
    </el-dialog>
    <el-dialog v-model="iframe10" top="5vh" width="95%">
    <el-dialog v-model="iframe10" top="5vh" width="95%" @close="iframeUrl10=''">
      <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
        frameborder="0"></iframe>
    </el-dialog>

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

@@ -208,6 +208,7 @@
                    new LambdaQueryWrapper<Damage>()
                            .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
                            .notIn(Damage::getStatus, 7, 8)
                            .lt(Damage::getStatus, 7)
                            .eq(Damage::getGlassId, damage.getGlassId())
            );
        } else {
@@ -315,6 +316,7 @@
                new LambdaQueryWrapper<Damage>()
                        .eq(Damage::getGlassId, glassId)
                        .in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
                        .lt(Damage::getStatus, 7)
        );
    }