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/Positioning2.vue |  372 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 223 insertions(+), 149 deletions(-)

diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index 5e20ccf..d460403 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -1,54 +1,76 @@
 <template>
   <div class="app">
-  <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+    <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/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 to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
+        $t('Parameter')
       }}</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 to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Automatic State')
       }}</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>
-  </el-breadcrumb>
-
-  <el-row :gutter="18" class='card'>
-    <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" >
-      <el-card class="json-block">
-        <div class="button-row" style="display: flex; justify-content: space-between;">
-          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
-            <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
-          </div>
-        </div>
-        <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
-          <div class="item-row">
-            <span class="name" style="width:250px;">{{ item.name }}</span>
-            <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
-            <el-button v-if="item.type === '0'"  class="input-box"  @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
-          </div>
-        </div>
+      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+        $t('ManualJog')
+      }}</router-link>
       
-      </el-card>
-    </el-col>
-  </el-row>
-  <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
-</div>
+       <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+        $t('ManualonePosition')
+      }}</router-link>
+
+<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/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+        $t('Address parameter settings')
+      }}</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>
+      
+    </el-breadcrumb>
+
+   <el-row :gutter="18" class='card'>
+      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+        <el-card class="json-block">
+          <div class="button-row" style="display: flex; justify-content: space-between;">
+            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
+              <span v-if="item.title" :name="item.title.name" class="action-button">{{ item.title.name }}</span>
+            </div>
+          </div>
+          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
+            <div class="item-row">
+              <span class="name" style="width:250px;">{{ item.name }}</span>
+              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"    @keyup.enter.native="submitDataToBackend"></el-input>
+              <!-- <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
+              <span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span>
+            </div>
+          </div>
+
+        </el-card>
+      </el-col>
+    </el-row>
+    <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
+  </div>
 </template>
 
 <script>
