helongyang
6 小时以前 3cd89b88edd913530062e13e20e7d6b866fd190f
更新
已修改9个文件
2401 ■■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Client/src/views/Login.vue 1162 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/AuxiliaryWarehouse.vue 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/DryFilmWarehouse.vue 290 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/InkWarehouse.vue 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/PpWarehouse.vue 282 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/SolderMaskWarehouse.vue 224 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs 131 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/Login.vue
@@ -1,386 +1,864 @@
<template>
  <div class="login-container">
    <div class="project-name">WIDESEA_WMS</div>
    <div class="login-form">
      <div class="form-user" @keypress="loginPress">
        <div class="login-text">
  <div id="vol-container" :class="['vol-theme-' + theme]">
    <div class="vol-aside" :style="{ width: menuWidth + 'px' }">
      <div class="header" :style="{ width: menuWidth - 1 + 'px' }">
        <img v-show="!isCollapse" v-bind:src="logo" />
        <i
          @click="toggleLeft"
          class="collapse-menu"
          :class="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'"
        />
      </div>
      <div class="vol-menu">
        <el-scrollbar style="height: 100%">
          <VolMenu
            :currentMenuId="currentMenuId"
            :on-select="onSelect"
            :enable="true"
            :open-select="false"
            :isCollapse="isCollapse"
            :list="menuOptions"
          ></VolMenu>
        </el-scrollbar>
      </div>
    </div>
    <div class="vol-container" :style="{ left: menuWidth - 1 + 'px' }">
      <div class="vol-header">
        <div class="project-name">WMS</div>
        <div class="header-text">
          <div class="h-link">
            <a
              href="javascript:void(0)"
              @click="to(item)"
              v-for="(item, index) in links.filter((c) => {
                return !c.icon;
              })"
              :key="index"
            >
              <span v-if="!item.icon">{{ item.text }}</span>
              <i v-else :class="item.icon"></i>
            </a>
          </div>
        </div>
        <div class="header-info">
          <div class="h-link">
            <a
              href="javascript:void(0)"
              @click="to(item)"
              v-for="(item, index) in links.filter((c) => {
                return c.icon;
              })"
              :key="index"
            >
              <span v-if="!item.icon">{{ item.text }}</span>
              <i v-else :class="item.icon"></i>
            </a>
          </div>
          <!--消息管理-->
          <div class="h-link" @click="messageModel = true">
            <a>
              <i class="el-icon-message-solid">
                <el-badge
                  :value="messageList.length"
                  :type="messageList.length > 0 ? 'danger' : 'success'"
                  class="item"
                  style="width: 10px"
                ></el-badge>
              </i>
            </a>
          </div>
          <div>
            <div>欢迎登录...</div>
            <div class="login-line"></div>
            <img class="user-header" :src="userImg" :onerror="errorImg" />
          </div>
          <div style="flex:1;"></div>
          <div class="user">
            <span>{{ userName }}</span>
            <span id="index-date"></span>
        </div>
        <div class="login-text-small">WELCOME TO LOGIN</div>
        <div class="item">
          <div class="input-icon el-icon-user"></div>
          <input type="text" v-focus v-model="userInfo.userName" placeholder="请输入账号" />
        </div>
        <div class="item">
          <div class="input-icon el-icon-lock"></div>
          <input type="password" v-focus v-model="userInfo.password" placeholder="请输入密码" />
        </div>
        <div class="item">
          <div class="input-icon el-icon-mobile"></div>
          <input v-focus type="text" v-model="userInfo.verificationCode" placeholder="输入验证码" />
          <div class="code" @click="getVierificationCode">
            <img v-show="codeImgSrc != ''" :src="codeImgSrc" />
          <div class="settings">
            <i style="font-size: 20px" class="el-icon-s-tools" @click="drawer_model = true" />
          </div>
        </div>
      </div>
      <div class="loging-btn">
        <el-button size="large" :loading="loading" color="#3a6cd1" :dark="true" @click="login" long>
          <span v-if="!loading">登录</span>
          <span v-else>正在登录...</span>
      <div class="vol-path">
        <el-tabs
          @tab-click="selectNav"
          @tab-remove="removeNav"
          @contextmenu.prevent="bindRightClickMenu(false)"
          type="border-card"
          class="header-navigation"
          v-model="selectId"
          :strtch="false"
        >
          <el-tab-pane
            v-for="(item, navIndex) in navigation"
            type="card"
            :name="navIndex + ''"
            :closable="navIndex > 0"
            :key="navIndex"
            :label="item.name"
          >
            <span style="display: none">{{ navIndex }}</span>
          </el-tab-pane>
        </el-tabs>
        <!-- å³é”®èœå• -->
        <div v-show="contextMenuVisible">
          <ul :style="{ left: menuLeft + 'px', top: menuTop + 'px' }" class="contextMenu">
            <li v-show="visibleItem.all">
              <el-button link @click="closeTabs()">
                <i class="el-icon-close"></i>
                {{
                navigation.length == 2 ? "关闭菜单" : "关闭所有"
                }}
        </el-button>
            </li>
            <li v-show="visibleItem.left">
              <el-button link @click="closeTabs('left')">
                <i class="el-icon-back"></i>关闭左边
              </el-button>
            </li>
            <li v-show="visibleItem.right">
              <el-button link @click="closeTabs('right')">
                <i class="el-icon-right"></i>关闭右边
              </el-button>
            </li>
            <li v-show="visibleItem.other">
              <el-button link @click="closeTabs('other')">
                <i class="el-icon-right"></i>关闭其他
              </el-button>
            </li>
          </ul>
      </div>
      <!-- è´¦å·ä¿¡æ¯ -->
      <!-- <div class="account-info">
        <p>演示账号:admin666 &nbsp; &nbsp;密码:123456</p>
        <p>本地账号:admin &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;密码:123456</p>
        <p><a href="https://jq.qq.com/?_wv=1027&k=Sqstuy0M" style="text-decoration: none"
            target="_blank">QQ3群:743852316</a>
          &nbsp; &nbsp;&nbsp; &nbsp;
          <a href="http://v2.volcore.xyz/document/guide" style="text-decoration: none" target="_blank">框架文档</a>
        </p>
      </div> -->
      <!-- é“¾æŽ¥ä½ç½® -->
      <!-- <div class="app-link" >
        <a href="#" style="text-decoration: none">移动端扫码</a>
        <a>
          <i class="el-icon-chat-dot-round"></i> å°ç¨‹åº
          <img src="https://app-1256993465.cos.ap-nanjing.myqcloud.com/wechat.jpg" /></a>
        <a>
          <i class="el-icon-apple"></i>
          Android
          <img src="https://app-1256993465.cos.ap-nanjing.myqcloud.com/Android.png" /></a>
        <a>
          <i class="el-icon-document"></i>
          H5
          <img src="https://app-1256993465.cos.ap-nanjing.myqcloud.com/H5.png" /></a>
      </div> -->
    </div>
      <div class="vol-main" id="vol-main">
        <el-scrollbar style="height: 100%" v-if="permissionInited">
          <loading v-show="$store.getters.isLoading()"></loading>
          <router-view v-slot="{ Component }">
            <keep-alive>
              <component
                :is="Component"
                :key="$route.name"
                v-if="
                  !$route.meta ||
                  ($route.meta && !$route.meta.hasOwnProperty('keepAlive'))
                "
              />
            </keep-alive>
            <component
              :is="Component"
              :key="$route.name"
              v-if="$route.meta && $route.meta.hasOwnProperty('keepAlive')"
            />
          </router-view>
        </el-scrollbar>
      </div>
    </div>
    <el-drawer title="选择主题" v-model="drawer_model" direction="rtl" destroy-on-close>
      <div class="theme-selector">
        <div
          @click="changeTheme(item.name)"
          class="item"
          v-for="(item, index) in theme_color"
          :key="index"
          :style="{ background: item.color }"
        >
          <div
            v-show="item.leftColor"
            :style="{ background: item.leftColor }"
            style="height: 100%; width: 20px"
            class="t-left"
          ></div>
          <div class="t-right"></div>
        </div>
      </div>
    </el-drawer>
    <!-- é¡µé¢åº•部 -->
    <!-- <div class="login-footer">
      <a style="text-decoration: none" href="https://beian.miit.gov.cn/" target="_blank">京ICP备19056538号-1</a>
      <a href="https://dotnet9.com/" style="text-decoration: none" target="blank">Dotnet9</a>
      <a href="https://space.bilibili.com/525836469" style="text-decoration: none" target="blank">NET视频教程(微软MVP-ACE录制)</a>
      <a href="https://www.cctalk.com/m/group/90268531" style="text-decoration: none" target="blank">VOL框架视频</a>
      <a href="http://120.48.115.252:9990" style="text-decoration: none" target="blank">视频演示地址</a>
    </div> -->
    <img class="login-bg" src="/static/login_bg.png" />
    <el-drawer title="消息列表" v-model="messageModel" direction="rtl" destroy-on-close size="40%">
      <Message :list="messageList"></Message>
    </el-drawer>
  </div>
