提交代码

唐耀东

2022-05-23 e28e9395819fd992bc3e168b6ff89fb6f538f1bc

提交代码

 src/views/basics/manufacturer/index.vue

@@ -131,7 +131,7 @@
    />

    <!-- 添加或修改厂商对话框 -->
    <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="厂商名称" prop="name">
          <el-input v-model="form.name" placeholder="请输入厂商名称" />

 src/views/basics/school/index.vue

@@ -184,7 +184,7 @@
    />

    <!-- 添加或修改学校对话框 -->
    <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="学校代码" prop="code">
          <el-input v-model="form.code" placeholder="请输入学校代码"/>

 src/views/construction/ai/index.vue

@@ -277,7 +277,7 @@
        lanOne: [
          {required: true, message: "LAN1不能为空", 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}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的LAN1",
            trigger: "blur"
          }
@@ -292,7 +292,7 @@
        ],
        lanTwo: [
          {
            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}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的LAN2",
            trigger: "blur"
          }

 src/views/construction/constructionBatch/index.vue

@@ -92,7 +92,7 @@
    />

    <!-- 添加或修改施工批次对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="施工批次" prop="batch">
          <el-input v-model="form.batch" maxlength="64" show-word-limit placeholder="请输入施工批次" />
@@ -121,7 +121,7 @@
          <el-input v-model="form.teamMembers" type="textarea" rows="4" maxlength="64" show-word-limit placeholder="请输入团队成员" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" rows="6" maxlength="512" show-word-limit placeholder="请输入内容" />
          <el-input v-model="form.remarks" type="textarea" rows="10" maxlength="512" show-word-limit placeholder="请输入内容" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">

 src/views/construction/iot/index.vue

@@ -326,7 +326,7 @@
        lan: [
          {required: true, message: "LAN不能为空", 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}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的LAN",
            trigger: "blur"
          }

 src/views/construction/ipc/index.vue

@@ -127,12 +127,12 @@
        <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">
@@ -273,7 +273,7 @@
        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}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的MAC，文本范围 0~9、a~f、A~F、：",
            trigger: "blur"
          }

 src/views/construction/nvr/index.vue

@@ -303,16 +303,16 @@
        passageway: [
          {required: true, message: "通道不能为空", trigger: "blur"}
        ],
        lanOne: [
          {required: true, message: "LAN1不能为空", trigger: "blur"},
        lanTwo: [
          {required: true, message: "LAN2不能为空", 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}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的LAN",
            trigger: "blur"
          }
        ],
        ipOne: [
          {required: true, message: "ip1不能为空", trigger: "blur"},
        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])$/,
            message: "请输入正确的ip地址，文本范围 0~9、.",
@@ -322,7 +322,7 @@
        // lanTwo: [
        //   {required: true, message: "LAN2不能为空", 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}$/,
        //     pattern: /^[0-9a-fA-F:]*$/,
        //     message: "请输入正确的LAN",
        //     trigger: "blur"
        //   }

 src/views/construction/reserveIp/index.vue

@@ -194,7 +194,7 @@
        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}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的MAC地址，文本范围 0~9、a~f、A~F、：",
            trigger: "blur"
          }

 src/views/construction/server/index.vue

@@ -308,7 +308,7 @@
        lan: [
          {required: true, message: "LAN不能为空", 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}$/,
            pattern: /^[0-9a-fA-F:]*$/,
            message: "请输入正确的LAN",
            trigger: "blur"
          }

 src/views/device/batch/index.vue

@@ -117,7 +117,7 @@
    />

    <!-- 添加或修改生产批次对话框 -->
    <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="生产批次" prop="batch">
          <el-input v-model="form.batch" placeholder="请输入生产批次" />

 src/views/device/equipment/index.vue

@@ -188,7 +188,7 @@
    />

    <!-- 添加或修改智控设备对话框 -->
    <Dialog :title="title" :visible.sync="open" width="50%" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="50%" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="序列号" prop="serialNumber">
          <el-input v-model="form.serialNumber" :disabled="disabled" placeholder="请输入序列号"/>

 src/views/device/peripheralUnit/index.vue

@@ -180,7 +180,7 @@
    />

    <!-- 添加或修改外设单元对话框 -->
    <Dialog :title="title" :visible.sync="open" width="50%" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="50%" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="外设代码" prop="code">
          <el-input v-model="form.code" placeholder="请输入外设代码" :disabled="disabled"/>

 src/views/system/dept/index.vue

@@ -115,7 +115,7 @@
    </el-table>

    <!-- 添加或修改部门对话框 -->
    <Dialog :title="title" :visible.sync="open" width="600px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-row>
          <el-col :span="24" v-if="form.parentId !== 0">

 src/views/system/post/index.vue

@@ -127,7 +127,7 @@
    />

    <!-- 添加或修改岗位对话框 -->
    <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="岗位名称" prop="postName">
          <el-input v-model="form.postName" placeholder="请输入岗位名称" />

 src/views/system/role/index.vue

@@ -163,7 +163,7 @@
    />

    <!-- 添加或修改角色配置对话框 -->
    <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="角色名称" prop="roleName">
          <el-input v-model="form.roleName" placeholder="请输入角色名称" />

 src/views/system/user/index.vue

@@ -209,7 +209,7 @@
    </el-row>

    <!-- 添加或修改用户配置对话框 -->
    <Dialog :title="title" :visible.sync="open" width="600px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-row>
          <el-col :span="12">