检验任务数据分类查询问题修复

zouyu

8 天以前 d2e867966539004b6b5a73ae3566a659ac6f8b6d

 src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue

@@ -17,19 +17,19 @@
                :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
                tooltip-effect="dark" height="100%">
        <el-table-column type="index" label="序号" align="center" width="65"></el-table-column>
        <el-table-column prop="deviceName" align="center" min-width="100" label="设备名称"></el-table-column>
        <el-table-column prop="deviceName" align="center" min-width="100" label="设备名称" show-overflow-tooltip></el-table-column>
        <el-table-column prop="sample" align="center" label="检验对象" show-overflow-tooltip
          min-width="150"></el-table-column>
        <el-table-column prop="inspectionItemClass" align="center" label="检验项分类" min-width="120"></el-table-column>
        <el-table-column prop="inspectionItem" align="center" label="检验项" min-width="100"></el-table-column>
        <el-table-column prop="inspectionItemSubclass" align="center" label="检验子项" min-width="100"></el-table-column>
        <el-table-column prop="referx" align="center" label="参照X" min-width="100"></el-table-column>
        <el-table-column prop="x" align="center" label="X"></el-table-column>
        <el-table-column prop="refery" align="center" label="参照Y" min-width="100"></el-table-column>
        <el-table-column prop="y" align="center" label="Y"></el-table-column>
        <el-table-column prop="anotherName" align="center" label="别名" min-width="100"></el-table-column>
        <el-table-column prop="matchingName" align="center" label="匹配名称" min-width="100"></el-table-column>
        <el-table-column prop="formula" align="center" label="公式"></el-table-column>
        <el-table-column prop="inspectionItemClass" align="center" label="检验项分类" min-width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="inspectionItem" align="center" label="检验项" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="inspectionItemSubclass" align="center" label="检验子项" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="referx" align="center" label="参照X" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="x" align="center" label="X" show-overflow-tooltip></el-table-column>
        <el-table-column prop="refery" align="center" label="参照Y" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="y" align="center" label="Y" show-overflow-tooltip></el-table-column>
        <el-table-column prop="anotherName" align="center" label="别名" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="matchingName" align="center" label="匹配名称" min-width="100" show-overflow-tooltip></el-table-column>
        <el-table-column prop="formula" align="center" label="公式" show-overflow-tooltip></el-table-column>
        <el-table-column fixed="right" label="操作" width="120" align="center">
          <template slot-scope="scope">
            <el-button type="text" @click="dataConfig(scope.row)">数采配置</el-button>
@@ -98,7 +98,7 @@
                :content="formula.content" :key="key" placement="top">
                <label>{{ formula.label }}()</label>
              </el-tooltip>
              <el-input type="textarea" autosi:autosize="{ minRows: 2, maxRows: 4}" ze placeholder="请输入内容"
              <el-input type="textarea" autosize:autosize="{ minRows: 2, maxRows: 4}"  placeholder="请输入内容"
                v-model="configForm.formula" @change="evalResult">
              </el-input>
            </template>
@@ -157,6 +157,10 @@
      <div class="search_thing" style="margin-bottom: 14px;">
        <div class="search_label">数据库密码：</div>
        <el-input size="small" placeholder="请输入" clearable v-model="configForm.dbPassword"></el-input>
      </div>
      <div v-if="configForm.fileType === '.mysql'" class="search_thing" style="margin-bottom: 14px;">
        <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>数据库表：</div>
        <el-input size="small" placeholder="请输入" clearable v-model="configForm.dbTable"></el-input>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-row>
@@ -244,7 +248,8 @@
        dbFileName: "",
        fiberOpticRibbon: "",
        dbUserName: "",
        dbPassword: ""
        dbPassword: "",
        dbTable: ""
      },
      domains: [
        {
@@ -263,9 +268,11 @@
        { label: "db", value: ".db" },
        { label: "mdb", value: ".mdb" },
        { label: "word", value: ".docx" },
        { label: "excel", value: ".xlsx" },
        { label: "excel", value: ".xls" },
        { label: "excelxlsx", value: ".xlsx" },
        { label: "excelxls", value: ".xls" },
        { label: "txt", value: ".txt" },
        { label: "mysql", value: ".mysql" },
        { label: "mqtt", value: ".mqtt" },
        { label: "png", value: ".png" }
      ],
      spanList: [],
@@ -417,7 +424,8 @@
        this.$set(this.configForm, "dbFileName", res.data.dbFileName);
        this.$set(this.configForm, "fiberOpticRibbon", res.data.fiberOpticRibbon);
        this.$set(this.configForm, "dbUserName", res.data.dbUserName);
        this.$set(this.configForm, "dbPassword", res.data.dbPassword)
        this.$set(this.configForm, "dbPassword", res.data.dbPassword);
        this.$set(this.configForm, "dbTable", res.data.dbTable);
      })
    },
    // 提交文件配置
@@ -433,7 +441,8 @@
        dbFileName: this.configForm.dbFileName,
        fiberOpticRibbon: this.configForm.fiberOpticRibbon,
        dbUserName: this.configForm.dbUserName,
        dbPassword: this.configForm.dbPassword
        dbPassword: this.configForm.dbPassword,
        dbTable: this.configForm.dbTable
      });
      this.upLoad4 = true;
      saveDeviceFileConfiguration({ deviceId: this.deviceId, ...obj }).then(res => {
@@ -467,6 +476,7 @@
        structureItemParameterId: row.structureItemParameterId
      }).then(res => {
        const data = res.data;
        console.log("数采配置--",data)
        if (data[0]) {
          this.domains.splice(0, 1);
          let formula = data[0].formula
@@ -518,7 +528,7 @@
                }
              }
            }
            if (isIncludes === false && this.configForm.formula !== "" && this.configForm.formula !== undefined) {
            if (isIncludes === false && this.configForm.formula !== "" && this.configForm.formula !== null && this.configForm.formula !== undefined) {
              i.formula = "(" + this.configForm.formula + ")";
            } else {
              i.formula = this.configForm.formula;