BUG修改

liuchengxin

2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d

 src/views/construction/exchange/index.vue

@@ -10,61 +10,66 @@
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="型号" prop="model">
        <el-input
      <template v-if="showMoreCondition">
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturerId">
        <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
      </el-form-item>
      <el-form-item label="网络端口" prop="networkPort">
        <el-select v-model="queryParams.networkPort" placeholder="请选择网络端口" clearable size="small">
          <el-option
          />
        </el-form-item>
        <el-form-item label="生产厂商" prop="manufacturerId">
          <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
        </el-form-item>
        <el-form-item label="网络端口" prop="networkPort">
          <el-select v-model="queryParams.networkPort" placeholder="请选择网络端口" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT113"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="指标A" prop="idnexA">
        <el-select v-model="queryParams.idnexA" placeholder="请选择指标A" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="指标A" prop="idnexA">
          <el-select v-model="queryParams.idnexA" placeholder="请选择指标A" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT114"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="级联端口" prop="cascadePort">
        <el-select v-model="queryParams.cascadePort" placeholder="请选择级联端口" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="级联端口" prop="cascadePort">
          <el-select v-model="queryParams.cascadePort" placeholder="请选择级联端口" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT113"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="指标B" prop="indexB">
        <el-select v-model="queryParams.indexB" placeholder="请选择指标B" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="指标B" prop="indexB">
          <el-select v-model="queryParams.indexB" placeholder="请选择指标B" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT114"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
            />
          </el-select>
        </el-form-item>
      </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -110,33 +115,33 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="网络端口" align="center" prop="networkPort">
      <el-table-column label="网络端口" align="center" prop="networkPort" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort"/>
          <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort" show-overflow-tooltip/>
        </template>
      </el-table-column>
      <el-table-column label="指标A" align="center" prop="idnexA">
      <el-table-column label="指标A" align="center" prop="idnexA" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA"/>
          <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA" show-overflow-tooltip/>
        </template>
      </el-table-column>
      <el-table-column label="级联端口" align="center" prop="cascadePort">
      <el-table-column label="级联端口" align="center" prop="cascadePort" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort"/>
          <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort" show-overflow-tooltip/>
        </template>
      </el-table-column>
      <el-table-column label="指标B" align="center" prop="indexB">
      <el-table-column label="指标B" align="center" prop="indexB" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT114" :value="scope.row.indexB"/>
        </template>
      </el-table-column>
      <el-table-column label="安装位置" min-width="180" align="center" prop="buildingId_dictText"/>
      <el-table-column label="具体位置" min-width="220" align="center" prop="address"/>
      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="型号" min-width="180" align="center" prop="model"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber" show-overflow-tooltip/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="安装位置" min-width="180" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<!--      <el-table-column label="具体位置" min-width="220" align="center" prop="address"/>-->
<!--      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>-->
<!--      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
<!--      <el-table-column label="型号" min-width="180" align="center" prop="model"/>-->
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -186,7 +191,7 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="网络端口" prop="networkPort">
              <el-select v-model="form.networkPort" placeholder="请选择网络端口">
              <el-select v-model="form.networkPort" placeholder="请选择网络端口" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT113"
                    :key="dict.value"
@@ -198,7 +203,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标A" prop="idnexA">
              <el-select v-model="form.idnexA" placeholder="请选择指标A">
              <el-select v-model="form.idnexA" placeholder="请选择指标A" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT114"
                    :key="dict.value"
@@ -212,7 +217,7 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="级联端口" prop="cascadePort">
              <el-select v-model="form.cascadePort" placeholder="请选择级联端口">
              <el-select v-model="form.cascadePort" placeholder="请选择级联端口" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT113"
                    :key="dict.value"
@@ -224,7 +229,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标B" prop="indexB">
              <el-select v-model="form.indexB" placeholder="请选择指标B">
              <el-select v-model="form.indexB" placeholder="请选择指标B" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT114"
                    :key="dict.value"
@@ -239,7 +244,7 @@
          <building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="8" placeholder="请输入具体位置""/>
          <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="3" placeholder="请输入具体位置""/>
        </el-form-item>
        <el-form-item label="所属单位" prop="organizationId">
          <organization v-if="open" v-model="form.organizationId" :schoolId="schoolId"></organization>
@@ -291,6 +296,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
import ShowMore from "@/views/components/showMore";

export default {
  name: "Exchange",
@@ -300,7 +306,8 @@
    organization,
    constructionBatch,
    manufacturer,
    nvr
    nvr,
    ShowMore
  },
  props: {
    schoolId: {
@@ -378,7 +385,8 @@
        ],
      },
      disabled: false,
      fileOpen: false
      fileOpen: false,
      showMoreCondition: false
    };
  },
  created() {