From 4001279159dd37942b3cf4c83ab537f95832a82d Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 06 六月 2022 13:33:21 +0800
Subject: [PATCH] BUG修改
---
src/views/construction/constructionBatch/index.vue | 12 +-
src/views/device/peripheralUnit/index.vue | 18 ++--
src/assets/styles/custom.scss | 3
src/views/construction/reserveIp/index.vue | 12 +-
src/views/construction/server/index.vue | 18 ++--
src/views/construction/system/index.vue | 18 ++--
src/views/basics/building/index.vue | 2
src/views/basics/organization/index.vue | 4
src/views/construction/exchange/index.vue | 22 ++--
src/views/construction/ipc/index.vue | 16 ++--
src/views/monitor/logininfor/index.vue | 4
src/views/construction/iot/index.vue | 16 ++--
src/views/basics/manufacturer/index.vue | 10 +-
src/views/device/equipment/index.vue | 14 +-
src/views/construction/ai/index.vue | 14 +-
src/views/construction/nvr/index.vue | 14 +-
src/views/device/batch/index.vue | 2
17 files changed, 101 insertions(+), 98 deletions(-)
diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss
index b8580c2..f6ebab3 100644
--- a/src/assets/styles/custom.scss
+++ b/src/assets/styles/custom.scss
@@ -19,3 +19,6 @@
flex-direction: row;
align-items: center;
}
+.el-dialog__body {
+ padding: 15px 20px 0 20px!important;
+}
diff --git a/src/views/basics/building/index.vue b/src/views/basics/building/index.vue
index 8bf17db..1ab522a 100644
--- a/src/views/basics/building/index.vue
+++ b/src/views/basics/building/index.vue
@@ -46,7 +46,7 @@
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
- <el-table-column label="鍗曞厓鍚嶇О" align="left" prop="name"/>
+ <el-table-column label="鍗曞厓鍚嶇О" align="left" prop="name" show-overflow-tooltip/>
<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">
diff --git a/src/views/basics/manufacturer/index.vue b/src/views/basics/manufacturer/index.vue
index f647474..74d718d 100644
--- a/src/views/basics/manufacturer/index.vue
+++ b/src/views/basics/manufacturer/index.vue
@@ -96,12 +96,12 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="鍘傚晢鍚嶇О" align="center" prop="name" />
- <el-table-column label="鍘傚晢浠ｇ爜" align="center" prop="code" />
- <el-table-column label="鑱旂郴鏂瑰紡" align="center" prop="phone" />
- <el-table-column label="閭" align="center" prop="mailbox" />
+ <el-table-column label="鍘傚晢鍚嶇О" align="center" prop="name" show-overflow-tooltip/>
+ <el-table-column label="鍘傚晢浠ｇ爜" align="center" prop="code" show-overflow-tooltip/>
+ <el-table-column label="鑱旂郴鏂瑰紡" align="center" prop="phone" show-overflow-tooltip/>
+ <el-table-column label="閭" align="center" prop="mailbox" show-overflow-tooltip/>
<el-table-column label="鑱旂郴鍦板潃" align="center" prop="contactAddress" show-overflow-tooltip />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" width="120" fixed="right" align="center" 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 90a2019..be5a4d0 100644
--- a/src/views/basics/organization/index.vue
+++ b/src/views/basics/organization/index.vue
@@ -37,8 +37,8 @@
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
- <el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name"/>
- <el-table-column label="鏈烘瀯缂栧彿" align="left" width="150" prop="code"/>
+ <el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name" show-overflow-tooltip/>
+ <el-table-column label="鏈烘瀯缂栧彿" align="left" width="150" prop="code" show-overflow-tooltip/>
<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">
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index 728db15..017e969 100644
--- a/src/views/construction/ai/index.vue
+++ b/src/views/construction/ai/index.vue
@@ -70,29 +70,29 @@
<el-table v-loading="loading" :data="aiList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
- <el-table-column label="搴忓彿" type="index" align="center">
+ <el-table-column label="搴忓彿" type="index" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" min-width="300" align="center" prop="deploymentName"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="300" align="center" prop="deploymentName" show-overflow-tooltip/>
<!-- <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="IP锛圠AN1锛�" width="130" align="center" prop="ipOne" show-overflow-tooltip/>
<!-- <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="220" align="center" prop="loginAccount" show-overflow-tooltip/>
<!-- <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="150" align="center" prop="serialNumber" show-overflow-tooltip/>
<!-- <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="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<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/constructionBatch/index.vue b/src/views/construction/constructionBatch/index.vue
index 852e68c..71388c5 100644
--- a/src/views/construction/constructionBatch/index.vue
+++ b/src/views/construction/constructionBatch/index.vue
@@ -55,15 +55,15 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="鏂藉伐鎵规" align="center" prop="batch" />
- <el-table-column label="鏂藉伐鍛ㄦ湡" align="center" width="180">
+ <el-table-column label="鏂藉伐鎵规" align="center" prop="batch" show-overflow-tooltip />
+ <el-table-column label="鏂藉伐鍛ㄦ湡" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.startDate + ' - ' + scope.row.endDate }}</span>
</template>
</el-table-column>
- <el-table-column label="璐熻矗浜�" align="center" prop="userId_dictText" />
- <el-table-column label="鍥㈤槦鎴愬憳" align="center" prop="teamMembers" />
- <el-table-column label="澶囨敞" align="center" prop="remarks" />
+ <el-table-column label="璐熻矗浜�" align="center" prop="userId_dictText" show-overflow-tooltip />
+ <el-table-column label="鍥㈤槦鎴愬憳" align="center" prop="teamMembers" show-overflow-tooltip />
+ <el-table-column label="澶囨敞" align="center" prop="remarks" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -122,7 +122,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="10" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.remarks" type="textarea" rows="4" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/construction/exchange/index.vue b/src/views/construction/exchange/index.vue
index 5030eac..e050300 100644
--- a/src/views/construction/exchange/index.vue
+++ b/src/views/construction/exchange/index.vue
@@ -115,29 +115,29 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="缃戠粶绔彛" align="center" prop="networkPort">
+ <el-table-column label="缃戠粶绔彛" align="center" prop="networkPort" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort"/>
+ <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort" show-overflow-tooltip/>
</template>
</el-table-column>
- <el-table-column label="鎸囨爣A" align="center" prop="idnexA">
+ <el-table-column label="鎸囨爣A" align="center" prop="idnexA" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA"/>
+ <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA" show-overflow-tooltip/>
</template>
</el-table-column>
- <el-table-column label="绾ц仈绔彛" align="center" prop="cascadePort">
+ <el-table-column label="绾ц仈绔彛" align="center" prop="cascadePort" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort"/>
+ <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort" show-overflow-tooltip/>
</template>
</el-table-column>
- <el-table-column label="鎸囨爣B" align="center" prop="indexB">
+ <el-table-column label="鎸囨爣B" align="center" prop="indexB" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT114" :value="scope.row.indexB"/>
</template>
</el-table-column>
- <el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
- <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="180" align="center" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<!-- <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"/>-->
@@ -244,7 +244,7 @@
<building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item label="鍏蜂綋浣嶇疆" prop="address">
- <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="8" placeholder="璇疯緭鍏ュ叿浣撲綅缃�""/>
+ <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="3" placeholder="璇疯緭鍏ュ叿浣撲綅缃�""/>
</el-form-item>
<el-form-item label="鎵�灞炲崟浣�" prop="organizationId">
<organization v-if="open" v-model="form.organizationId" :schoolId="schoolId"></organization>
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 80cb471..e972c02 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/index.vue
@@ -107,18 +107,18 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" align="center" min-width="300" prop="deploymentName"/>
- <el-table-column label="鐗堟湰" align="center" prop="edition">
+ <el-table-column label="閮ㄧ讲鍚嶇О" align="center" min-width="300" prop="deploymentName" show-overflow-tooltip/>
+ <el-table-column label="鐗堟湰" align="center" prop="edition" show-overflow-tooltip>
<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="IP" align="center" min-width="130" prop="ip"/>
- <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="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
+ <el-table-column label="IP" align="center" min-width="130" prop="ip" show-overflow-tooltip/>
+ <el-table-column label="鐩戞帶瀵硅薄" align="center" min-width="220" prop="monitorObject" show-overflow-tooltip/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="220" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<!-- <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"/>-->
@@ -245,7 +245,7 @@
</el-col>
</el-row>
<el-form-item label="鐩戞帶瀵硅薄" prop="monitorObject">
- <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="8" placeholder="璇疯緭鍏ュ唴瀹�"/>
+ <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="3" placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index a0f37e2..6d394ef 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -73,18 +73,18 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</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="璐︽埛/瀵嗙爜" min-width="180" align="center" prop="loginAccount"/>
- <el-table-column label="NVR" align="center" min-width="150" prop="nvrId_dictText">
+ <el-table-column label="MAC" min-width="150" align="center" prop="mac" show-overflow-tooltip/>
+ <el-table-column label="IP" width="130" align="center" prop="ip" show-overflow-tooltip/>
+ <el-table-column label="璐︽埛/瀵嗙爜" min-width="180" align="center" prop="loginAccount" show-overflow-tooltip/>
+ <el-table-column label="NVR" align="center" min-width="150" prop="nvrId_dictText" show-overflow-tooltip>
<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="180" align="center" prop="serialNumber"/>
- <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" prop="passageway_dictText" show-overflow-tooltip/>
+ <el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<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/nvr/index.vue b/src/views/construction/nvr/index.vue
index fd466ca..9b1d89c 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="240" align="center" prop="deploymentName"/>
- <el-table-column label="閫氶亾锛堣矾锛�" width="120" align="center" prop="passageway_dictText"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="240" align="center" prop="deploymentName" show-overflow-tooltip/>
+ <el-table-column label="閫氶亾锛堣矾锛�" width="120" align="center" prop="passageway_dictText" show-overflow-tooltip/>
<!-- <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="IP锛圠AN2锛�" align="center" width="130" prop="ipTwo" show-overflow-tooltip/>
<!-- <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="180" prop="loginAccount" show-overflow-tooltip/>
+ <el-table-column label="搴忓垪鍙�" min-width="220" align="center" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="纭洏" align="center" min-width="120" prop="hardDisk" show-overflow-tooltip/>
<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/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index d5fefc5..b099a10 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/src/views/construction/reserveIp/index.vue
@@ -61,15 +61,15 @@
<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="鐢宠鏃ユ湡" align="center" prop="applicationDate" width="180">
+ <el-table-column label="IP鍦板潃" align="center" prop="ip" show-overflow-tooltip/>
+ <el-table-column label="MAC鍦板潃" align="center" prop="mac" show-overflow-tooltip/>
+ <el-table-column label="閫傜敤鍦扮偣" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applicationDate" width="180" show-overflow-tooltip>
<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" :show-overflow-tooltip="true"/>
+ <el-table-column label="澶囨敞" align="center" prop="remarks" show-overflow-tooltip/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -122,7 +122,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" :rows="10" maxlength="512" show-word-limit
+ <el-input v-model="form.remarks" type="textarea" :rows="4" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index b873d4f..dd8c1ce 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -75,18 +75,18 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" min-width="300" align="center" prop="deploymentName"/>
- <el-table-column label="鎿嶄綔绯荤粺" align="center" min-width="180" prop="operatingSystem">
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="300" align="center" prop="deploymentName" show-overflow-tooltip/>
+ <el-table-column label="鎿嶄綔绯荤粺" align="center" min-width="180" prop="operatingSystem" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
</template>
</el-table-column>
<!-- <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="220" prop="remarks"/>
+ <el-table-column label="IP" align="center" prop="ip" min-width="130" show-overflow-tooltip/>
+ <el-table-column label="璐﹀彿/瀵嗙爜" align="center" width="220" prop="account" show-overflow-tooltip/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="240" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="澶囨敞" align="center" min-width="220" prop="remarks" show-overflow-tooltip/>
<!-- <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"/>-->
@@ -212,11 +212,11 @@
</el-col>
</el-row>
<el-form-item label="鎬ц兘鎸囨爣" prop="performanceIndex">
- <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="512" show-word-limit
+ <el-input v-model="form.performanceIndex" type="textarea" :rows="3" 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="512" show-word-limit
+ <el-input v-model="form.remarks" type="textarea" :rows="3" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index 89b23f8..026e8d9 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/index.vue
@@ -70,17 +70,17 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <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="authorizationMethod_dictText"/>
- <el-table-column label="鎺堟潈鏁伴噺" min-width="180" align="center" prop="authorizedQuantity"/>
- <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" width="180" prop="serverId_dictText">
+ <el-table-column label="杞欢鍚嶇О" align="center" min-width="180" prop="name" show-overflow-tooltip/>
+ <el-table-column label="鐗堟湰" min-width="180" align="center" prop="edition" show-overflow-tooltip/>
+ <el-table-column label="鎺堟潈鏂瑰紡" min-width="180" align="center" prop="authorizationMethod_dictText" show-overflow-tooltip/>
+ <el-table-column label="鎺堟潈鏁伴噺" min-width="180" align="center" prop="authorizedQuantity" show-overflow-tooltip/>
+ <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" width="180" prop="serverId_dictText" show-overflow-tooltip>
<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="220" align="center" prop="manufacturerId_dictText"/>
- <el-table-column label="鍔熻兘鎻忚堪" min-width="180" align="center" prop="functionDescription"/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="鍔熻兘鎻忚堪" min-width="180" align="center" prop="functionDescription" show-overflow-tooltip/>
<!-- <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">
@@ -142,7 +142,7 @@
</el-col>
</el-row>
<el-form-item label="鍔熻兘鎻忚堪" prop="functionDescription">
- <el-input v-model="form.functionDescription" :rows="8" maxlength="512" show-word-limit type="textarea"
+ <el-input v-model="form.functionDescription" :rows="3" maxlength="512" show-word-limit type="textarea"
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
<el-row>
@@ -193,7 +193,7 @@
<el-input v-model="form.address" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
+ <el-input v-model="form.remarks" :rows="3" maxlength="512" show-word-limit type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/device/batch/index.vue b/src/views/device/batch/index.vue
index 90b3f83..3a92880 100644
--- a/src/views/device/batch/index.vue
+++ b/src/views/device/batch/index.vue
@@ -75,7 +75,7 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="鐢熶骇鎵规" align="center" prop="batch" />
+ <el-table-column label="鐢熶骇鎵规" align="center" prop="batch" show-overflow-tooltip/>
<el-table-column label="涓嬪崟鏃ユ湡" align="center" prop="orderDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 5a3f065..479b0a8 100644
--- a/src/views/device/equipment/index.vue
+++ b/src/views/device/equipment/index.vue
@@ -139,19 +139,19 @@
{{formatZero(scope.row.serialNumber, 4)}}
</template>
</el-table-column>
- <el-table-column label="璁惧绫诲瀷" min-width="120" align="center" prop="type_dictText"/>
- <el-table-column label="纭欢搴忓垪鐮�" min-width="120" align="center" prop="sequenceCode" show-overflow-tooltip/>
+ <el-table-column label="璁惧绫诲瀷" min-width="120" align="center" prop="type_dictText" show-overflow-tooltip/>
+ <el-table-column label="纭欢搴忓垪鐮�" min-width="180" align="center" prop="sequenceCode" show-overflow-tooltip/>
<el-table-column label="杞欢鐗堟湰" align="center" min-width="120" prop="edition" show-overflow-tooltip/>
<el-table-column label="瀛︽牎鍚嶇О" align="center" prop="schoolId_dictText" show-overflow-tooltip/>
- <el-table-column label="涓绘満ID" align="center" min-width="120" prop="hostId"/>
- <el-table-column label="尾缃戠粶ID" align="center" prop="networkId"/>
- <el-table-column label="尾宸ヤ綔棰戞" align="center" prop="frequencyBand">
+ <el-table-column label="涓绘満ID" align="center" min-width="120" prop="hostId" show-overflow-tooltip/>
+ <el-table-column label="尾缃戠粶ID" align="center" prop="networkId" show-overflow-tooltip/>
+ <el-table-column label="尾宸ヤ綔棰戞" align="center" prop="frequencyBand" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT102" :value="scope.row.frequencyBand"/>
</template>
</el-table-column>
- <el-table-column label="鐢熶骇鎵规" align="center" prop="batchId_dictText"/>
- <el-table-column label="鍦ㄧ敤" align="center" prop="useStatus">
+ <el-table-column label="鐢熶骇鎵规" min-width="150" align="center" prop="batchId_dictText" show-overflow-tooltip/>
+ <el-table-column label="鍦ㄧ敤" align="center" prop="useStatus" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT104" :value="scope.row.useStatus"/>
</template>
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index 55b7c49..f733fd9 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -119,19 +119,19 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code"/>
- <el-table-column label="澶栬鍚嶇О" align="center" prop="name" show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="60"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText"/>
- <el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText"/>
- <el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate">
+ <el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code" show-overflow-tooltip/>
+ <el-table-column label="澶栬鍚嶇О" align="center" min-width="180" prop="name" show-overflow-tooltip/>
+ <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="120" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText" min-width="200" show-overflow-tooltip/>
+ <el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText" show-overflow-tooltip/>
+ <el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
</template>
</el-table-column>
- <el-table-column label="闂鎸囦护" align="center" width="220" prop="readInstruction"/>
- <el-table-column label="鎸囦护闀垮害" width="80" align="center" prop="orderLength"/>
- <el-table-column label="杩斿洖闀垮害" width="80" align="center" prop="loopLength"/>
+ <el-table-column label="闂鎸囦护" align="center" width="220" prop="readInstruction" show-overflow-tooltip/>
+ <el-table-column label="鎸囦护闀垮害" width="80" align="center" prop="orderLength" show-overflow-tooltip/>
+ <el-table-column label="杩斿洖闀垮害" width="80" align="center" prop="loopLength" show-overflow-tooltip/>
<!-- <el-table-column label="瑙ｆ瀽璇存槑" align="center" min-width="300" show-overflow-tooltip prop="description"/>-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
<template slot-scope="scope">
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 8e133dd..d86d3ca 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -97,13 +97,13 @@
<el-table-column label="鐧诲綍鍦板潃" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="娴忚鍣�" align="center" prop="browser" :show-overflow-tooltip="true" />
- <el-table-column label="鎿嶄綔绯荤粺" width="180" align="center" prop="os" />
+ <el-table-column label="鎿嶄綔绯荤粺" width="180" align="center" prop="os" show-overflow-tooltip/>
<el-table-column label="鐧诲綍鐘舵��" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔淇℃伅" align="center" prop="msg" />
+ <el-table-column label="鎿嶄綔淇℃伅" align="center" prop="msg" show-overflow-tooltip/>
<el-table-column label="鐧诲綍鏃ユ湡" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) }}</span>
--
Gitblit v1.9.1