修改检验任务bug

licp

2024-07-31 cc702f8d62c082c8f4b97b44e094fb8b8c7b97d8

 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（selectAllByOne） 就需在父组件声明并传入  @selectAllByOne="selectAllByOne"-->
         <ValueTable @selectAllByOne="selectAllByOne" @isUpdate="isUpdate" ref="ValueTable"
            :url="$api.deviceScope.selectDeviceParameter" :upUrl="$api.deviceScope.upDeviceParameter"
@@ -162,7 +162,7 @@
            </el-col>
            <!-- 右边布局 -->
            <el-col :span="7">
               <el-form :label-position="labelPosition" :model="formData" label-width="120px" ref="ruleForm">
               <el-form :label-position="labelPosition" :model="formData" label-width="140px" ref="ruleForm">
            <!-- 实验室列表 -->
            <el-form-item label="所属部门:">
              <el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="请选择" size="small" style="width:100%">
@@ -410,7 +410,7 @@
                  v-model="configForm.y"></el-input>
         </div>
      <div class="search_thing">
            <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>公式：</div>
            <div class="search_label">公式：</div>
            <el-input size="small" placeholder="请输入" clearable
                  v-model="configForm.formula"></el-input>
         </div>
@@ -421,7 +421,7 @@
            </el-row>
         </span>
    </el-dialog>
    <dataAcquisitionConfig v-if="showData"/>
    <dataAcquisitionConfig v-if="showData" :deviceId="deviceId"/>
   </div>
</template>

@@ -435,6 +435,16 @@
      },
      data() {
         return {
            deviceId: '',
            fileTypeOptions: [
               {label: 'csv', value: '.csv'},
               {label: 'db', value: '.db'},
               {label: 'mdb', value: '.mdb'},
               {label: 'word', value: '.docx'},
               {label: 'excel', value: '.xlsx'},
               {label: 'txt', value: '.txt'},
               {label: 'png', value: '.png'},
            ],
            //是否是档案修订  true不是 false是
            isUp: true,
            formData: {
@@ -451,6 +461,7 @@
            dialogVisible2: false,
            addPower: false,
        showData: false, // 数采配置页面
        tableList: [],
            componentData: {
               entity: {
                  deviceStatus: null,
@@ -479,7 +490,10 @@
                  id: 'handleConfig',
                  font: '数采配置',
                  type: 'text',
                  method: 'handleConfig'
                  method: 'handleConfig',
            disabFun: (row, index) => {
              return row.insProductItem === ''
            }
               }],
          headNoShow:['enDeviceName'],
               tagField: {
@@ -570,8 +584,8 @@
               this.subordinateDepartmentsList = data
            })
         },
         refreshTable() {
            this.$refs['ValueTable'].selectList()
         refreshTable(e) {
            this.$refs['ValueTable'].selectList(e)
         },
         refresh() {
            this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -594,21 +608,21 @@
               if (power[i].menuMethod == 'addDeviceParameter') {
                  add = true
               }
          if (power[i].menuMethod == 'numberCollect') {
                   if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
                  config = true
               }
            }
        if (!config) {
               this.componentData.do.splice(2, 1)
            }
            if (!up) {
               this.componentData.do.splice(1, 1)
            }
            if (!del) {
               this.componentData.do.splice(0, 1)
            }
            this.addPower = add
         },
            if (!config) {
                     this.componentData.do.splice(2, 1)
                  }
                  if (!up) {
                     this.componentData.do.splice(1, 1)
                  }
                  if (!del) {
                     this.componentData.do.splice(0, 1)
                  }
                  this.addPower = add
               },
         // 获取字典
         selectEnumByCategory() {
            this.$axios.post(this.$api.enums.selectEnumByCategory, {
@@ -658,6 +672,23 @@
            this.componentData.tagField.insProductIds.select = [...this.componentData.tagField.insProductIds.select,...children]
            this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
            return m
          })
          this.options.forEach(item=>{
            if(item.children.length==0){
              item.children = null;
            }else{
              item.children.forEach(m=>{
                if(m.children.length==0){
                  m.children = null;
                }else{
                  m.children.forEach(n=>{
                    if(n.children&&n.children.length==0){
                      n.children = null;
                    }
                  })
                }
              })
            }
          })
            })
      },
@@ -777,7 +808,7 @@
               }
               this.$message.success('修改成功')
               this.upLoad = false
               this.refreshTable()
               this.refreshTable('page')
               this.dialogVisible = false
            }).catch(e => {
               this.$message.error('修改失败')
@@ -827,7 +858,7 @@
               }
               this.$message.success('提交成功')
               this.upLoad2 = false
               this.refreshTable()
               this.refreshTable('page')
               this.dialogVisible2 = false
               this.formData2 = {
                  imageUpload: '',
@@ -846,7 +877,20 @@
        //   this.configForm = res.data
        // })
        this.showData = true
        console.log('?????', this.showData)
        const list = row.insProductItem.split(';')
        let list2 = []
        list.map((item) => {
          const obj = Object.assign({
         deviceId: row.id,
            insProductItem: item,
          })
          list2.push(obj)
        })
        this.tableList = list2
      this.deviceId = row.id
      },
      closeDataVue () {
        this.showData = false
      },
      submitForm3(){
        if(!this.configForm.ip){
@@ -873,10 +917,6 @@
          this.$message.error('请填写Y');
          return
        }
        if(!this.configForm.formula){
          this.$message.error('请填写公式');
          return
        }

        this.upLoad3 = true
        this.$axios.post(this.$api.deviceScope.numberCollect, this.configForm, {
@@ -889,7 +929,7 @@
                  return
               }
               this.$message.success('操作成功')
               this.refreshTable()
               this.refreshTable('page')
               this.dialogVisible3 = false
            }).catch(e => {
               this.$message.error('操作失败')