BUG修改

liuchengxin

2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d

 src/views/construction/iot/index.vue

@@ -107,25 +107,25 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" align="center" prop="deploymentName"/>
      <el-table-column label="版本" align="center" prop="edition">
      <el-table-column label="部署名称" align="center" min-width="300" prop="deploymentName" show-overflow-tooltip/>
      <el-table-column label="版本" align="center" prop="edition" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT110" :value="scope.row.edition"/>
        </template>
      </el-table-column>
      <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>
      <el-table-column label="IP" align="center" min-width="130" prop="ip"/>
      <el-table-column label="通道1" align="center" min-width="180" prop="passagewayOne_dictText"/>
      <el-table-column label="通道2" align="center" min-width="180" prop="passagewayTwo_dictText"/>
      <el-table-column label="通道3" align="center" min-width="180" prop="passagewayThree_dictText"/>
      <el-table-column label="通道4" align="center" min-width="180" prop="passagewayFour_dictText"/>
      <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" min-width="220" prop="manufacturerId_dictText"/>
      <el-table-column label="监控对象" align="center" min-width="180" prop="monitorObject"/>
<!--      <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>-->
      <el-table-column label="IP" align="center" min-width="130" prop="ip" show-overflow-tooltip/>
      <el-table-column label="监控对象" align="center" min-width="220" prop="monitorObject" show-overflow-tooltip/>
      <el-table-column label="序列号" align="center" min-width="220" prop="serialNumber" show-overflow-tooltip/>
      <el-table-column label="生产厂商" align="center" min-width="220" 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="通道1" align="center" min-width="180" prop="passagewayOne_dictText"/>-->
<!--      <el-table-column label="通道2" align="center" min-width="180" prop="passagewayTwo_dictText"/>-->
<!--      <el-table-column label="通道3" align="center" min-width="180" prop="passagewayThree_dictText"/>-->
<!--      <el-table-column label="通道4" align="center" min-width="180" prop="passagewayFour_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="model"/>-->
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -173,7 +173,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="版本" prop="edition">
              <el-select v-model="form.edition" placeholder="请选择版本">
              <el-select v-model="form.edition" placeholder="请选择版本" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT110"
                    :key="dict.value"
@@ -187,12 +187,12 @@
        <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>
@@ -245,7 +245,7 @@
          </el-col>
        </el-row>
        <el-form-item label="监控对象" prop="monitorObject">
          <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="8" placeholder="请输入内容"/>
          <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="3" placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -341,7 +341,7 @@
        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])$/,
            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"
          }