From c01dff9a24f98f10f247d2f2e449383f567ec338 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期三, 18 五月 2022 14:55:48 +0800
Subject: [PATCH] 提交代码

---
 src/views/construction/reserveIp/index.vue |  151 ++++++++++++++++++++++++++++----------------------
 1 files changed, 85 insertions(+), 66 deletions(-)

diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index 7e59d54..c9d1d95 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/src/views/construction/reserveIp/index.vue
@@ -3,12 +3,15 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="IP鍦板潃" prop="ip">
         <el-input
-          v-model="queryParams.ip"
-          placeholder="璇疯緭鍏p鍦板潃"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.ip"
+            placeholder="璇疯緭鍏p鍦板潃"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+      <el-form-item label="閫傜敤鍦扮偣" prop="buildingId">
+        <building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -19,104 +22,112 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:reserveIp:add']"
-        >鏂板</el-button>
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['oa:reserveIp:add']"
+        >鏂板
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:reserveIp:edit']"
-        >淇敼</el-button>
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['oa:reserveIp:edit']"
+        >淇敼
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:reserveIp:remove']"
-        >鍒犻櫎</el-button>
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['oa:reserveIp:remove']"
+        >鍒犻櫎
+        </el-button>
       </el-col>
     </el-row>
 
     <el-table v-loading="loading" :data="reserveIpList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="搴忓彿" type="index" align="center">
         <template slot-scope="scope">
-          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="IP鍦板潃" align="center" prop="ip" />
-      <el-table-column label="MAC鍦板潃" align="center" prop="mac" />
-      <el-table-column label="閫傜敤鍦扮偣" align="center" prop="buildingId_dictText" />
+      <el-table-column label="IP鍦板潃" align="center" prop="ip"/>
+      <el-table-column label="MAC鍦板潃" align="center" prop="mac"/>
+      <el-table-column label="閫傜敤鍦扮偣" align="center" prop="buildingId_dictText"/>
       <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applicationDate" width="180">
         <template slot-scope="scope">
           <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"/>
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:reserveIp:edit']"
-          >淇敼</el-button>
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['oa:reserveIp:edit']"
+          >淇敼
+          </el-button>
           <el-button
-            size="mini"
-            type="text"
-            class="del-btn"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:reserveIp:remove']"
-          >鍒犻櫎</el-button>
+              size="mini"
+              type="text"
+              class="del-btn"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['oa:reserveIp:remove']"
+          >鍒犻櫎
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 娣诲姞鎴栦慨鏀归鐣橧P瀵硅瘽妗� -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="500px" :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">
-          <el-input v-model="form.ip" placeholder="璇疯緭鍏p鍦板潃" />
+          <el-input v-model="form.ip" placeholder="璇疯緭鍏p鍦板潃"/>
         </el-form-item>
         <el-form-item label="MAC鍦板潃" prop="mac">
-          <el-input v-model="form.mac" placeholder="璇疯緭鍏AC鍦板潃" />
+          <el-input v-model="form.mac" placeholder="璇疯緭鍏AC鍦板潃"/>
         </el-form-item>
         <el-form-item label="閫傜敤鍦扮偣" prop="buildingId">
           <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"
-            placeholder="閫夋嫨鐢宠鏃ユ湡">
+                          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 placeholder="璇疯緭鍏ュ唴瀹�" />
+          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
+                    placeholder="璇疯緭鍏ュ唴瀹�"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -130,7 +141,7 @@
 </template>
 
 <script>
-import { listReserveIp, getReserveIp, delReserveIp, addReserveIp, updateReserveIp } from "@/api/oa/reserveIp";
+import {listReserveIp, getReserveIp, delReserveIp, addReserveIp, updateReserveIp} from "@/api/oa/reserveIp";
 import building from '../../components/building'
 
 export default {
@@ -178,15 +189,23 @@
       // 琛ㄥ崟鏍¢獙
       rules: {
         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])$/, message: "璇疯緭鍏ユ纭殑ip鍦板潃", trigger: "blur" }
+          {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銆�.",
+            trigger: "blur"
+          }
         ],
         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}$/, message: "璇疯緭鍏ユ纭殑MAC鍦板潃", trigger: "blur" }
+          {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}$/,
+            message: "璇疯緭鍏ユ纭殑MAC鍦板潃锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
+            trigger: "blur"
+          }
         ],
         buildingId: [
-          { required: true, message: "寤虹瓚鍗曞厓涓嶈兘涓虹┖", trigger: "change" }
+          {required: true, message: "寤虹瓚鍗曞厓涓嶈兘涓虹┖", trigger: "change"}
         ],
       },
       buildOpen: false
@@ -245,7 +264,7 @@
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.1