From 219f95ef447355d55c8cc37847a4ee7e1cd9f3ea Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 31 五月 2022 21:09:25 +0800
Subject: [PATCH] 提交代码

---
 src/views/construction/reserveIp/index.vue |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index 6e0406f..d5fefc5 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/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 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀归鐣橧P瀵硅瘽妗� -->
-    <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,15 +113,16 @@
           <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"
-                          v-model="form.applicationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="閫夋嫨鐢宠鏃ユ湡">
+          <el-date-picker
+              style="width: 100%"
+              v-model="form.applicationDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="閫夋嫨鐢宠鏃ユ湡">
           </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銆乤~f銆丄~F銆侊細",
@@ -329,3 +329,12 @@
   }
 };
 </script>
+
+<style lang="css">
+.el-tooltip__popper {
+  font-size: 14px;
+  max-width: 50%
+}
+
+/*璁剧疆鏄剧ず闅愯棌閮ㄥ垎鍐呭锛屾寜50%鏄剧ず*/
+</style>

--
Gitblit v1.9.1