Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-07-12 a2b21db9570a77cecd66add096036d54561bc341

 src/components/view/a6-device-management.vue

@@ -51,15 +51,15 @@

<template>
   <div class="role_manage">
      <div>
      <div v-if="!showData">
         <el-row class="title">
            <el-col :span="12" style="padding-left: 20px;">设备工具明细</el-col>
            <el-col :span="12" style="padding-left: 20px;text-align: left;">设备工具明细</el-col>
            <el-col :span="12" style="text-align: right;">
               <el-button size="medium" type="primary" @click="dialogVisible2 = true">新增</el-button>
            </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（selectAllByOne） 就需在父组件声明并传入  @selectAllByOne="selectAllByOne"-->
         <ValueTable @selectAllByOne="selectAllByOne" @isUpdate="isUpdate" ref="ValueTable"
            :url="$api.deviceScope.selectDeviceParameter" :upUrl="$api.deviceScope.upDeviceParameter"
@@ -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,
@@ -477,6 +481,7 @@
                  type: 'text',
                  method: 'handleConfig'
               }],
          headNoShow:['enDeviceName'],
               tagField: {
                  deviceStatus: {
                     select: []
@@ -840,7 +845,12 @@
        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('请填写IP');