BUG修改

liuchengxin

2022-05-27 d138b7df8fa97dc7ed6b07acdfef804ebb186a74

 src/views/construction/server/index.vue

@@ -10,21 +10,26 @@
      <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>
        <el-form-item label="生产厂商" prop="manufacturerId">
          <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
        </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>

@@ -70,25 +75,25 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" min-width="120" align="center" prop="deploymentName"/>
      <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>
      <el-table-column label="IP" align="center" prop="ip" min-width="130"/>
      <el-table-column label="部署名称" min-width="300" align="center" prop="deploymentName"/>
      <el-table-column label="操作系统" align="center" min-width="180" prop="operatingSystem">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
        </template>
      </el-table-column>
      <el-table-column label="系统账号" align="center" prop="account"/>
      <el-table-column label="部署位置" align="center" min-width="180" prop="buildingId_dictText"/>
      <el-table-column label="机柜号" align="center" prop="cabinetNumber"/>
      <el-table-column label="机架号" align="center" prop="rackNumber"/>
      <el-table-column label="所属单位" align="center" min-width="180" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" align="center" min-width="180" prop="constructionBatchId_dictText"/>
      <el-table-column label="序列号" align="center" prop="serialNumber"/>
      <el-table-column label="型号" align="center" min-width="180" prop="model"/>
<!--      <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>-->
      <el-table-column label="IP" align="center" prop="ip" min-width="130"/>
      <el-table-column label="账号/密码" align="center" width="220" prop="account"/>
      <el-table-column label="序列号" align="center" min-width="240" prop="serialNumber"/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText"/>
      <el-table-column label="性能指标" align="center" prop="performanceIndex"/>
      <el-table-column label="备注" align="center" prop="remarks"/>
      <el-table-column label="备注" align="center" min-width="220" prop="remarks"/>
<!--      <el-table-column label="部署位置" align="center" min-width="180" prop="buildingId_dictText"/>-->
<!--      <el-table-column label="机柜号" align="center" prop="cabinetNumber"/>-->
<!--      <el-table-column label="机架号" align="center" prop="rackNumber"/>-->
<!--      <el-table-column label="所属单位" align="center" min-width="180" prop="organizationId_dictText"/>-->
<!--      <el-table-column label="施工批次" align="center" min-width="180" prop="constructionBatchId_dictText"/>-->
<!--      <el-table-column label="型号" align="center" min-width="180" prop="model"/>-->
<!--      <el-table-column label="性能指标" align="center" min-width="120" prop="performanceIndex"/>-->
      <!--      <el-table-column label="附件" align="center" prop="filePath" />-->
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
@@ -165,8 +170,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="账户" prop="account">
              <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="请输入账户"/>
            <el-form-item label="账户/密码" prop="account">
              <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="请输入账户/密码"/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -243,6 +248,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: "Server",
@@ -252,7 +258,8 @@
    organization,
    constructionBatch,
    manufacturer,
    nvr
    nvr,
    ShowMore
  },
  props: {
    schoolId: {
@@ -308,7 +315,7 @@
        lan: [
          {required: true, message: "LAN不能为空", trigger: "blur"},
          {
            pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的LAN",
            trigger: "blur"
          }
@@ -338,7 +345,8 @@
        ],
      },
      disabled: false,
      fileOpen: false
      fileOpen: false,
      showMoreCondition: false
    };
  },
  created() {