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

zouyu

2024-08-08 c263fb316fc23d9db98ce711fda30d81c28d2d9c

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

@@ -225,20 +225,6 @@
                        </el-upload>
                     </div>
                  </el-form-item>
      <el-form-item label="检测的文件类型:" required>
            <el-select :disabled="isUp" v-model="formData.fileType" placeholder="请选择文件类型" clearable>
              <el-option v-for="item in fileTypeOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="采集地址:" required clearable>
            <el-input :disabled="isUp" v-model="formData.collectUrl"></el-input>
          </el-form-item>
          <el-form-item label="储存地址:">
            <el-input :disabled="isUp" v-model="formData.storageUrl"></el-input>
          </el-form-item>
               </el-form>
            </el-col>
         </el-row>
@@ -382,20 +368,6 @@
                        </el-upload>
                     </div>
                  </el-form-item>
                  <el-form-item label="检测的文件类型:" required>
            <el-select v-model="formData.fileType" placeholder="请选择文件类型" clearable>
              <el-option v-for="item in fileTypeOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="采集地址:" required clearable>
            <el-input v-model="formData.collectUrl"></el-input>
          </el-form-item>
          <el-form-item label="储存地址:">
            <el-input v-model="formData.storageUrl"></el-input>
          </el-form-item>
               </el-form>
            </el-col>
         </el-row>
@@ -438,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>
@@ -449,7 +421,7 @@
            </el-row>
         </span>
    </el-dialog>
    <dataAcquisitionConfig v-if="showData" :tableList="tableList"/>
    <dataAcquisitionConfig v-if="showData" :deviceId="deviceId"/>
   </div>
</template>

@@ -463,6 +435,7 @@
      },
      data() {
         return {
            deviceId: '',
            fileTypeOptions: [
               {label: 'csv', value: '.csv'},
               {label: 'db', value: '.db'},
@@ -556,7 +529,8 @@
            }
               },
               requiredAdd: [],
               requiredUp: []
               requiredUp: [],
          needSort: ['deviceName', 'acquisitionDate', 'activationDate', 'lastCalibrationDate', 'nextCalibrationDate', 'deviceStatus'],
            },
            entityCopy: {},
            upIndex: 0,
@@ -611,8 +585,8 @@
               this.subordinateDepartmentsList = data
            })
         },
         refreshTable() {
            this.$refs['ValueTable'].selectList()
         refreshTable(e) {
            this.$refs['ValueTable'].selectList(e)
         },
         refresh() {
            this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -699,6 +673,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;
                    }
                  })
                }
              })
            }
          })
            })
      },
@@ -801,14 +792,6 @@
          this.$message.error('未输入校准周期（月）')
          return
        }
      if(!this.formData.fileType){
          this.$message.error('未选择文件后缀！')
          return
        }
      if(!this.formData.collectUrl){
          this.$message.error('请输入采集地址！')
          return
        }
            delete this.formData.createTime
            delete this.formData.updateTime
            delete this.formData.createUser
@@ -826,7 +809,7 @@
               }
               this.$message.success('修改成功')
               this.upLoad = false
               this.refreshTable()
               this.refreshTable('page')
               this.dialogVisible = false
            }).catch(e => {
               this.$message.error('修改失败')
@@ -863,14 +846,6 @@
          this.$message.error('输入校准周期（月）')
          return
        }
      if(!this.formData2.fileType){
          this.$message.error('未选择文件后缀！')
          return
        }
      if(!this.formData2.collectUrl){
          this.$message.error('请输入采集地址！')
          return
        }
            this.upLoad2 = true;
        this.formData2.insProductIds = this.formData2.insProductIds.join()
            this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
@@ -884,7 +859,7 @@
               }
               this.$message.success('提交成功')
               this.upLoad2 = false
               this.refreshTable()
               this.refreshTable('page')
               this.dialogVisible2 = false
               this.formData2 = {
                  imageUpload: '',
@@ -913,6 +888,7 @@
          list2.push(obj)
        })
        this.tableList = list2
      this.deviceId = row.id
      },
      closeDataVue () {
        this.showData = false
@@ -942,10 +918,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, {
@@ -958,7 +930,7 @@
                  return
               }
               this.$message.success('操作成功')
               this.refreshTable()
               this.refreshTable('page')
               this.dialogVisible3 = false
            }).catch(e => {
               this.$message.error('操作失败')