提交代码

唐耀东

2022-05-18 7ca1a8ec18fccca9102cd1179e05fdc877bdc511

 src/views/construction/iot/index.vue

@@ -68,7 +68,6 @@
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['oa:iot:add']"
        >新增
        </el-button>
      </el-col>
@@ -80,7 +79,6 @@
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['oa:iot:edit']"
        >修改
        </el-button>
      </el-col>
@@ -92,7 +90,6 @@
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['oa:iot:remove']"
        >删除
        </el-button>
      </el-col>
@@ -120,8 +117,8 @@
      <el-table-column label="安装位置" min-width="180" align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="150" 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="serialNumber"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText"/>
      <el-table-column label="监控对象" align="center" min-width="180" prop="monitorObject"/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
@@ -138,7 +135,6 @@
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['oa:iot:edit']"
          >修改
          </el-button>
          <el-button
@@ -147,7 +143,6 @@
              class="del-btn"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['oa:iot:remove']"
          >删除
          </el-button>
        </template>
@@ -340,7 +335,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"
          }
        ],
@@ -505,7 +500,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除IoT设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delIot(ids);
      }).then(() => {