Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

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

@@ -225,20 +225,6 @@
                        </el-upload>
                     </div>
                  </el-form-item>
      <el-form-item label="检测的文件类型:">
            <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="采集地址:" 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="检测的文件类型:">
            <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="采集地址:" 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>
@@ -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'},
@@ -914,6 +887,7 @@
          list2.push(obj)
        })
        this.tableList = list2
      this.deviceId = row.id
      },
      closeDataVue () {
        this.showData = false