From 7327f887e85b42577bf5dbb51c05aaa36e9473f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=AD=81?= <2403457699@qq.com> Date: Thu, 15 Dec 2022 20:14:21 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B8=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c86cea4c5fb61b262591f8192d5a421fb117af63. --- src/assets/scss/buttonstyle.scss | 15 +- .../scss/modules/management/list-main.css | 324 ++++++++++++++++++ .../scss/modules/management/list-main.min.css | 1 + .../scss/modules/management/list-main.scss | 66 ++-- src/assets/scss/people-info.scss | 3 +- src/views/components/resiSearch.vue | 15 +- src/views/modules/base/resi.vue | 6 +- src/views/modules/shequ/cpts/peopleDetail.vue | 74 ++-- 8 files changed, 396 insertions(+), 108 deletions(-) create mode 100644 src/assets/scss/modules/management/list-main.css create mode 100644 src/assets/scss/modules/management/list-main.min.css diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index dd936d1a0..85056b160 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -36,7 +36,7 @@ height: 32px !important; // line-height: 22px !important; // padding:0 8px !important; - border: none; + } @@ -105,18 +105,7 @@ border-radius: 2px !important; border: 1px solid #0056D6 !important; } - // 普通按钮 -.diy-button--common { - font-size: 14px !important; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #606266 !important; - min-width: 60px !important; - height: 32px !important; - background: #FFFFFF !important; - border-radius: 2px !important; - border: 1px solid #dcdfe6 !important; -} + //操作栏更多 .diy-button--other { text-decoration: underline !important; diff --git a/src/assets/scss/modules/management/list-main.css b/src/assets/scss/modules/management/list-main.css new file mode 100644 index 000000000..1521b3e99 --- /dev/null +++ b/src/assets/scss/modules/management/list-main.css @@ -0,0 +1,324 @@ +.div_main { + width: 100%; +} + +.div_main .marginl-20 { + margin-left: 16px; +} + +.div_main .div_search { + padding: 10px; + background: #FFFFFF; + box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12); + margin: 7px 7px; +} + +.div_main .div_search /deep/ .el-form-item { + margin-bottom: 14px; +} + +.div_main .div_search .div_search_btn { + margin-right: 10px; + margin-top: 5px; + float: right; +} + +.div_main .div_search .div_search_label { + line-height: 36px; + margin-left: 24px; + margin-right: 6px; + font-size: 14px; + color: #606266; + vertical-align: middle; +} + +.div_main .data-tag { + margin-left: 10px; +} + +.div_main .item_width_normal { + width: 168px; +} + +.div_main .item_width_daterange { + width: 206px; +} + +.div_main .item_width_daterange2 { + width: 445px; +} + +.div_main .item_width_communitycascader { + width: 141px; +} + +.div_main .item_width_buildcascader { + width: 96px; +} + +.div_main .div_table { + margin: 16px 7px 7px; + background: #FFFFFF; + box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12); + position: relative; + padding: 24px 16px 10px; +} + +.div_main .div_table .div_btn { + display: flex; + justify-content: space-between; +} + +.div_main .div_table .div_btn .div_btn_left { + display: flex; +} + +.div_main .div_table .div_btn .div_btn_left .btn_upload { + margin-left: 10px; + display: flex; + text-align: center; +} + +.div_main .div_table .div_table_item { + margin-top: 16px; + position: relative; +} + +.div_main .setFormBoxHeight { + max-height: 153px; + overflow: hidden; +} + +.div_main .setFormBoxHeightAuto { + height: auto; +} + +.div_main .flex { + display: flex; + flex-wrap: nowrap; +} + +.div_main .hflex { + display: flex; + flex-flow: column; + overflow: hidden; +} + +.div_main .flex1 { + flex: 1; +} + +.div_main .mean { + justify-content: space-around; +} + +.div_main .endpoint { + justify-content: space-between; +} + +.div_main .align_item { + align-items: center; +} + +.div_main .font12 { + font-size: 12px; +} + +.div_main .font14 { + font-size: 14px !important; +} + +.div_main .font16 { + font-size: 16px !important; +} + +.div_main .font18 { + font-size: 18px !important; +} + +.div_main .p0 { + padding: 0 !important; +} + +.div_main .p10 { + padding: 10px; +} + +.div_main .p16 { + padding: 16px; +} + +.div_main .p50 { + padding: 50px; +} + +.div_main .p30 { + padding: 30px; +} + +.div_main .right5 { + margin-right: 5px; +} + +.div_main .right24 { + margin-right: 24px; +} + +.div_main .bottom8 { + margin-bottom: 8px; +} + +.div_main .bottom16 { + margin-bottom: 16px; +} + +.div_main .top2 { + margin-top: 2px; +} + +.div_main .top12 { + margin-top: 12px; +} + +.div_main .top24 { + margin-top: 24px !important; +} + +.div_main .top32 { + margin-top: 32px !important; +} + +.div_main .top40 { + margin-top: 40px !important; +} + +.div_main .top48 { + margin-top: 48px !important; +} + +.div_main .top8 { + margin-top: 8px !important; +} + +.div_main .bot8 { + margin-bottom: 8px; +} + +.div_main .bot24 { + margin-bottom: 24px !important; +} + +.div_main .top16 { + margin-top: 16px !important; +} + +.div_main .bot16 { + margin-bottom: 16px !important; +} + +.div_main .right8 { + margin-right: 8px !important; +} + +.div_main .margin30 { + margin: 30px; +} + +.div_main .m0 { + margin: 0 !important; +} + +.div_main .title-small { + border-left: solid 4px #0056d6; + height: 12px; + line-height: 16px; + margin-left: 70px; + padding-left: 6px; + font-size: 16px; + font-weight: bold; +} + +@media only screen and (min-width: 2013px) { + .div_main .showUnfold { + display: none; + } +} + +@media only screen and (min-width: 1481px) { + .div_main .communityUnfold { + display: none; + } +} + +.div_main .item_width_2 { + width: 138px; +} + +.div_main .item_width_1 { + width: 260px; +} + +.div_main .item_width_3 { + width: 200px; +} + +.div_main .list_item_width_1 { + width: 165px; +} + +.div_main .list_item_width_2 { + width: 135px; +} + +.div-mult-form { + margin-top: 20px; +} + +.div-mult-form .div_person { + display: flex; + font-size: 14px; + padding-bottom: 20px; +} + +.div-mult-form .div_person .person_title { + text-align: right; + flex: 0 0 100px; + line-height: 36px; + padding: 0 12px 0 0; +} + +.div-mult-form .div_person .tag_item { + margin-right: 10px; + margin-top: 10px; +} + +.div-mult-form .div_person .tag_tip { + margin-top: 10px; + color: #9c9c9c; +} + +.div-mult-table { + position: relative; + padding: 0 20px; +} + +.div-mult-table .div_selcount { + position: absolute; + bottom: 10px; + left: 30px; +} + +.div_dialog_table { + padding: 10px; +} + +.div_dialog_table .table { + margin-top: 20px; +} + +.twoline { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; +} diff --git a/src/assets/scss/modules/management/list-main.min.css b/src/assets/scss/modules/management/list-main.min.css new file mode 100644 index 000000000..28b03fbe9 --- /dev/null +++ b/src/assets/scss/modules/management/list-main.min.css @@ -0,0 +1 @@ +.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p16{padding:16px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:16px;margin-left:70px;padding-left:6px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}@media only screen and (min-width: 1481px){.div_main .communityUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden} diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 96922e6c2..0bdd9689e 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -120,133 +120,133 @@ height: auto; } // 弹性盒子 -.f-flex { +.flex { display: flex; flex-wrap: nowrap; } -.f-hflex { +.hflex { display: flex; flex-flow: column; overflow: hidden; } -.f-flex1 { +.flex1 { flex: 1; } -.f-mean { +.mean { justify-content: space-around; } -.f-endpoint { +.endpoint { justify-content: space-between; } -.f-align_item { +.align_item { align-items: center; } // 字体大小 -.f-font12 { +.font12 { font-size: 12px; } -.f-font14 { +.font14 { font-size: 14px !important; } -.f-font16 { +.font16 { font-size: 16px !important; } -.f-font18 { +.font18 { font-size: 18px !important; } //内边距 -.f-p0 { +.p0 { padding: 0 !important; } -.f-p10 { +.p10 { padding: 10px; } -.f-p16 { +.p16 { padding: 16px; } -.f-p50 { +.p50 { padding: 50px; } -.f-p30 { +.p30 { padding: 30px; } // 外边距 -.f-right5 { +.right5 { margin-right: 5px; } -.f-right24 { +.right24 { margin-right: 24px; } -.f-bottom8 { +.bottom8 { margin-bottom: 8px; } -.f-bottom16 { +.bottom16 { margin-bottom: 16px; } -.f-top2 { +.top2 { margin-top: 2px; } -.f-top12 { +.top12 { margin-top: 12px; } -.f-top24 { +.top24 { margin-top: 24px !important; } -.f-top32 { +.top32 { margin-top: 32px !important; } -.f-top40 { +.top40 { margin-top: 40px !important; } -.f-top48 { +.top48 { margin-top: 48px !important; } -.f-top8 { +.top8 { margin-top: 8px !important; } -.f-bot8 { +.bot8 { margin-bottom: 8px; } -.f-bot24 { +.bot24 { margin-bottom: 24px !important; } -.f-top16 { +.top16 { margin-top: 16px !important; } -.f-bot16 { +.bot16 { margin-bottom: 16px !important; } -.f-right8 { +.right8 { margin-right: 8px !important; } -.f-margin30 { +.margin30 { margin: 30px; } -.f-m0 { +.m0 { margin: 0 !important; } // 详情分类title diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss index 4c525796c..b0aa3714b 100644 --- a/src/assets/scss/people-info.scss +++ b/src/assets/scss/people-info.scss @@ -3,7 +3,6 @@ .m-pop { @include shield; - z-index: 2000; background-color: rgba(#000, 0.5); overflow-y: auto; @@ -52,7 +51,7 @@ .list { display: flex; flex-wrap: wrap; - padding: 10px 67px; + padding: 10px 97px; .item { position: relative; diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 8c08b8210..9d19c1847 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -23,11 +23,11 @@