From 79e0a14068decac12cbd6c670639413f0fa9e18c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 165 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 128 insertions(+), 37 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
index 4621453..9c16aa7 100644
--- a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -1,60 +1,103 @@
<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/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> -->
<!-- <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('Manual/Automatic')
- }}</router-link>
+ }}</router-link> -->
+ <router-link
+ to="/Electrical/Sign"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("I/O") }}</router-link
+ >
+ <router-link
+ to="/Electrical/Servomanual"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Manual/Automatic") }}</router-link
+ >
</el-breadcrumb>
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Automatic State')
- }}</router-link>
- <!-- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualJog')
- }}</router-link> -->
-
- <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition')
- }}</router-link>
+ <router-link
+ to="/Electrical/Parameter2"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Glass Data") }}</router-link
+ >
+ <!-- <router-link
+ to="/Electrical/ManualJog"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("ManualJog") }}</router-link
+ > -->
-<router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
- $t('Servomanualone')
- }}</router-link>
+ <router-link
+ to="/Electrical/ManualonePosition"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Manual Control") }}</router-link
+ >
+
+ <router-link
+ to="/Electrical/Servomanualone"
+ tag="el-button"
+ type="text"
+ active-class="blue-button" v-show="false"
+ >{{ $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/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
- $t('Address parameter settings')
- }}</router-link>
+
+ <router-link
+ to="/Electrical/Positioning1"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Cage Positions") }}</router-link
+ >
<!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
$t('Positioning2')
}}</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('Speed parameter settings')
- }}</router-link>
+ <router-link
+ to="/Electrical/AutomaticParameterSetting"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("Speed parameter settings") }}</router-link
+ >
-<router-link
+ <router-link
to="/Electrical/InteractionState"
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("InteractionState") }}</router-link
+ >{{ $t("PLC-MES Info") }}</router-link
>
-
</el-breadcrumb>
<el-row :gutter="18" class="card">
@@ -99,6 +142,7 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/AutomaticParameterSetting'
+import {SelectPassword} from "../../api/home";
let socket;
@@ -107,11 +151,12 @@
mixins: [LanguageMixin],
data () {
return {
- jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ jsonData: data ,
+ password: 1// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
},
activated () {
-
+ document.body.style.zoom = "90%";
this.initWebSocket();
const language = this.$i18n.locale;
console.log(language);
@@ -120,10 +165,27 @@
}
this.$forceUpdate();
+ this.load();
},
methods: {
+ load(){
+
+SelectPassword().then(res => {
+ this.password = res.data.password;
+ console.log(this.password)
+ });
+
+
+
+
+
+// console.log(this.jsonData)
+
+
+
+},
closeSocket () {
// 鍏抽棴 WebSocket 杩炴帴
socket.close();
@@ -162,8 +224,37 @@
// 鎻愪氦鏁版嵁鍒板悗绔�
const jsonString = JSON.stringify(jsonObject);
- console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', jsonString);
+ this.$prompt(
+ this.$t('Are you sure to perform this operation?'),
+ this.$t('prompt'),
+ {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning',
+ }
+ ).then(({ value }) => {
+ // 楠岃瘉瀵嗙爜鏄惁姝ｇ‘
+ if (value !== this.password) {
+ this.$message.error(this.$t('Incorrect password'));
+ return ;
+ }else{
+
+ console.log("鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:", jsonString);
socket?.send(jsonString);
+ }
+
+
+
+
+ }).catch(() => {
+ // 鍙栨秷鎿嶄綔
+ console.log('鍙栨秷1');
+ });
+
+ // console.log("鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:", jsonString);
+ // socket?.send(jsonString);
event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
},
--
Gitblit v1.8.0