From c89113ec9b5032b5553334ec6c9ac3700ba6c398 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 23 六月 2022 16:35:29 +0800
Subject: [PATCH] 1.设备管理、设备类型(查询、新增、删除)功能开发 2.设备管理、设备组(查询、新增、删除)功能开发
---
src/views/jcsz/jsqd.vue | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 8ed5b4e..096d44a 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -10,15 +10,15 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
- <el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
- <el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊绫诲瀷" style=" display: flex;">
- <el-select v-model="form.RoleTypeCode" filterable style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.RoleTypeCode" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -28,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
<div style="display: flex;align-items: start;margin-top: 5px;">
@@ -47,6 +47,7 @@
<el-table
:data="tableData"
border
+ stripe
:style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -212,7 +213,7 @@
<el-table-column
width="50"
label="搴忓彿"
- type="index"
+ prop="RowNum"
/>
<el-table-column
prop="roletype_code"
@@ -789,6 +790,7 @@
this.RoleTypeCodeArr.splice(index, 1)
}
})
+ this.getRoleTypeSearch2()
},
// 璁剧疆瀵硅瘽妗嗗彇娑堜簨浠�
settingDialogVisibleCancel() {
@@ -840,7 +842,7 @@
// 璁剧疆琛ㄥ崟鍙栨秷浜嬩欢
formSettingCancel(row) {
this.RoleTypeCodeArr.forEach((item, index) => {
- if (item.isVisible === 1) {
+ if (item.isVisible === 1 && item.roletype_code === row.roletype_code) {
this.RoleTypeCodeArr.splice(index, 1)
}
})
@@ -1069,7 +1071,7 @@
this.dialogVisibleRight = false
},
// 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
- async rightDialogVisibleConfirm() {
+ async rightDialogVisibleConfirm() {
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
@@ -1276,17 +1278,25 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
-::v-deep .el-button--info {
+::v-deep .el-button--info{
//background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -1299,6 +1309,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -1401,7 +1412,7 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
@@ -1462,4 +1473,11 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 100%;
+ flex-wrap: wrap;
+}
</style>
--
Gitblit v1.9.3