From e28e9395819fd992bc3e168b6ff89fb6f538f1bc Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 23 五月 2022 15:25:34 +0800
Subject: [PATCH] 提交代码
---
src/views/construction/server/index.vue | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index 1ff45d3..29e19a9 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -36,7 +36,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:server:add']"
>鏂板
</el-button>
</el-col>
@@ -48,7 +47,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:server:edit']"
>淇敼
</el-button>
</el-col>
@@ -60,7 +58,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:server:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -81,17 +78,17 @@
<dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
</template>
</el-table-column>
- <!-- <el-table-column label="璐︽埛" align="center" prop="account" />-->
+ <el-table-column label="绯荤粺璐﹀彿" align="center" prop="account"/>
<el-table-column label="閮ㄧ讲浣嶇疆" align="center" min-width="180" prop="buildingId_dictText"/>
<el-table-column label="鏈烘煖鍙�" align="center" prop="cabinetNumber"/>
<el-table-column label="鏈烘灦鍙�" align="center" prop="rackNumber"/>
<el-table-column label="鎵�灞炲崟浣�" align="center" min-width="180" prop="organizationId_dictText"/>
<el-table-column label="鏂藉伐鎵规" align="center" min-width="180" prop="constructionBatchId_dictText"/>
- <!-- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber" />-->
+ <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber"/>
<el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText"/>
- <!-- <el-table-column label="鎬ц兘鎸囨爣" align="center" prop="performanceIndex" />-->
- <!-- <el-table-column label="澶囨敞" align="center" prop="remarks" />-->
+ <el-table-column label="鎬ц兘鎸囨爣" align="center" prop="performanceIndex"/>
+ <el-table-column label="澶囨敞" align="center" prop="remarks"/>
<!-- <el-table-column label="闄勪欢" align="center" prop="filePath" />-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -107,7 +104,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:server:edit']"
>淇敼
</el-button>
<el-button
@@ -123,7 +119,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:server:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -212,11 +207,11 @@
</el-col>
</el-row>
<el-form-item label="鎬ц兘鎸囨爣" prop="performanceIndex">
- <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="64" show-word-limit
+ <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="64" show-word-limit
+ <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
@@ -313,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"
}
@@ -322,7 +317,7 @@
{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鍦板潃",
+ message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
],
@@ -482,7 +477,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鏈嶅姟鍣ㄧ紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delServer(ids);
}).then(() => {
--
Gitblit v1.9.1