diff --git a/src/assets/scss/modules/management/list-main.css b/src/assets/scss/modules/management/list-main.css index 9e5ef5f8b..3ce4cf916 100644 --- a/src/assets/scss/modules/management/list-main.css +++ b/src/assets/scss/modules/management/list-main.css @@ -85,7 +85,7 @@ } .div_main .setFormBoxHeight { - max-height: 99px; + max-height: 153px; overflow: hidden; } @@ -93,6 +93,154 @@ height: auto; } +.div_main .flex { + display: flex; + flex-wrap: nowrap; +} + +.div_main .hflex { + display: flex; + flex-flow: column; + overflow: hidden; + height: 100%; +} + +.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 .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: 20px; + margin-left: -36px; + padding-left: 30px; + font-size: 16px; + font-weight: bold; +} + +@media only screen and (min-width: 2013px) { + .div_main .showUnfold { + display: none; + } +} + .div_main .item_width_2 { width: 138px; } diff --git a/src/assets/scss/modules/management/list-main.min.css b/src/assets/scss/modules/management/list-main.min.css index 379c79249..d2ddb7042 100644 --- a/src/assets/scss/modules/management/list-main.min.css +++ b/src/assets/scss/modules/management/list-main.min.css @@ -1 +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:99px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.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} +.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;height:100%}.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 .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:20px;margin-left:-36px;padding-left:30px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{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 e14eea038..69f60a47a 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -98,13 +98,155 @@ // 搜索栏高度控制显示隐藏 .setFormBoxHeight{ - max-height: 99px; + max-height: 153px; overflow: hidden; } .setFormBoxHeightAuto{ height: auto; } +// 弹性盒子 +.flex { + display: flex; + flex-wrap: nowrap; +} + +.hflex { + display: flex; + flex-flow: column; + overflow: hidden; + height: 100%; +} + +.flex1 { + flex: 1; +} + +.mean { + justify-content: space-around; +} + +.endpoint { + justify-content: space-between; +} + +.align_item { + align-items: center; +} +// 字体大小 +.font12 { + font-size: 12px; +} + +.font14 { + font-size: 14px !important; +} + +.font16 { + font-size: 16px !important; +} + +.font18 { + font-size: 18px !important; +} +//内边距 +.p0 { + padding: 0 !important; +} +.p10 { + padding: 10px; +} + +.p50 { + padding: 50px; +} + +.p30 { + padding: 30px; +} +// 外边距 +.right5 { + margin-right: 5px; +} + +.right24 { + margin-right: 24px; +} + +.bottom8 { + margin-bottom: 8px; +} + +.bottom16 { + margin-bottom: 16px; +} +.top2 { + margin-top: 2px; +} + +.top12 { + margin-top: 12px; +} + +.top24 { + margin-top: 24px !important; +} +.top32 { + margin-top: 32px !important; +} +.top40 { + margin-top: 40px !important; +} + +.top48 { + margin-top: 48px !important; +} + +.top8 { + margin-top: 8px !important; +} + +.bot8 { + margin-bottom: 8px; +} + +.bot24 { + margin-bottom: 24px !important; +} + +.top16 { + margin-top: 16px !important; +} + +.bot16 { + margin-bottom: 16px !important; +} +.right8 { + margin-right: 8px !important; +} + +.margin30 { + margin: 30px; +} + +.m0 { + margin: 0 !important; +} +// 详情分类title +.title-small { + border-left: solid 4px rgba(0, 86, 214, 1); + height: 12px; + line-height: 20px; + margin-left: -36px; + padding-left: 30px; + font-size: 16px; + font-weight: bold; +} +@media only screen and (min-width: 2013px) { + .showUnfold { + display: none; + } +} //---------旧版 .item_width_2{ diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 88c7463d2..a5e8ce76d 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -109,7 +109,7 @@ 重置 查询 - {{ boxHeight ? '收起' : '展开' }} diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index e73eb7c58..02ff8be80 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -336,7 +336,7 @@ }" @close="handleDiyClose"> - +
+
+
+
+ 居民详情 + + + +
+
+
+ 显示脱敏信息 +
+ +
+
+
+ 所属网格： + {{ gridName }} +
+
+ 所属小区： + {{ xiaoquName }} +
+
+ 所属楼栋： + {{ louName }}-{{ danyuanName }} +
+
+ 所属家庭： + {{ homeName }} +
+
+ {{ field.label }}： + {{ info[field.columnName]||'--'}} + {{ + info[field.columnName] == null + ? "--" + : getOptionLabel( + field.options, + info[field.columnName], + field.itemType + ) + }} + + {{ + info[field.columnName] == null ? "--" : info[field.columnName] + }} +
+
+ +
+
+ +
+
+ +
+
+ {{ item.label }} +
+
+ +
+
+ +
+
+
+
+ {{ field.label }}： + {{ + infoItem[field.columnName] == null + ? "--" + : getOptionLabel( + field.options, + infoItem[field.columnName], + field.itemType + ) + }} + + {{ + infoItem[field.columnName] == null + ? "--" + : infoItem[field.columnName] + }} +
+
+
+
+ + + + + + + + + + +
+
+ + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+
+
+ {{ field.label }}： + {{ + !allInfo[group.tableName] || + allInfo[group.tableName][0][field.columnName] == null + ? "--" + : getOptionLabel( + field.options, + allInfo[group.tableName][0][field.columnName], + field.itemType + ) + }} + + {{ + !allInfo[group.tableName] || + allInfo[group.tableName][0][field.columnName] == null + ? "--" + : allInfo[group.tableName][0][field.columnName] + }} +
+
+
+
+
+
+ + + + + + \ No newline at end of file