From d138b7df8fa97dc7ed6b07acdfef804ebb186a74 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期五, 27 五月 2022 21:21:21 +0800
Subject: [PATCH] BUG修改
---
src/views/components/nvr/list.vue | 2
src/assets/styles/custom.scss | 4
src/views/construction/server/index.vue | 30 +++---
src/views/construction/system/index.vue | 10 +-
src/views/basics/building/index.vue | 9 +-
src/views/basics/organization/index.vue | 9 +-
src/views/construction/exchange/index.vue | 10 +-
src/views/construction/ipc/index.vue | 20 ++---
src/views/construction/iot/index.vue | 24 +++---
src/views/components/organization/organizationList.vue | 1
src/views/construction/ai/index.vue | 47 ++++++-----
src/views/construction/nvr/index.vue | 30 +++---
src/views/components/constructionBatch/list.vue | 2
13 files changed, 99 insertions(+), 99 deletions(-)
diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss
index af4dd1e..b8580c2 100644
--- a/src/assets/styles/custom.scss
+++ b/src/assets/styles/custom.scss
@@ -3,8 +3,8 @@
background-color:#f8f8f8;
}
::-webkit-scrollbar {//婊氬姩鏉＄殑瀹藉害
- width:6px;
- height:6px;
+ width:10px;
+ height:10px;
}
::-webkit-scrollbar-thumb {//婊氬姩鏉＄殑璁剧疆
background-color:#dddddd;
diff --git a/src/views/basics/building/index.vue b/src/views/basics/building/index.vue
index 484a35e..8bf17db 100644
--- a/src/views/basics/building/index.vue
+++ b/src/views/basics/building/index.vue
@@ -42,13 +42,14 @@
v-loading="loading"
:data="buildingList"
row-key="id"
+ height="calc(100vh - 210px)"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
- <el-table-column label="鍗曞厓鍚嶇О" align="center" prop="name"/>
- <el-table-column label="鍗曞厓缂栧彿" prop="code"/>
- <el-table-column label="鏄剧ず椤哄簭" align="center" prop="orderNum"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鍗曞厓鍚嶇О" align="left" prop="name"/>
+ <el-table-column label="鍗曞厓缂栧彿" align="left" width="150" prop="code"/>
+ <el-table-column label="鏄剧ず椤哄簭" align="center" width="80" prop="orderNum"/>
+ <el-table-column label="鎿嶄綔" align="center" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/basics/organization/index.vue b/src/views/basics/organization/index.vue
index 0a4958e..90a2019 100644
--- a/src/views/basics/organization/index.vue
+++ b/src/views/basics/organization/index.vue
@@ -33,13 +33,14 @@
v-loading="loading"
:data="organizationList"
row-key="id"
+ height="calc(100vh - 210px)"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
- <el-table-column label="鏈烘瀯鍚嶇О" align="center" prop="name"/>
- <el-table-column label="鏈烘瀯缂栧彿" prop="code"/>
- <el-table-column label="鏄剧ず椤哄簭" align="center" prop="orderNum"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name"/>
+ <el-table-column label="鏈烘瀯缂栧彿" align="left" width="150" prop="code"/>
+ <el-table-column label="鏄剧ず椤哄簭" width="80" align="center" prop="orderNum"/>
+ <el-table-column label="鎿嶄綔" align="center" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/components/constructionBatch/list.vue b/src/views/components/constructionBatch/list.vue
index 6740207..63503c8 100644
--- a/src/views/components/constructionBatch/list.vue
+++ b/src/views/components/constructionBatch/list.vue
@@ -16,7 +16,7 @@
</el-form-item>
</el-form>
- <el-table v-loading="loading" :data="constructionBatchList" highlight-current-row
+ <el-table v-loading="loading" :data="constructionBatchList" highlight-current-row height="50vh"
@current-change="handleCurrentChange">
<el-table-column label="搴忓彿" type="index" align="center">
<template slot-scope="scope">
diff --git a/src/views/components/nvr/list.vue b/src/views/components/nvr/list.vue
index f403b81..aeb10b0 100644
--- a/src/views/components/nvr/list.vue
+++ b/src/views/components/nvr/list.vue
@@ -17,7 +17,7 @@
</el-form-item>
</el-form>
- <el-table v-loading="loading" :data="nvrList" highlight-current-row
+ <el-table v-loading="loading" :data="nvrList" highlight-current-row height="50vh"
@current-change="handleCurrentChange">
<el-table-column label="搴忓彿" align="center" width="50">
<template slot-scope="scope">
diff --git a/src/views/components/organization/organizationList.vue b/src/views/components/organization/organizationList.vue
index 50caf0e..1e69546 100644
--- a/src/views/components/organization/organizationList.vue
+++ b/src/views/components/organization/organizationList.vue
@@ -21,6 +21,7 @@
v-loading="loading"
:data="organizationList"
row-key="id"
+ height="50vh"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
highlight-current-row
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index bbd840f..866c227 100644
--- a/src/views/construction/ai/index.vue
+++ b/src/views/construction/ai/index.vue
@@ -75,23 +75,24 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
- <el-table-column label="鏀寔閫氶亾" align="center" prop="passageway">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.DICT112" :value="scope.row.passageway"/>
- </template>
- </el-table-column>
- <el-table-column label="LAN1" min-width="150" align="center" prop="lanOne"/>
- <el-table-column label="IP" width="130" align="center" prop="ipOne"/>
- <el-table-column label="LAN2" min-width="150" align="center" prop="lanTwo"/>
- <el-table-column label="IP" width="130" align="center" prop="ipTwo"/>
- <el-table-column label="鐧诲綍璐︽埛" min-width="180" align="center" prop="loginAccount"/>
- <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="300" align="center" prop="deploymentName"/>
+<!-- <el-table-column label="鏀寔閫氶亾" align="center" prop="passageway">-->
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.DICT112" :value="scope.row.passageway"/>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column label="IP锛圠AN1锛�" width="130" align="center" prop="ipOne"/>
+<!-- <el-table-column label="LAN1" min-width="150" align="center" prop="lanOne"/>-->
+
+<!-- <el-table-column label="LAN2" min-width="150" align="center" prop="lanTwo"/>-->
+<!-- <el-table-column label="IP" width="130" align="center" prop="ipTwo"/>-->
+ <el-table-column label="璐︽埛/瀵嗙爜" min-width="220" align="center" prop="loginAccount"/>
+<!-- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
<el-table-column label="搴忓垪鍙�" min-width="150" align="center" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" min-width="120" align="center" prop="model"/>
+<!-- <el-table-column label="鍨嬪彿" min-width="120" align="center" prop="model"/>-->
<el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -139,7 +140,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫氶亾" prop="passageway">
- <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾">
+ <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT112"
:key="dict.value"
@@ -153,7 +154,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN1" prop="lanOne">
- <el-input v-model="form.lanOne" placeholder="璇疯緭鍏AN1"/>
+ <el-input v-model="form.lanOne" placeholder="璇疯緭鍏ユ牎鍥綉绔彛"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -165,7 +166,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN2" prop="lanTwo">
- <el-input v-model="form.lanTwo" placeholder="璇疯緭鍏AN2"/>
+ <el-input v-model="form.lanTwo" placeholder="璇疯緭鍏ュ眬鍩熺綉绔彛"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -174,8 +175,8 @@
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="鐧诲綍璐︽埛" prop="loginAccount">
- <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ョ櫥褰曡处鎴�"/>
+ <el-form-item label="璐︽埛/瀵嗙爜" prop="loginAccount">
+ <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�/瀵嗙爜"/>
</el-form-item>
<el-form-item label="瀹夎浣嶇疆" prop="buildingId">
<building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
@@ -282,10 +283,10 @@
{required: true, message: "閫氶亾涓嶈兘涓虹┖", trigger: "change"}
],
lanOne: [
- {required: true, message: "LAN1涓嶈兘涓虹┖", trigger: "blur"},
+ {required: true, message: "鏍″洯缃戠鍙ｄ笉鑳戒负绌�", trigger: "blur"},
{
pattern: /^[0-9a-fA-F:]*$/,
- message: "璇疯緭鍏ユ纭殑LAN1",
+ message: "璇疯緭鍏ユ纭殑鏍″洯缃戠鍙�",
trigger: "blur"
}
],
@@ -300,7 +301,7 @@
lanTwo: [
{
pattern: /^[0-9a-fA-F:]*$/,
- message: "璇疯緭鍏ユ纭殑LAN2",
+ message: "璇疯緭鍏ユ纭殑灞�鍩熺綉绔彛",
trigger: "blur"
}
],
diff --git a/src/views/construction/exchange/index.vue b/src/views/construction/exchange/index.vue
index 2edb98f..25bd1af 100644
--- a/src/views/construction/exchange/index.vue
+++ b/src/views/construction/exchange/index.vue
@@ -135,13 +135,13 @@
<dict-tag :options="dict.type.DICT114" :value="scope.row.indexB"/>
</template>
</el-table-column>
- <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鍏蜂綋浣嶇疆" min-width="220" align="center" prop="address"/>
- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>
<el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" min-width="180" align="center" prop="model"/>
<el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText"/>
+<!-- <el-table-column label="鍏蜂綋浣嶇疆" min-width="220" align="center" prop="address"/>-->
+<!-- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="鍨嬪彿" min-width="180" align="center" prop="model"/>-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index d658ea5..671916d 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/index.vue
@@ -107,25 +107,25 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" align="center" min-width="300" prop="deploymentName"/>
<el-table-column label="鐗堟湰" align="center" prop="edition">
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT110" :value="scope.row.edition"/>
</template>
</el-table-column>
- <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>
+<!-- <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>-->
<el-table-column label="IP" align="center" min-width="130" prop="ip"/>
- <el-table-column label="閫氶亾1" align="center" min-width="180" prop="passagewayOne_dictText"/>
- <el-table-column label="閫氶亾2" align="center" min-width="180" prop="passagewayTwo_dictText"/>
- <el-table-column label="閫氶亾3" align="center" min-width="180" prop="passagewayThree_dictText"/>
- <el-table-column label="閫氶亾4" align="center" min-width="180" prop="passagewayFour_dictText"/>
- <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" min-width="150" align="center" prop="constructionBatchId_dictText"/>
- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" align="center" prop="model"/>
+ <el-table-column label="鐩戞帶瀵硅薄" align="center" min-width="220" prop="monitorObject"/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="220" prop="serialNumber"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText"/>
- <el-table-column label="鐩戞帶瀵硅薄" align="center" min-width="180" prop="monitorObject"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
+<!-- <el-table-column label="閫氶亾1" align="center" min-width="180" prop="passagewayOne_dictText"/>-->
+<!-- <el-table-column label="閫氶亾2" align="center" min-width="180" prop="passagewayTwo_dictText"/>-->
+<!-- <el-table-column label="閫氶亾3" align="center" min-width="180" prop="passagewayThree_dictText"/>-->
+<!-- <el-table-column label="閫氶亾4" align="center" min-width="180" prop="passagewayFour_dictText"/>-->
+<!-- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" min-width="150" align="center" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="鍨嬪彿" align="center" prop="model"/>-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 5206727..1e1aca8 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -75,20 +75,16 @@
</el-table-column>
<el-table-column label="MAC" min-width="150" align="center" prop="mac"/>
<el-table-column label="IP" width="130" align="center" prop="ip"/>
- <el-table-column label="绔彛" width="80" align="center" prop="port"/>
- <el-table-column label="鐧诲綍璐︽埛" min-width="120" align="center" prop="loginAccount"/>
- <el-table-column label="NVR" align="center" prop="nvrId_dictText">
+ <el-table-column label="璐︽埛/瀵嗙爜" min-width="180" align="center" prop="loginAccount"/>
+ <el-table-column label="NVR" align="center" min-width="150" prop="nvrId_dictText">
<template slot-scope="scope">
<el-link type="primary" @click="nvrClick(scope.row)">{{ scope.row.nvrId_dictText }}</el-link>
</template>
</el-table-column>
<el-table-column label="閫氶亾" align="center" prop="passageway_dictText"/>
- <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" min-width="200" align="center" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" min-width="120" align="center" prop="constructionBatchId_dictText"/>
<el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" min-width="180" align="center" prop="model"/>
<el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -126,9 +122,9 @@
/>
<!-- 娣诲姞鎴栦慨鏀筰pc璁惧瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="900px" :append-to-body="true" :close-on-click-modal="false"
+ <el-dialog :title="title" :visible.sync="open" width="920px" :append-to-body="true" :close-on-click-modal="false"
:destroy-on-close="true">
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="disabled">
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px" :disabled="disabled">
<el-row>
<el-col :span="8">
<el-form-item label="MAC" prop="mac">
@@ -146,8 +142,8 @@
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="鐧诲綍璐︽埛" prop="loginAccount">
- <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ョ櫥褰曡处鍙�"/>
+ <el-form-item label="璐︽埛/瀵嗙爜" prop="loginAccount">
+ <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�/瀵嗙爜"/>
</el-form-item>
<el-row>
<el-col :span="12">
@@ -157,7 +153,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫氶亾" prop="passageway">
- <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�">
+ <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT109"
:key="dict.value"
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index 0e9809e..06c1a0c 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -80,20 +80,20 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" min-width="150" align="center" prop="deploymentName"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="240" align="center" prop="deploymentName"/>
<el-table-column label="閫氶亾锛堣矾锛�" width="120" align="center" prop="passageway_dictText"/>
- <el-table-column label="LAN1" align="center" width="150" prop="lanOne"/>
- <el-table-column label="IP" align="center" width="130" prop="ipOne"/>
- <el-table-column label="LAN2" align="center" min-width="150" prop="lanTwo"/>
- <el-table-column label="IP" align="center" width="130" prop="ipTwo"/>
- <el-table-column label="鐧诲綍璐︽埛" align="center" min-width="120" prop="loginAccount"/>
+<!-- <el-table-column label="LAN1" align="center" width="150" prop="lanOne"/>-->
+<!-- <el-table-column label="IP" align="center" width="130" prop="ipOne"/>-->
+<!-- <el-table-column label="瀹夎浣嶇疆" align="center" min-width="240" prop="buildingId_dictText"/>-->
+<!-- <el-table-column label="鎵�灞炲崟浣�" align="center" min-width="200" prop="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>-->
+ <el-table-column label="IP锛圠AN2锛�" align="center" width="130" prop="ipTwo"/>
+<!-- <el-table-column label="LAN2" align="center" min-width="150" prop="lanTwo"/>-->
+ <el-table-column label="璐︽埛/瀵嗙爜" align="center" min-width="180" prop="loginAccount"/>
+ <el-table-column label="搴忓垪鍙�" min-width="220" align="center" prop="serialNumber"/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText"/>
<el-table-column label="纭洏" align="center" min-width="120" prop="hardDisk"/>
- <el-table-column label="瀹夎浣嶇疆" align="center" min-width="240" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" align="center" min-width="200" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>
- <el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="200" prop="manufacturerId_dictText"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -139,7 +139,7 @@
<!-- 娣诲姞鎴栦慨鏀筃VR璁惧瀵硅瘽妗� -->
<el-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" :disabled="disabled">
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px" :disabled="disabled">
<el-row>
<el-col :span="12">
<el-form-item label="閮ㄧ讲鍚嶇О" prop="deploymentName">
@@ -185,8 +185,8 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐧诲綍璐﹀彿" prop="loginAccount">
- <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ョ櫥褰曡处鍙�"/>
+ <el-form-item label="璐︽埛/瀵嗙爜" prop="loginAccount">
+ <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�/瀵嗙爜"/>
</el-form-item>
</el-col>
<el-col :span="12">
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index e274cbc..e3330d0 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -75,25 +75,25 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" min-width="120" align="center" prop="deploymentName"/>
- <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>
- <el-table-column label="IP" align="center" prop="ip" min-width="130"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="300" align="center" prop="deploymentName"/>
<el-table-column label="鎿嶄綔绯荤粺" align="center" min-width="180" prop="operatingSystem">
<template slot-scope="scope">
<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" 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" min-width="180" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>
+<!-- <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>-->
+ <el-table-column label="IP" align="center" prop="ip" min-width="130"/>
+ <el-table-column label="璐﹀彿/瀵嗙爜" align="center" width="220" prop="account"/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="240" prop="serialNumber"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText"/>
- <el-table-column label="鎬ц兘鎸囨爣" align="center" min-width="120" prop="performanceIndex"/>
- <el-table-column label="澶囨敞" align="center" min-width="120" prop="remarks"/>
+ <el-table-column label="澶囨敞" align="center" min-width="220" prop="remarks"/>
+<!-- <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" min-width="180" prop="model"/>-->
+<!-- <el-table-column label="鎬ц兘鎸囨爣" align="center" min-width="120" prop="performanceIndex"/>-->
<!-- <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">
@@ -170,8 +170,8 @@
</el-form-item>
</el-col>
<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 label="璐︽埛/瀵嗙爜" prop="account">
+ <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�/瀵嗙爜"/>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index 222e84e..ebf6b17 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/index.vue
@@ -70,19 +70,19 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="杞欢鍚嶇О" align="center" prop="name"/>
+ <el-table-column label="杞欢鍚嶇О" align="center" min-width="180" prop="name"/>
<el-table-column label="鐗堟湰" min-width="180" align="center" prop="edition"/>
- <el-table-column label="鍔熻兘鎻忚堪" min-width="180" align="center" prop="functionDescription"/>
<el-table-column label="鎺堟潈鏂瑰紡" min-width="180" align="center" prop="authorizationMethod_dictText"/>
<el-table-column label="鎺堟潈鏁伴噺" min-width="180" align="center" prop="authorizedQuantity"/>
- <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" prop="serverId_dictText">
+ <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" width="180" prop="serverId_dictText">
<template slot-scope="scope">
<el-link type="primary" @click="serverClick(scope.row)">{{scope.row.serverId_dictText}}</el-link>
</template>
</el-table-column>
- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>
<el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
- <el-table-column label="澶囨敞" align="center" min-width="180" prop="remarks"/>
+ <el-table-column label="鍔熻兘鎻忚堪" min-width="180" align="center" prop="functionDescription"/>
+<!-- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="澶囨敞" align="center" min-width="180" prop="remarks"/>-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
--
Gitblit v1.9.1