From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 十二月 2023 11:42:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/State.vue | 165 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 140 insertions(+), 25 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index 979371d..aa1079f 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -2,25 +2,28 @@
<div class="app">
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
- <el-button type="text">璁惧绠＄悊</el-button>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">State</router-link>
+
+ <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('Parameter')
+ }}</router-link>
</el-breadcrumb>
- <div>State</div>
+ <div>{{ $t('State') }}</div>
+ <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">
-
- <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ records }">
- <div id="btn_div">
- <el-button type="primary">涓嬪彂鍙傛暟</el-button>
+ <div class="kuai_div" v-for="item in this.record.xyData" :key="item.name">
+ <el-input style="width: 60%;" class="in_mc" v-model="item.name" readonly></el-input>
+ <el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>
</div>
- <div class="kuai_div" v-for="item in records" :key="item.id">
- <el-input v-model="item.mingcheng" style="width: 280px;" class="in_mc"></el-input>
- <el-input v-model="item.zhuangtai" style="width: 80px;"></el-input>
- </div>
</el-form>
@@ -30,23 +33,123 @@
</template>
<script >
-
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/State'
+let socket;
export default {
name: "State",
+ mixins: [LanguageMixin],
data () {
return {
- records: [
- { id: 1, mingcheng: 'conveyor Velocity(Auto SLOW)', zhuangtai: "1" },
- { id: 2, mingcheng: 'B01 B02 TRAVEL POS Velocity AUTO', zhuangtai: "2" },
- { id: 3, mingcheng: 'B01 B02 TRAVEL JOG Velocity', zhuangtai: "2" },
- { id: 4, mingcheng: 'conveyor Velocity(Manual)', zhuangtai: "2" }
- ]
+ jsonData: data,
+ activeButton: '',
+ record: {
+ params: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1,],
+ xyData: [
+ { name: 'D01.State', value: "鑷姩" },
+ { name: 'D02.State', value: "鑷姩" },
+ { name: 'B01.State', value: "鑷姩" },
+ { name: 'B02.State', value: "鑷姩" },
+ { name: 'A01.State', value: "鑷姩" },
+ { name: 'A02.State', value: "鑷姩" },
+ { name: 'D03.State', value: "鑷姩" },
+ { name: 'D04.State', value: "鑷姩" },
+ { name: 'D05.State', value: "鑷姩" },
+ { name: 'D06.State', value: "鑷姩" },
+ ],
+
+
+ },
+
+ localizedRoles: [],
+ messagepack: {
+ data: { taskname: "" }
+ },
+ queryInfo: {
+ data: "1",
+ pageSize: 10
+ },
}
},
- created () {
- },
+ // created () {
+ // this.init();
+ // this.replaceChineseWithEnglish();
+ // },
+
+ activated(){
+ this.init();
+ this.replaceChineseWithEnglish();
+ },
+
methods: {
+ onButtonClick () {
+ this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
+ setTimeout(() => {
+ this.isButtonClicked = false; // 閲嶇疆鎸夐挳棰滆壊
+ }, 500); // 杩欓噷鐨�500姣鏄牴鎹偍甯屾湜鎸夐挳棰滆壊鎸佺画澶氶暱鏃堕棿鏉ュ畾鐨勶紝鍙互鏍规嵁闇�姹傝繘琛岃皟鏁�
+ },
+ init () {
+ let viewname = "State";
+
+ if (typeof (WebSocket) == "undefined") {
+ console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+ } else {
+ //console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
+
+ let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;
+ if (socket != null) {
+ socket.close();
+ socket = null;
+ }
+ // 寮�鍚竴涓獁ebsocket鏈嶅姟
+ socket = new WebSocket(socketUrl);
+ //鎵撳紑浜嬩欢
+ socket.onopen = function () {
+ console.log("websocket宸叉墦寮�");
+ };
+ // 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
+ socket.onmessage = function (msg) {
+
+ //console.log("鏀跺埌鏁版嵁====" + msg.data);
+ let obj = JSON.parse(msg.data);
+ this.record.params[0] = obj.sta[0];
+ //灏嗚鍙栧埌鐨凱LC鐨勬暟鎹紝涓庡畾涔夌殑xyData锛岀粍鍚堟垚鏂扮殑鏁扮粍
+ for (let a = 0; a < this.record.params[0].length; a++) {
+
+ this.record.xyData[a].name = this.jsonData.state[a].name;
+ this.record.xyData[a].value = this.record.params[0][a];
+
+ }
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
+ this.$forceUpdate();
+ this.replaceChineseWithEnglish();
+
+ }.bind(this);
+ //鍏抽棴浜嬩欢
+ socket.onclose = function () {
+ console.log("websocket宸插叧闂�");
+ };
+ //鍙戠敓浜嗛敊璇簨浠�
+ socket.onerror = function () {
+ console.log("websocket鍙戠敓浜嗛敊璇�");
+ }
+ }
+ },
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('dvstate');
+ const translation1 = this.$t('Statelang');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation1[item.name] || item.name, value: translation[item.value] || item.value }; });
+ //console.log(translation);
+ },
+
+
}
}
@@ -57,18 +160,26 @@
</script>
-<style>
+<style scoped>
+/* * {
+ margin: 0px;
+ padding: 0px;
+} */
+
.kuai_div {
width: 30%;
margin-bottom: 15px;
}
+
.el-input {
border: none;
.el-input__inner {
+ text-align: center;
border: 1 solid black;
+ padding: 0 10px;
}
@@ -88,4 +199,8 @@
#btn_div .el-button {
float: right;
}
+
+.blue-button {
+ background-color: skyblue;
+}
</style>
--
Gitblit v1.8.0