CanadaMes-ui/src/App.vue
@@ -3,7 +3,6 @@ <!--路由占位符--> <router-view/> <div class="custom-icon"> </div> </div> </template> CanadaMes-ui/src/configuration/Manualoneposition.json
@@ -35,15 +35,7 @@ }, { "button": { "name": "A01故障", "value": 1, "address": "DB10.0", "state": 1 } }, { "button": { "name": "A01复位", "name": "故障", "value": 0, "address": "DB10.0", "state": 1 @@ -51,18 +43,10 @@ }, { "button": { "name": "A01未回零", "name": "复位", "value": 0, "address": "DB10.0", "state": 0 } }, { "button": { "name": "A01回零", "value": 0, "address": "DB10.0", "state": 0 "state": 1 } } ], @@ -102,7 +86,7 @@ }, { "button": { "name": "A02故障", "name": "故障", "value": 0, "address": "DB10.0", "state": 1 @@ -110,26 +94,10 @@ }, { "button": { "name": "A02复位", "name": "复位", "value": 0, "address": "DB10.0", "state": 1 } }, { "button": { "name": "未回零", "value": 0, "address": "DB10.0", "state": 0 } }, { "button": { "name": "回零", "value": 0, "address": "DB10.0", "state": 0 } } ], @@ -169,7 +137,7 @@ }, { "button": { "name": "B01故障", "name": "故障", "value": 0, "address": "DB10.0", "state": 1 @@ -177,7 +145,7 @@ }, { "button": { "name": "B01复位", "name": "复位", "value": 0, "address": "DB10.0", "state": 1 @@ -185,7 +153,7 @@ }, { "button": { "name": "B01未回零", "name": "未回零", "value": 0, "address": "DB10.0", "state": 1 @@ -193,7 +161,7 @@ }, { "button": { "name": "B01回零", "name": "回零", "value": 0, "address": "DB10.0", "state": 1 @@ -236,15 +204,7 @@ }, { "button": { "name": "B02故障", "value": 1, "address": "DB10.0", "state": 1 } }, { "button": { "name": "B02复位", "name": "故障", "value": 0, "address": "DB10.0", "state": 1 @@ -252,7 +212,7 @@ }, { "button": { "name": "B02未回零", "name": "复位", "value": 0, "address": "DB10.0", "state": 1 @@ -260,7 +220,15 @@ }, { "button": { "name": "B02回零", "name": "未回零", "value": 0, "address": "DB10.0", "state": 1 } }, { "button": { "name": "回零", "value": 0, "address": "DB10.0", "state": 1 CanadaMes-ui/src/configuration/Manualoneposition2.json
@@ -32,7 +32,7 @@ }, { "button": { "name": "A01故障", "name": "故障", "value": 0, "address": "DB10.0", "state": 1 @@ -40,7 +40,7 @@ }, { "button": { "name": "A01复位", "name": "复位", "value": 0, "address": "DB10.0", "state": 1 @@ -48,7 +48,7 @@ }, { "button": { "name": "A01未回零", "name": "未回零", "value": 0, "address": "DB10.0", "state": 1 @@ -56,7 +56,7 @@ }, { "button": { "name": "A01回零", "name": "回零", "value": 0, "address": "DB10.0", "state": 1 @@ -96,7 +96,7 @@ }, { "button": { "name": "A02故障", "name": "故障", "value": 0, "address": "DB10.0", "state": 1 @@ -104,7 +104,7 @@ }, { "button": { "name": "A02复位", "name": "复位", "value": 0, "address": "DB10.0", "state": 1 @@ -112,7 +112,7 @@ }, { "button": { "name": "A02未回零", "name": "未回零", "value": 0, "address": "DB10.0", "state": 1 @@ -120,7 +120,7 @@ }, { "button": { "name": "A02回零", "name": "回零", "value": 0, "address": "DB10.0", "state": 1 CanadaMes-ui/src/configuration/parameter2.json
@@ -172,25 +172,6 @@ "sending": 0, "type": "0", "value": 0 } ], [ { "button": { "name": "A01手动状态", "value": 0, "address": "DB10.0" }, "type": "4" }, { "button": { "name": "清除ID", "value": 0, "address": "DB10.0" }, "type": "3" }, { "name": "ID2", @@ -201,6 +182,7 @@ } ], [ { "button": { @@ -219,8 +201,8 @@ "type": "3" }, { "name": "ID", "read": 33, "name": "A02ID", "read": "ID28", "sending": 0, "type": "0", "value": 0 @@ -230,22 +212,22 @@ { "button": { "name": "B01手动状态", "value": 0, "address": "DB10.0" "value": 0 }, "type": "4" }, { "button": { "name": "清除ID", "value": 0, "address": "DB10.0" "value": 0 }, "type": "3" }, { "name": "ID", "read": 33, "name": "B01ID", "read": "ID29", "sending": 0, "type": "0", "value": 0 @@ -263,14 +245,14 @@ { "button": { "name": "清除ID", "value": 0, "address": "DB10.0" "value": 0 }, "type": "3" }, { "name": "ID", "read": 33, "name": "B02ID", "read": "ID210", "sending": 0, "type": "0", "value": 0 CanadaMes-ui/src/lang/locales/en-US.json
@@ -353,6 +353,9 @@ "D01手动状态": "D01 Manual Status", "清除ID": "Clear ID", "ID": "ID", "A02ID": "ID", "B01ID": "ID", "B02ID": "ID", "D02手动状态": "D02 Manual Status", "D03手动状态": "D03 Manual Status", "D04手动状态": "D04 Manual Status", @@ -417,35 +420,30 @@ "出片格位置设定": "OutgoingGridPositionSetting", "B01格位置设定":"B01PositionSetting", "B02位置设定":"B02PositionSetting" },"ManualonePositionlang": { }, "ManualonePositionlang": { "A01手动格子": "A01 Target grid(Manual)", "A01定位速度": "A01 TRAVEL POS Velocity manual", "A01当前格子": "A01 Current Grid", "A01启动": "A01 Start", "A01故障": "A01 Fault", "A01复位": "A01 Reset", "故障": "Fault", "复位": "Reset", "A02手动格子": "A02 Target grid(Manual)", "A02定位速度": "A02 TRAVEL POS Velocity manual", "A02当前格子": "A02 Current Grid", "A02启动": "A02 Start", "A02故障": "A02 Fault", "A02复位": "A02 Reset", "复位": "Reset", "B01手动格子": "B01 Target grid(Manual)", "B01定位速度": "B01 TRAVEL POS Velocity manual", "B01当前格子": "B01 Current Grid", "B01启动": "Start", "B01故障": "Fault", "B01复位": "Reset", "B01回零": "Zero", "B01未回零": "NotZero", "复位": "Reset", "回零": "Zero", "未回零": "NotZero", "B02手动格子": "B02 Target grid(Manual)", "B02定位速度": "B02 TRAVEL POS Velocity manual", "B02当前格子": "B02 Current Grid", "B02启动": "Start", "B02故障": "Fault", "B02复位": "Reset", "B02回零": "Zero", "B02未回零": "NotZero", "复位": "Reset", "A01实时位置": "A01 tavel Actual Position", "A02实时位置": "A02 tavel Actual Position", "B01实时位置": "B02 tavel Actual Position", @@ -456,18 +454,17 @@ "A01定位速度": "A01 TURN POS Velocity manual", "A01翻转实时位置": "A01 turn Actual angle", "A01翻转启动": "A01 SERVE TURN", "A01故障": "Fault", "A01复位": "Reset", "A01未回零": "NotZero", "A01回零": "Zero", "故障": "Fault", "复位": "Reset", "未回零": "NotZero", "回零": "Zero", "A02手动位置": "A02 turn Target Angle(Manual)", "A02定位速度": "A02 TURN POS Velocity manual", "A02翻转实时位置": "A02 turn Actual angle", "A02翻转启动": "SERVE TURN", "A02故障": "Fault", "A02复位": "Reset", "A02未回零": "NotZero", "A02回零": "Zero" "未回零": "NotZero", "回零": "Zero" }, "AutomaticParameterSettinglang": { "A01行走高速角度": "A01 turn Angle1", CanadaMes-ui/src/views/Electrical/Action.vue
@@ -8,8 +8,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual') CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ @@ -23,8 +23,8 @@ }}</router-link> <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1') }}</router-link> <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> --> <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1') }}</router-link> @@ -157,7 +157,7 @@ let obj = JSON.parse(msg.data); const jsonData2 = this.jsonData; console.log(obj); // console.log(obj); const handleMouseMove = throttle(function (event) { const inputBox = document.querySelectorAll('.el-card__body'); CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ @@ -23,8 +23,8 @@ }}</router-link> <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1') }}</router-link> <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> --> <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1') }}</router-link> @@ -94,7 +94,13 @@ socket.close(); }, updateButtonValue (dataGroup, itemIndex) { this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1 if (dataGroup[itemIndex].button.value === 1) { // 如果当前按钮的值是 0,将其设为 1 this.$set(dataGroup[itemIndex].button, 'value', 0); } else { // 否则将其设为 0 this.$set(dataGroup[itemIndex].button, 'value', 1); } }, submitDataToBackend () { const inputData = this.jsonData.map(dataGroup => { @@ -118,7 +124,7 @@ }, //根据读取PLC的值,根据名称改变颜色1打开,0关闭 getStatusClass (zhuangtai) { console.log(zhuangtai); if (zhuangtai === 1) { return "op"; } @@ -163,7 +169,7 @@ const parms = obj.params; // const xiaoche = obj.params[3]; //console.log(parms); // console.log(parms); for (let i = 0; i < jsonData2.length; i++) { @@ -218,7 +224,7 @@ }); console.log(this.jsonData) // console.log(this.jsonData) } }, CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -1,456 +1,485 @@ <template> <div class="app"> <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb"> <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('ServoManual') }}</router-link> </el-breadcrumb> <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb"> <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone') }}</router-link> <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1') }}</router-link> <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1') }}</router-link> <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2') }}</router-link> <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{ $t('ManualonePosition') }}</router-link> <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{ $t('ManualonePosition2') }}</router-link> <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{ $t('AutomaticParameterSetting') }}</router-link> <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{ $t('ManualJog') }}</router-link> </el-breadcrumb> <el-row :gutter="10"> <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex"> <el-card class="json-block" style="width:585px;"> <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container"> <div class="item-row"> <span class="name" style="width:300px;">{{ item.name }}</span> <el-input style="width:250px;" v-if="item.state != 0 && item.type === '0'" v-model="item.value" class="input-box"></el-input> </div> </div> <div class="button-row" style="display: flex; justify-content: space-between;"> <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex"> <el-button v-if="item.button && item.button.state != 0" :name="item.button.name" v-model="item.button.value" :class="{ 'action-button': true, 'error-button': item.button.name === $t('故障') && item.button.value === 1 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button> </div> </div> </el-card> </el-col> </el-row> <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> --> </div> </template> <script> import LanguageMixin from '../../lang/LanguageMixin' import data from '../../configuration/Manualoneposition' import { throttle } from 'lodash'; let socket; export default { name: "ManualonePosition", mixins: [LanguageMixin], data () { return { jsonData: data, // 加载整个data.json文件作为jsonData } }, activated () { this.initWebSocket(); const language = this.$i18n.locale; console.log(language); if (language === 'en-US') { this.replaceChineseWithEnglish(); } this.$forceUpdate(); }, methods: { closeSocket () { // 关闭 WebSocket 连接 socket.close(); }, updateButtonValue (dataGroup, itemIndex) { // 将当前按钮的值设为1 this.$set(dataGroup[itemIndex].button, 'value', 1); }, submitDataToBackend (currentButtonName) { if (currentButtonName === 'A01启动' || currentButtonName === 'A01 Start' ) { const data = []; for (let i = 0; i < 1; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.push(values); } const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === 'A02启动' || currentButtonName === 'A02 Start') { const data = []; for (let i = 1; i < 2; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.unshift([]); data.push(values); } const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === 'B01启动' || currentButtonName === 'B01 Start') { const data = []; for (let i = 2; i < 3; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.unshift([], []); data.push(values); } const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === 'B02启动' || currentButtonName === 'B02 Start') { const data = []; for (let i = 3; i < 4; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.unshift([], [], []); data.push(values); } const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === '故障' || currentButtonName === 'Fault') { const data2 = []; const resetButtonValues = this.jsonData.map(item => { // const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '故障' || subItem.button.name === 'Fault'); const buttonItem = item.find(subItem => subItem.button && ['故障', 'Fault'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(...resetButtonValues); data2.unshift([], [], [], []); const jsonObject2 = { data2 }; // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有故障的value:', jsonString2); socket?.send(jsonString2); } if (currentButtonName === '复位' || currentButtonName === 'Reset') { const data2 = []; const resetButtonValues = this.jsonData.map(item => { const buttonItem = item.find(subItem => subItem.button && ['复位', 'Reset'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(...resetButtonValues); data2.unshift([], [], [], [], []); const jsonObject2 = { data2 }; // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有复位的value:', jsonString2); socket?.send(jsonString2); setTimeout(()=> window.location.reload(),2000 ) } if (currentButtonName === '回零' || currentButtonName === 'Zero') { const data2 = []; const resetButtonValues = this.jsonData.map(item => { const buttonItem = item.find(subItem => subItem.button && ['回零', 'Zero'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(...resetButtonValues); data2.unshift([], [], [], [], [], []); const jsonObject2 = { data2 }; // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有回零的value:', jsonString2); socket?.send(jsonString2); setTimeout(()=> window.location.reload(),2000 ) } }, initWebSocket () { let viewname = "ManualonePosition"; if (typeof WebSocket === "undefined") { console.log("您的浏览器不支持WebSocket"); } else { let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname; if (socket != null) { socket.close(); socket = null; } // 开启一个websocket服务 socket = new WebSocket(socketUrl); // 打开事件 socket.onopen = function () { console.log("websocket已打开"); }; // 收到消息 socket.onmessage = (msg) => { if (!msg.data) { return; // 如果收到空数据,则直接返回,不执行后续逻辑 } let obj = JSON.parse(msg.data); // console.log(obj) const jsonData2 = this.jsonData; const handleMouseMove = throttle(function (event) { const inputBox = document.querySelectorAll('.el-card__body'); const target = event.target; if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) { // 执行更新逻辑 for (let i = 0; i < 4; i++) { jsonData2[i].forEach((item, index) => { if (typeof item.value !== 'undefined' && typeof obj[`zuhe${i + 1}`][0][index] !== 'undefined') { item.value = obj[`zuhe${i + 1}`][0][index]; } }); } //更新实时位置 jsonData2.forEach((item) => { item.forEach((subItem) => { if (subItem.sending === 4) { subItem.value = obj.shishi1[0][0]; } if (subItem.sending === 5) { subItem.value = obj.shishi1[0][1]; } if (subItem.sending === 6) { subItem.value = obj.shishi1[0][2]; } if (subItem.sending === 7) { subItem.value = obj.shishi1[0][3]; } }); }); // 遍历guzhang数组 for (let i = 0; i < obj.guzhang[0].length; i++) { const guzhangValue = obj.guzhang[0][i]; // 查找jsonData2中带有"button"的对象,并且name等于"故障" for (let j = 0; j < jsonData2.length; j++) { const section = jsonData2[j]; for (let k = 0; k < section.length; k++) { const item = section[k]; if (item.button && (item.button.name === "故障" || item.button.name === "Fault")) { // 更新value属性 item.button.value = guzhangValue; break; } } } } } }, 200); document.addEventListener('mouseover', handleMouseMove); }; // 关闭事件 socket.onclose = function () { console.log("websocket已关闭"); }; // 发生错误事件 socket.onerror = function () { console.log("websocket发生了错误"); }; this.$router.afterEach(function () { socket.close(); }) } }, send () { socket?.send(JSON.stringify(this.messagepack)); }, replaceChineseWithEnglish () { const nameMap = this.$t('ManualonePositionlang') this.jsonData = this.jsonData.map((item) => { return item.map((obj) => { if (obj.name) { const newName = nameMap[obj.name] || obj.name; return { ...obj, name: newName }; } else if (obj.button && obj.button.name) { const newName = nameMap[obj.button.name] || obj.button.name; return { ...obj, button: { ...obj.button, name: newName } }; } else { return obj; } }); }); console.log(this.jsonData) } } } </script> <style scoped> .item-row { display: flex; align-items: center; margin-bottom: 2px; /* 调整每个项目之间的间距 */ } .action-button { margin-right: 10px; background: #66b1ff; color: #FFF; } .blue-button { background-color: skyblue; } .el-card ::v-deep .el-card__body { padding: 13px; } .error-button { background-color: red; } <template> <div class="app"> <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb"> <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('ServoManual') }}</router-link> </el-breadcrumb> <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb"> <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone') }}</router-link> <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1') }}</router-link> <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1') }}</router-link> <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2') }}</router-link> <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{ $t('ManualonePosition') }}</router-link> <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{ $t('ManualonePosition2') }}</router-link> <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{ $t('AutomaticParameterSetting') }}</router-link> <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{ $t('ManualJog') }}</router-link> </el-breadcrumb> <el-row :gutter="10"> <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex"> <el-card class="json-block" style="width:585px;"> <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container"> <div class="item-row"> <span class="name" style="width:300px;">{{ item.name }}</span> <el-input style="width:250px;" v-if="item.state != 0 && item.type === '0'" v-model="item.value" class="input-box"></el-input> </div> </div> <div class="button-row" style="display: flex; justify-content: space-between;"> <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex"> <el-button v-if="item.button && language === 'en-US' && item.state != 0" :name="item.button.name" v-model="item.button.value" :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 0 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button> <el-button v-if="item.button && language === 'zh-CN' && item.state != 0" :name="item.button.name" v-model="item.button.value" :class="{ 'action-button': true, 'error-button': item.button.name === '故障' && item.button.value === 1, 'error-button2': item.button.name === '未回零' && item.button.value === 0 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button> </div> </div> </el-card> </el-col> </el-row> <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> --> </div> </template> <script> import LanguageMixin from '../../lang/LanguageMixin' import data from '../../configuration/Manualoneposition' import { throttle } from 'lodash'; let socket; export default { name: "ManualonePosition", mixins: [LanguageMixin], data () { return { jsonData: data, language: this.$i18n.locale, // 加载整个data.json文件作为jsonData } }, activated () { this.initWebSocket(); const language = this.$i18n.locale; //console.log(language); if (language === 'en-US') { this.replaceChineseWithEnglish(); } this.$forceUpdate(); }, methods: { closeSocket () { // 关闭 WebSocket 连接 socket.close(); }, updateButtonValue (dataGroup, itemIndex) { // 将当前按钮的值设为1 this.$set(dataGroup[itemIndex].button, 'value', 1); }, submitDataToBackend (currentButtonName) { if (currentButtonName === 'A01启动' || currentButtonName === 'A01 Start') { const data = []; for (let i = 0; i < 1; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.push(values); } data.push([], [], [],[],[],[]); const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === 'A02启动' || currentButtonName === 'A02 Start') { const data = []; for (let i = 1; i < 2; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.unshift([]); data.push(values); } data.push([], [], [],[],[]); const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === 'B01启动' || currentButtonName === 'B01 Start') { const data = []; for (let i = 2; i < 3; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.unshift([], []); data.push(values); } //data.unshift([]); data.push([], [], [],[]); const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === 'B02启动' || currentButtonName === 'B02 Start') { const data = []; for (let i = 3; i < 4; i++) { const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => { return { value: item.value }; }); const values = inputData.map(item => item.value); data.unshift([], [], []); data.push(values); } data.push([], [],[]); const jsonObject = { data }; // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('所有Type为0的value:', jsonString); socket?.send(jsonString); } if (currentButtonName === '故障' || currentButtonName === 'Fault') { const data2 = []; const resetButtonValues = this.jsonData.map(item => { // const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '故障' || subItem.button.name === 'Fault'); const buttonItem = item.find(subItem => subItem.button && ['故障', 'Fault'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(...resetButtonValues); data2.unshift([], [], [], []); const jsonObject2 = { data:data2 }; data.push([],[]); // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有故障的value:', jsonString2); socket?.send(jsonString2); } if (currentButtonName === '复位' || currentButtonName === 'Reset') { const data2 = []; const resetButtonValues = this.jsonData.map(item => { const buttonItem = item.find(subItem => subItem.button && ['复位', 'Reset'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(resetButtonValues.flat()); data2.unshift([], [], [], [], []); const jsonObject2 = { data:data2 }; data2.push([]); // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有复位的value:', jsonString2); socket?.send(jsonString2); // setTimeout(() => // window.location.reload(), 2000 // ) } if (currentButtonName === '回零' || currentButtonName === 'Zero') { const data2 = []; const resetButtonValues = this.jsonData.map(item => { const buttonItem = item.find(subItem => subItem.button && ['回零', 'Zero'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(resetButtonValues.flat()); data2.unshift([], [], [], [], [], []); const jsonObject2 = { data:data2 }; // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有回零的value:', jsonString2); socket?.send(jsonString2); // setTimeout(() => // window.location.reload(), 2000 // ) } }, initWebSocket () { let viewname = "ManualonePosition"; if (typeof WebSocket === "undefined") { console.log("您的浏览器不支持WebSocket"); } else { let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname; if (socket != null) { socket.close(); socket = null; } // 开启一个websocket服务 socket = new WebSocket(socketUrl); // 打开事件 socket.onopen = function () { console.log("websocket已打开"); }; // 收到消息 socket.onmessage = (msg) => { if (!msg.data) { return; // 如果收到空数据,则直接返回,不执行后续逻辑 } let obj = JSON.parse(msg.data); // console.log(obj); const jsonData2 = this.jsonData; const weihuiling = obj.weihuiling; const handleMouseMove = throttle(function (event) { const inputBox = document.querySelectorAll('.el-card__body'); const target = event.target; if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) { // 执行更新逻辑 for (let i = 0; i < 4; i++) { jsonData2[i].forEach((item, index) => { if (typeof item.value !== 'undefined' && typeof obj[`zuhe${i + 1}`][0][index] !== 'undefined') { item.value = obj[`zuhe${i + 1}`][0][index]; } }); } //更新实时位置 jsonData2.forEach((item) => { item.forEach((subItem) => { if (subItem.sending === 4) { subItem.value = obj.shishi1[0][0]; } if (subItem.sending === 5) { subItem.value = obj.shishi1[0][1]; } if (subItem.sending === 6) { subItem.value = obj.shishi1[0][2]; } if (subItem.sending === 7) { subItem.value = obj.shishi1[0][3]; } }); }); // 遍历guzhang数组 for (let i = 0; i < jsonData2.length; i++) { let arr = jsonData2[i]; for (let j = 0; j < arr.length; j++) { let obj2 = arr[j]; if (obj2.button && (obj2.button.name === "故障" || obj2.button.name === "Fault")) { obj2.button.value = obj.guzhang[0][i]; // console.log(obj2.button.value) } } } for (let i = 2; i < jsonData2.length; i++) { let arr2 = jsonData2[i]; for (let j = 2; j < arr2.length; j++) { let obj3 = arr2[j]; if (obj3.button) { if (obj3.button && (obj3.button.name === "未回零" || obj3.button.name === "NotZero")) { obj3.button.value = weihuiling[0][i]; console.log(obj3.button.value) } } } } } }, 200); document.addEventListener('mouseover', handleMouseMove); }; // 关闭事件 socket.onclose = function () { console.log("websocket已关闭"); }; // 发生错误事件 socket.onerror = function () { console.log("websocket发生了错误"); }; this.$router.afterEach(function () { socket.close(); }) } }, send () { socket?.send(JSON.stringify(this.messagepack)); }, replaceChineseWithEnglish () { const nameMap = this.$t('ManualonePositionlang') this.jsonData = this.jsonData.map((item) => { return item.map((obj) => { if (obj.name) { const newName = nameMap[obj.name] || obj.name; return { ...obj, name: newName }; } else if (obj.button && obj.button.name) { const newName = nameMap[obj.button.name] || obj.button.name; return { ...obj, button: { ...obj.button, name: newName } }; } else if (obj.title && obj.title.name) { const newName = nameMap[obj.title.name] || obj.title.name; return { ...obj, title: { ...obj.title, name: newName } }; } else { return obj; } }); }); } } } </script> <style scoped> .item-row { display: flex; align-items: center; margin-bottom: 2px; /* 调整每个项目之间的间距 */ } .action-button { margin-right: 10px; background: #66b1ff; color: #FFF; } .blue-button { background-color: skyblue; } .el-card ::v-deep .el-card__body { padding: 13px; } .error-button { background-color: red; } .error-button2 { background-color: red; } </style> CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ @@ -23,8 +23,8 @@ }}</router-link> <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1') }}</router-link> <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> --> <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2') }}</router-link> <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1') }}</router-link> @@ -57,9 +57,12 @@ </div> <div class="button-row" style="display: flex; justify-content: space-between;"> <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex"> <el-button v-if="item.button && item.button.state != 0" :name="item.button.name" v-model="item.button.value" :class="{ 'action-button': true, 'error-button': item.button.name === $t('故障') && item.button.value === 1 }" <el-button v-if="item.button && language === 'en-US'" :name="item.button.name" v-model="item.button.value" :class="{ 'action-button': true, 'error-button': item.button.name === 'Fault' && item.button.value === 1, 'error-button2': item.button.name === 'NotZero' && item.button.value === 0 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button> <el-button v-if="item.button && language === 'zh-CN'" :name="item.button.name" v-model="item.button.value" :class="{ 'action-button': true, 'error-button': item.button.name === '故障' && item.button.value === 1, 'error-button2': item.button.name === '未回零' && item.button.value === 0 }" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button> </div> @@ -81,7 +84,8 @@ mixins: [LanguageMixin], data () { return { jsonData: data // 加载整个data.json文件作为jsonData jsonData: data, // 加载整个data.json文件作为jsonData language: this.$i18n.locale, } }, @@ -106,7 +110,13 @@ updateButtonValue (dataGroup, itemIndex) { // 将当前按钮的值设为1 this.$set(dataGroup[itemIndex].button, 'value', 1); if (dataGroup[itemIndex].button.value === 1) { // 如果当前按钮的值是 0,将其设为 1 this.$set(dataGroup[itemIndex].button, 'value', 0); } else { // 否则将其设为 0 this.$set(dataGroup[itemIndex].button, 'value', 1); } @@ -124,6 +134,7 @@ data.push(values); } data.push([], [], [],[]); @@ -148,7 +159,7 @@ data.unshift([]); data.push(values); } data.push([], [], []); const jsonObject = { data }; @@ -165,7 +176,7 @@ const data2 = []; const resetButtonValues = this.jsonData.map(item => { const buttonItem = item.find(subItem => subItem.button && ['故障', 'Fault'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); @@ -173,6 +184,7 @@ data2.push(...resetButtonValues); data2.unshift([], []); const jsonObject2 = { data2 }; data2.push([], []); // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); @@ -192,9 +204,10 @@ }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(...resetButtonValues); data2.push(resetButtonValues.flat()); data2.unshift([], [], []); const jsonObject2 = { data2 }; const jsonObject2 = { data:data2 }; data2.push([]); // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); @@ -209,15 +222,14 @@ const data2 = []; const resetButtonValues = this.jsonData.map(item => { const buttonItem = item.find(subItem => subItem.button && ['回零', 'Zero'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(...resetButtonValues); data2.push(resetButtonValues.flat()); data2.unshift([], [], [], []); const jsonObject2 = { data2 }; const jsonObject2 = { data:data2 }; // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有Type为0的value:', jsonString2); @@ -261,7 +273,7 @@ let obj = JSON.parse(msg.data); // console.log(obj) const jsonData2 = this.jsonData; const weihuiling = obj.weihuiling; const handleMouseMove = throttle(function (event) { const inputBox = document.querySelectorAll('.el-card__body'); const target = event.target; @@ -293,33 +305,41 @@ }); // 遍历guzhang数组 for (let i = 0; i < obj.guzhang[0].length; i++) { const guzhangValue = obj.guzhang[0][i]; for (let i = 0; i < jsonData2.length; i++) { let arr = jsonData2[i]; for (let j = 0; j < arr.length; j++) { let obj2 = arr[j]; if (obj2.button && (obj2.button.name === "故障" || obj2.button.name === "Fault")) { obj2.button.value = obj.guzhang[0][i]; // console.log(obj2.button.value) } } // 查找jsonData2中带有"button"的对象,并且name等于"故障" for (let j = 0; j < jsonData2.length; j++) { const section = jsonData2[j]; for (let k = 0; k < section.length; k++) { const item = section[k]; } if (item.button && (item.button.name === "故障" || item.button.name === "Fault")) { // 更新value属性 item.button.value = guzhangValue; break; for (let i = 0; i < jsonData2.length; i++) { let arr2 = jsonData2[i]; for (let j = 0; j < arr2.length; j++) { let obj3 = arr2[j]; if (obj3.button) { if (obj3.button && (obj3.button.name === "未回零" || obj3.button.name === "NotZero")) { obj3.button.value = weihuiling[0][i]; // console.log(obj3.button.value) } } } } } }, 200); }, 50); document.addEventListener('mouseover', handleMouseMove); }; @@ -359,6 +379,9 @@ } else if (obj.button && obj.button.name) { const newName = nameMap[obj.button.name] || obj.button.name; return { ...obj, button: { ...obj.button, name: newName } }; } else if (obj.title && obj.title.name) { const newName = nameMap[obj.title.name] || obj.title.name; return { ...obj, title: { ...obj.title, name: newName } }; } else { return obj; } @@ -391,4 +414,12 @@ .blue-button { background-color: skyblue; } .error-button { background-color: red; } .error-button2 { background-color: red; } </style> CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual') @@ -141,37 +141,44 @@ }); }, updateButtonValue(dataGroup, itemIndex) { // 将当前按钮的值设为1 updateButtonValue(dataGroup, itemIndex) { if (dataGroup[itemIndex].button.value === 1) { // 如果当前按钮的值是 0,将其设为 1 this.$set(dataGroup[itemIndex].button, 'value', 0); } else { // 否则将其设为 0 this.$set(dataGroup[itemIndex].button, 'value', 1); // 将其他按钮的值全部设为0 } }, submitDataToBackend(currentButtonName) { if (currentButtonName === '清除ID' || currentButtonName === 'Clear ID' ) { const inputData = this.jsonData.map(dataGroup => { return dataGroup.map(item => { if (item.type === '3') { return { value: item.button.value }; } return null; }); }); const values = inputData.flat().filter(item => item !== null).map(item => item.value); const jsonObject = { data: values }; if (currentButtonName === '清除ID' || currentButtonName === 'Clear ID' ) { const data2 = []; const resetButtonValues = this.jsonData.map(item => { const buttonItem = item.find(subItem => subItem.button && ['清除ID', 'Clear ID'].includes(subItem.button.name)); return buttonItem ? buttonItem.button.value : null; }).filter(value => value !== null); // 将得到的值添加到 data 数组中 data2.push(resetButtonValues.flat()); // 提交数据到后端 const jsonString = JSON.stringify(jsonObject); console.log('Type为3的value:', jsonString); socket?.send(jsonString); setTimeout(()=> window.location.reload(),2000 ) } // 在 data2 数组前面添加两个空数组 // 创建 jsonObject2 对象,并添加 data2 属性 const jsonObject2 = { data: data2 }; // 提交数据到后端 const jsonString2 = JSON.stringify(jsonObject2); console.log('所有Type为0的value:', jsonString2); socket?.send(jsonString2); } }, initWebSocket () { @@ -204,13 +211,13 @@ let obj = JSON.parse(msg.data); const jsonData2 = this.jsonData; // console.log(jsonData2); // 如果鼠标不在输入框内,更新输入框的值 // this.submitDataToBackend() const parms = obj.params; // const xiaoche = obj.params[3]; // console.log(parms); // console.log(obj); //清除id for (let i = 0; i < jsonData2.length; i++) { let arr = jsonData2[i]; @@ -218,6 +225,7 @@ let obj = arr[j]; if (obj.type === '3') { obj.button.value = parms[0][i]; // console.log(obj.button.value); } } @@ -236,6 +244,21 @@ obj.value = parms[1][i].replace(specialChars, ''); // console.log(obj.value); } if (obj.name === 'ID2') { obj.value = parms[1][7].replace(specialChars, ''); // 将ID2对应的值赋为parms[1][6] } if (obj.name === 'A02ID') { obj.value = parms[1][8].replace(specialChars, ''); // 将ID2对应的值赋为parms[1][6] } if (obj.name === 'B01ID') { obj.value = parms[1][9].replace(specialChars, ''); // 将ID2对应的值赋为parms[1][6] } if (obj.name === 'B02ID') { obj.value = parms[1][10].replace(specialChars, ''); // 将ID2对应的值赋为parms[1][6] } } } @@ -262,6 +285,7 @@ } }); }); jsonData2.forEach((item) => { item.forEach((subItem) => { if (subItem.read === 666) { CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual') CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -7,8 +7,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -9,8 +9,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual') CanadaMes-ui/src/views/Electrical/State.vue
@@ -9,8 +9,8 @@ }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual') CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -6,7 +6,7 @@ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link> <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link> <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> --> <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link> <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual') }}</router-link> springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
@@ -71,8 +71,36 @@ // Integer Plccount = this.count; // System.out.println(stt); List<Boolean> arraylist = S7control.getinstance().ReadBits("DB101.0.0", 16); List<Boolean> arraylist2 = S7control.getinstance().ReadBits("DB101.2.6", 8); List<String> addressList0 = new ArrayList<>(); addressList0.add("DB101.2.6"); addressList0.add("DB101.2.7"); addressList0.add("DB101.3.0"); addressList0.add("DB101.3.1"); addressList0.add("DB101.3.2"); addressList0.add("DB101.3.3"); addressList0.add("DB101.3.4"); addressList0.add("DB101.3.5"); List<String> addressList21 = new ArrayList<>(); addressList21.add("DB101.0.0"); addressList21.add("DB101.0.1"); addressList21.add("DB101.0.2"); addressList21.add("DB101.0.3"); addressList21.add("DB101.0.4"); addressList21.add("DB101.0.5"); addressList21.add("DB101.0.6"); addressList21.add("DB101.0.7"); addressList21.add("DB101.1.0"); addressList21.add("DB101.1.1"); addressList21.add("DB101.1.2"); addressList21.add("DB101.1.3"); addressList21.add("DB101.1.4"); addressList21.add("DB101.1.5"); addressList21.add("DB101.1.6"); addressList21.add("DB101.1.7"); List<Boolean> arraylist = S7control.getinstance().readBits(addressList21); List<Boolean> arraylist2 = S7control.getinstance().readBits(addressList0); List<Boolean> arraylist3 = S7control.getinstance().ReadBits("DB101.5.2", 2); // Boolean[] values1 = { false, true, true, true, false, false, true, false, // false, true, true, true, false, false, @@ -96,6 +124,7 @@ jsonObject.append("params", params); // System.out.println("messageValue:" + arraylist +"messageValue2:" + arraylist2 ); WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog"); if (sendwServer != null) { sendwServer.sendMessage(jsonObject.toString()); @@ -104,9 +133,43 @@ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog"); if (webSocketServer != null) { String addressList1 = "DB101.0.0"; String addressList2 = "DB101.2.6"; // String addressList1 = "DB101.0.0"; // String addressList2 = "DB101.2.6"; String addressList3 = "DB101.5.2"; List<String> addressList2 = new ArrayList<>(); addressList2.add("DB101.2.6"); addressList2.add("DB101.2.7"); addressList2.add("DB101.3.0"); addressList2.add("DB101.3.1"); addressList2.add("DB101.3.2"); addressList2.add("DB101.3.3"); addressList2.add("DB101.3.4"); addressList2.add("DB101.3.5"); List<String> addressList211 = new ArrayList<>(); addressList211.add("DB101.0.0"); addressList211.add("DB101.0.1"); addressList211.add("DB101.0.2"); addressList211.add("DB101.0.3"); addressList211.add("DB101.0.4"); addressList211.add("DB101.0.5"); addressList211.add("DB101.0.6"); addressList211.add("DB101.0.7"); addressList211.add("DB101.1.0"); addressList211.add("DB101.1.1"); addressList211.add("DB101.1.2"); addressList211.add("DB101.1.3"); addressList211.add("DB101.1.4"); addressList211.add("DB101.1.5"); addressList211.add("DB101.1.6"); addressList211.add("DB101.1.7"); List<String> addressList311 = new ArrayList<>(); addressList311.add("DB101.5.2"); addressList311.add("DB101.5.3"); List<String> messages = webSocketServer.getMessages(); if (!messages.isEmpty()) { @@ -153,17 +216,18 @@ // System.out.println(bolList2); // System.out.println(bolList3); if (!bolList.isEmpty()) { S7control.getinstance().WriteBit(addressList1, bolList); System.out.println("messageValue:" + bolList + " written to PLC at address " + addressList1); S7control.getinstance().WriteBit(addressList211, bolList); System.out.println("messageValue:" + bolList + " written to PLC at address " + addressList211); } if (!bolList2.isEmpty()) { S7control.getinstance().WriteBit(addressList2, bolList2); S7control.getinstance().WriteBit(addressList2, bolList2); System.out.println("messageValue:" + bolList2 + " written to PLC at address " + addressList2); } if (!bolList3.isEmpty()) { S7control.getinstance().WriteBit(addressList3, bolList3); System.out.println("messageValue:" + bolList3 + " written to PLC at address " + addressList3); S7control.getinstance().WriteBit(addressList311, bolList3); System.out.println("messageValue:" + bolList3 + " written to PLC at address " + addressList311); } webSocketServer.clearMessages(); } } springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -100,9 +100,22 @@ addresses.add("DB103.6"); List<Short> data = S7control.getinstance().readWords(addresses); List<String> addressList0 = new ArrayList<>(); addressList0.add("DB101.9.2"); addressList0.add("DB101.9.3"); addressList0.add("DB101.9.4"); addressList0.add("DB101.9.5"); addressList0.add("DB101.9.6"); addressList0.add("DB101.9.7"); addressList0.add("DB101.10.0"); addressList0.add("DB101.10.1"); addressList0.add("DB101.10.2"); addressList0.add("DB101.10.3"); List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10); List<Boolean> data2 = S7control.getinstance().readBits(addressList0); List<String> addressList3 = new ArrayList<>(); addressList3.add("DB103.256"); addressList3.add("DB103.270"); @@ -116,16 +129,16 @@ List<Short> data4 = S7control.getinstance().readWords(addresses4); // // String[] values6 = { ".x1 ","x2 ","x3",";;x4","x5","x6","x7","x8","x9","x10","x11"}; // List<String> paramlist = new ArrayList<>(Arrays.asList(values6)); // Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; // List<Short> data = new ArrayList<>(Arrays.asList(values1)); // Boolean[] value4 = { false, true, true, true, true, true, true, true, true, // Boolean[] value4 = { true, true, true, true, true, true, true, true, true, // true}; // List<Boolean> data2 = new ArrayList<>(Arrays.asList(value4)); // Short[] values3 = { 22,33}; // List<Short> data3 = new ArrayList<>(Arrays.asList(values3)); // String[] values3 = { ".x11 ","x21 "}; // List<String> data3 = new ArrayList<>(Arrays.asList(values3)); // Short[] values4 = { 2,2,3,4}; // List<Short> data4 = new ArrayList<>(Arrays.asList(values4)); // @@ -167,6 +180,7 @@ addressList.add("DB101.10.3"); if (!messages.isEmpty()) { // 将最后一个消息转换为整数类型的列表 String lastMessage = messages.get(messages.size() - 1); @@ -192,7 +206,7 @@ } // 将布尔列表写入 PLC S7control.getinstance().WriteBit(addressList, messageBooleans); S7control.getinstance().WriteBit(addressList, messageBooleans); System.out.println("messageValues:" + messageBooleans); System.out.println("addressList:" + addressList); // 清空消息列表 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
@@ -124,7 +124,7 @@ // 写入第yi个地址 if (!mergedList.isEmpty()) { // S7control.getinstance().WriteWord(addressList3, mergedList); S7control.getinstance().WriteWord(addressList3, mergedList); System.out.println("messageValue:" + mergedList + " written to PLC at address " + addressList3); } springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -344,6 +344,7 @@ if (stringdatas.length == 2) { dbwindex = Integer.parseInt(stringdatas[1]); } else if (stringdatas.length == 3) { dbwindex = Integer.parseInt(stringdatas[1]); bitindex = Integer.parseInt(stringdatas[2]); } else return null; springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -35,28 +35,28 @@ // System.out.println("启动完成"); new PlcHold().start(); // new PlcHold().start(); // // new Plchome().start(); // // new PlcParameter().start(); // // // // new Plcalarm().start(); // // // new Plcsign().start(); // // // new Plcaction().start(); // new Plcstate().start(); // new PlcPositioning1().start(); // new PlcPositioning2().start(); // new PlcParameter2().start(); // new PlcParameter1().start(); // new PLCAutomaticParameterSetting().start(); // new Plchome().start(); // // new PlcParameter().start(); // // new Plcalarm().start(); // new Plcsign().start(); // new Plcaction().start(); new Plcstate().start(); new PlcPositioning1().start(); new PlcPositioning2().start(); new PlcParameter2().start(); new PlcParameter1().start(); new PLCAutomaticParameterSetting().start(); // new PlcManualonePosition().start(); // new PlcManualonePosition2().start(); // new PlcServoManualone().start(); // new PLCManualJog().start(); new PlcManualonePosition().start(); new PlcManualonePosition2().start(); new PlcServoManualone().start(); new PLCManualJog().start(); } }