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

yangys

2025-11-18 698bbdfcbbe4939b0427c022eea67e45f58fd253

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

 src/utils/tool.js

@@ -1,8 +1,8 @@
/*
 * @Descripttion: 工具集
 * @version: 1.2
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-12-18 15:11:50
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-11-18 14:03:23
 */

import CryptoJS from 'crypto-js';
@@ -18,7 +18,7 @@

console.log(hostname,port,pathname)
if (process.env.NODE_ENV=='development') {
    //var path = "120.46.212.231:86";  //如果是本地联调，写成120.46.212.231:86，发版写成hostname+":"+port;
    //var path = "120.46.212.231:85/";  //如果是本地联调，写成120.46.212.231:86，发版写成hostname+":"+port;
    var path = hostname+":"+port;
} else {
    var path = hostname+":"+port;

 src/views/home/widgets/components/mdcEquipmentRun.vue

@@ -1,8 +1,8 @@
<!--
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-04-16 15:22:46
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-06-24 22:33:49
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-11-18 12:36:09
 * @FilePath: /CPSnew/smart-web/src/views/home/widgets/components/mdcDeviceStatus.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -199,6 +199,11 @@
                        this.data = this.formatData(data)
                        this.$nextTick(() => {
                            this.parentData = this.data;
                            var ids = this.extractLastLevelIds(this.parentData); 
                            this.selectedIds = ids;
                            this.search.workStationIdList = ids;
                            this.search.top = 5;  //24小时内前5名
                            this.search.timeLevel = 24;  //24小时内前5名
                            this.getList();
                        })
                    }
@@ -230,7 +235,7 @@
                    top: 7,
                    workStationIdList: ids
                }
                this.$HTTP.post(`/api/blade-visual/status/oee-top`,obj).then(res=> {
                this.$HTTP.post(`/api/blade-visual/status/oee-top`,this.search).then(res=> {
                    if(res.code == 200) {
                        var recordDom = document.getElementById('equipment');
                        this.option.yAxis.data = res.data.categories;

 src/views/mdc/components/StationLiveSpeed.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-18 21:52:18
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-03-14 09:31:16
 * @LastEditTime: 2025-11-18 14:02:28
 * @FilePath: /cps-web/src/views/mdc/components/StationLiveSpeed.vue
-->
<template>
@@ -117,18 +117,18 @@
    },
    methods: {
        query() {
            // if(this.dmpList.length == 0) return;
            // var a,b,c;
            // this.dmpList.forEach(item=> {
            //     if(item.dpName == "SpindleLoad") {
            //         a = item.codeName;
            //     }else if(item.dpName == "SpindleRate") {
            //         b = item.codeName;
            //     }else if(item.dpName == "FeedRate") {
            //         c = item.codeName;
            //     }
            // })
            // this.showCharts(a,b,c);
            if(this.dmpList.length == 0) return;
            var a,b,c;
            this.dmpList.forEach(item=> {
                if(item.dpName == "SpindleLoad") {
                    a = item.codeName;
                }else if(item.dpName == "SpindleRate") {
                    b = item.codeName;
                }else if(item.dpName == "FeedRate") {
                    c = item.codeName;
                }
            })
            this.showCharts(a,b,c);
        },
        showCharts(a, b, c) {
            var myChartA = echarts.init(this.$refs.c);