提交代码

唐耀东

2022-05-18 7ca1a8ec18fccca9102cd1179e05fdc877bdc511

 src/views/construction/ipc/index.vue

@@ -34,7 +34,6 @@
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['oa:ipc:add']"
        >新增
        </el-button>
      </el-col>
@@ -46,7 +45,6 @@
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['oa:ipc:edit']"
        >修改
        </el-button>
      </el-col>
@@ -58,7 +56,6 @@
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['oa:ipc:remove']"
        >删除
        </el-button>
      </el-col>
@@ -77,16 +74,16 @@
      <el-table-column label="登录账户" min-width="120" align="center" prop="loginAccount"/>
      <el-table-column label="NVR" align="center" prop="nvrId_dictText">
        <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="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="serialNumber"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -101,7 +98,6 @@
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['oa:ipc:edit']"
          >修改
          </el-button>
          <el-button
@@ -110,7 +106,6 @@
              class="del-btn"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['oa:ipc:remove']"
          >删除
          </el-button>
        </template>
@@ -279,7 +274,7 @@
          {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",
            message: "请输入正确的MAC，文本范围 0~9、a~f、A~F、：",
            trigger: "blur"
          }
        ],
@@ -287,7 +282,7 @@
          {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地址",
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
@@ -476,7 +471,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(() => {