提交代码

唐耀东

2022-05-31 219f95ef447355d55c8cc37847a4ee7e1cd9f3ea

提交代码

 src/views/construction/ai/index.vue

@@ -154,24 +154,24 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="LAN1" prop="lanOne">
              <el-input v-model="form.lanOne" placeholder="请输入校园网端口"/>
              <el-input v-model="form.lanOne" maxlength="17" show-word-limit placeholder="请输入校园网端口"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="IP" prop="ipOne">
              <el-input v-model="form.ipOne" placeholder="请输入IP"/>
              <el-input v-model="form.ipOne" maxlength="15" show-word-limit placeholder="请输入IP"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="LAN2" prop="lanTwo">
              <el-input v-model="form.lanTwo" placeholder="请输入局域网端口"/>
              <el-input v-model="form.lanTwo" maxlength="17" show-word-limit placeholder="请输入局域网端口"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="IP" prop="ipTwo">
              <el-input v-model="form.ipTwo" placeholder="请输入IP"/>
              <el-input v-model="form.ipTwo" maxlength="15" show-word-limit placeholder="请输入IP"/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -293,7 +293,7 @@
        ipOne: [
          {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"
          }
@@ -307,7 +307,7 @@
        ],
        ipTwo: [
          {
            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"
          }

 src/views/construction/constructionBatch/index.vue

@@ -58,7 +58,7 @@
      <el-table-column label="施工批次" align="center" prop="batch" />
      <el-table-column label="施工周期" align="center" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') + ' - ' + parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
          <span>{{ scope.row.startDate + ' - ' + scope.row.endDate }}</span>
        </template>
      </el-table-column>
      <el-table-column label="负责人" align="center" prop="userId_dictText" />

 src/views/construction/iot/index.vue

@@ -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>
@@ -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"
          }

 src/views/construction/ipc/index.vue

@@ -284,7 +284,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"
          }

 src/views/construction/nvr/index.vue

@@ -162,24 +162,24 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="LAN1" prop="lanOne">
              <el-input v-model="form.lanOne" placeholder="请输入LAN1"/>
              <el-input v-model="form.lanOne" maxlength="17" show-word-limit placeholder="请输入LAN1"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="IP" prop="ipOne">
              <el-input v-model="form.ipOne" placeholder="请输入IP"/>
              <el-input v-model="form.ipOne" maxlength="15" show-word-limit placeholder="请输入IP"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="LAN2" prop="lanTwo">
              <el-input v-model="form.lanTwo" placeholder="请输入LAN2"/>
              <el-input v-model="form.lanTwo" maxlength="17" show-word-limit placeholder="请输入LAN2"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="IP" prop="ipTwo">
              <el-input v-model="form.ipTwo" placeholder="请输入IP"/>
              <el-input v-model="form.ipTwo" maxlength="15" show-word-limit placeholder="请输入IP"/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -310,6 +310,20 @@
        passageway: [
          {required: true, message: "通道不能为空", trigger: "blur"}
        ],
        lanOne: [
          {
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的LAN",
            trigger: "blur"
          }
        ],
        ipOne: [
          {
            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"
          }
        ],
        lanTwo: [
          {required: true, message: "LAN2不能为空", trigger: "blur"},
          {
@@ -321,7 +335,7 @@
        ipTwo: [
          {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"
          }
@@ -337,7 +351,7 @@
        // ipTwo: [
        //   {required: true, message: "ip2不能为空", 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"
        //   }

 src/views/construction/reserveIp/index.vue

@@ -69,7 +69,7 @@
          <span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="备注" align="center" prop="remarks"/>
      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -100,7 +100,7 @@
    />

    <!-- 添加或修改预留IP对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true"
    <el-dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :destroy-on-close="true"
               :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="IP地址" prop="ip">
@@ -113,7 +113,8 @@
          <building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
        </el-form-item>
        <el-form-item label="申请日期" prop="applicationDate">
          <el-date-picker clearable size="small"
          <el-date-picker
              style="width: 100%"
                          v-model="form.applicationDate"
                          type="date"
                          value-format="yyyy-MM-dd"
@@ -121,7 +122,7 @@
          </el-date-picker>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
          <el-input v-model="form.remarks" type="textarea" :rows="10" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
@@ -186,13 +187,12 @@
        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"
          }
        ],
        mac: [
          {required: true, message: "MAC地址不能为空", trigger: "blur"},
          {
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的MAC地址，文本范围 0~9、a~f、A~F、：",
@@ -329,3 +329,12 @@
  }
};
</script>

<style lang="css">
.el-tooltip__popper {
  font-size: 14px;
  max-width: 50%
}

/*设置显示隐藏部分内容，按50%显示*/
</style>

 src/views/construction/server/index.vue

@@ -147,12 +147,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>
@@ -323,7 +323,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"
          }

 src/views/construction/system/index.vue

@@ -164,9 +164,6 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="载体服务器" prop="serverId">
          <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
        </el-form-item>
        <el-row>
          <el-col :span="12">
            <el-form-item label="施工批次" prop="constructionBatchId">
@@ -180,6 +177,21 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <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>
          </el-col>
          <el-col :span="12">
            <el-form-item label="载体服务器" prop="serverId">
              <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="访问地址" prop="address">
          <el-input v-model="form.address" maxlength="512" show-word-limit placeholder="请输入内容"/>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="请输入内容"/>
        </el-form-item>
@@ -306,6 +318,12 @@
        constructionBatchId: [
          {required: true, message: "施工批次不能为空", trigger: "blur"}
        ],
        account: [
          {required: true, message: "账号/密码不能为空", trigger: "blur"}
        ],
        address: [
          {required: true, message: "访问地址不能为空", trigger: "blur"}
        ],
      },
      disabled: false,
      fileOpen: false,