From e846eefa54a7a2274a34d43d4601e192a1ada3d9 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 25 六月 2022 13:16:07 +0800
Subject: [PATCH] 1.项目整体样式的配置2.实现工艺设置动态添加的静态样式
---
src/views/jcsz/jsqd.vue | 110 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 34 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0eaa63c..badb582 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -1,8 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;">
- <!-- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">-->
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -10,15 +9,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" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.RoleTypeCode" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -28,7 +27,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;">
@@ -37,22 +36,25 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex; z-index: 2">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
+ stripe
+ :height="tableHeight"
+ :style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- :style="{width: 100+'%',height:tableHeight+'px'}"-->
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -142,7 +144,7 @@
<!-- 鏂板淇敼瀵硅瘽妗�-->
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
top="15vh"
@@ -159,6 +161,8 @@
<el-form-item prop="RoleTypeCode" label="瑙掕壊绫诲瀷">
<el-select
v-model="dialogForm.RoleTypeCode"
+ filterable
+ :popper-append-to-body="false"
style="width: 220px"
placeholder="璇烽�夋嫨"
>
@@ -188,7 +192,6 @@
width="50%"
top="15vh"
class="settingDialogVisible"
- @closed="handleCloseSetting"
@close="handleCloseSetting"
>
<div style="margin-bottom: 20px;display: flex">
@@ -211,7 +214,7 @@
<el-table-column
width="50"
label="搴忓彿"
- type="index"
+ prop="RowNum"
/>
<el-table-column
prop="roletype_code"
@@ -233,7 +236,7 @@
<div v-else> {{ row.roletype_name }}</div>
</template>
</el-table-column>
- <el-table-column>
+ <el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
@@ -272,7 +275,7 @@
<el-dialog
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
- width="90%"
+ width="80%"
top="15vh"
class="userDialogVisible"
@closed="handleCloseUser"
@@ -297,6 +300,8 @@
<el-cascader
ref="dialogCascaderUser"
key="cascaderKey"
+ filterable
+ :append-to-body="false"
:options="StuOrgArr"
:props="defaultProps"
class="userDialogVisibleInput"
@@ -308,6 +313,8 @@
<el-form-item label="鍏宠仈瑙掕壊">
<el-select
v-model="dialogFormUser.isrole"
+ filterable
+ :popper-append-to-body="false"
style="width: 220px"
placeholder="璇烽�夋嫨"
class="userDialogVisibleInput"
@@ -491,7 +498,7 @@
DeleteRole, RoleAssociationRight,
RoleAssociationUser,
RoleSearch, RoleTypeAdd,
- RoleTypeDelete, RoleTypeSearch, SaveRoleAssoctUser, SaveUserAssoctRight, UserOrganization
+ RoleTypeDelete, RoleTypeSearch, RoleTypeSelect, SaveRoleAssoctUser, SaveUserAssoctRight, UserOrganization
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
@@ -532,7 +539,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
total: 10,
RoleTypeCodeArr: [], // 瑙掕壊绫诲瀷缂栫爜鏁扮粍
@@ -644,13 +651,7 @@
})
},
async getRoleTypeSearch2() { // 鎼滅储灞曠ず鐨勫唴瀹�
- const data = {
- page: 1,
- rows: 1000000,
- prop: 'roletype_code',
- order: 'desc'
- }
- const res = await RoleTypeSearch(data)
+ const res = await RoleTypeSelect()
this.RoleTypeCodeArr2 = res.data
},
settingButton() {
@@ -780,7 +781,7 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
})
},
@@ -792,6 +793,7 @@
this.RoleTypeCodeArr.splice(index, 1)
}
})
+ this.getRoleTypeSearch2()
},
// 璁剧疆瀵硅瘽妗嗗彇娑堜簨浠�
settingDialogVisibleCancel() {
@@ -843,7 +845,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)
}
})
@@ -977,7 +979,7 @@
this.$nextTick(() => {
$('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 10)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
}
// 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
@@ -988,7 +990,7 @@
this.$nextTick(() => {
$('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 10)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
}
// 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
@@ -1002,7 +1004,7 @@
$('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
$('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 10)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
}
this.dialogFormRight.rightOperationArr.push({
@@ -1072,7 +1074,7 @@
this.dialogVisibleRight = false
},
// 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
- async rightDialogVisibleConfirm() {
+ async rightDialogVisibleConfirm() {
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
@@ -1279,17 +1281,29 @@
height: 30px;
display: flex;
align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
}
-::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 {
@@ -1302,6 +1316,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -1404,7 +1419,10 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
}
::v-deep .el-table .caret-wrapper {
@@ -1465,4 +1483,28 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+.body ::v-deep .el-divider{
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+.body ::v-deep .el-form-item{
+ margin-bottom: 0;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
+
</style>
--
Gitblit v1.9.3