liding
2025-04-30 4ae5681e4a92c1cc98e811135098c71958c48a02
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -148,7 +148,7 @@
        </div>
        <el-input size="small" placeholder="请输入" clearable v-model="configForm.collectUrl"></el-input>
      </div>
      <div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && deviceName.includes('网络分析')">
      <!-- <div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && deviceName.includes('网络分析')">
        <div class="search_label" style="width: 130px;">
          <span style="color:red;margin-right: 4px;">*</span>网分仪采集通道:
        </div>
@@ -156,7 +156,7 @@
          <el-option v-for="(item, index) in channelList" :key="index" :label="item" :value="item">
          </el-option>
        </el-select>
      </div>
      </div> -->
      <div class="search_thing" style="margin-bottom: 14px;" v-if="deviceName && !deviceName.includes('网络分析')">
        <div class="search_label">储存地址:</div>
        <el-input size="small" placeholder="请输入" clearable v-model="configForm.storageUrl"></el-input>
@@ -298,9 +298,13 @@
        { label: "db", value: ".db" },
        { label: "mdb", value: ".mdb" },
        { label: "word", value: ".docx" },
        { label: "excel", value: ".xlsx" },
        // { label: "excel", value: ".xlsx" },
        { label: "xlsx", value: ".xlsx" },
        { label: "txt", value: ".txt" },
        { label: "png", value: ".png" }
        { label: "png", value: ".png" },
        { label: "et", value: ".et" },
        { label: "xls", value: ".xls" },
        { label: "pdf", value: ".pdf" }
      ],
      spanList: [],
      specialSpanList: [],
@@ -452,9 +456,9 @@
          this.tableList[0].fiberOpticRibbon
        )
        this.$set(this.configForm, "port", this.tableList[0].port);
        let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
        this.$set(this.configForm, "channel", arr);
        this.channelList = arr
        // let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
        // this.$set(this.configForm, "channel", arr);
        // this.channelList = arr
      }
    },
    init() {
@@ -511,18 +515,18 @@
            "fiberOpticRibbon",
            this.tableList[0].fiberOpticRibbon
          )
          let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
          this.$set(
            this.configForm,
            "channel",
            arr
          )
          this.$set(
            this.configForm,
            "port",
            this.tableList[0].port
          )
          this.channelList = arr;
          // let arr = this.tableList[0].channel ? this.tableList[0].channel.split(',') : []
          // this.$set(
          //   this.configForm,
          //   "channel",
          //   arr
          // )
          // this.$set(
          //   this.configForm,
          //   "port",
          //   this.tableList[0].port
          // )
          // this.channelList = arr;
        }
        // 一般的合并行
        if (
@@ -579,15 +583,15 @@
        dbFileName: this.configForm.dbFileName,
        fiberOpticRibbon: this.configForm.fiberOpticRibbon,
        port: this.configForm.port,
        channel: this.configForm.channel
        // channel: this.configForm.channel
      });
      if (this.deviceName && this.deviceName.includes('网络分析')) {
        if (!this.configForm.port) {
          return this.$message.error("请填写端口");
        }
        if (!this.configForm.channel || !this.configForm.channel.length) {
          return this.$message.error("请填写网分仪采集通道");
        }
        // if (!this.configForm.channel || !this.configForm.channel.length) {
        //   return this.$message.error("请填写网分仪采集通道");
        // }
      }
      this.upLoad4 = true;
      saveDataAcquisitionConfiguration({ deviceId: this.deviceId, ...obj }).then(res => {