BUG修改

liuchengxin

2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d

 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>

@@ -36,7 +41,6 @@
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['oa:server:add']"
        >新增
        </el-button>
      </el-col>
@@ -48,7 +52,6 @@
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['oa:server:edit']"
        >修改
        </el-button>
      </el-col>
@@ -60,7 +63,6 @@
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['oa:server:remove']"
        >删除
        </el-button>
      </el-col>
@@ -73,25 +75,25 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" 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="120"/>
      <el-table-column label="操作系统" align="center" min-width="180" prop="operatingSystem">
      <el-table-column label="部署名称" min-width="300" align="center" prop="deploymentName" show-overflow-tooltip/>
      <el-table-column label="操作系统" align="center" min-width="180" prop="operatingSystem" show-overflow-tooltip>
        <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="生产厂商" 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="LAN" align="center" min-width="150" prop="lan"/>-->
      <el-table-column label="IP" align="center" prop="ip" min-width="130" show-overflow-tooltip/>
      <el-table-column label="账号/密码" align="center" width="220" prop="account" show-overflow-tooltip/>
      <el-table-column label="序列号" align="center" min-width="240" prop="serialNumber" show-overflow-tooltip/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="备注" align="center" min-width="220" prop="remarks" show-overflow-tooltip/>
<!--      <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">
@@ -107,7 +109,6 @@
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['oa:server:edit']"
          >修改
          </el-button>
          <el-button
@@ -123,7 +124,6 @@
              class="del-btn"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['oa:server:remove']"
          >删除
          </el-button>
        </template>
@@ -140,26 +140,26 @@

    <!-- 添加或修改服务器对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="700px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="disabled">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="disabled">
        <el-form-item label="部署名称" prop="deploymentName">
          <el-input v-model="form.deploymentName" maxlength="64" show-word-limit placeholder="请输入部署名称"/>
        </el-form-item>
        <el-row>
          <el-col :span="12">
            <el-form-item label="LAN" prop="lan">
              <el-input v-model="form.lan" placeholder="请输入LAN"/>
              <el-input v-model="form.lan" maxlength="17" show-word-limit placeholder="请输入LAN"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="IP" prop="ip">
              <el-input v-model="form.ip" placeholder="请输入IP"/>
              <el-input v-model="form.ip" maxlength="15" show-word-limit placeholder="请输入IP"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="操作系统" prop="operatingSystem">
              <el-select v-model="form.operatingSystem" placeholder="请选择操作系统">
              <el-select v-model="form.operatingSystem" placeholder="请选择操作系统" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT115"
                    :key="dict.value"
@@ -170,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>
@@ -212,11 +212,11 @@
          </el-col>
        </el-row>
        <el-form-item label="性能指标" prop="performanceIndex">
          <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="64" show-word-limit
          <el-input v-model="form.performanceIndex" type="textarea" :rows="3" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="64" show-word-limit
          <el-input v-model="form.remarks" type="textarea" :rows="3" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
@@ -248,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",
@@ -257,7 +258,8 @@
    organization,
    constructionBatch,
    manufacturer,
    nvr
    nvr,
    ShowMore
  },
  props: {
    schoolId: {
@@ -313,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"
          }
@@ -321,8 +323,8 @@
        ip: [
          {required: true, message: "IP不能为空", trigger: "blur"},
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
@@ -343,7 +345,8 @@
        ],
      },
      disabled: false,
      fileOpen: false
      fileOpen: false,
      showMoreCondition: false
    };
  },
  created() {
@@ -482,7 +485,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除服务器编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delServer(ids);
      }).then(() => {