Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

yangys

2025-11-18 831cfa4c439c6d073d706a82d2a439f8b1818498

Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

 src/utils/tool.js

@@ -2,7 +2,7 @@
 * @Descripttion: 工具集
 * @version: 1.2
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-11-18 14:03:23
 * @LastEditTime: 2025-11-18 16:55:36
 */

import CryptoJS from 'crypto-js';

 src/views/mdc/components/StationLiveSpeed.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 21:52:18
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-11-18 14:02:28
 * @LastEditTime: 2025-11-18 16:54:41
 * @FilePath: /cps-web/src/views/mdc/components/StationLiveSpeed.vue
-->
<template>
@@ -13,8 +13,8 @@
    <div class="dataHr">加工数据</div>
    <el-row :gutter="20" style="padding-right: 12px;padding-left: 12px;">
        <!-- 主轴负载(SpindleLoad),主轴倍率(SpindleRate),进给倍率(FeedRate) 不在这里展示 -->
        <el-col :span="12" v-for="item in dmpList" style="margin-bottom: 12px;"
            v-show="item.dpName != 'SpindleLoad' && item.dpName != 'SpindleRate' && item.dpName != 'FeedRate'">
        <el-col :span="12" v-for="item in dmpList" style="margin-bottom: 12px;">
            <!-- v-show="item.dpName.toLowerCase() != 'spindleload' && item.dpName.toLowerCase() != 'spindlerate' && item.dpName.toLowerCase() != 'feedrate'" -->
            <div>
                <div class="inlineDiv">{{ item.dpLabel }}</div>
                <el-input v-model="item.codeName" :disabled="true" class="inlineInput"
@@ -120,11 +120,11 @@
            if(this.dmpList.length == 0) return;
            var a,b,c;
            this.dmpList.forEach(item=> {
                if(item.dpName == "SpindleLoad") {
                if(item.dpName.toLowerCase() == "spindleload") {
                    a = item.codeName;
                }else if(item.dpName == "SpindleRate") {
                }else if(item.dpName.toLowerCase() == "spindlerate") {
                    b = item.codeName;
                }else if(item.dpName == "FeedRate") {
                }else if(item.dpName.toLowerCase() == "feedrate") {
                    c = item.codeName;
                }
            })

 src/views/mdc/station-live.vue

@@ -2,7 +2,7 @@
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-03-26 10:28:33
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-03-27 14:50:26
 * @LastEditTime: 2025-11-18 16:57:42
 * @FilePath: /smart-web/src/views/master/person/main/index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -719,19 +719,18 @@
                        }, 500);
                        this.$TOOL.socket.websocket.onmessage = function(event) {  
                            var JSONData = JSON.parse(res.data.dpConfig);
                            var SpindleLoad = JSONData.some(obj => obj.dpName === 'SpindleLoad'); //判断是否有主轴负载(SpindleLoad)；
                            var SpindleRate = JSONData.some(obj => obj.dpName === 'SpindleRate'); //判断是否有主轴倍率(SpindleRate)；
                            var FeedRate = JSONData.some(obj => obj.dpName === 'FeedRate'); //判断是否有进给倍率(FeedRate)；
                            if(!SpindleLoad) JSONData.push({dpName: "SpindleLoad",dpLabel: "主轴负载"});
                            if(!SpindleRate) JSONData.push({dpName: "SpindleRate",dpLabel: "主轴倍率"});
                            if(!FeedRate) JSONData.push({dpName: "FeedRate",dpLabel: "进给倍率"});
                            var SpindleLoad = JSONData.some(obj => obj.dpName === 'spindleLoad'); //判断是否有主轴负载(SpindleLoad)；
                            var SpindleRate = JSONData.some(obj => obj.dpName === 'spindleRate'); //判断是否有主轴倍率(SpindleRate)；
                            var FeedRate = JSONData.some(obj => obj.dpName === 'feedRate'); //判断是否有进给倍率(FeedRate)；
                            if(!SpindleLoad) JSONData.push({dpName: "spindleLoad",dpLabel: "主轴负载"});
                            if(!SpindleRate) JSONData.push({dpName: "spindleRate",dpLabel: "主轴倍率"});
                            if(!FeedRate) JSONData.push({dpName: "feedRate",dpLabel: "进给倍率"});
                            var eventData = JSON.parse(event.data);
                            JSONData.forEach((item,index)=> {  //第一步把v放到code里
                                if(item.dpName == "DeviceStatus") {  //机器状态
                                    if(eventData.data[item.dpName]) {
                                        item.code = eventData.data[item.dpName].v;
                                    }
									
                                    setTimeout(()=> {
                                        console.log(that.allwcs,888)
                                    },5000)
@@ -749,7 +748,7 @@
                                        if(eventData.data[item.dpName]) {
                                            item.codeName = eventData.data[item.dpName].v;
                                        }else {  //ws没有的情况
                                            if(item.dpName == "SpindleLoad" || item.dpName == "SpindleRate" || item.dpName == "FeedRate") {
                                            if(item.dpName == "spindleLoad" || item.dpName == "spindleRate" || item.dpName == "feedRate") {
                                                item.codeName = 0;
                                            }else {
                                                item.codeName = "";