diff --git a/src/router/index.js b/src/router/index.js index 44239586..866ee5f0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -115,7 +115,7 @@ export const moduleShujuRoutes = { name: "home2", meta: { title: "主页2", - isTab: true, + isTab: false, }, }, { @@ -125,7 +125,7 @@ export const moduleShujuRoutes = { name: "visual-basicinfo-people", meta: { title: "个人详情", - isTab: true, + isTab: false, }, }, { @@ -135,7 +135,7 @@ export const moduleShujuRoutes = { name: "visual-basicinfo-people-list", meta: { title: "人员列表", - isTab: true, + isTab: false, }, }, ], diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index 54551433..fb1e16b0 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -176,15 +176,40 @@
+ + + + + +
(事项封面,图片小于1M)
+
+
-
-
- - - - - -
(事项封面,图片小于1M)
- 删除 .m-staffs { margin-left: auto; - width: 950px; + width: 520px; .item { - display: flex; + // display: flex; + // align-items: flex-start; + padding-bottom: 20px; + margin-bottom: 20px; + border-bottom: 4px dashed #f7f8f9; + .item-info { display: flex; - margin: 0 20px; - width: 65%; - justify-content: space-around; - align-items: center; - margin-bottom: 7px; - } - .item-pic { - display: flex; - width: 35%; - align-items: center; - .hint { - font-size: 14px; - color: #999999; - margin-left: 10px; - } + align-items: flex-start; + margin: 0 0; + // margin-bottom: 7px; + .avatar-uploader { + margin: 0 0 0 20px; + ::v-deep .el-upload { cursor: pointer; position: relative; @@ -671,8 +668,8 @@ export default { border-color: #409eff; } .avatar { - width: 50px; - height: 50px; + width: 36px; + height: 36px; display: block; } .avatar-uploader-icon { @@ -680,12 +677,23 @@ export default { border-radius: 6px; font-size: 28px; color: #8c939d; - width: 50px; - height: 50px; - line-height: 50px; + width: 36px; + height: 36px; + line-height: 36px; text-align: center; } } + .hint { + // width: 75%; + font-size: 14px; + color: #999999; + margin-left: 0; + } + } + .item-pic { + display: flex; + align-items: center; + // justify-content: space-around; } } } diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index d486b845..8173f652 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -106,7 +106,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" - width="1150px" + width="850px" top="5vh" class="dialog-h" @closed="handleClose" diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index d200e5b7..ef34596d 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -791,6 +791,11 @@ export default { color: #fff; } } + ::v-deep .el-breadcrumb__item:first-child { + .el-breadcrumb__inner { + color: #a0c3d9; + } + } } diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue index 91e30121..b6757fb4 100644 --- a/src/views/modules/visual/basicinfo/peopleList.vue +++ b/src/views/modules/visual/basicinfo/peopleList.vue @@ -68,16 +68,15 @@
- - - @@ -112,7 +111,7 @@ export default { headerList: [], tableData: [], searchName: '', - pageSize: 7, + pageSize: 10, pageNo: 1, total: 0, orgLevel: 'search', @@ -236,8 +235,13 @@ export default { height: 780px; margin: 20px auto; } +.warning-table { + height: 640px; +} .pagination { + padding-right: 0; margin-top: 0; + text-align: right; } .g-bread { padding: 10px 20px; @@ -247,5 +251,10 @@ export default { color: #fff; } } + ::v-deep .el-breadcrumb__item:first-child { + .el-breadcrumb__inner { + color: #a0c3d9; + } + } } diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue index 1f1faaea..5ba13eb3 100644 --- a/src/views/modules/visual/measure/dialogInfo.vue +++ b/src/views/modules/visual/measure/dialogInfo.vue @@ -92,7 +92,7 @@ -
+
尚有 ${item.serviceDemandTotal} 个需求未完成
` }else { - desc += `
共有 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个
` + desc += `
共有 ${item.totalService} ${unit} ${item.legendName} 完成 ${item.serviceDemandTotal} 个需求
` } })