@@ -57,145 +79,197 @@
 import data from '../../configuration/Positioning2'
 
 export default {
-name: "Positioning2",
-mixins: [LanguageMixin],
-data() {
-  return {
-    jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
-  }
-},
-created () {
-  this.initWebSocket();
-  // console.log('jsonData:', this.jsonData); 
-
-},
-methods: {
-  updateButtonValue(dataGroup, itemIndex) {
-    this.$set(dataGroup[itemIndex].button, 'value', 1); // 鐐瑰嚮鎸夐挳鍚庡皢鍊兼敼涓�1
+  name: "Positioning2",
+  mixins: [LanguageMixin],
+  data () {
+    return {
+      jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+    }
   },
-  submitDataToBackend() {
-const inputData = this.jsonData.map(dataGroup => {
-  return dataGroup.map(item => {
-    if (item.type === '0') {
-      return { value: parseInt(item.value) };
-    } else if (item.button) {
-      return { value: parseInt(item.title.value) };
-    }
-    return null;
-  });
-});
+ activated(){
+    // 婵�娲荤粍浠舵椂璋冪敤
+    // 鍒濆鍖朩ebSocket
+   
+    this.initWebSocket ();
+   // 鑾峰彇褰撳墠璇█
+   const language = this.$i18n.locale;
+  console.log(language);
+  // 濡傛灉褰撳墠璇█鏄嫳璇紝鍒欏皢涓枃鏇挎崲涓鸿嫳鏂�
+  if (language === 'en-US') {
+    this.replaceChineseWithEnglish();
+  }
+  this.$forceUpdate();
+ },
+  methods: {
+    updateButtonValue (dataGroup, itemIndex) {
+      this.$set(dataGroup[itemIndex].button, 'value', 1); // 鐐瑰嚮鎸夐挳鍚庡皢鍊兼敼涓�1
+    },
+    //鎻愪氦鏁版嵁鍒板悗绔�
+   submitDataToBackend () {
+      // 灏唈sonData杞崲涓烘暟缁�
+      const inputData = this.jsonData.map(dataGroup => {
+        return dataGroup.map(item => {
+          // 濡傛灉鏄暟瀛楃被鍨嬶紝鍒欒浆鎹负鏁存暟
+          if (item.type === '0') {
+            return { value: parseInt(item.value) };
+          // 濡傛灉鏄寜閽被鍨嬶紝鍒欒浆鎹负鏁存暟
+          } else if (item.button) {
+            return { value: parseInt(item.title.value) };
+          }
+          // 鍚﹀垯杩斿洖null
+          return null;
+        });
+      });
 
-// 灏唅nputData杞崲涓烘暣鏁版暟缁�
-const integerArray = inputData.map(dataGroup => {
-  return dataGroup.map(item => {
-    if (item !== null) {
-      return item.value;
-    }
-    return null;
-  });
-});
-// 鏋勫缓JSON瀵硅薄
-const jsonObject = { data: integerArray };
+      // 灏唅nputData杞崲涓烘暣鏁版暟缁�
+      const integerArray = inputData.map(dataGroup => {
+        return dataGroup.map(item => {
+          // 濡傛灉item涓嶄负null锛屽垯杩斿洖item.value
+          if (item !== null) {
+            return item.value;
+          }
+          // 鍚﹀垯杩斿洖null
+          return null;
+        });
+      });
+      // 鏋勫缓JSON瀵硅薄
+      const jsonObject = { data: integerArray };
 
-// 鎻愪氦鏁版嵁鍒板悗绔�
-const jsonString = JSON.stringify(jsonObject);
-// console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', jsonString);
-socket?.send(jsonString);
-},
-  initWebSocket () {
+      // 鎻愪氦鏁版嵁鍒板悗绔�
+      const jsonString = JSON.stringify(jsonObject);
+      // console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', jsonString);
+      socket?.send(jsonString);
+    },
+    initWebSocket () {
 
-    let viewname = "Positioning2";
+      let viewname = "Positioning2";
 
-    if (typeof WebSocket === "undefined") {
-      console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
-    } else {
-      let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+      if (typeof WebSocket === "undefined") {
+        console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+      } else {
+        let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;
 
-      if (socket != null) {
-        socket.close();
-        socket = null;
+        if (socket != null) {
+          socket.close();
+          socket = null;
+        }
+
+        // 寮�鍚竴涓獁ebsocket鏈嶅姟
+        socket = new WebSocket(socketUrl);
+
+        // 鎵撳紑浜嬩欢
+        socket.onopen = function () {
+          console.log("websocket宸叉墦寮�");
+        };
+
+        // 鏀跺埌娑堟伅
+        socket.onmessage = (msg) => {
+          if (!msg.data) {
+            return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+          }
+
+          let obj = JSON.parse(msg.data);
+          const jsonData2 = this.jsonData;
+          document.addEventListener('mouseover', function (event) {
+            const inputBox = document.querySelectorAll('.el-card__body');
+            const target = event.target;
+            const parms = obj.params;
+            if ( parms && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+              // 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
+              // this.submitDataToBackend()
+              
+
+              // console.log(parms)
+
+              let index = 0;
+              for (let i = 0; i < jsonData2.length; i++) {
+                let arr = jsonData2[i];
+                for (let j = 0; j < arr.length; j++) {
+                  let obj = arr[j];
+                  if (obj.type === '0' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
+                    obj.value = parms[0][index];
+                    index++;
+                  }
+                }
+              }
+              // console.log(jsonData2);
+
+            }
+          });
+        };
+
+
+
+
+        // 鍏抽棴浜嬩欢
+        socket.onclose = function () {
+          console.log("websocket宸插叧闂�");
+        };
+
+        // 鍙戠敓閿欒浜嬩欢
+        socket.onerror = function () {
+          console.log("websocket鍙戠敓浜嗛敊璇�");
+        };
+        this.$router.afterEach(function(){
+          socket.close();
+        })
+
       }
-
-      // 寮�鍚竴涓獁ebsocket鏈嶅姟
-      socket = new WebSocket(socketUrl);
-
-      // 鎵撳紑浜嬩欢
-      socket.onopen = function () {
-        console.log("websocket宸叉墦寮�");
-      };
-
-      // 鏀跺埌娑堟伅
-      socket.onmessage = (msg) => {
-if (!msg.data) {
-  return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
-}
-
-let obj = JSON.parse(msg.data);
-const jsonData2 = this.jsonData;
-document.addEventListener('mouseover', function(event) {
-  const inputBox = document.querySelectorAll('.el-card__body');
-  const target = event.target;
-  if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
-    // 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
-    // this.submitDataToBackend()
-    const parms = obj.params;
-    
+    },
+    //璇█鏇挎崲
+    replaceChineseWithEnglish() {
  
-    let index = 0;
-for (let i = 0; i < jsonData2.length; i++) {
-  let arr = jsonData2[i];
-  for (let j = 0; j < arr.length; j++) {
-    let obj = arr[j];
-    if (obj.type === '0' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
-      obj.value = parms[0][index];
-      index++;
+   
+ const nameMap=  this.$t('langPositioning2')
+ 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;
     }
-  }
-}
-// console.log(jsonData2);
-
-  }
+  });
 });
-};
 
 
+// console.log(this.jsonData)
+
+},
+   send () {
 
 
-      // 鍏抽棴浜嬩欢
-      socket.onclose = function () {
-        console.log("websocket宸插叧闂�");
-      };
+      // 鍚戞湇鍔″櫒鍙戦�佹秷鎭�
 
-      // 鍙戠敓閿欒浜嬩欢
-      socket.onerror = function () {
-        console.log("websocket鍙戠敓浜嗛敊璇�");
-      };
+      // 鍚戞湇鍔″櫒鍙戦�佹秷鎭�
+      socket?.send(JSON.stringify(this.messagepack));
+    },
 
-    }
-  },
-  send () {
-   
-   
-    socket?.send(JSON.stringify(this.messagepack));
-  },
-
-}
+  }
 }
 </script>
 
 <style scoped>
 .item-row {
-display: flex;
-align-items: center;
-margin-bottom: 5px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px;
+  /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
 }
 
 .action-button {
-margin-right: 30px;
-background: #66b1ff;
-color: #FFF;
+  margin-right: 30px;
+  background: #66b1ff;
+  color: #FFF;
 }
+
 .blue-button {
-background-color: skyblue;
+  background-color: skyblue;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0