Crunchy
2024-07-15 5c1a305e8d0ada752d6cc38e500e5e9de9af43a3
设备数采配置 调整
已修改2个文件
90 ■■■■ 文件已修改
src/components/do/b6-device-management/b6-data-acquisition-config.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-device-management.vue 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -30,10 +30,10 @@
      </el-pagination>
    </div>
    <el-dialog title="数采配置" :visible.sync="dialogVisible3" width="920px" :before-close="closeForm">
      <el-form :model="configForm" :rules="rules" label-position="top" size="small"
      <el-form :model="configForm" label-position="top" size="small"
               ref="configForm" label-width="100px" class="demo-ruleForm">
        <div class="fomItem1">
          <el-form-item class="fomItemInput" label="检测的文件类型:" prop="fileType">
        <!-- <div class="fomItem1"> -->
          <!-- <el-form-item class="fomItemInput" label="检测的文件类型:" prop="fileType">
            <el-select v-model="configForm.fileType" placeholder="请选择文件类型">
              <el-option v-for="item in fileTypeOptions"
                         :key="item.value"
@@ -46,8 +46,8 @@
          </el-form-item>
          <el-form-item class="fomItemInput" label="储存地址:" prop="storageUrl">
            <el-input v-model="configForm.storageUrl"></el-input>
          </el-form-item>
        </div>
          </el-form-item> -->
        <!-- </div> -->
        <div class="fomItem1"
             v-for="(domain, index) in domains"
             :key="index">
@@ -71,7 +71,7 @@
          </el-form-item>
        </div>
        <div class="fomItem1">
          <el-form-item class="fomItemInput" label="公式:" prop="formula">
          <el-form-item class="fomItemInput" label="公式:">
            <el-input v-model="configForm.formula" @change="evalResult"></el-input>
          </el-form-item>
        </div>
@@ -110,17 +110,8 @@
        current: 1,
        size: 20,
      },
      rules: {
        fileType: [{ required: true, message: '请选择活动区域', trigger: 'change' }],
        collectUrl: [{ required: true, message: '请填写采集地址', trigger: 'blur' }],
        storageUrl: [{ required: true, message: '请填写储存地址', trigger: 'blur' }],
        formula: [{ required: true, message: '请填写公式', trigger: 'blur' }],
      },
      dialogVisible3:false,
      configForm:{
        fileType: '',
        collectUrl: '',
        storageUrl: '',
        formula: '',
      },
      domains: [
@@ -155,9 +146,6 @@
        const data = res.data
        if(data[0]) {
          this.domains.splice(0, 1)
          this.$set(this.configForm, 'fileType', data[0].fileType)
          this.$set(this.configForm, 'collectUrl', data[0].collectUrl)
          this.$set(this.configForm, 'storageUrl', data[0].storageUrl)
          this.$set(this.configForm, 'formula', data[0].formula)
          data.forEach(i => {
            this.domains.push({
@@ -181,14 +169,17 @@
            }
          })
          this.domains.forEach(i => {
            i.fileType = this.configForm.fileType
            i.collectUrl = this.configForm.collectUrl
            i.storageUrl = this.configForm.storageUrl
            if(i.x == '') {
              i.x = null
            }
            if(i.y == '') {
              i.y = null
            }
            i.formula = this.configForm.formula
            i.deviceId = this.configForm.deviceId
            i.insProductItem = this.configForm.insProductItem
          })
          this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration, {dataConfigList: JSON.parse(JSON.stringify(this.domains))},{headers: {
          this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration, {dataConfigList: this.domains},{headers: {
            'Content-Type': 'application/json'
          }}).then(res => {
            this.dialogVisible3 = false
src/components/view/a6-device-management.vue
@@ -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%">
@@ -225,6 +225,20 @@
                                </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>
@@ -368,6 +382,20 @@
                                </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>
@@ -435,6 +463,15 @@
        },
        data() {
            return {
                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: {
@@ -764,6 +801,14 @@
          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
@@ -818,6 +863,14 @@
          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, {