From 5d3a7df62a0b0197ddd3fc7d3bcc65fe8f5bc75e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 七月 2024 13:20:55 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a6-device-management.vue | 18 ++++++++++++------
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/components/do/b6-device-management/b6-data-acquisition-config.vue b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
new file mode 100644
index 0000000..70414f4
--- /dev/null
+++ b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -0,0 +1,39 @@
+<template>
+ <div class="data-acquisition-config">
+ <div>
+ <el-row class="title">
+ <el-col :span="6" style="padding-left: 20px;text-align: left;">鏁伴噰閰嶇疆</el-col>
+ </el-row>
+ </div>
+ <div>
+ <el-table></el-table>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "dataAcquisitionConfig",
+ // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
+ components: {},
+ data() {
+ // 杩欓噷瀛樻斁鏁版嵁
+ return {}
+ },
+ // 鏂规硶闆嗗悎
+ methods: {},
+}
+</script>
+
+<style scoped>
+.data-acquisition-config {
+ width: 100%;
+ height: 100%;
+ overflow-y: auto;
+ //overflow-x: hidden;
+ .title {
+ height: 60px;
+ line-height: 60px;
+ }
+}
+</style>
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 4d7f99e..69c9e78 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -421,14 +421,17 @@
</el-row>
</span>
</el-dialog>
+ <dataAcquisitionConfig v-if="showData"/>
</div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
+ import dataAcquisitionConfig from '../do/b6-device-management/b6-data-acquisition-config.vue'
export default {
components: {
- ValueTable
+ ValueTable,
+ dataAcquisitionConfig
},
data() {
return {
@@ -447,6 +450,7 @@
dialogVisible: false,
dialogVisible2: false,
addPower: false,
+ showData: false, // 鏁伴噰閰嶇疆椤甸潰
componentData: {
entity: {
deviceStatus: null,
@@ -836,11 +840,13 @@
})
},
handleConfig(row){
- this.configForm = {}
- this.dialogVisible3 = true
- this.$axios.post(this.$api.deviceScope.getNumberCollect+'?id='+row.id).then(res => {
- this.configForm = res.data
- })
+ // this.configForm = {}
+ // this.dialogVisible3 = true
+ // this.$axios.post(this.$api.deviceScope.getNumberCollect+'?id='+row.id).then(res => {
+ // this.configForm = res.data
+ // })
+ this.showData = true
+ console.log('?????', this.showData)
},
submitForm3(){
if(!this.configForm.ip){
--
Gitblit v1.9.3