BUG修改

liuchengxin

2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d

 src/views/construction/ipc/index.vue

@@ -10,19 +10,24 @@
      <el-form-item label="所属单位" prop="organizationId">
        <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
      </el-form-item>
      <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="constructionBatchId">
          <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
        </el-form-item>
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
          />
        </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>

@@ -34,7 +39,6 @@
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['oa:ipc:add']"
        >新增
        </el-button>
      </el-col>
@@ -46,7 +50,6 @@
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['oa:ipc:edit']"
        >修改
        </el-button>
      </el-col>
@@ -58,7 +61,6 @@
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['oa:ipc:remove']"
        >删除
        </el-button>
      </el-col>
@@ -71,22 +73,18 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="MAC" min-width="150" align="center" prop="mac"/>
      <el-table-column label="IP" width="130" align="center" prop="ip"/>
      <el-table-column label="端口" width="80" align="center" prop="port"/>
      <el-table-column label="登录账户" min-width="120" align="center" prop="loginAccount"/>
      <el-table-column label="NVR" align="center" prop="nvrId_dictText">
      <el-table-column label="MAC" min-width="150" align="center" prop="mac" show-overflow-tooltip/>
      <el-table-column label="IP" width="130" align="center" prop="ip" show-overflow-tooltip/>
      <el-table-column label="账户/密码" min-width="180" align="center" prop="loginAccount" show-overflow-tooltip/>
      <el-table-column label="NVR" align="center" min-width="150" prop="nvrId_dictText" show-overflow-tooltip>
        <template slot-scope="scope">
          <el-link type="primary" @click="nvrClick(scope.row)">{{scope.row.nvrId_dictText}}</el-link>
          <el-link type="primary" @click="nvrClick(scope.row)">{{ scope.row.nvrId_dictText }}</el-link>
        </template>
      </el-table-column>
      <el-table-column label="通道" align="center" prop="passageway_dictText"/>
      <el-table-column label="安装位置" min-width="240"  align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="200" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="120" align="center" prop="constructionBatchId_dictText"/>
      <!--      <el-table-column label="序列号" align="center" prop="serialNumber" />-->
      <!--      <el-table-column label="型号" align="center" prop="model" />-->
      <!--      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText" />-->
      <el-table-column label="通道" align="center" prop="passageway_dictText" show-overflow-tooltip/>
      <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="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -101,7 +99,6 @@
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['oa:ipc:edit']"
          >修改
          </el-button>
          <el-button
@@ -110,7 +107,6 @@
              class="del-btn"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['oa:ipc:remove']"
          >删除
          </el-button>
        </template>
@@ -126,18 +122,18 @@
    />

    <!-- 添加或修改ipc设备对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="900px" :append-to-body="true" :close-on-click-modal="false"
    <el-dialog :title="title" :visible.sync="open" width="920px" :append-to-body="true" :close-on-click-modal="false"
               :destroy-on-close="true">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="disabled">
      <el-form ref="form" :model="form" :rules="rules" label-width="90px" :disabled="disabled">
        <el-row>
          <el-col :span="8">
            <el-form-item label="MAC" prop="mac">
              <el-input v-model="form.mac" placeholder="请输入MAC"/>
              <el-input v-model="form.mac" maxlength="17" show-word-limit placeholder="请输入MAC"/>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <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-col :span="8">
@@ -146,8 +142,8 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="登录账户" prop="loginAccount">
          <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="请输入登录账号"/>
        <el-form-item label="账户/密码" prop="loginAccount">
          <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="请输入账户/密码"/>
        </el-form-item>
        <el-row>
          <el-col :span="12">
@@ -157,7 +153,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="通道" prop="passageway">
              <el-select v-model="form.passageway" placeholder="请选择通道（路）">
              <el-select v-model="form.passageway" placeholder="请选择通道（路）" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT109"
                    :key="dict.value"
@@ -218,6 +214,7 @@
import manufacturer from "../../components/manufacturer";
import nvr from '../../components/nvr'
import nvrForm from '../../components/nvr/form'
import ShowMore from "@/views/components/showMore";

export default {
  name: "Ipc",
@@ -228,7 +225,8 @@
    constructionBatch,
    manufacturer,
    nvr,
    nvrForm
    nvrForm,
    ShowMore
  },
  props: {
    schoolId: {
@@ -278,16 +276,16 @@
        mac: [
          {required: true, message: "mac不能为空", 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}$/,
            message: "请输入正确的MAC",
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的MAC，文本范围 0~9、a~f、A~F、：",
            trigger: "blur"
          }
        ],
        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"
          }
        ],
@@ -310,7 +308,8 @@
      },
      disabled: false,
      nvrOpen: false,
      nvrId: undefined
      nvrId: undefined,
      showMoreCondition: false
    };
  },
  computed: {
@@ -476,7 +475,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除ipc设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delIpc(ids);
      }).then(() => {