diff --git a/src/App.vue b/src/App.vue index 8ed69a1f8..c61c7b92f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -115,11 +115,16 @@ export default { } } +//弹框标题 .el-dialog__title { - font-size: 17px !important; - font-family: Source Han Serif CN !important; - font-weight: 600 !important; - color: #0043c8 !important; + font-size: 16px !important; + font-family: PingFangSC-Medium, PingFang SC !important; + font-weight: 500 !important; + color: rgba(0, 0, 0, 0.85) !important; +} +.el-dialog__header { + padding-bottom: 16px !important; + border-bottom: 1px solid #dcdee0 !important; } .tox-dialog__disable-scroll { diff --git a/src/assets/scss/modules/management/edit-main copy.scss b/src/assets/scss/modules/management/edit-main copy.scss new file mode 100644 index 000000000..a31e4f388 --- /dev/null +++ b/src/assets/scss/modules/management/edit-main copy.scss @@ -0,0 +1,151 @@ + +@import "@/assets/scss/c/config.scss"; +@import "@/assets/scss/c/function.scss"; + + +.edit_form{ + +} + +//编辑框-普通form宽度 +.edit_item_width_normal{ +width:320px; +} + +.m-edit{ + + .m-form{ + padding-left:20px; + padding-right:25px; + } + + + /deep/ .el-form .el-form-item{ + border: 1px solid #D3DCE6; + margin-bottom: 0; + margin-top:2px; + height:47px; + // line-height: 40px; + } + + + .item-map{ + /deep/ .el-form-item{ + height:350px; + // line-height: 40px; + + } + + .map_line{ + // height:5px; + // background-color: #ffffff; + } + + .div_map{ + margin-top:10px; + height:280px; + padding-bottom:10px; + } + } + .item-image{ + /deep/ .el-form-item{ + height:185px; + // line-height: 40px; + } + + .item-imagebtn { + + display: flex; + justify-content: space-between; + padding: 11px 23px; + align-items: center; + } + + .d-img{ + height:140px; + // width:117px; + } + + .pic-btn { + width: 75px; + height: 25px; + background: linear-gradient(0deg, #32adab 0%, #2ad0cc 100%); + border-radius: 3px; + font-size: 14px; + font-family: Source Han Serif CN; + font-weight: 500; + color: #ffffff; + line-height: 23px; + text-align: center; + } + } + + .item-textarea{ + /deep/ .el-form-item{ + height:89px; + // line-height: 40px; + } + /deep/ .el-form-item__content{ + height:78px; + } + + /deep/ .el-input__countx { + background:none; + } + } + + /deep/ .el-form-item__label{ + background: #D6E2F8; + height:100%; + line-height: 40px; + } + /deep/ .el-form-item__content{ + width:760px; + margin:5px 6px; + background: #F6F6F6; + padding:0 16px; + line-height: 36px + } + /deep/ .el-input__inner{ + width:95%; + background-color: #F6F6F6; + border:0px; + line-height: 26px; + padding:0px; + } + /deep/ .el-textarea__inner { + + width:100%; + background-color: #F6F6F6; + border:0px; + line-height: 26px; + padding:0px; + } + + /deep/ .el-input .el-input__count .el-input__count-inner { + background:none; + } + + /deep/ .el-input__prefix{ + left:700px; + } + +} + +.edit_item_width_1{ + width:100%; +} +//带着按钮 +.edit_item_btn_width_1{ + width:650px; +} + +.edit-btn-1{ + float:right; + margin-right:10px; +} +.div_btn { + margin-top: 20px; + text-align: center; +} + diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss index 4d507d7f0..0b7802b14 100644 --- a/src/assets/scss/modules/management/edit-main.scss +++ b/src/assets/scss/modules/management/edit-main.scss @@ -2,141 +2,38 @@ @import "@/assets/scss/c/config.scss"; @import "@/assets/scss/c/function.scss"; +.edit_form{ + margin-top: 30px; -.m-edit{ - - .m-form{ - padding-left:20px; - padding-right:25px; - } - - - /deep/ .el-form .el-form-item{ - border: 1px solid #D3DCE6; - margin-bottom: 0; - margin-top:2px; - height:47px; - // line-height: 40px; - } - - - .item-map{ - /deep/ .el-form-item{ - height:350px; - // line-height: 40px; - - } - - .map_line{ - // height:5px; - // background-color: #ffffff; - } - - .div_map{ - margin-top:10px; - height:280px; - padding-bottom:10px; - } - } - .item-image{ - /deep/ .el-form-item{ - height:185px; - // line-height: 40px; - } - - .item-imagebtn { - - display: flex; - justify-content: space-between; - padding: 11px 23px; - align-items: center; - } - - .d-img{ - height:140px; - // width:117px; - } - - .pic-btn { - width: 75px; - height: 25px; - background: linear-gradient(0deg, #32adab 0%, #2ad0cc 100%); - border-radius: 3px; - font-size: 14px; - font-family: Source Han Serif CN; - font-weight: 500; - color: #ffffff; - line-height: 23px; - text-align: center; - } + /deep/ .el-form-item{ + margin-bottom:14px; } +} - .item-textarea{ - /deep/ .el-form-item{ - height:89px; - // line-height: 40px; - } - /deep/ .el-form-item__content{ - height:78px; - } - - /deep/ .el-input__countx { - background:none; - } - } +//编辑框-普通form宽度 +.edit_item_width_normal{ + width:320px; +} - /deep/ .el-form-item__label{ - background: #D6E2F8; - height:100%; - line-height: 40px; - } - /deep/ .el-form-item__content{ - width:760px; - margin:5px 6px; - background: #F6F6F6; - padding:0 16px; - line-height: 36px - } - /deep/ .el-input__inner{ - width:95%; - background-color: #F6F6F6; - border:0px; - line-height: 26px; - padding:0px; - } - /deep/ .el-textarea__inner { - - width:100%; - background-color: #F6F6F6; - border:0px; - line-height: 26px; - padding:0px; - } +.edit_map{ - /deep/ .el-input .el-input__count .el-input__count-inner { - background:none; + .edit_map_search{ + margin-bottom: 10px; } - - /deep/ .el-input__prefix{ - left:700px; + .edit_div_map{ + margin-top:10px; + height:280px; + padding-bottom:10px; } } -.edit_item_width_1{ - width:100%; -} -//带着按钮 -.edit_item_btn_width_1{ - width:650px; -} -.edit-btn-1{ - float:right; - margin-right:10px; -} .div_btn { + display: flex; margin-top: 20px; + margin-right:16px; + justify-content: flex-end; text-align: center; } diff --git a/src/views/modules/base/community/buildDetail.vue b/src/views/modules/base/community/buildDetail.vue index 9b011b0dc..5fcec1356 100644 --- a/src/views/modules/base/community/buildDetail.vue +++ b/src/views/modules/base/community/buildDetail.vue @@ -3,108 +3,65 @@
-
-
-
所属小区：
- -
-
{{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}
-
+ class="m-row"> +
+
+ 所属小区： + {{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}
-
-
楼栋名称：
- -
-
{{ dataForm.buildingName||'--' }}
-
+
+ 楼栋名称： + {{ dataForm.buildingName?dataForm.buildingName:'--' }}
-
-
楼栋编码：
- -
-
{{ dataForm.coding||'--' }}
-
+
+ 楼栋编码： + {{ dataForm.coding?dataForm.coding:'--'}}
-
-
楼栋类型：
- -
-
{{ dataForm.typeName ||'--'}}
-
+
+ 楼栋类型： + {{ dataForm.typeName?dataForm.typeName:'--'}}
-
-
单元数：
- -
-
{{dataForm.totalUnitNum?dataForm.totalUnitNum:0 }}
-
+
+ 单元数： + {{dataForm.totalUnitNum?dataForm.totalUnitNum:0 }}
-
-
层数：
- -
-
{{dataForm.totalFloorNum?dataForm.totalFloorNum:0 }}
-
+
+ 层数： + {{dataForm.totalFloorNum?dataForm.totalFloorNum:0 }}
-
-
总户数：
- -
-
{{dataForm.totalHouseNum?dataForm.totalHouseNum:0 }}
-
+
+ 总户数： + {{dataForm.totalHouseNum?dataForm.totalHouseNum:0 }}
-
-
人口数：
- -
-
{{dataForm.realPerson?dataForm.realPerson:0 }}
-
+
+ 人口数： + {{dataForm.realPerson?dataForm.realPerson:0 }}
-
-
楼长姓名：
- -
-
{{ dataForm.buildingLeaderName||'--' }}
-
+
+ 楼长姓名： + {{ dataForm.buildingLeaderName?dataForm.buildingLeaderName:'--' }}
-
-
楼长电话：
- -
-
{{ dataForm.buildingLeaderMobile||'--' }}
-
+
+ 楼长电话： + {{ dataForm.buildingLeaderMobile?dataForm.buildingLeaderMobile:'--' }}
-
-
详细地址：
- -
-
{{ dataForm.coordinatePosition||'--' }}
-
+
+ 详细地址： + {{ dataForm.coordinatePosition?dataForm.coordinatePosition:'--' }}
- - -
-
地图位置：
-
-
-
-
-
@@ -113,7 +70,6 @@
关 闭
diff --git a/src/views/modules/base/community/communityDetail.vue b/src/views/modules/base/community/communityDetail.vue index 0cb4cd1a4..f08478197 100644 --- a/src/views/modules/base/community/communityDetail.vue +++ b/src/views/modules/base/community/communityDetail.vue @@ -3,76 +3,57 @@
-
-
-
所属组织：
-
-
{{ dataForm.agencyName }}
-
+ class="m-row"> +
+
+ 所属组织： + {{ dataForm.agencyName }}
-
-
所属网格：
-
-
{{ dataForm.gridName?dataForm.gridName:'--' }}
-
+
+ 所属网格： + {{ dataForm.gridName?dataForm.gridName:'--' }}
-
-
小区名称：
-
-
{{ dataForm.neighborHoodName}}
-
+
+ 小区名称： + {{ dataForm.neighborHoodName}}
-
-
小区编码：
-
-
{{ dataForm.coding?dataForm.coding:'--'}}
-
+
+ 小区编码： + {{ dataForm.coding?dataForm.coding:'--'}}
-
-
二维码：
-
-
- - 下载 -
-
+ +
+ + 下载
-
-
关联物业：
-
-
{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}
-
+
+ 关联物业： + {{ dataForm.propertyShow?dataForm.propertyShow:'--'}}
-
-
实有楼栋：
-
-
{{dataForm.realBuilding?dataForm.realBuilding:0 }}
-
+
+ 实有楼栋： + {{dataForm.realBuilding?dataForm.realBuilding:0 }}
-
-
详细地址：
-
-
{{ dataForm.address }}
-
+
+ 详细地址： + {{ dataForm.address }}
-
-
地图位置：
-
-
-
-
+
+ 地图位置： +
+ +
+
@@ -82,7 +63,6 @@
关 闭
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue index 2771187c9..7b51922db 100644 --- a/src/views/modules/base/community/communityForm.vue +++ b/src/views/modules/base/community/communityForm.vue @@ -1,14 +1,14 @@