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

licp

2024-07-12 5d3a7df62a0b0197ddd3fc7d3bcc65fe8f5bc75e

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

@@ -53,7 +53,7 @@
   <div class="role_manage">
      <div>
         <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>
@@ -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,
@@ -455,7 +459,7 @@
                  largeCategory: null,
                  orderBy: {
                     field: 'id',
                     order: 'desc'
                     order: 'asc'
                  }
               },
               isIndex: true,
@@ -477,6 +481,7 @@
                  type: 'text',
                  method: 'handleConfig'
               }],
          headNoShow:['enDeviceName'],
               tagField: {
                  deviceStatus: {
                     select: []
@@ -578,6 +583,7 @@
            let up = false
            let del = false
            let add = false
        let config = false
            for (var i = 0; i < power.length; i++) {
               if (power[i].menuMethod == 'upDeviceParameter') {
                  up = true
@@ -588,6 +594,12 @@
               if (power[i].menuMethod == 'addDeviceParameter') {
                  add = true
               }
          if (power[i].menuMethod == 'numberCollect') {
                  config = true
               }
            }
        if (!config) {
               this.componentData.do.splice(2, 1)
            }
            if (!up) {
               this.componentData.do.splice(1, 1)
@@ -709,9 +721,11 @@
               this.formData.imageName = response.data.name;
            }
         },
         handleSuccessUpImg2(response, ) {
         handleSuccessUpImg2(response) {
            if (response.code == 200) {
               this.$nextTick(() => {
            this.formData.imageUpload = response.data.url;
            this.formData.imageName = response.data.name;
                  this.formData2.imageUpload = response.data.url;
                  this.formData2.imageName = response.data.name;
               })
@@ -826,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){