| .env.production | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/utils/tool.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/home/widgets/components/mdcEquipmentRun.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mdc/components/StationLiveSpeed.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mdc/realtime-status/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mdc/station-live.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.production
@@ -8,7 +8,8 @@ NODE_ENV = production # 标题 VUE_APP_TITLE = 制造信息管理系统 VUE_APP_TITLE = 工业母机中试验证云平台 #制造信息管理系统 # 接口地址 VUE_APP_API_BASEURL = /api 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 16:55:36 */ 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 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" @@ -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.toLowerCase() == "spindleload") { a = item.codeName; }else if(item.dpName.toLowerCase() == "spindlerate") { b = item.codeName; }else if(item.dpName.toLowerCase() == "feedrate") { c = item.codeName; } }) this.showCharts(a,b,c); }, showCharts(a, b, c) { var myChartA = echarts.init(this.$refs.c); src/views/mdc/realtime-status/index.vue
@@ -378,9 +378,12 @@ item.active = true; } deviceNumAll += item.deviceNum; /* //调试 后端数据已经取消 if(item.statusName != '调试') { newResData.push(item); } }*/ newResData.push(item); if(item.statusName == '报警') { item.icon = "Position"; }else if(item.statusName == '待机') { 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 = "";
