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

ZengTao

2025-02-26 8b375a4ac0d06ee6e8e6b0ac00a86ddac188ff94

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

# Conflicts:
#	UI-Project/src/views/largescreendisplay/screendisplay.vue

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

@@ -13,7 +13,6 @@
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')

const timeRange = ref([])
let socket = null;
const rawGlassStorageDetailList = ref([])
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/largenScreen`;
@@ -78,7 +77,7 @@
  const endTime = dayjs().startOf('minute'); // 当前时间，精确到分钟
  const startTime = endTime.subtract(1, 'day').startOf('minute'); // 当前时间的前一天，精确到分钟
  // 设置时间范围为 [开始时间, 结束时间]
  timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
  // timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
});
// onMounted(() => {
//   socket = initializeWebSocket(socketUrl, handleMessage);
@@ -130,21 +129,34 @@
  </div>
  <!-- 点击下方弹窗 -->
  <el-dialog v-model="blindb" top="10vh" width="90%">
    <div style="display: flex;">
      <el-select :placeholder="$t('basicData.coatingtypes')" clearable style="width: 270px;margin-left: 10px;"
        v-model="taskStat">
        <el-option v-for="item in optionsa" :key="item.value" :label="item.label" :value="item.value" />
      </el-select>
      <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span>
      <!-- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" :start-placeholder="$t('reportmanage.starttime')" 
  <div style="display: flex;">
            <el-select 
            :placeholder="$t('basicData.coatingtypes')"
             clearable
             style="width: 270px;margin-left: 10px;"  
             v-model="taskStat">
               <el-option
                v-for="item in optionsa"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
          </el-select>
          <!-- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span> -->
            <!-- <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-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()">{{
            <!-- <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>