</template>
<style lang="less" scoped>
@import "./index/index.less";
</style>
<script >
import loading from "@/components/basic/RouterLoading";
import VolMenu from "@/components/basic/VolElementMenu.vue";
import Message from "./index/Message.vue";
import MessageConfig from "./index/MessageConfig.js";
var imgUrl = require("@/assets/imgs/wms_x.png");
var $this;
var $interval;
var $indexDate;
import {
  defineComponent,
  ref,
  reactive,
  toRefs,
  getCurrentInstance
} from 'vue';
import { useRouter, useRoute } from 'vue-router';
import store from '../store/index';
import http from '@/../src/api/http.js';
  ref,
  watch,
  onMounted,
  getCurrentInstance,
  h
} from "vue";
import { useRouter, useRoute } from "vue-router";
import store from "../store/index";
import http from "@/../src/api/http.js";
import { ElNotification } from "element-plus";
import { useStore } from "vuex";
export default defineComponent({
  setup(props, context) {
    store.commit('clearUserInfo', '');
    const loading = ref(false);
    const codeImgSrc = ref('');
    const userInfo = reactive({
      userName: '',
      password: '',
      verificationCode: '',
      UUID: undefined
    });
    const getVierificationCode = () => {
      http.get('/api/User/getVierificationCode').then((x) => {
        codeImgSrc.value = 'data:image/png;base64,' + x.img;
        userInfo.UUID = x.uuid;
      });
    };
    getVierificationCode();
    let appContext = getCurrentInstance().appContext;
    let $message = appContext.config.globalProperties.$message;
    let router = useRouter();
    const login = () => {
      if (!userInfo.userName) return $message.error('请输入用户名');
      if (!userInfo.password) return $message.error('请输入密码');
      if (!userInfo.verificationCode) {
        return $message.error('请输入验证码');
      }
      loading.value = true;
      http.post('/api/User/login', userInfo, '正在登录....').then((result) => {
        if (!result.status) {
          loading.value = false;
          getVierificationCode();
          return $message.error(result.message);
        }
        $message.success('登录成功,正在跳转!');
        store.commit('setUserInfo', result.data);
        router.push({ path: '/' });
      });
    };
    const loginPress = (e) => {
      if (e.keyCode == 13) {
        login();
      }
    };
    const openUrl = (url) => {
      window.open(url, '_blank');
    };
    return {
  components: {
    VolMenu,
      loading,
      codeImgSrc,
      getVierificationCode,
      login,
      userInfo,
      loginPress,
      openUrl
    Message
  },
  data() {
    return {
      allTabs: true,
      leftTabs: true,
      rightTabs: true,
      otherTabs: true,
      menuLeft: 0,
      menuTop: 0
    };
  },
  directives: {
    focus: {
      inserted: function (el) {
        el.focus();
  setup(props, context) {
    let client = ref(null);
    // èŠ‚æµç›¸å…³å˜é‡ï¼ˆå»¶è¿Ÿæ—¶é—´å»ºè®®300-500ms,根据后端推送频率调整)
    const THROTTLE_DELAY = 300; // å»¶è¿Ÿæ›´æ–°æ—¶é—´ï¼ˆæ¯«ç§’)
    let lastUpdateTime = ref(0); // ä¸Šä¸€æ¬¡æ›´æ–°æ—¶é—´
    let latestWsData = ref(null); // ç¼“存最新的WebSocket数据
    let throttleTimer = ref(null); // èŠ‚æµå®šæ—¶å™¨
    // èŽ·å–å…¨å±€å±žæ€§å’Œæ–¹æ³•
    const { proxy } = getCurrentInstance();
    // èœå•导航默认宽度
    const menuWidth = ref(200);
    const contextMenuVisible = ref(false);
    const isCollapse = ref(false);
    const drawer_model = ref(false);
    const messageModel = ref(false);
    const theme_color = ref([
      { name: "blue", color: "rgb(45, 140, 240)" },
      { name: "blue2", color: "rgb(45, 140, 240)", leftColor: "#0068d6" },
      { name: "red", color: "rgb(237, 64, 20)" },
      { name: "red2", color: "rgb(237, 64, 20)", leftColor: "#a90000" },
      { name: "dark", color: "#272929" },
      { name: "orange", color: "#ff9900" },
      { name: "orange2", color: "#ff9900", leftColor: "rgb(232 141 5)" },
      { name: "green", color: "rgb(25, 190, 107)" },
      { name: "green2", color: "rgb(25, 190, 107)", leftColor: "#019e4f" },
      { name: "white", color: "#fff" }
    ]);
    const links = ref([
      { text: "个人中心", path: "/UserInfo", id: -1, icon: "el-icon-s-custom" },
      {
        text: "安全退出",
        path: "/login",
        id: -4,
        icon: "el-icon-switch-button"
      }
    ]);
    const errorImg = ref(
      'this.src="' + require("@/assets/imgs/error-img.png") + '"'
    );
    const selectId = ref("1");
    // ã€é¦–页】标签序号(当前右键选中的菜单)
    const selectMenuIndex = ref("0");
    //2022.05.29增加tab选项与菜单联动功能
    const currentMenuId = ref(0);
    const userName = ref("--");
    const userTrueName = ref("--");
    const userInfo = ref({});
    const visibleItem = reactive({
      left: false,
      right: false,
      all: false,
      other: false
    });
    const userImg = ref("");
    const navigation = reactive([
      { orderNo: "0", id: "1", name: "首页", path: "/home" }
    ]);
    const logo = ref(imgUrl);
    const theme = ref("blue2");
    const menuOptions = ref([]);
    const permissionInited = ref(false);
    const messageList = reactive([]);
    let _config = getCurrentInstance().appContext.config.globalProperties;
    let router = useRouter();
    const toggleLeft = () => {
      isCollapse.value = !isCollapse.value;
      menuWidth.value = isCollapse.value ? 63 : 200;
    };
    //2021.08.28开放手动折叠菜单方法
    _config.menu = {
      show() {
        toggleLeft();
      },
      hide() {
        toggleLeft();
      }
    };
    const Store = useStore();
    const s = ref(null);
    // èŠ‚æµå¤„ç†WebSocket数据(核心逻辑)
    const handleThrottledWsData = (rawData) => {
      // ç¼“存最新数据(确保最终更新用的是最新值)
      latestWsData.value = rawData;
      const now = Date.now();
      // æƒ…况1:距离上次更新超过延迟时间,直接处理
      if (now - lastUpdateTime.value >= THROTTLE_DELAY) {
        processAndUpdateData();
        lastUpdateTime.value = now;
      }
      // æƒ…况2:未超过延迟时间,用定时器延迟处理(避免重复触发)
      else {
        if (throttleTimer.value) clearTimeout(throttleTimer.value);
        throttleTimer.value = setTimeout(() => {
          processAndUpdateData();
          lastUpdateTime.value = Date.now();
        }, THROTTLE_DELAY);
      }
    };
    // ç»Ÿä¸€å¤„理并更新数据(避免重复代码)
    const processAndUpdateData = () => {
      if (!latestWsData.value) return;
      try {
        // è§£æžWebSocket数据
        const parsedData = typeof latestWsData.value === 'string'
          ? JSON.parse(latestWsData.value)
          : latestWsData.value;
        // 1. æ›´æ–°Vuex中的homedata
        store.dispatch("sethomedata", parsedData);
        // 2. å¤„理消息列表
        if (parsedData.title && parsedData.message) {
          messageList.push(parsedData);
          // æ˜¾ç¤ºé€šçŸ¥
          ElNotification({
            title: parsedData.title,
            message: h("i", { style: "color: teal" }, parsedData.message),
            position: "bottom-right"
          });
        }
      } catch (err) {
        console.error("WebSocket数据处理失败:", err);
      }
    };
    // WebSocket连接逻辑(使用节流处理数据)
    const createSocket = url => {
      // å…³é—­å·²æœ‰è¿žæŽ¥ï¼ˆé¿å…é‡å¤è¿žæŽ¥ï¼‰
      if (client.value) {
        client.value.close();
      }
      // åˆ›å»ºWebSocket连接
      client.value = new WebSocket("ws:localhost:9260/");
      client.value.onopen = function() {
        console.log("WebSocket è¿žæŽ¥æˆåŠŸ");
      };
      // æ”¶åˆ°æ¶ˆæ¯åŽäº¤ç»™èŠ‚æµå‡½æ•°å¤„ç†
      client.value.onmessage = function(event) {
        if (event && event.data) {
          handleThrottledWsData(event.data);
        }
      };
      client.value.onclose = function() {
        console.log("WebSocket è¿žæŽ¥å…³é—­");
        // é‡è¿žé€»è¾‘
        setTimeout(() => createSocket(url), 5000);
      };
      client.value.onerror = function(err) {
        console.log("WebSocket è¿žæŽ¥é”™è¯¯: ", err);
        // é”™è¯¯åŽé‡è¿ž
        setTimeout(() => createSocket(url), 5000);
      };
    };
    const changeTheme = name => {
      if (theme.value != name) {
        theme.value = name;
      }
      localStorage.setItem("vol3_theme", name);
    };
    const to = item => {
      if (item.path == "#") {
        window.open("https://github.com/cq-panda/Vue.NetCore");
        return;
      }
      if (item.path.indexOf("http") != -1) {
        window.open(item.path);
        return;
      }
      if (typeof item == "string" || item.path == "/login") {
        if (item == "/login" || item.path == "/login") {
          store.commit("clearUserInfo", "");
          window.location.href = "/";
          return;
        }
        router.push({ path: item });
        return;
      }
      if (item.path == "#") return;
      open(item);
    };
    const open = (item, useRoute) => {
      let _index = navigation.findIndex(x => {
        return x.path == item.path;
      });
      if (_index == -1) {
        navigation.push({
          id: item.id + "",
          name: item.name || item.text || "无标题",
          path: item.path,
          query: item.query
        });
        selectId.value = navigation.length - 1 + "";
      } else {
        selectId.value = _index + "";
      }
      if (useRoute === undefined) {
        setItem(item);
        router.push(item);
      }
      currentMenuId.value = item.id * 1;
      // tab菜单绑定右键事件
      proxy.$nextTick(function(e) {
        proxy.bindRightClickMenu(true);
      });
    };
    const close = path => {
      let index = navigation.findIndex(x => {
        return x.path == path;
      });
      if (index == -1) {
        return _config.$Message.error("未找到菜单");
      }
      removeNav(index);
    };
    const setItem = item => {
      localStorage.setItem(
        window.location.origin + "_tabs",
        JSON.stringify(item)
      );
    };
    const getItem = () => {
      let nav = localStorage.getItem(window.location.origin + "_tabs");
      return nav ? JSON.parse(nav) : null;
    };
    const selectNav = item => {
      selectId.value = item.props.name;
      let _path = navigation[item.index].path;
      currentMenuId.value = (
        menuOptions.value.find(c => {
          return c.path == _path;
        }) || { id: 0 }
      ).id;
      router.push({
        path: navigation[item.index].path,
        query: navigation[item.index].query
      });
    };
    const removeNav = _index => {
      return new Promise(() => {
        //关闭的当前项,跳转到前一个页面
        if (selectId.value == _index + "") {
          setItem(navigation[_index - 1]);
          router.push({
            path: navigation[_index - 1].path,
            query: navigation[_index - 1].query
          });
          navigation.splice(_index, 1);
          selectId.value = selectId.value - 1 + "";
          return;
        }
        if (_index < selectId.value) {
          selectId.value = selectId.value - 1 + "";
        }
        navigation.splice(_index, 1);
        currentMenuId.value = (
          menuOptions.value.find(c => {
            return c.path == navigation[selectId.value * 1].path;
          }) || { id: 0 }
        ).id;
      });
    };
    const getSelectMenuName = id => {
      return menuOptions.value.find(function(x) {
        return x.id == id;
      });
    };
    const onSelect = treeId => {
      var item = getSelectMenuName(treeId);
      open(item, false);
    };
    /**
     * æ˜¾ç¤ºå³é”®èœå•
     */
    const openTabsMenu = function(e) {
      e.preventDefault();
      let tabId = e.target.id.split("-")[1] * 1;
      //记录当前选中的菜单index
      selectMenuIndex.value =
        document.getElementById("pane-" + tabId).children[0].textContent * 1;
      //只有首页时不显示
      if (navigation.length == 1) {
        return;
      }
      //首页设置显示关闭右边菜单
      if (!selectMenuIndex.value) {
        visibleItem.all = false;
        visibleItem.right = true;
        visibleItem.left = false;
        visibleItem.other = false;
      } else {
        visibleItem.all = true;
        //不是最后一个显示关闭右边菜单
        visibleItem.right = selectMenuIndex.value != navigation.length - 1;
        //只有两个菜单时不显示关闭左边
        visibleItem.left = navigation.length != 2;
        //只有两个菜单时不显示关闭其他
        visibleItem.other = navigation.length != 2;
      }
      contextMenuVisible.value = true;
      // è®¾ç½®å³é”®èœå•显示的位置
      proxy.menuLeft =
        e.target.getBoundingClientRect().left - (isCollapse.value ? 63 : 198);
      proxy.menuTop = 36;
    };
    /**
     * å…³é—­å³é”®èœå•
     */
    const closeTabsMenu = () => {
      contextMenuVisible.value = false;
    };
    const toHome = () => {
      open({
        text: navigation[0].name,
        path: navigation[0].path
      });
    };
    /**
     * å…³é—­å…¶å®ƒæ ‡ç­¾é¡µ
     */
    const closeTabs = value => {
      let _menuId = navigation[selectId.value * 1].id;
      let currnetIndex = selectId.value * 1;
      switch (value) {
        case "left": {
          // åˆ é™¤å·¦ä¾§tab标签
          navigation.splice(1, currnetIndex - 1);
          break;
        }
        case "right": {
          // åˆ é™¤å³ä¾§tab标签
          if (selectMenuIndex.value == 0) {
            navigation.splice(currnetIndex);
            toHome();
          } else {
            navigation.splice(currnetIndex + 1);
            if (selectMenuIndex.value < currnetIndex) {
              navigation.splice(
                selectMenuIndex.value,
                currnetIndex - selectMenuIndex.value
              );
            }
          }
          break;
        }
        case "other": {
          // åˆ é™¤å…¶ä»–所有tab标签
          navigation.splice(currnetIndex + 1);
          navigation.splice(1, currnetIndex - 1);
          break;
        }
        default: {
          //关闭所有
          navigation.splice(1, navigation.length);
          toHome();
          break;
        }
      }
      selectId.value =
        navigation.findIndex(c => {
          return c.id == _menuId;
        }) + "";
      closeTabsMenu();
    };
    watch(
      () => contextMenuVisible.value,
      (newVal, oldVal) => {
        if (newVal) {
          document.body.addEventListener("click", closeTabsMenu);
        } else {
          document.body.removeEventListener("click", closeTabsMenu);
        }
      }
    );
    /**
     * ç³»ç»Ÿåˆ›å»ºå¼€å§‹
     */
    const created = () => {
      let _theme = localStorage.getItem("vol3_theme");
      if (_theme) {
        theme.value = _theme;
      }
      let _userInfo = store.getters.getUserInfo();
      if (_userInfo) {
        userName.value = _userInfo.userName;
        userTrueName.value = _userInfo.userTrueName;
        if (_userInfo.img) {
          userImg.value = _config.base.getImgSrc(_userInfo.img, http.ipAddress);
        }
      }
      createSocket(window.webConfig.webSocketUrl);
      Object.assign(_config.$tabs, { open: open, close: close });
      http.get("api/Sys_Menu/getTreeMenu", {}, true).then(data => {
        data.push({ id: "1", name: "首页", url: "/home" });
        data.forEach(d => {
          d.path = (d.url || "").replace("/Manager", "");
          d.to = (d.url || "").replace("/Manager", "");
          if (!d.icon || d.icon.substring(0, 3) != "el-") {
            d.icon = "el-icon-menu";
          }
        });
        store.dispatch("setPermission", data);
        menuOptions.value = data;
        permissionInited.value = true;
        //开启消息推送
        if (_config.$global.signalR) {
          MessageConfig(http, result => {
            messageList.unshift(result);
          });
        }
        //当前刷新是不是首页
        if (router.currentRoute.value.path != navigation[0].path) {
          //查找系统菜单
          let item = menuOptions.value.find(x => {
            return x.path == router.currentRoute.value.path;
          });
          if (item) return onSelect(item.id);
          //查找顶部快捷连接
          item = links.value.find(x => {
            return x.path == router.currentRoute.value.path;
          });
          //查找最后一次跳转的页面
          if (!item) {
            item = getItem();
          }
          if (item) {
            return open(item, false);
          }
        }
        selectId.value = "1";
      });
    };
    created();
    return {
      menuWidth,
      isCollapse,
      drawer_model,
      theme_color,
      errorImg,
      userInfo,
      userName,
      userTrueName,
      userImg,
      selectId,
      selectMenuIndex,
      navigation,
      links,
      onSelect,
      openTabsMenu,
      selectNav,
      getSelectMenuName,
      removeNav,
      logo,
      theme,
      menuOptions,
      permissionInited,
      changeTheme,
      to,
      toggleLeft,
      messageModel,
      messageList,
      contextMenuVisible,
      visibleItem,
      closeTabsMenu,
      closeTabs,
      currentMenuId
    };
  },
  /**
   * æŒ‚载钩子函数
   */
  mounted() {
    let _date = showTime();
    $indexDate = document.getElementById("index-date");
    $indexDate.innerText = _date;
    $interval = setInterval(function() {
      $indexDate.innerText = showTime();
    }, 1000);
    this.bindRightClickMenu(true);
  },
  methods: {
    /**
     * ç»‘定右键事件
     */
    bindRightClickMenu(enable) {
      if (!enable) return;
      let that = this;
      // ä½¿ç”¨åŽŸç”Ÿjs ä¸ºå•个dom绑定鼠标右击事件
      that.$nextTick(() => {
        let tab_top_dom = Object.assign(
          [],
          document.getElementsByClassName("el-tabs__item is-top")
        );
        tab_top_dom.forEach((item, index) => {
          item.oncontextmenu = that.openTabsMenu;
        });
      });
    }
  },
  /**
   * é”€æ¯é’©å­å‡½æ•°
   */
  destroyed() {
    $this = null;
    clearInterval($interval);
    // å…³é—­WebSocket连接
    if (client && client.value) {
      client.value.close();
    }
  }
});
</script>
<style lang="less" scoped>
.login-container {
  display: flex;
  width: 100%;
  height: 100%;
  background: rgb(246, 247, 252);
  justify-content: flex-end;
  align-items: center;
const week = new Array(
  "星期一",
  "星期二",
  "星期三",
  "星期四",
  "星期五",
  "星期六",
  "星期日"
);
function showTime() {
  let date = new Date();
  let year = date.getFullYear();
  let month = date.getMonth() + 1;
  let day = date.getDate();
  let hour = date.getHours();
  let minutes = date.getMinutes();
  let second = date.getSeconds();
  return (
    year +
    "." +
    (month < 10 ? "0" + month : month) +
    "." +
    (day < 10 ? "0" + day : day) +
    "" +
    " " +
    (hour < 10 ? "0" + hour : hour) +
    ":" +
    (minutes < 10 ? "0" + minutes : minutes) +
    ":" +
    (second < 10 ? "0" + second : second) +
    " " +
    (week[date.getDay() - 1] || week[6])
  );
}
</script>
.login-form {
  align-items: center;
  width: 50%;
  display: flex;
  flex-direction: column;
  // margin-right: 150px;
  z-index: 999;
  .form-user {
    // margin: 25px 0;
<style lang="less" scoped>
.vol-container .vol-path ::v-deep(.el-tabs__content) {
  padding: 0;
}
    .item {
      border-radius: 5px;
      border: 1px solid #ececec;
      display: flex;
      margin-bottom: 30px;
      background: #ffff;
      height: 45px;
      padding-left: 20px;
      display: flex;
      .code {
        position: relative;
        cursor: pointer;
        width: 74px;
        padding: 5px 10px 0 0;
  margin-top: -20px;
  margin-right: 40px;
      }
      .input-icon {
        line-height: 45px;
        color: #7a7a7a;
        padding-right: 20px;
      }
    }
  }
  input:-webkit-autofill {
    box-shadow: 0 0 0px 1000px white inset;
    -webkit-box-shadow: 0 0 0px 1000px white inset !important;
  }
  input {
    background: white;
    display: block;
    box-sizing: border-box;
    width: 100%;
    min-width: 0;
    margin: 0;
    padding: 0;
    color: #323233;
    line-height: inherit;
    text-align: left;
    border: 0;
    outline: none;
    font-size: 16px;
    line-height: 20px;
  }
}
.form-user,
.loging-btn {
  width: 400px;
}
.loging-btn {
  box-shadow: 2px 4px 11px #a4c2ff;
  margin-top: 10px;
  button {
    padding: 21px;
    font-size: 14px !important;
    width: 100%;
  }
}
.login-text {
  font-weight: bolder;
  font-size: 20px;
  letter-spacing: 2px;
  position: relative;
  display: flex;
  .login-line {
    z-index: -1;
    padding: 5px;
    position: relative;
    top: -8px;
    width: 100%;
    background-image: linear-gradient(to right, #6598ff, white);
  }
}
.login-text-small {
  margin-bottom: 20px;
  font-size: 13px;
  color: #7d7c7c;
}
.login-bg {
  left: 0;
  position: absolute;
  height: 100%;
  width: 50%;
  z-index: 0;
}
.project-name {
  position: absolute;
  top: 40px;
  left: 40px;
  z-index: 9999;
  font-weight: bolder;
  background-image: linear-gradient(to right, #1850c1, #9c009c);
  -webkit-background-clip: text;
  color: transparent;
  font-size: 25px;
}
</style>
<style lang="less" scoped>
.app-link {
  // font-weight: bolder;
  text-align: center;
  padding-top: 5px;
  font-size: 12px;
  width: 400px;
  padding-left: 40px;
  display: flex;
  a {
    flex: 1;
    position: relative;
    cursor: pointer;
    width: 70px;
    color: #666666;
    margin: 2px 10px 0 0;
  }
  img {
    display: none;
  }
  a:hover {
    color: #0545f6 !important;
    img {
      display: block;
      position: absolute;
      z-index: 999999999;
      top: -130px;
.contextMenu {
      width: 120px;
      left: -22px;
      border: 1px solid #b1b1b1;
    }
  }
}
.login-footer {
  margin: 0;
  border: 1px solid #eaeaea;
  background: #fff;
  z-index: 30000;
  position: absolute;
  width: 50%;
  bottom: 0.5rem;
  font-size: 12px;
  text-align: center;
  padding-bottom: 10px;
  color: #4f4f4f;
  a {
    margin-right: 10px;
    font-size: 12px;
    color: #4f4f4f;
  list-style-type: none;
  padding: 5px 0;
  border-radius: 4px;
  font-size: 14px;
  color: #333;
  box-shadow: 2px 2px 3px 0 rgb(182 182 182 / 20%);
  i,
  button {
    font-size: 14px !important;
  }
  }
  div {
    margin-bottom: 5px;
.contextMenu li {
  margin: 0;
  padding: 5px 17px;
  }
  a:hover {
.contextMenu li:hover {
  background: #fafafa;
    cursor: pointer;
    color: #0540e3 !important;
  }
}
.account-info {
  font-size: 12px;
  color: #636363;
  margin-top: 15px;
.contextMenu li button {
  color: #626060;
  font-size: 14px;
  letter-spacing: 1px;
}
.el-tabs.el-tabs--top.el-tabs--border-card.header-navigation
  > .el-tabs__header
  .el-tabs__item:last-child,
.el-tabs--top.el-tabs--border-card.header-navigation
  > .el-tabs__header
  .el-tabs__item:nth-child(2) {
  padding: 0;
}
.header-navigation ::v-deep(.el-tabs__item.is-top) {
  padding: 0 15px;
}
</style>
<style lang="less" scoped>
@media screen and (max-width: 700px) {
  .login-bg,
  .account-info,
  .app-link,
  .login-footer,
  .project-name {
    display: none;
  }
  .login-container {
    padding: 2rem;
    justify-content: center;
  }
  .login-form {
    width: 100%;
  }
  .form-user,
  .loging-btn {
    width: 100%;
  }
<style>
.horizontal-collapse-transition {
  transition: 0s width ease-in-out, 0s padding-left ease-in-out,
    0s padding-right ease-in-out;
}
</style>
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/AuxiliaryWarehouse.vue
@@ -1,24 +1,23 @@
<template>
  <div id="title">
    <div id="bkuang" style="border-top: none">
      <div class="skuang">
        <div class="zhuname">入库8005站台</div>
        <div class="zhankuang">
          <div class="xname">放货完成(写):</div>
          <div class="xzhi" :title="data.W_PutFinish5">{{ data.W_PutFinish5 }}</div>
          <div class="xzhi" :title="flData.W_PutFinish5">{{ flData.W_PutFinish5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">入库到位指令(读):</div>
          <div class="xzhi" :title="data.R_ConveyArrivaled5">{{ data.R_ConveyArrivaled5 }}</div>
          <div class="xzhi" :title="flData.R_ConveyArrivaled5">{{ flData.R_ConveyArrivaled5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">到位托盘号(读):</div>
          <div class="xzhi" :title="data.R_Barcode5">{{ data.R_Barcode5 }}</div>
          <div class="xzhi" :title="flData.R_Barcode5">{{ flData.R_Barcode5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">到位任务号(读):</div>
          <div class="xzhi" :title="data.R_TaskNum5">{{ data.R_TaskNum5 }}</div>
          <div class="xzhi" :title="flData.R_TaskNum5">{{ flData.R_TaskNum5 || '-' }}</div>
        </div> 
      </div>
      
@@ -26,20 +25,19 @@
        <div class="zhuname">出库8001站台</div>
        <div class="zhankuang">
          <div class="xname">放货完成(写):</div>
          <div class="xzhi" :title="data.W_PutFinish1">{{ data.W_PutFinish1 }}</div>
          <div class="xzhi" :title="flData.W_PutFinish1">{{ flData.W_PutFinish1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否允许放货(读):</div>
          <div class="xzhi" :title="data.R_IsCanPut">{{ data.R_IsCanPut }}</div>
          <div class="xzhi" :title="flData.R_IsCanPut">{{ flData.R_IsCanPut || '-' }}</div>
        </div>
      </div>
    </div>
  </div>
</template>
<script>
import { ref, nextTick } from "vue";
import { ref, nextTick, watch, onUnmounted } from "vue";
import { useStore } from "vuex";
import { onMounted } from "vue";
@@ -49,69 +47,106 @@
      xuan: 0
    };
  },
  methods: {
  },
  setup() {
    const store = useStore();
    const data = ref({});
    // ä»…存储FL相关数据
    const flData = ref({});
    // 1. å®šä¹‰æ™®é€šå­—段的映射规则
    const statusMap = {
    // å»¶è¿Ÿæ›´æ–°é…ç½®ï¼Œè§£å†³é—ªçƒé—®é¢˜
    const UPDATE_DELAY = 300; // 300ms延迟,平衡实时性和界面稳定性
    let updateTimer = null;   // å®šæ—¶å™¨å®žä¾‹
      
    };
    // 2. å®šä¹‰éœ€è¦å…±ç”¨æ˜ å°„规则的字段列表和对应的映射规则
    const booleanFields = [
    // FL数据映射规则配置
    const flStatusConfig = {
      // FL boolean类型字段映射
      booleanFields: {
        keys: [
      "W_PutFinish5", "W_PutFinish1",
      "R_IsCanPut", "R_ConveyArrivaled5",
    ];
    const booleanMap = {
      true: "是",
      false: "否"
          "R_IsCanPut", "R_ConveyArrivaled5"
        ],
        map: { true: "是", false: "否" }
      }
    };
    // å¤„理数据,先处理普通映射,再批量处理共用映射的字段
    const processData = (rawData) => {
    // å¤„理FL原始数据
    const processFLData = (rawData) => {
      if (!rawData) return {};
      const processed = { ...rawData };
      // å¤„理普通字段映射
      Object.keys(statusMap).forEach(key => {
      // å¤„理boolean类型字段
      flStatusConfig.booleanFields.keys.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          const map = statusMap[key];
          processed[key] = map[processed[key]] || processed[key];
        }
      });
      // æ‰¹é‡å¤„理共用映射规则的字段
      booleanFields.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = booleanMap[processed[key]] || processed[key];
          processed[key] = flStatusConfig.booleanFields.map[processed[key]] || processed[key];
        }
      });
      return processed;
    };
    onMounted(() => {
    // å»¶è¿Ÿæ›´æ–°FL数据,避免高频刷新导致的闪烁
    const delayedUpdateFLData = (newRawData) => {
      if (updateTimer) clearTimeout(updateTimer);
      updateTimer = setTimeout(() => {
        // æ£€æŸ¥æ˜¯å¦åŒ…含FL特征字段
        const hasFLFields = flStatusConfig.booleanFields.keys.some(key =>
          newRawData && newRawData[key] !== undefined
        );
        if (hasFLFields) {
          flData.value = processFLData(newRawData);
          // æ›´æ–°æ ·å¼
      nextTick(() => {
        setInterval(() => {
          const rawData = store.state.homedata;
          data.value = processData(rawData);
          const xian = document.getElementsByClassName("xzhi");
          for (let i = 0; i < xian.length; i++) {
            if (xian[i].innerHTML === "是") {
              xian[i].style.color = "yellow";
            } else if (xian[i].innerHTML === "否") {
              xian[i].style.color = "red";
            const valueElements = document.getElementsByClassName("xzhi");
            for (let i = 0; i < valueElements.length; i++) {
              const text = valueElements[i].innerHTML;
              if (text === "是") {
                valueElements[i].style.color = "yellow";
              } else if (text === "否") {
                valueElements[i].style.color = "red";
            }
          }
        });
        }
      }, UPDATE_DELAY);
    };
    onMounted(() => {
      // åˆå§‹åŠ è½½æ•°æ®
      const initialData = store.state.homedata;
      const hasFLFields = flStatusConfig.booleanFields.keys.some(key =>
        initialData && initialData[key] !== undefined
      );
      if (hasFLFields) {
        flData.value = processFLData(initialData);
      }
      // ç›‘听数据变化,只处理FL数据
      const unwatch = watch(
        () => store.state.homedata,
        (newData) => {
          const hasFLFields = flStatusConfig.booleanFields.keys.some(key =>
            newData && newData[key] !== undefined
          );
          if (hasFLFields) {
            delayedUpdateFLData(newData);
          }
        },
        { deep: true }
      );
      // ç»„件卸载时清理资源
      onUnmounted(() => {
        unwatch();
        if (updateTimer) clearTimeout(updateTimer);
      });
    });
    return {
      data,
      flData
    };
  }
};
@@ -255,3 +290,4 @@
  border-radius: 10px;
}
</style>
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/DryFilmWarehouse.vue
@@ -1,151 +1,156 @@
<template>
  <div id="title">
    <div id="bkuang" style="border-top: none">
      <!-- GM仓堆垛机状态面板 -->
      <div class="skuang">
        <div class="zhuname">干膜仓堆垛机</div>
        <div class="zhankuang">
          <div class="xname">堆垛机状态:</div>
          <div class="xzhi" :title="data.R_GM_Status">{{ data.R_GM_Status }}</div>
          <div class="xzhi" :title="gmData.R_GM_Status">{{ gmData.R_GM_Status || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机手自动状态:</div>
          <div class="xzhi" :title="data.R_GM_AutoStatus">{{ data.R_GM_AutoStatus }}</div>
          <div class="xzhi" :title="gmData.R_GM_AutoStatus">{{ gmData.R_GM_AutoStatus || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">正在执行的任务号:</div>
          <div class="xzhi" :title="data.R_GM_TaskNum">{{ data.R_GM_TaskNum }}</div>
          <div class="xzhi" :title="gmData.R_GM_TaskNum">{{ gmData.R_GM_TaskNum || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机工作状态:</div>
          <div class="xzhi" :title="data.R_GM_WorkStatus">{{ data.R_GM_WorkStatus }}</div>
          <div class="xzhi" :title="gmData.R_GM_WorkStatus">{{ gmData.R_GM_WorkStatus || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">作业类型:</div>
          <div class="xzhi" :title="data.R_GM_WorkType">{{ data.R_GM_WorkType }}</div>
          <div class="xzhi" :title="gmData.R_GM_WorkType">{{ gmData.R_GM_WorkType || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">托盘类型:</div>
          <div class="xzhi" :title="data.R_GM_TrayType">{{ data.R_GM_TrayType }}</div>
          <div class="xzhi" :title="gmData.R_GM_TrayType">{{ gmData.R_GM_TrayType || '-' }}</div>
        </div>
      </div>
      <!-- GM关联站台(入库7003) -->
      <div class="skuang">
        <div class="zhuname">入库7003站台</div>
        <div class="zhankuang">
          <div class="xname">读取箱体码(读):</div>
          <div class="xzhi" :title="data.R_GM_Boxcode">{{ data.R_GM_Boxcode }}</div>
          <div class="xzhi" :title="gmData.R_GM_Boxcode">{{ gmData.R_GM_Boxcode || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">握手信号(读):</div>
          <div class="xzhi" :title="data.R_GM_HandShake3">{{ data.R_GM_HandShake3 }}</div>
          <div class="xzhi" :title="gmData.R_GM_HandShake3">{{ gmData.R_GM_HandShake3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否联机(读):</div>
          <div class="xzhi" :title="data.R_GM_Online3">{{ data.R_GM_Online3 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Online3">{{ gmData.R_GM_Online3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否空闲(读):</div>
          <div class="xzhi" :title="data.R_GM_Free3">{{ data.R_GM_Free3 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Free3">{{ gmData.R_GM_Free3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否有货(读):</div>
          <div class="xzhi" :title="data.R_GM_Goods3">{{ data.R_GM_Goods3 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Goods3">{{ gmData.R_GM_Goods3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否故障(读):</div>
          <div class="xzhi" :title="data.R_GM_Alarm3">{{ data.R_GM_Alarm3 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Alarm3">{{ gmData.R_GM_Alarm3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(读):</div>
          <div class="xzhi" :title="data.R_GM_STB3">{{ data.R_GM_STB3 }}</div>
          <div class="xzhi" :title="gmData.R_GM_STB3">{{ gmData.R_GM_STB3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(读):</div>
          <div class="xzhi" :title="data.R_GM_ACK3">{{ data.R_GM_ACK3 }}</div>
          <div class="xzhi" :title="gmData.R_GM_ACK3">{{ gmData.R_GM_ACK3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(写):</div>
          <div class="xzhi" :title="data.W_GM_STB3">{{ data.W_GM_STB3 }}</div>
          <div class="xzhi" :title="gmData.W_GM_STB3">{{ gmData.W_GM_STB3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(写):</div>
          <div class="xzhi" :title="data.W_GM_ACK3">{{ data.W_GM_ACK3 }}</div>
          <div class="xzhi" :title="gmData.W_GM_ACK3">{{ gmData.W_GM_ACK3 || '-' }}</div>
        </div>
      </div>
      
      <!-- GM关联站台(出库7004+7005) -->
      <div class="skuang">
        <div class="zhuname">出库终点7004站台</div>
        <div class="zhankuang">
          <div class="xname">握手信号(读):</div>
          <div class="xzhi" :title="data.R_GM_HandShake4">{{ data.R_GM_HandShake4 }}</div>
          <div class="xzhi" :title="gmData.R_GM_HandShake4">{{ gmData.R_GM_HandShake4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否联机(读):</div>
          <div class="xzhi" :title="data.R_GM_Online4">{{ data.R_GM_Online4 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Online4">{{ gmData.R_GM_Online4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否空闲(读):</div>
          <div class="xzhi" :title="data.R_GM_Free4">{{ data.R_GM_Free4 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Free4">{{ gmData.R_GM_Free4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否有货(读):</div>
          <div class="xzhi" :title="data.R_GM_Goods4">{{ data.R_GM_Goods4 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Goods4">{{ gmData.R_GM_Goods4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否故障(读):</div>
          <div class="xzhi" :title="data.R_GM_Alarm4">{{ data.R_GM_Alarm4 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Alarm4">{{ gmData.R_GM_Alarm4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(读):</div>
          <div class="xzhi" :title="data.R_GM_STB4">{{ data.R_GM_STB4 }}</div>
          <div class="xzhi" :title="gmData.R_GM_STB4">{{ gmData.R_GM_STB4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(读):</div>
          <div class="xzhi" :title="data.R_GM_ACK4">{{ data.R_GM_ACK4 }}</div>
          <div class="xzhi" :title="gmData.R_GM_ACK4">{{ gmData.R_GM_ACK4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(写):</div>
          <div class="xzhi" :title="data.W_GM_STB4">{{ data.W_GM_STB4 }}</div>
          <div class="xzhi" :title="gmData.W_GM_STB4">{{ gmData.W_GM_STB4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(写):</div>
          <div class="xzhi" :title="data.W_GM_ACK4">{{ data.W_GM_ACK4 }}</div>
          <div class="xzhi" :title="gmData.W_GM_ACK4">{{ gmData.W_GM_ACK4 || '-' }}</div>
        </div>
        <div class="zhuname">出库7005站台</div>
        <div class="zhankuang">
          <div class="xname">握手信号(读):</div>
          <div class="xzhi" :title="data.R_GM_HandShake5">{{ data.R_GM_HandShake5 }}</div>
          <div class="xzhi" :title="gmData.R_GM_HandShake5">{{ gmData.R_GM_HandShake5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否联机(读):</div>
          <div class="xzhi" :title="data.R_GM_Online5">{{ data.R_GM_Online5 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Online5">{{ gmData.R_GM_Online5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否空闲(读):</div>
          <div class="xzhi" :title="data.R_GM_Free5">{{ data.R_GM_Free5 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Free5">{{ gmData.R_GM_Free5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否有货(读):</div>
          <div class="xzhi" :title="data.R_GM_Goods5">{{ data.R_GM_Goods5 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Goods5">{{ gmData.R_GM_Goods5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否故障(读):</div>
          <div class="xzhi" :title="data.R_GM_Alarm5">{{ data.R_GM_Alarm5 }}</div>
          <div class="xzhi" :title="gmData.R_GM_Alarm5">{{ gmData.R_GM_Alarm5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(读):</div>
          <div class="xzhi" :title="data.R_GM_STB5">{{ data.R_GM_STB5 }}</div>
          <div class="xzhi" :title="gmData.R_GM_STB5">{{ gmData.R_GM_STB5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(读):</div>
          <div class="xzhi" :title="data.R_GM_ACK5">{{ data.R_GM_ACK5 }}</div>
          <div class="xzhi" :title="gmData.R_GM_ACK5">{{ gmData.R_GM_ACK5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(写):</div>
          <div class="xzhi" :title="data.W_GM_STB5">{{ data.W_GM_STB5 }}</div>
          <div class="xzhi" :title="gmData.W_GM_STB5">{{ gmData.W_GM_STB5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(写):</div>
          <div class="xzhi" :title="data.W_GM_ACK5">{{ data.W_GM_ACK5 }}</div>
          <div class="xzhi" :title="gmData.W_GM_ACK5">{{ gmData.W_GM_ACK5 || '-' }}</div>
        </div>
      </div>
    </div>
@@ -153,7 +158,7 @@
</template>
<script>
import { ref, nextTick } from "vue";
import { ref, nextTick, watch, onUnmounted } from "vue";
import { useStore } from "vuex";
import { onMounted } from "vue";
@@ -163,162 +168,132 @@
      xuan: 0
    };
  },
  methods: {
  },
  setup() {
    const store = useStore();
    const data = ref({});
    // ä»…存储GM数据,与其他仓数据隔离
    const gmData = ref({});
    // 1. å®šä¹‰æ™®é€šå­—段的映射规则
    const statusMap = {
      R_GM_Status: {
        1: "正常",
        2: "故障",
        3: "急停",
    // å»¶è¿Ÿæ›´æ–°é…ç½®ï¼Œè§£å†³é—ªçƒé—®é¢˜
    const UPDATE_DELAY = 300; // 300ms延迟,平衡实时性和界面稳定性
    let updateTimer = null;   // å®šæ—¶å™¨å®žä¾‹
    // GM数据映射规则配置(按功能分组)
    const gmStatusConfig = {
      coreStatus: {
        R_GM_Status: { 1: "正常", 2: "故障", 3: "急停" },
        R_GM_AutoStatus: { 0: "ç»´ä¿®", 1: "手动", 2: "半自动", 3: "自动" },
        R_GM_WorkStatus: { 0: "待机", 1: "取货中", 2: "取货完成", 4: "放货中", 5: "放货完成", 6: "任务完成" },
        R_GM_WorkType: { 0: "无作业任务(0)", 1: "取放货作业(1)", 2: "只取货作业(2)", 3: "只放货作业(3)", 4: "移动到指定位置" },
        R_GM_TrayType: { "-1": "空箱(-1)", 1: "小托盘(1)", 2: "中托盘(2)", 3: "大托盘(3)", 4: "特大托盘(4)" }
      },
      R_GM_AutoStatus: {
        0: "ç»´ä¿®",
        1: "手动",
        2: "半自动",
        3: "自动",
      onlineStatus: {
        keys: ["R_GM_Online3", "R_GM_Online4", "R_GM_Online5"],
        map: { true: "联机", false: "脱机" }
      },
      R_GM_WorkStatus: {
        0: "待机",
        1: "取货中",
        2: "取货完成",
        4: "放货中",
        5: "放货完成",
        6: "任务完成",
      alarmStatus: {
        keys: ["R_GM_Alarm3", "R_GM_Alarm4", "R_GM_Alarm5"],
        map: { true: "故障", false: "正常" }
      },
      R_GM_WorkType: {
        0: "无作业任务(0)",
        1: "取放货作业(1)",
        2: "只取货作业(2)",
        3: "只放货作业(3)",
        4: "移动到指定位置"
      freeStatus: {
        keys: ["R_GM_Free3", "R_GM_Free4", "R_GM_Free5"],
        map: { true: "空闲", false: "繁忙" }
      },
      R_GM_TrayType: {
        "-1": "空箱(-1)",
        1: "小托盘(1)",
        2: "中托盘(2)",
        3: "大托盘(3)",
        4: "特大托盘(4)",
      goodsStatus: {
        keys: ["R_GM_Goods3", "R_GM_Goods4", "R_GM_Goods5"],
        map: { true: "有货", false: "无货" }
      },
      signalFields: {
        keys: [
          "R_GM_HandShake3", "R_GM_STB3", "R_GM_ACK3", "W_GM_STB3", "W_GM_ACK3",
          "R_GM_HandShake4", "R_GM_STB4", "R_GM_ACK4", "W_GM_STB4", "W_GM_ACK4",
          "R_GM_HandShake5", "R_GM_STB5", "R_GM_ACK5", "W_GM_STB5", "W_GM_ACK5"
        ],
        map: { true: "是", false: "否" }
      }
    };
    const onlines = [
        "R_GM_Online3","R_GM_Online4",
        "R_GM_Online5",
    ]
    const online = {
      1: "联机",
      0: "脱机"
    };
    const alarms = [
        "R_GM_Alarm3","R_GM_Alarm4",
        "R_GM_Alarm5",
    ]
    const alarm = {
      1: "故障",
      0: "正常"
    };
    const frees = [
        "R_GM_Free3","R_GM_Free4",
        "R_GM_Free5",
    ]
    const free = {
      1: "空闲",
      0: "繁忙"
    };
    const goods = [
        "R_GM_Goods3", "R_GM_Goods4",
        "R_GM_Goods5",
    ]
    const good = {
      1: "有货",
      0: "无货"
    };
    // 2. å®šä¹‰éœ€è¦å…±ç”¨æ˜ å°„规则的字段列表和对应的映射规则
    const booleanFields = [
      "R_GM_HandShake3",
       "R_GM_STB3",
      "R_GM_ACK3", "W_GM_STB3",
      "W_GM_ACK3",
      "R_GM_HandShake4",
       "R_GM_STB4",
      "R_GM_ACK4", "W_GM_STB4",
      "W_GM_ACK4",
      "R_GM_HandShake5",
       "R_GM_STB5",
      "R_GM_ACK5", "W_GM_STB5",
      "W_GM_ACK5",
    ];
    const booleanMap = {
      true: "是",
      false: "否"
    };
    // å¤„理数据,先处理普通映射,再批量处理共用映射的字段
    const processData = (rawData) => {
    // å¤„理GM原始数据
    const processGMData = (rawData) => {
      if (!rawData) return {};
      const processed = { ...rawData };
      // å¤„理普通字段映射
      Object.keys(statusMap).forEach(key => {
      // å¤„理核心状态字段
      Object.entries(gmStatusConfig.coreStatus).forEach(([key, map]) => {
        if (processed.hasOwnProperty(key)) {
          const map = statusMap[key];
          processed[key] = map[processed[key]] || processed[key];
        }
      });
      // æ‰¹é‡å¤„理共用映射规则的字段
      booleanFields.forEach(key => {
      // æ‰¹é‡å¤„理分组字段
      [
        gmStatusConfig.onlineStatus,
        gmStatusConfig.alarmStatus,
        gmStatusConfig.freeStatus,
        gmStatusConfig.goodsStatus,
        gmStatusConfig.signalFields
      ].forEach(group => {
        group.keys.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = booleanMap[processed[key]] || processed[key];
            processed[key] = group.map[processed[key]] || processed[key];
        }
      });
      onlines.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = online[processed[key]] || processed[key];
        }
      });
      alarms.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = alarm[processed[key]] || processed[key];
        }
      });
      frees.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = free[processed[key]] || processed[key];
        }
      });
      goods.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = good[processed[key]] || processed[key];
        }
      });
      return processed;
    };
    onMounted(() => {
    // å»¶è¿Ÿæ›´æ–°GM数据,避免高频刷新导致的闪烁
    const delayedUpdateGMData = (newRawData) => {
      if (updateTimer) clearTimeout(updateTimer);
      updateTimer = setTimeout(() => {
        // ä»…处理包含GM特征字段的数据
        if (newRawData && newRawData.R_GM_Status !== undefined) {
          gmData.value = processGMData(newRawData);
          // æ›´æ–°æ ·å¼
      nextTick(() => {
        setInterval(() => {
          const rawData = store.state.homedata;
          data.value = processData(rawData);
          const xian = document.getElementsByClassName("xzhi");
          for (let i = 0; i < xian.length; i++) {
            if (xian[i].innerHTML === "是" || xian[i].innerHTML === "联机") {
              xian[i].style.color = "yellow";
            } else if (xian[i].innerHTML === "否") {
              xian[i].style.color = "red";
            const valueElements = document.getElementsByClassName("xzhi");
            for (let i = 0; i < valueElements.length; i++) {
              const text = valueElements[i].innerHTML;
              if (text === "是" || text === "联机") {
                valueElements[i].style.color = "yellow";
              } else if (text === "否") {
                valueElements[i].style.color = "red";
            }
          }
        });
        }
      }, UPDATE_DELAY);
    };
    onMounted(() => {
      // åˆå§‹åŠ è½½æ•°æ®
      const initialData = store.state.homedata;
      if (initialData && initialData.R_GM_Status !== undefined) {
        gmData.value = processGMData(initialData);
      }
      // ç›‘听数据变化,只处理GM数据
      const unwatch = watch(
        () => store.state.homedata,
        (newData) => {
          if (newData && newData.R_GM_Status !== undefined) {
            delayedUpdateGMData(newData);
          }
        },
        { deep: true }
      );
      // ç»„件卸载时清理资源
      onUnmounted(() => {
        unwatch();
        if (updateTimer) clearTimeout(updateTimer);
      });
    });
    return {
      data,
      gmData
    };
  }
};
@@ -462,3 +437,4 @@
  border-radius: 10px;
}
</style>
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/InkWarehouse.vue
@@ -1,95 +1,98 @@
<template>
  <div id="title">
    <div id="bkuang" style="border-top: none">
      <!-- YM仓堆垛机状态面板 -->
      <div class="skuang">
        <div class="zhuname">油墨仓堆垛机</div>
        <div class="zhankuang">
          <div class="xname">堆垛机状态:</div>
          <div class="xzhi" :title="data.R_YM_Status">{{ data.R_YM_Status }}</div>
          <div class="xzhi" :title="ymData.R_YM_Status">{{ ymData.R_YM_Status || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机手自动状态:</div>
          <div class="xzhi" :title="data.R_YM_AutoStatus">{{ data.R_YM_AutoStatus }}</div>
          <div class="xzhi" :title="ymData.R_YM_AutoStatus">{{ ymData.R_YM_AutoStatus || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">正在执行的任务号:</div>
          <div class="xzhi" :title="data.R_YM_TaskNum">{{ data.R_YM_TaskNum }}</div>
          <div class="xzhi" :title="ymData.R_YM_TaskNum">{{ ymData.R_YM_TaskNum || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机工作状态:</div>
          <div class="xzhi" :title="data.R_YM_WorkStatus">{{ data.R_YM_WorkStatus }}</div>
          <div class="xzhi" :title="ymData.R_YM_WorkStatus">{{ ymData.R_YM_WorkStatus || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">作业类型:</div>
          <div class="xzhi" :title="data.R_YM_WorkType">{{ data.R_YM_WorkType }}</div>
          <div class="xzhi" :title="ymData.R_YM_WorkType">{{ ymData.R_YM_WorkType || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">托盘类型:</div>
          <div class="xzhi" :title="data.R_YM_TrayType">{{ data.R_YM_TrayType }}</div>
          <div class="xzhi" :title="ymData.R_YM_TrayType">{{ ymData.R_YM_TrayType || '-' }}</div>
        </div>
      </div>
      <!-- YM关联站台(出入库9001) -->
      <div class="skuang">
        <div class="zhuname">出入库9001站台</div>
        <div class="zhankuang">
          <div class="xname">有货(读):</div>
          <div class="xzhi" :title="data.R_YM_Tray1">{{ data.R_YM_Tray1 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Tray1">{{ ymData.R_YM_Tray1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">入库执行中(读):</div>
          <div class="xzhi" :title="data.R_YM_Inbounding1">{{ data.R_YM_Inbounding1 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Inbounding1">{{ ymData.R_YM_Inbounding1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">提升机空闲(读):</div>
          <div class="xzhi" :title="data.R_YM_Leisure1">{{ data.R_YM_Leisure1 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Leisure1">{{ ymData.R_YM_Leisure1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">出库执行中(读):</div>
          <div class="xzhi" :title="data.R_YM_Outbounding1">{{ data.R_YM_Outbounding1 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Outbounding1">{{ ymData.R_YM_Outbounding1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">申请入库(写):</div>
          <div class="xzhi" :title="data.W_YM_RequestIn1">{{ data.W_YM_RequestIn1 }}</div>
          <div class="xzhi" :title="ymData.W_YM_RequestIn1">{{ ymData.W_YM_RequestIn1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">申请出库(写):</div>
          <div class="xzhi" :title="data.W_YM_RequestOut1">{{ data.W_YM_RequestOut1 }}</div>
          <div class="xzhi" :title="ymData.W_YM_RequestOut1">{{ ymData.W_YM_RequestOut1 || '-' }}</div>
        </div> 
      </div>
      
      <!-- YM关联站台(出入库9002) -->
      <div class="skuang">
        <div class="zhuname">出入库9002站台</div>
        <div class="zhankuang">
          <div class="xname">有货(读):</div>
          <div class="xzhi" :title="data.R_YM_Tray2">{{ data.R_YM_Tray2 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Tray2">{{ ymData.R_YM_Tray2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">入库执行中(读):</div>
          <div class="xzhi" :title="data.R_YM_Inbounding2">{{ data.R_YM_Inbounding2 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Inbounding2">{{ ymData.R_YM_Inbounding2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">提升机空闲(读):</div>
          <div class="xzhi" :title="data.R_YM_Leisure2">{{ data.R_YM_Leisure2 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Leisure2">{{ ymData.R_YM_Leisure2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">出库执行中(读):</div>
          <div class="xzhi" :title="data.R_YM_Outbounding2">{{ data.R_YM_Outbounding2 }}</div>
          <div class="xzhi" :title="ymData.R_YM_Outbounding2">{{ ymData.R_YM_Outbounding2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">申请入库(写):</div>
          <div class="xzhi" :title="data.W_YM_RequestIn2">{{ data.W_YM_RequestIn2 }}</div>
          <div class="xzhi" :title="ymData.W_YM_RequestIn2">{{ ymData.W_YM_RequestIn2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">申请出库(写):</div>
          <div class="xzhi" :title="data.W_YM_RequestOut2">{{ data.W_YM_RequestOut2 }}</div>
          <div class="xzhi" :title="ymData.W_YM_RequestOut2">{{ ymData.W_YM_RequestOut2 || '-' }}</div>
        </div>
      </div>
    </div>
  </div>
</template>
<script>
import { ref, nextTick } from "vue";
import { ref, nextTick, watch, onUnmounted } from "vue";
import { useStore } from "vuex";
import { onMounted } from "vue";
@@ -99,14 +102,17 @@
      xuan: 0
    };
  },
  methods: {
  },
  setup() {
    const store = useStore();
    const data = ref({});
    // ä»…存储YM数据,与其他数据隔离
    const ymData = ref({});
    // 1. å®šä¹‰æ™®é€šå­—段的映射规则
    const statusMap = {
    // å»¶è¿Ÿæ›´æ–°é…ç½®ï¼Œè§£å†³é—ªçƒé—®é¢˜
    const UPDATE_DELAY = 300; // å»¶è¿Ÿ300ms更新UI
    let updateTimer = null;   // å®šæ—¶å™¨å®žä¾‹
    // YM数据映射规则
    const ymStatusMap = {
      R_YM_Status: {
        1: "正常",
        2: "故障",
@@ -142,62 +148,103 @@
      }
    };
    // 2. å®šä¹‰éœ€è¦å…±ç”¨æ˜ å°„规则的字段列表和对应的映射规则
    const booleanFields = [
      "R_YM_Tray1", "R_YM_Inbounding1",
      "R_YM_Leisure1", "R_YM_Outbounding1",
    // YM字段分组
    const ymFieldGroups = {
      statusFields: {
        keys: [
          "R_YM_Tray1", "R_YM_Inbounding1", "R_YM_Leisure1", "R_YM_Outbounding1",
          "R_YM_Tray2", "R_YM_Inbounding2", "R_YM_Leisure2", "R_YM_Outbounding2"
        ],
        map: { true: "是", false: "否" }
      },
      requestFields: {
        keys: [
      "W_YM_RequestIn1", "W_YM_RequestOut1",
      "R_YM_Tray2", "R_YM_Inbounding2",
      "R_YM_Leisure2", "R_YM_Outbounding2",
      "W_YM_RequestIn2", "W_YM_RequestOut2",
    ];
    const booleanMap = {
      true: "是",
      false: "否"
          "W_YM_RequestIn2", "W_YM_RequestOut2"
        ],
        map: { true: "是", false: "否" }
      }
    };
    // å¤„理数据,先处理普通映射,再批量处理共用映射的字段
    const processData = (rawData) => {
    // å¤„理YM原始数据
    const processYMData = (rawData) => {
      if (!rawData) return {};
      const processed = { ...rawData };
      const processedData = { ...rawData };
      // å¤„理普通字段映射
      Object.keys(statusMap).forEach(key => {
        if (processed.hasOwnProperty(key)) {
          const map = statusMap[key];
          processed[key] = map[processed[key]] || processed[key];
      // å¤„理核心状态字段
      Object.keys(ymStatusMap).forEach(key => {
        if (processedData.hasOwnProperty(key)) {
          processedData[key] = ymStatusMap[key][processedData[key]] || processedData[key];
        }
      });
      // æ‰¹é‡å¤„理共用映射规则的字段
      booleanFields.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = booleanMap[processed[key]] || processed[key];
      // å¤„理分组字段
      Object.values(ymFieldGroups).forEach(group => {
        group.keys.forEach(key => {
          if (processedData.hasOwnProperty(key)) {
            processedData[key] = group.map[processedData[key]] || processedData[key];
        }
      });
      });
      return processed;
      return processedData;
    };
    // å»¶è¿Ÿæ›´æ–°YM数据,避免高频刷新
    const delayedUpdateYMData = (newRawData) => {
      if (updateTimer) {
        clearTimeout(updateTimer);
      }
      updateTimer = setTimeout(() => {
        // åªå¤„理包含YM特征字段的数据
        if (newRawData && newRawData.R_YM_Status !== undefined) {
          ymData.value = processYMData(newRawData);
          // æ›´æ–°æ ·å¼
          nextTick(() => {
            const valueElements = document.getElementsByClassName("xzhi");
            for (let i = 0; i < valueElements.length; i++) {
              if (valueElements[i].innerHTML === "是") {
                valueElements[i].style.color = "yellow";
              } else if (valueElements[i].innerHTML === "否") {
                valueElements[i].style.color = "red";
              }
            }
          });
        }
      }, UPDATE_DELAY);
    };
    onMounted(() => {
      nextTick(() => {
        setInterval(() => {
          const rawData = store.state.homedata;
          data.value = processData(rawData);
          const xian = document.getElementsByClassName("xzhi");
          for (let i = 0; i < xian.length; i++) {
            if (xian[i].innerHTML === "是") {
              xian[i].style.color = "yellow";
            } else if (xian[i].innerHTML === "否") {
              xian[i].style.color = "red";
      // åˆå§‹åŠ è½½æ•°æ®
      const initialData = store.state.homedata;
      if (initialData && initialData.R_YM_Status !== undefined) {
        ymData.value = processYMData(initialData);
            }
      // ç›‘听数据变化,只处理YM数据
      const unwatch = watch(
        () => store.state.homedata,
        (newData) => {
          if (newData && newData.R_YM_Status !== undefined) {
            delayedUpdateYMData(newData);
          }
        });
        },
        { deep: true }
      );
      // ç»„件卸载时清理
      onUnmounted(() => {
        unwatch();
        if (updateTimer) {
          clearTimeout(updateTimer);
        }
      });
    });
    return {
      data,
      ymData
    };
  }
};
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/PpWarehouse.vue
@@ -1,189 +1,194 @@
<template>
  <div id="title">
    <div id="bkuang" style="border-top: none">
      <!-- PP仓堆垛机状态面板 -->
      <div class="skuang">
        <div class="zhuname">PP仓堆垛机</div>
        <div class="zhankuang">
          <div class="xname">堆垛机状态:</div>
          <div class="xzhi" :title="data.R_PP_Status">{{ data.R_PP_Status }}</div>
          <div class="xzhi" :title="ppData.R_PP_Status">{{ ppData.R_PP_Status }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机手自动状态:</div>
          <div class="xzhi" :title="data.R_PP_AutoStatus">{{ data.R_PP_AutoStatus }}</div>
          <div class="xzhi" :title="ppData.R_PP_AutoStatus">{{ ppData.R_PP_AutoStatus }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">正在执行的任务号:</div>
          <div class="xzhi" :title="data.R_PP_TaskNum">{{ data.R_PP_TaskNum }}</div>
          <div class="xzhi" :title="ppData.R_PP_TaskNum">{{ ppData.R_PP_TaskNum }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机工作状态:</div>
          <div class="xzhi" :title="data.R_PP_WorkStatus">{{ data.R_PP_WorkStatus }}</div>
          <div class="xzhi" :title="ppData.R_PP_WorkStatus">{{ ppData.R_PP_WorkStatus }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">作业类型:</div>
          <div class="xzhi" :title="data.R_PP_WorkType">{{ data.R_PP_WorkType }}</div>
          <div class="xzhi" :title="ppData.R_PP_WorkType">{{ ppData.R_PP_WorkType }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">托盘类型:</div>
          <div class="xzhi" :title="data.R_PP_TrayType">{{ data.R_PP_TrayType }}</div>
          <div class="xzhi" :title="ppData.R_PP_TrayType">{{ ppData.R_PP_TrayType }}</div>
        </div>
      </div>
      <!-- PP关联站台(入库2004+出库2005) -->
      <div class="skuang">
        <div class="zhuname">入库2004站台</div>
        <div class="zhankuang">
          <div class="xname">读取箱体码(读):</div>
          <div class="xzhi" :title="data.R_PP_Boxcode">{{ data.R_PP_Boxcode }}</div>
          <div class="xzhi" :title="ppData.R_PP_Boxcode">{{ ppData.R_PP_Boxcode || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">握手信号(读):</div>
          <div class="xzhi" :title="data.R_PP_HandShake4">{{ data.R_PP_HandShake4 }}</div>
          <div class="xzhi" :title="ppData.R_PP_HandShake4">{{ ppData.R_PP_HandShake4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否联机(读):</div>
          <div class="xzhi" :title="data.R_PP_Online4">{{ data.R_PP_Online4 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Online4">{{ ppData.R_PP_Online4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否空闲(读):</div>
          <div class="xzhi" :title="data.R_PP_Free4">{{ data.R_PP_Free4 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Free4">{{ ppData.R_PP_Free4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否有货(读):</div>
          <div class="xzhi" :title="data.R_PP_Goods4">{{ data.R_PP_Goods4 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Goods4">{{ ppData.R_PP_Goods4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否故障(读):</div>
          <div class="xzhi" :title="data.R_PP_Alarm4">{{ data.R_PP_Alarm4 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Alarm4">{{ ppData.R_PP_Alarm4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(读):</div>
          <div class="xzhi" :title="data.R_PP_STB4">{{ data.R_PP_STB4 }}</div>
          <div class="xzhi" :title="ppData.R_PP_STB4">{{ ppData.R_PP_STB4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(读):</div>
          <div class="xzhi" :title="data.R_PP_ACK4">{{ data.R_PP_ACK4 }}</div>
          <div class="xzhi" :title="ppData.R_PP_ACK4">{{ ppData.R_PP_ACK4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(写):</div>
          <div class="xzhi" :title="data.W_PP_STB4">{{ data.W_PP_STB4 }}</div>
          <div class="xzhi" :title="ppData.W_PP_STB4">{{ ppData.W_PP_STB4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(写):</div>
          <div class="xzhi" :title="data.W_PP_ACK4">{{ data.W_PP_ACK4 }}</div>
          <div class="xzhi" :title="ppData.W_PP_ACK4">{{ ppData.W_PP_ACK4 || '-' }}</div>
        </div>
        <div class="zhuname">出库2005站台</div>
        <div class="zhankuang">
          <div class="xname">握手信号(读):</div>
          <div class="xzhi" :title="data.R_PP_HandShake5">{{ data.R_PP_HandShake5 }}</div>
          <div class="xzhi" :title="ppData.R_PP_HandShake5">{{ ppData.R_PP_HandShake5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否联机(读):</div>
          <div class="xzhi" :title="data.R_PP_Online5">{{ data.R_PP_Online5 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Online5">{{ ppData.R_PP_Online5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否空闲(读):</div>
          <div class="xzhi" :title="data.R_PP_Free5">{{ data.R_PP_Free5 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Free5">{{ ppData.R_PP_Free5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否有货(读):</div>
          <div class="xzhi" :title="data.R_PP_Goods5">{{ data.R_PP_Goods5 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Goods5">{{ ppData.R_PP_Goods5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否故障(读):</div>
          <div class="xzhi" :title="data.R_PP_Alarm5">{{ data.R_PP_Alarm5 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Alarm5">{{ ppData.R_PP_Alarm5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(读):</div>
          <div class="xzhi" :title="data.R_PP_STB5">{{ data.R_PP_STB5 }}</div>
          <div class="xzhi" :title="ppData.R_PP_STB5">{{ ppData.R_PP_STB5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(读):</div>
          <div class="xzhi" :title="data.R_PP_ACK5">{{ data.R_PP_ACK5 }}</div>
          <div class="xzhi" :title="ppData.R_PP_ACK5">{{ ppData.R_PP_ACK5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(写):</div>
          <div class="xzhi" :title="data.W_PP_STB5">{{ data.W_PP_STB5 }}</div>
          <div class="xzhi" :title="ppData.W_PP_STB5">{{ ppData.W_PP_STB5 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(写):</div>
          <div class="xzhi" :title="data.W_PP_ACK5">{{ data.W_PP_ACK5 }}</div>
          <div class="xzhi" :title="ppData.W_PP_ACK5">{{ ppData.W_PP_ACK5 || '-' }}</div>
        </div>
      </div>
      
      <!-- PP关联站台(出库2016+出库2017) -->
      <div class="skuang">
        <div class="zhuname">出库2016站台</div>
        <div class="zhankuang">
          <div class="xname">握手信号(读):</div>
          <div class="xzhi" :title="data.R_PP_HandShake6">{{ data.R_PP_HandShake6 }}</div>
          <div class="xzhi" :title="ppData.R_PP_HandShake6">{{ ppData.R_PP_HandShake6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否联机(读):</div>
          <div class="xzhi" :title="data.R_PP_Online6">{{ data.R_PP_Online6 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Online6">{{ ppData.R_PP_Online6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否空闲(读):</div>
          <div class="xzhi" :title="data.R_PP_Free6">{{ data.R_PP_Free6 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Free6">{{ ppData.R_PP_Free6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否有货(读):</div>
          <div class="xzhi" :title="data.R_PP_Goods6">{{ data.R_PP_Goods6 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Goods6">{{ ppData.R_PP_Goods6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否故障(读):</div>
          <div class="xzhi" :title="data.R_PP_Alarm6">{{ data.R_PP_Alarm6 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Alarm6">{{ ppData.R_PP_Alarm6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(读):</div>
          <div class="xzhi" :title="data.R_PP_STB6">{{ data.R_PP_STB6 }}</div>
          <div class="xzhi" :title="ppData.R_PP_STB6">{{ ppData.R_PP_STB6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(读):</div>
          <div class="xzhi" :title="data.R_PP_ACK6">{{ data.R_PP_ACK6 }}</div>
          <div class="xzhi" :title="ppData.R_PP_ACK6">{{ ppData.R_PP_ACK6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(写):</div>
          <div class="xzhi" :title="data.W_PP_STB6">{{ data.W_PP_STB6 }}</div>
          <div class="xzhi" :title="ppData.W_PP_STB6">{{ ppData.W_PP_STB6 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(写):</div>
          <div class="xzhi" :title="data.W_PP_ACK6">{{ data.W_PP_ACK6 }}</div>
          <div class="xzhi" :title="ppData.W_PP_ACK6">{{ ppData.W_PP_ACK6 || '-' }}</div>
        </div>
        <div class="zhuname">出库2017站台</div>
        <div class="zhankuang">
          <div class="xname">握手信号(读):</div>
          <div class="xzhi" :title="data.R_PP_HandShake7">{{ data.R_PP_HandShake7 }}</div>
          <div class="xzhi" :title="ppData.R_PP_HandShake7">{{ ppData.R_PP_HandShake7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否联机(读):</div>
          <div class="xzhi" :title="data.R_PP_Online7">{{ data.R_PP_Online7 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Online7">{{ ppData.R_PP_Online7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否空闲(读):</div>
          <div class="xzhi" :title="data.R_PP_Free7">{{ data.R_PP_Free7 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Free7">{{ ppData.R_PP_Free7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否有货(读):</div>
          <div class="xzhi" :title="data.R_PP_Goods7">{{ data.R_PP_Goods7 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Goods7">{{ ppData.R_PP_Goods7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否故障(读):</div>
          <div class="xzhi" :title="data.R_PP_Alarm7">{{ data.R_PP_Alarm7 }}</div>
          <div class="xzhi" :title="ppData.R_PP_Alarm7">{{ ppData.R_PP_Alarm7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(读):</div>
          <div class="xzhi" :title="data.R_PP_STB7">{{ data.R_PP_STB7 }}</div>
          <div class="xzhi" :title="ppData.R_PP_STB7">{{ ppData.R_PP_STB7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(读):</div>
          <div class="xzhi" :title="data.R_PP_ACK7">{{ data.R_PP_ACK7 }}</div>
          <div class="xzhi" :title="ppData.R_PP_ACK7">{{ ppData.R_PP_ACK7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">请求信号(写):</div>
          <div class="xzhi" :title="data.W_PP_STB7">{{ data.W_PP_STB7 }}</div>
          <div class="xzhi" :title="ppData.W_PP_STB7">{{ ppData.W_PP_STB7 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">响应信号(写):</div>
          <div class="xzhi" :title="data.W_PP_ACK7">{{ data.W_PP_ACK7 }}</div>
          <div class="xzhi" :title="ppData.W_PP_ACK7">{{ ppData.W_PP_ACK7 || '-' }}</div>
        </div>
      </div>
    </div>
@@ -191,7 +196,7 @@
</template>
<script>
import { ref, nextTick } from "vue";
import { ref, nextTick, watch, onUnmounted } from "vue";
import { useStore } from "vuex";
import { onMounted } from "vue";
@@ -201,13 +206,16 @@
      xuan: 0
    };
  },
  methods: {
  },
  setup() {
    const store = useStore();
    const data = ref({});
    // ä»…存储PP数据,避免与ZH数据混淆
    const ppData = ref({});
    // 1. å®šä¹‰æ™®é€šå­—段的映射规则
    // å»¶è¿Ÿæ›´æ–°é…ç½®ï¼Œè§£å†³é«˜é¢‘刷新导致的闪烁
    const UPDATE_DELAY = 300; // å»¶è¿Ÿ300ms更新UI
    let updateTimer = null;   // å®šæ—¶å™¨å®žä¾‹
    // PP数据映射规则(仅处理PP相关字段)
    const statusMap = {
      R_PP_Status: {
        1: "正常",
@@ -243,121 +251,120 @@
        4: "特大托盘(4)",
      }
    };
    const onlines = [
        "R_PP_Online6","R_PP_Online4",
        "R_PP_Online5","R_PP_Online7"
    ]
    const online = {
      true: "联机",
      false: "脱机"
    };
    const alarms = [
        "R_PP_Alarm6","R_PP_Alarm4",
        "R_PP_Alarm5","R_PP_Alarm7"
    ]
    const alarm = {
      true: "故障",
      false: "正常"
    };
    const frees = [
        "R_PP_Free6","R_PP_Free4",
        "R_PP_Free5","R_PP_Free7"
    ]
    const free = {
      true: "空闲",
      false: "繁忙"
    };
    const goods = [
        "R_PP_Goods6", "R_PP_Goods4",
        "R_PP_Goods5","R_PP_Goods7"
    ]
    const good = {
      true: "有货",
      false: "无货"
    // PP相关布尔字段分组
    const fieldGroups = {
      online: {
        fields: ["R_PP_Online6", "R_PP_Online4", "R_PP_Online5", "R_PP_Online7"],
        map: { true: "联机", false: "脱机" }
      },
      alarm: {
        fields: ["R_PP_Alarm6", "R_PP_Alarm4", "R_PP_Alarm5", "R_PP_Alarm7"],
        map: { true: "故障", false: "正常" }
      },
      free: {
        fields: ["R_PP_Free6", "R_PP_Free4", "R_PP_Free5", "R_PP_Free7"],
        map: { true: "空闲", false: "繁忙" }
      },
      goods: {
        fields: ["R_PP_Goods6", "R_PP_Goods4", "R_PP_Goods5", "R_PP_Goods7"],
        map: { true: "有货", false: "无货" }
      },
      signal: {
        fields: [
          "R_PP_HandShake4", "R_PP_STB4", "R_PP_ACK4", "W_PP_STB4", "W_PP_ACK4",
          "R_PP_HandShake5", "R_PP_STB5", "R_PP_ACK5", "W_PP_STB5", "W_PP_ACK5",
          "R_PP_HandShake6", "R_PP_STB6", "R_PP_ACK6", "W_PP_STB6", "W_PP_ACK6",
          "R_PP_HandShake7", "R_PP_STB7", "R_PP_ACK7", "W_PP_STB7", "W_PP_ACK7"
        ],
        map: { true: "是", false: "否" }
      }
    };
    // 2. å®šä¹‰éœ€è¦å…±ç”¨æ˜ å°„规则的字段列表和对应的映射规则
    const booleanFields = [
      "R_PP_HandShake4", "R_PP_STB4",
      "R_PP_ACK4", "W_PP_STB4",
      "W_PP_ACK4",
      "R_PP_HandShake5", "R_PP_STB5",
      "R_PP_ACK5", "W_PP_STB5",
      "W_PP_ACK5",
      "R_PP_HandShake6", "R_PP_STB6",
      "R_PP_ACK6", "W_PP_STB6",
      "W_PP_ACK6",
      "R_PP_HandShake7", "R_PP_STB7",
      "R_PP_ACK7", "W_PP_STB7",
      "W_PP_ACK7",
    ];
    const booleanMap = {
      true: "是",
      false: "否"
    };
    // å¤„理数据,先处理普通映射,再批量处理共用映射的字段
    const processData = (rawData) => {
    // å¤„理PP原始数据
    const processPPData = (rawData) => {
      if (!rawData) return {};
      // å¤åˆ¶åŽŸå§‹æ•°æ®ï¼Œé¿å…ç›´æŽ¥ä¿®æ”¹
      const processed = { ...rawData };
      // å¤„理普通字段映射
      // å¤„理状态字段映射
      Object.keys(statusMap).forEach(key => {
        if (processed.hasOwnProperty(key)) {
          const map = statusMap[key];
          processed[key] = map[processed[key]] || processed[key];
          processed[key] = statusMap[key][processed[key]] || processed[key];
        }
      });
      // æ‰¹é‡å¤„理共用映射规则的字段
      booleanFields.forEach(key => {
      // å¤„理布尔型字段映射
      Object.values(fieldGroups).forEach(group => {
        group.fields.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = booleanMap[processed[key]] || processed[key];
            processed[key] = group.map[processed[key]] || processed[key];
        }
      });
      onlines.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = online[processed[key]] || processed[key];
        }
      });
      alarms.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = alarm[processed[key]] || processed[key];
        }
      });
      frees.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = free[processed[key]] || processed[key];
        }
      });
      goods.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = good[processed[key]] || processed[key];
        }
      });
      return processed;
    };
    onMounted(() => {
    // å»¶è¿Ÿæ›´æ–°PP数据,避免高频刷新
    const delayedUpdatePPData = (newRawData) => {
      // æ¸…除之前的定时器,确保只执行最后一次更新
      if (updateTimer) {
        clearTimeout(updateTimer);
      }
      // å»¶è¿ŸæŒ‡å®šæ—¶é—´åŽæ›´æ–°æ•°æ®
      updateTimer = setTimeout(() => {
        // åªå¤„理包含PP特征字段的数据
        if (newRawData && newRawData.R_PP_Status !== undefined) {
          ppData.value = processPPData(newRawData);
          // æ›´æ–°æ ·å¼
      nextTick(() => {
        setInterval(() => {
          const rawData = store.state.homedata;
          data.value = processData(rawData);
          const xian = document.getElementsByClassName("xzhi");
          for (let i = 0; i < xian.length; i++) {
            if (xian[i].innerHTML === "是") {
              xian[i].style.color = "yellow";
            } else if (xian[i].innerHTML === "否") {
              xian[i].style.color = "red";
            const valueElements = document.getElementsByClassName("xzhi");
            for (let i = 0; i < valueElements.length; i++) {
              if (valueElements[i].innerHTML === "是") {
                valueElements[i].style.color = "yellow";
              } else if (valueElements[i].innerHTML === "否") {
                valueElements[i].style.color = "red";
            }
          }
        });
        }
      }, UPDATE_DELAY);
    };
    onMounted(() => {
      // åˆå§‹åŠ è½½æ•°æ®
      const initialData = store.state.homedata;
      if (initialData && initialData.R_PP_Status !== undefined) {
        ppData.value = processPPData(initialData);
      }
      // ç›‘听数据变化,只处理PP数据
      const unwatch = watch(
        () => store.state.homedata,
        (newData) => {
          // ä»…当数据包含PP特征字段时才更新
          if (newData && newData.R_PP_Status !== undefined) {
            delayedUpdatePPData(newData);
          }
        },
        { deep: true } // æ·±åº¦ç›‘听对象内部变化
      );
      // ç»„件卸载时清理资源
      onUnmounted(() => {
        unwatch();
        if (updateTimer) {
          clearTimeout(updateTimer);
        }
      });
    });
    return {
      data,
      ppData
    };
  }
};
@@ -501,3 +508,4 @@
  border-radius: 10px;
}
</style>
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/SolderMaskWarehouse.vue
@@ -1,168 +1,174 @@
<template>
  <div id="title">
    <div id="bkuang" style="border-top: none">
      <!-- ZH仓堆垛机状态面板 -->
      <div class="skuang">
        <div class="zhuname">阻焊仓堆垛机</div>
        <div class="zhankuang">
          <div class="xname">堆垛机状态:</div>
          <div class="xzhi" :title="data.R_ZH_Status">{{ data.R_ZH_Status }}</div>
          <div class="xzhi" :title="zhData.R_ZH_Status">{{ zhData.R_ZH_Status || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机手自动状态:</div>
          <div class="xzhi" :title="data.R_ZH_AutoStatus">{{ data.R_ZH_AutoStatus }}</div>
          <div class="xzhi" :title="zhData.R_ZH_AutoStatus">{{ zhData.R_ZH_AutoStatus || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">正在执行的任务号:</div>
          <div class="xzhi" :title="data.R_ZH_TaskNum">{{ data.R_ZH_TaskNum }}</div>
          <div class="xzhi" :title="zhData.R_ZH_TaskNum">{{ zhData.R_ZH_TaskNum || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">堆垛机工作状态:</div>
          <div class="xzhi" :title="data.R_ZH_WorkStatus">{{ data.R_ZH_WorkStatus }}</div>
          <div class="xzhi" :title="zhData.R_ZH_WorkStatus">{{ zhData.R_ZH_WorkStatus || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">作业类型:</div>
          <div class="xzhi" :title="data.R_ZH_WorkType">{{ data.R_ZH_WorkType }}</div>
          <div class="xzhi" :title="zhData.R_ZH_WorkType">{{ zhData.R_ZH_WorkType || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">托盘类型:</div>
          <div class="xzhi" :title="data.R_ZH_TrayType">{{ data.R_ZH_TrayType }}</div>
          <div class="xzhi" :title="zhData.R_ZH_TrayType">{{ zhData.R_ZH_TrayType || '-' }}</div>
        </div>
      </div>
      <!-- ZH关联站台(入库301+入库302) -->
      <div class="skuang">
        <div class="zhuname">入库301站台</div>
        <div class="zhankuang">
          <div class="xname">是否允许放货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanPut1">{{ data.R_ZH_IsCanPut1 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanPut1">{{ zhData.R_ZH_IsCanPut1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否允许取货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanTake1">{{ data.R_ZH_IsCanTake1 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanTake1">{{ zhData.R_ZH_IsCanTake1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货托盘类型(读):</div>
          <div class="xzhi" :title="data.R_ZH_TakePalletType1">{{ data.R_ZH_TakePalletType1 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_TakePalletType1">{{ zhData.R_ZH_TakePalletType1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货托盘类型(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutPalletType1">{{ data.W_ZH_PutPalletType1 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutPalletType1">{{ zhData.W_ZH_PutPalletType1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutRequest1">{{ data.W_ZH_PutRequest1 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutRequest1">{{ zhData.W_ZH_PutRequest1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutFinish1">{{ data.W_ZH_PutFinish1 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutFinish1">{{ zhData.W_ZH_PutFinish1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeRequest1">{{ data.W_ZH_TakeRequest1 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeRequest1">{{ zhData.W_ZH_TakeRequest1 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeFinish1">{{ data.W_ZH_TakeFinish1 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeFinish1">{{ zhData.W_ZH_TakeFinish1 || '-' }}</div>
        </div>
        <div class="zhuname">入库302站台</div>
        <div class="zhankuang">
          <div class="xname">是否允许放货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanPut2">{{ data.R_ZH_IsCanPut2 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanPut2">{{ zhData.R_ZH_IsCanPut2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否允许取货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanTake2">{{ data.R_ZH_IsCanTake2 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanTake2">{{ zhData.R_ZH_IsCanTake2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货托盘类型(读):</div>
          <div class="xzhi" :title="data.R_ZH_TakePalletType2">{{ data.R_ZH_TakePalletType2 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_TakePalletType2">{{ zhData.R_ZH_TakePalletType2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货托盘类型(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutPalletType2">{{ data.W_ZH_PutPalletType2 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutPalletType2">{{ zhData.W_ZH_PutPalletType2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutRequest2">{{ data.W_ZH_PutRequest2 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutRequest2">{{ zhData.W_ZH_PutRequest2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutFinish2">{{ data.W_ZH_PutFinish2 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutFinish2">{{ zhData.W_ZH_PutFinish2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeRequest2">{{ data.W_ZH_TakeRequest2 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeRequest2">{{ zhData.W_ZH_TakeRequest2 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeFinish2">{{ data.W_ZH_TakeFinish2 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeFinish2">{{ zhData.W_ZH_TakeFinish2 || '-' }}</div>
        </div>
      </div>
      
      <!-- ZH关联站台(出库303+出库304) -->
      <div class="skuang">
        <div class="zhuname">出库303站台</div>
        <div class="zhankuang">
          <div class="xname">是否允许放货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanPut3">{{ data.R_ZH_IsCanPut3 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanPut3">{{ zhData.R_ZH_IsCanPut3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否允许取货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanTake3">{{ data.R_ZH_IsCanTake3 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanTake3">{{ zhData.R_ZH_IsCanTake3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货托盘类型(读):</div>
          <div class="xzhi" :title="data.R_ZH_TakePalletType3">{{ data.R_ZH_TakePalletType3 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_TakePalletType3">{{ zhData.R_ZH_TakePalletType3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货托盘类型(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutPalletType3">{{ data.W_ZH_PutPalletType3 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutPalletType3">{{ zhData.W_ZH_PutPalletType3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutRequest3">{{ data.W_ZH_PutRequest3 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutRequest3">{{ zhData.W_ZH_PutRequest3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutFinish3">{{ data.W_ZH_PutFinish3 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutFinish3">{{ zhData.W_ZH_PutFinish3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeRequest3">{{ data.W_ZH_TakeRequest3 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeRequest3">{{ zhData.W_ZH_TakeRequest3 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeFinish3">{{ data.W_ZH_TakeFinish3 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeFinish3">{{ zhData.W_ZH_TakeFinish3 || '-' }}</div>
        </div>
        <div class="zhuname">出库304站台</div>
        <div class="zhankuang">
          <div class="xname">是否允许放货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanPut4">{{ data.R_ZH_IsCanPut4 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanPut4">{{ zhData.R_ZH_IsCanPut4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">是否允许取货(读):</div>
          <div class="xzhi" :title="data.R_ZH_IsCanTake4">{{ data.R_ZH_IsCanTake4 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_IsCanTake4">{{ zhData.R_ZH_IsCanTake4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货托盘类型(读):</div>
          <div class="xzhi" :title="data.R_ZH_TakePalletType4">{{ data.R_ZH_TakePalletType4 }}</div>
          <div class="xzhi" :title="zhData.R_ZH_TakePalletType4">{{ zhData.R_ZH_TakePalletType4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货托盘类型(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutPalletType4">{{ data.W_ZH_PutPalletType4 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutPalletType4">{{ zhData.W_ZH_PutPalletType4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutRequest4">{{ data.W_ZH_PutRequest4 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutRequest4">{{ zhData.W_ZH_PutRequest4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">放货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_PutFinish4">{{ data.W_ZH_PutFinish4 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_PutFinish4">{{ zhData.W_ZH_PutFinish4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货请求(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeRequest4">{{ data.W_ZH_TakeRequest4 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeRequest4">{{ zhData.W_ZH_TakeRequest4 || '-' }}</div>
        </div>
        <div class="zhankuang">
          <div class="xname">取货完成(写):</div>
          <div class="xzhi" :title="data.W_ZH_TakeFinish4">{{ data.W_ZH_TakeFinish4 }}</div>
          <div class="xzhi" :title="zhData.W_ZH_TakeFinish4">{{ zhData.W_ZH_TakeFinish4 || '-' }}</div>
        </div>
      </div>
    </div>
@@ -170,7 +176,7 @@
</template>
<script>
import { ref, nextTick } from "vue";
import { ref, nextTick, watch, onUnmounted } from "vue";
import { useStore } from "vuex";
import { onMounted } from "vue";
@@ -180,14 +186,17 @@
      xuan: 0
    };
  },
  methods: {
  },
  setup() {
    const store = useStore();
    const data = ref({});
    // ä»…存储ZH数据,与其他数据隔离
    const zhData = ref({});
    // 1. å®šä¹‰æ™®é€šå­—段的映射规则
    const statusMap = {
    // å»¶è¿Ÿæ›´æ–°é…ç½®ï¼Œè§£å†³é—ªçƒé—®é¢˜
    const UPDATE_DELAY = 300; // å»¶è¿Ÿ300ms更新UI
    let updateTimer = null;   // å®šæ—¶å™¨å®žä¾‹
    // ZH数据映射规则
    const zhStatusMap = {
      R_ZH_Status: {
        1: "正常",
        2: "故障",
@@ -223,68 +232,109 @@
      }
    };
    // 2. å®šä¹‰éœ€è¦å…±ç”¨æ˜ å°„规则的字段列表和对应的映射规则
    const booleanFields = [
      "R_ZH_IsCanPut1", "R_ZH_IsCanTake1",
      "W_ZH_PutRequest1", "W_ZH_PutFinish1",
      "W_ZH_TakeRequest1", "W_ZH_TakeFinish1",
      "R_ZH_IsCanPut2", "R_ZH_IsCanTake2",
      "W_ZH_PutRequest2", "W_ZH_PutFinish2",
      "W_ZH_TakeRequest2", "W_ZH_TakeFinish2",
      "R_ZH_IsCanPut3", "R_ZH_IsCanTake3",
      "W_ZH_PutRequest3", "W_ZH_PutFinish3",
      "W_ZH_TakeRequest3", "W_ZH_TakeFinish3",
      "R_ZH_IsCanPut4", "R_ZH_IsCanTake4",
      "W_ZH_PutRequest4", "W_ZH_PutFinish4",
      "W_ZH_TakeRequest4", "W_ZH_TakeFinish4",
    ];
    const booleanMap = {
      true: "是",
      false: "否"
    // ZH字段分组
    const zhFieldGroups = {
      permissionFields: {
        keys: ["R_ZH_IsCanPut1", "R_ZH_IsCanTake1", "R_ZH_IsCanPut2", "R_ZH_IsCanTake2",
               "R_ZH_IsCanPut3", "R_ZH_IsCanTake3", "R_ZH_IsCanPut4", "R_ZH_IsCanTake4"],
        map: { true: "是", false: "否" }
      },
      requestFields: {
        keys: ["W_ZH_PutRequest1", "W_ZH_TakeRequest1", "W_ZH_PutRequest2", "W_ZH_TakeRequest2",
               "W_ZH_PutRequest3", "W_ZH_TakeRequest3", "W_ZH_PutRequest4", "W_ZH_TakeRequest4"],
        map: { true: "是", false: "否" }
      },
      finishFields: {
        keys: ["W_ZH_PutFinish1", "W_ZH_TakeFinish1", "W_ZH_PutFinish2", "W_ZH_TakeFinish2",
               "W_ZH_PutFinish3", "W_ZH_TakeFinish3", "W_ZH_PutFinish4", "W_ZH_TakeFinish4"],
        map: { true: "是", false: "否" }
      },
      palletTypeFields: {
        keys: ["R_ZH_TakePalletType1", "R_ZH_TakePalletType2", "R_ZH_TakePalletType3", "R_ZH_TakePalletType4",
               "W_ZH_PutPalletType1", "W_ZH_PutPalletType2", "W_ZH_PutPalletType3", "W_ZH_PutPalletType4"],
        map: { "-1": "空箱(-1)", 1: "小托盘(1)", 2: "中托盘(2)", 3: "大托盘(3)", 4: "特大托盘(4)" }
      }
    };
    // å¤„理数据,先处理普通映射,再批量处理共用映射的字段
    const processData = (rawData) => {
    // å¤„理ZH原始数据
    const processZHData = (rawData) => {
      if (!rawData) return {};
      const processed = { ...rawData };
      const processedData = { ...rawData };
      // å¤„理普通字段映射
      Object.keys(statusMap).forEach(key => {
        if (processed.hasOwnProperty(key)) {
          const map = statusMap[key];
          processed[key] = map[processed[key]] || processed[key];
      // å¤„理核心状态字段
      Object.keys(zhStatusMap).forEach(key => {
        if (processedData.hasOwnProperty(key)) {
          processedData[key] = zhStatusMap[key][processedData[key]] || processedData[key];
        }
      });
      // æ‰¹é‡å¤„理共用映射规则的字段
      booleanFields.forEach(key => {
        if (processed.hasOwnProperty(key)) {
          processed[key] = booleanMap[processed[key]] || processed[key];
      // å¤„理分组字段
      Object.values(zhFieldGroups).forEach(group => {
        group.keys.forEach(key => {
          if (processedData.hasOwnProperty(key)) {
            processedData[key] = group.map[processedData[key]] || processedData[key];
        }
      });
      });
      return processed;
      return processedData;
    };
    // å»¶è¿Ÿæ›´æ–°ZH数据,避免高频刷新
    const delayedUpdateZHData = (newRawData) => {
      if (updateTimer) {
        clearTimeout(updateTimer);
      }
      updateTimer = setTimeout(() => {
        // åªå¤„理包含ZH特征字段的数据
        if (newRawData && newRawData.R_ZH_Status !== undefined) {
          zhData.value = processZHData(newRawData);
          // æ›´æ–°æ ·å¼
          nextTick(() => {
            const valueElements = document.getElementsByClassName("xzhi");
            for (let i = 0; i < valueElements.length; i++) {
              if (valueElements[i].innerHTML === "是") {
                valueElements[i].style.color = "yellow";
              } else if (valueElements[i].innerHTML === "否") {
                valueElements[i].style.color = "red";
              }
            }
          });
        }
      }, UPDATE_DELAY);
    };
    onMounted(() => {
      nextTick(() => {
        setInterval(() => {
          const rawData = store.state.homedata;
          data.value = processData(rawData);
          const xian = document.getElementsByClassName("xzhi");
          for (let i = 0; i < xian.length; i++) {
            if (xian[i].innerHTML === "是") {
              xian[i].style.color = "yellow";
            } else if (xian[i].innerHTML === "否") {
              xian[i].style.color = "red";
      // åˆå§‹åŠ è½½æ•°æ®
      const initialData = store.state.homedata;
      if (initialData && initialData.R_ZH_Status !== undefined) {
        zhData.value = processZHData(initialData);
            }
      // ç›‘听数据变化,只处理ZH数据
      const unwatch = watch(
        () => store.state.homedata,
        (newData) => {
          if (newData && newData.R_ZH_Status !== undefined) {
            delayedUpdateZHData(newData);
          }
        });
        },
        { deep: true }
      );
      // ç»„件卸载时清理
      onUnmounted(() => {
        unwatch();
        if (updateTimer) {
          clearTimeout(updateTimer);
        }
      });
    });
    return {
      data,
      zhData
    };
  }
};
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs
@@ -31,5 +31,7 @@
        List<PPStockSelectViewDTO> PPGetPKStockSelectViews(int orderId, string materielCode);
        WebResponseContent UpdateExpirationlabel();
        Task T0DingTalkText(string webhookUrl,string secret);
    }
}
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs
@@ -1,10 +1,12 @@
using AutoMapper;
using MailKit.Search;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.StockEnum;
@@ -294,8 +296,11 @@
            try
            {
                var today = DateTime.Today;
                int batchSize = 1000; // æ‰¹æ¬¡å¤„理大小
                int batchSize = 1000;
                int totalUpdated = 0;
                int skipCount = 0;
                // åªæŸ¥è¯¢éœ€è¦çš„字段,减少数据传输和内存占用
                var query = BaseDal.Db.Queryable<Dt_StockInfoDetail>()
                    .InnerJoin<Dt_StockInfo>((detail, master) => detail.StockId == master.Id)
                    .Select((detail, master) => new
@@ -303,61 +308,82 @@
                        MasterId = master.Id,
                        master.WarehouseId,
                        detail.EffectiveDate,
                        CurrentExpirationlabel = master.Expirationlabel // ç”¨äºŽåˆ¤æ–­æ˜¯å¦éœ€è¦æ›´æ–°
                        CurrentExpirationlabel = master.Expirationlabel
                    });
                // åˆ†æ‰¹å¤„理,使用Take和Skip实现分页
                var totalUpdated = 0;
                int skipCount = 0;
                while (true)
                {
                    // ä½¿ç”¨Skip和Take实现分页获取数据
                    var batchData = query.Skip(skipCount).Take(batchSize).ToList();
                    if (!batchData.Any()) break; // æ²¡æœ‰æ›´å¤šæ•°æ®æ—¶é€€å‡ºå¾ªçޝ
                    if (!batchData.Any()) break;
                    var groupedData = batchData.GroupBy(item => item.MasterId)
                        .Select(g => new
                        {
                            MasterId = g.Key,
                            WarehouseId = g.First().WarehouseId,
                            // å–最早的有效日期
                            EarliestEffectiveDate = g.Min(item =>
                            {
                                DateTime.TryParse(item.EffectiveDate, out DateTime date);
                                return date;
                            }),
                            CurrentExpirationlabel = g.First().CurrentExpirationlabel
                        })
                        .ToList();
                    var updateDic = new Dictionary<long, int>();
                    foreach (var item in batchData)
                    foreach (var group in groupedData)
                    {
                        if (!DateTime.TryParse(item.EffectiveDate, out DateTime effectiveDate))
                        DateTime effectiveDate = group.EarliestEffectiveDate;
                        if (effectiveDate == default(DateTime)) // å¤„理解析失败的情况
                        {
                            Console.WriteLine($"主表ID {group.MasterId} ä¸‹æ— æœ‰æ•ˆæ—¥æœŸï¼Œè·³è¿‡");
                            continue; 
                        }
                        int newLabel;
                        if (effectiveDate < today)
                        {
                            newLabel = ExpirationlabelEnum.过期.ObjToInt();
                        }
                        else if (item.WarehouseId == 3)
                        else if (group.WarehouseId == 3)
                        {
                            int daysDiff = (effectiveDate - today).Days;
                            newLabel = daysDiff <= 60 ? ExpirationlabelEnum.临期预警.ObjToInt() : ExpirationlabelEnum.未临期.ObjToInt();
                            newLabel = daysDiff < 60
                                ? ExpirationlabelEnum.临期预警.ObjToInt()
                                : ExpirationlabelEnum.未临期.ObjToInt();
                        }
                        else
                        {
                            int daysDiff = (effectiveDate - today).Days;
                            newLabel = daysDiff <= 30 ? ExpirationlabelEnum.临期预警.ObjToInt() : ExpirationlabelEnum.未临期.ObjToInt();
                            newLabel = daysDiff < 30
                                ? ExpirationlabelEnum.临期预警.ObjToInt()
                                : ExpirationlabelEnum.未临期.ObjToInt();
                        }
                        // åªæ›´æ–°æœ‰å˜åŒ–的值,并且去重
                        if (newLabel != item.CurrentExpirationlabel && !updateDic.ContainsKey(item.MasterId))
                        if (newLabel != group.CurrentExpirationlabel && !updateDic.ContainsKey(group.MasterId))
                        {
                            updateDic[item.MasterId] = newLabel;
                            updateDic[group.MasterId] = newLabel;
                        }
                    }
                    if (updateDic.Any())
                    {
                        // æž„建批量更新语句
                        var updateBuilder = BaseDal.Db.Updateable<Dt_StockInfo>();
                        foreach (var kvp in updateDic)
                        {
                            updateBuilder.SetColumns(m => m.Expirationlabel == kvp.Value)
                                         .Where(m => m.Id == kvp.Key);
                        var idsToUpdate = updateDic.Keys.ToList();
                        int updateValue = updateDic.First().Value;
                        updateBuilder.SetColumns(m => m.Expirationlabel == updateValue)
                                     .Where(m => idsToUpdate.Contains(m.Id));
                        int batchUpdated = updateBuilder.ExecuteCommand();
                        totalUpdated += batchUpdated;
                        Console.WriteLine($"批次更新:{batchUpdated} æ¡ï¼Œç´¯è®¡æ›´æ–°ï¼š{totalUpdated} æ¡ï¼Œæ›´æ–°æ¡ä»¶ï¼š{JsonConvert.SerializeObject(idsToUpdate)}");
                        }
                        totalUpdated += updateBuilder.ExecuteCommand();
                    skipCount += batchSize;
                    }
                    skipCount += batchSize; // å‡†å¤‡èŽ·å–ä¸‹ä¸€æ‰¹æ•°æ®
                }
                return WebResponseContent.Instance.OK($"更新成功,共更新 {totalUpdated} æ¡è®°å½•");
            }
            catch (Exception ex)
@@ -365,5 +391,62 @@
                return WebResponseContent.Instance.Error("更新失败,请联系管理员");
            }
        }
        /// <summary>
        /// é’‰é’‰æœºå™¨äººæ¶ˆæ¯æŽ¨é€æµ‹è¯•
        /// </summary>
        /// <returns></returns>
        public async Task T0DingTalkText(string webhookUrl, string secret)
        {
            try
            {
                if (webhookUrl == null || secret == null)
                {
                    webhookUrl = "https://oapi.dingtalk.com/robot/send?access_token=fbc3aaf4133ea650d8116fb86b3ebfd0c5e0d46775966ce87893a41886bdf9dc";
                    secret = "SECf221842b26356f22ccac84c4e60714e5287408ee8332a8f63503791382c3f5fb";
                }
                HttpClient httpClient = new HttpClient();
                ///获取时间戳
                var timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
                ///生成签名
                var sign = GenerateSign(timestamp,secret);
                // æž„建请求URL
                var url = $"{webhookUrl.Split('?')[0]}?access_token={new Uri(webhookUrl).Query.Split('=')[1]}&timestamp={timestamp}&sign={sign}";
                var requestBody = new
                {
                    msgtype = "text",
                    text = new { content = "小洋主人说: å°æ´‹è¦å’Œå°å¦å¤©ä¸‹ç¬¬ä¸€æœ€æœ€å¥½" },
                };
                var jsonBody = JsonConvert.SerializeObject(requestBody);
                var content = new StringContent(jsonBody, Encoding.UTF8, "application/json");
                // å‘送POST请求
                var response = await httpClient.PostAsync(url, content);
                if (!response.IsSuccessStatusCode)
                {
                    // å¤„理请求失败的情况
                    var errorContent = await response.Content.ReadAsStringAsync();
                    throw new Exception($"钉钉消息发送失败,状态码: {response.StatusCode},错误内容: {errorContent}");
                }
            }
            catch(Exception ex)
            {
                throw new Exception($"钉钉消息发送失败,错误内容: {ex.Message}");
            }
        }
        /// <summary>
        /// ç”ŸæˆåŠ ç­¾ç­¾å
        /// </summary>
        /// <param name="timestamp">时间戳</param>
        /// <returns>签名</returns>
        private string GenerateSign(long timestamp,string secret)
        {
            var stringToSign = $"{timestamp}\n{secret}";
            using (var hmacsha256 = new System.Security.Cryptography.HMACSHA256(Encoding.UTF8.GetBytes(secret)))
            {
                var hashBytes = hmacsha256.ComputeHash(Encoding.UTF8.GetBytes(stringToSign));
                return Convert.ToBase64String(hashBytes).Replace("+", "%2B").Replace("/", "%2F");
            }
        }
    }
}
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs
@@ -89,5 +89,16 @@
        {
            return Service.UpdateExpirationlabel();
        }
        /// <summary>
        /// é’‰é’‰æœºå™¨äººæ¶ˆæ¯æŽ¨é€æµ‹è¯•
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("T0DingTalkText"), AllowAnonymous]
        public Task T0DingTalkText(string webhookUrl, string secret)
        {
            return Service.T0DingTalkText(webhookUrl, secret);
        }
    }
}