From a2b21db9570a77cecd66add096036d54561bc341 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 七月 2024 16:02:06 +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 | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 69c9e78..a96603f 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -51,7 +51,7 @@
<template>
<div class="role_manage">
- <div>
+ <div v-if="!showData">
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;">璁惧宸ュ叿鏄庣粏</el-col>
<el-col :span="12" style="text-align: right;">
@@ -59,7 +59,7 @@
</el-col>
</el-row>
</div>
- <div class="search">
+ <div class="search" v-if="!showData">
<div class="search_thing">
<div class="search_label">鐘舵�侊細</div>
<el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴" size="small">
@@ -82,7 +82,7 @@
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
</div>
- <div class="table">
+ <div class="table" v-if="!showData">
<!-- 璇硶 瀛愮粍浠堕�氳繃 this.$emit +浼犲叆鏂规硶鍚� 璋冪敤鐖剁粍浠舵柟娉� 渚嬪 this.$emit锛坰electAllByOne锛� 灏遍渶鍦ㄧ埗缁勪欢澹版槑骞朵紶鍏� @selectAllByOne="selectAllByOne"-->
<ValueTable @selectAllByOne="selectAllByOne" @isUpdate="isUpdate" ref="ValueTable"
:url="$api.deviceScope.selectDeviceParameter" :upUrl="$api.deviceScope.upDeviceParameter"
@@ -421,17 +421,17 @@
</el-row>
</span>
</el-dialog>
- <dataAcquisitionConfig v-if="showData"/>
+<!-- <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'
+ // import dataAcquisitionConfig from '../do/b6-device-management/b6-data-acquisition-config.vue'
export default {
components: {
ValueTable,
- dataAcquisitionConfig
+ // dataAcquisitionConfig
},
data() {
return {
@@ -840,14 +840,17 @@
})
},
handleConfig(row){
- // 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)
+ 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)
},
+ // closeDataVue () {
+ // this.showData = false
+ // },
submitForm3(){
if(!this.configForm.ip){
this.$message.error('璇峰～鍐橧P');
--
Gitblit v1.9.3