From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index d44cc90..26dd5ec 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -22,16 +22,16 @@
}}</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>
<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 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')
@@ -44,8 +44,8 @@
}}</router-link>
</el-breadcrumb>
- <el-row :gutter="18">
- <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" class='card'>
+ <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">
@@ -56,7 +56,12 @@
<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>
+
+
+
+ <el-button
+ v-if="item.type === '0' && item.name !== '鏍煎瓙闂磋窛' && item.name !== '鍑虹墖鎺ョ墖鍦板潃' && item.name !== '瀛樼墖鎺ョ墖鍦板潃'"
+ class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
</div>
</div>
@@ -82,7 +87,7 @@
},
created () {
this.initWebSocket();
- console.log('jsonData:', this.jsonData);
+ // console.log('jsonData:', this.jsonData);
},
methods: {
@@ -115,7 +120,7 @@
// 鎻愪氦鏁版嵁鍒板悗绔�
const jsonString = JSON.stringify(jsonObject);
- console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', jsonString);
+ // console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', jsonString);
socket?.send(jsonString);
},
initWebSocket () {
@@ -149,29 +154,32 @@
let obj = JSON.parse(msg.data);
const jsonData2 = this.jsonData;
document.addEventListener('mouseover', function (event) {
- const inputBox = document.querySelector('.card'); // 鏍规嵁浣犵殑瀹為檯鎯呭喌閫夋嫨姝ｇ‘鐨勯�夋嫨鍣�
- if (inputBox && !inputBox.contains(event.target)) {
+ const inputBox = document.querySelectorAll('.el-card__body');
+ const target = event.target;
+ if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
// 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
// this.submitDataToBackend()
- const params = obj.params;
+ const parms = obj.params;
+ console.log(parms)
- // this.submitDataToBackend()
- let currentIndex = 0;
-
- jsonData2.forEach((group, groupIndex) => {
- group.forEach((item) => {
- if (item.type !== '1') {
- if (params[groupIndex] && params[groupIndex][currentIndex] !== undefined) {
- item.value = params[groupIndex][currentIndex];
- }
- currentIndex++;
+ 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++;
}
- });
- currentIndex = 0; // 鎵嬪姩閲嶇疆绱㈠紩锛屽噯澶囧鐞嗕笅涓�涓垎缁�
- });
+ }
+ }
- console.log(jsonData2);
+
+
+
+
+ // console.log(jsonData2);
}
});
@@ -219,4 +227,4 @@
.blue-button {
background-color: skyblue;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0