From 490df5d4d92877171076756af73a96dee1fc053f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 25 十二月 2024 16:03:25 +0800
Subject: [PATCH] 数据回传日志记录功能修改
---
UI-Project/src/views/MechanicalArm/mechanicalArm.vue | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
index 6032299..c68bd9e 100644
--- a/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
+++ b/UI-Project/src/views/MechanicalArm/mechanicalArm.vue
@@ -13,6 +13,8 @@
password: '',
});
const blind = ref(false)
+const blindMode = ref(false)
+const blindModeNumber = ref('')
const errorInfo = ref(true)
const loadData = ref([]);
const findMachine = ref([]);
@@ -302,18 +304,44 @@
}
-
const fetchData = async () => {
//鎵爜鍥炶溅鎻愪氦
//alert(searchs.value);
searchs.value = "";
}
+
const filterTableData = computed(() =>
loadData.value.filter(
(data) =>
!searchs.value || data.scanId.toLowerCase().includes(searchs.value.toLowerCase())
)
)
+
+//涓嬫媺妗嗘ā寮忛�夋嫨
+const modevalue = ref('')
+
+const options = [
+ {
+ value: '1',
+ label: '鏍囧噯',
+ },
+ {
+ value: '2',
+ label: '瀹氬埗',
+ },
+ {
+ value: '3',
+ label: '鎵嬪姩',
+ }
+]
+//妯″紡閫夋嫨鏃惰繘琛屽鐞�
+const modeChange = async () => {
+ if(modevalue.value=='3'){
+ //褰撴槸鎵嬪姩妯″紡鏃跺脊绐楁彁绀� 璁剧疆涓婄墖鏁伴噺
+ blindMode.value = true;
+ }
+
+}
</script>
<template>
<div ref="content" style="padding:0 20px;">
@@ -346,11 +374,35 @@
</el-table-column>
</el-table>
</el-dialog>
+
+ <el-dialog v-model="blindMode" top="30vh" style="text-align: center;width: 600px;" @close="handleDialogClose">
+ <!-- 鎵嬪姩妯″紡杈撳叆鏁伴噺 -->
+ <div style="text-align: none;font-size: 20px;margin-bottom: 20px;">
+ 鎵嬪姩杈撳叆妯″紡
+ </div>
+ <div>
+ 鎵嬪姩杈撳叆涓婄墖鏁伴噺锛�
+ <el-input v-model="blindModeNumber" style="width: 200px;" type="Number" id="blindMode" @keyup.enter="fetchData"></el-input>
+ </div>
+ <!-- <div>
+ <el-button size="mini" link type="primary" plain @click="startOrStopTask(scope.row, 2, 2)">纭</el-button>
+ <el-button size="mini" link type="primary" plain @click="startOrStopTask(scope.row, 2, 2)">鍙栨秷</el-button>
+ </div> -->
+ </el-dialog>
<hr />
<br>
<div id="search">
<!-- 鍔熻兘 -->
+ <div class="flex flex-wrap gap-4 items-center">
+ 涓婄墖鏈鸿繍琛屾ā寮�:
+ <el-select v-model="modevalue" @change="modeChange" placeholder="璇烽�夋嫨妯″紡" size="large" style="width: 220px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ <span @click="modeChange" style="margin-left: 40px;">涓婄墖鏁伴噺:{{ blindModeNumber}}</span>
+
+ </div>
+ <br>
<el-button :type="(findMachine['state'] == '鏆傚仠' ? 'danger' : 'success')" id="ButtonMachineStatus"
@click="machineStatus((findMachine['state'] == '鏆傚仠' ? '寮�宸�' : '鏆傚仠'))">{{ findMachine['state'] == '寮�宸�' ?
$t('functionState.start') : $t('functionState.stop') }}</el-button>
@@ -379,11 +431,17 @@
<el-popover placement="bottom" title="绛涢��" :width="200" trigger="click">
<el-input v-model="searchs" type="primary" id="ReportSubmission" @keyup.enter="fetchData"></el-input>
<template #reference>
- <el-icon><Filter /></el-icon>
+ <el-icon>
+ <Filter />
+ </el-icon>
</template>
</el-popover>
- <el-icon><CaretTop /></el-icon>
- <el-icon><CaretBottom /></el-icon>
+ <el-icon>
+ <CaretTop />
+ </el-icon>
+ <el-icon>
+ <CaretBottom />
+ </el-icon>
<!-- <el-input v-model="searchs" type="primary" id="ReportSubmission" @keyup.enter="fetchData"></el-input> -->
<!-- <el-input size="small" placeholder="Type to search" /> -->
</div>
--
Gitblit v1.8.0