diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 0f175f2..03e3a0c 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -90,7 +90,3 @@ .el-submenu__icon-arrow { display: none; } - -.el-dropdown .el-dropdown-link{ - color: var(--el-color-primary) !important; -} \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index f7b2986..a7adbd6 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -4,12 +4,11 @@ @import './element-ui.scss'; @import './sidebar.scss'; @import './btn.scss'; -@import './ruoyi.scss'; -@import "./font.css"; +@import './public.scss'; +@import './font.css'; body { height: 100%; - margin: 0; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; @@ -27,6 +26,7 @@ html { #app { height: 100%; + background-color: #F2F4F6; } *, @@ -124,6 +124,8 @@ aside { //main-container全局样式 .app-container { + height: 100%; + overflow-y: scroll; padding: 20px; } @@ -132,6 +134,10 @@ aside { position: relative; } +.pagination-container { + margin-top: 30px; +} + .text-center { text-align: center } diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss new file mode 100644 index 0000000..ae08178 --- /dev/null +++ b/src/assets/styles/public.scss @@ -0,0 +1,527 @@ +.L-main { + height: 100%; + width: 100%; + display: flex; + flex-direction: column; + background-color: #F2F4F6; + + .content-search { + padding-top: 20px; + margin-bottom: 15px; + background-color: #fff; + border-radius: 5px; + + .search-title { + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + padding-bottom: 15px; + border-bottom: 1px solid #F2F4F6; + + &::before { + content: ""; + display: block; + width: 4px; + height: 20px; + border-radius: 5px; + position: absolute; + top: 0px; + left: 0px; + background-color: #2F8AE5; + } + } + + .demo-form-inline { + padding: 20px 20px 30px 20px; + } + + .el-form-item { + width: 100%; + + .el-form-item__content { + width: calc(100% - 120px); + + .el-select { + width: 100%; + } + } + } + + .tyshxydm-class { + .el-form-item__content { + width: calc(100% - 140px); + } + } + + .unit-form { + .el-form-item__content { + width: 100%; + } + } + } + + main { + flex: 1; + padding: 20px 0px; + background-color: #fff; + border-radius: 5px; + + .search-title { + display: flex; + justify-content: space-between; + border-bottom: 1px solid #F2F4F6; + padding: 0px 10px 0px 0px; + + .search-title-span { + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + + &::before { + content: ""; + display: block; + width: 4px; + height: 20px; + border-radius: 5px; + position: absolute; + top: 0px; + left: 0px; + background-color: #2F8AE5; + } + } + } + + .search-title-two { + padding-bottom: 15px; + } + + section { + margin: 10px 0; + padding: 0px 10px; + + .el-table { + th { + background: rgba(98, 153, 204, 0.1); + } + + td { + border-bottom: none; + } + + .evenNumber-row { + background-color: #F6F9FD; + } + } + } + } +} + +#L-pagination { + margin-top: 10px; + padding: 0px 10px; + + .btn-prev, + .btn-next { + padding: 0px 15px; + } +} + +// 任务管理-任务详情 +.L-task-info { + height: 100%; + width: 100%; + overflow-y: scroll; + background-color: #f2f2f2; + display: flex; + overflow: hidden; + + .el-row { + height: 100%; + display: flex; + + .el-col { + height: 100%; + } + } + + .info-left, + .info-right { + height: 100%; + background-color: #fff; + border-radius: 5px; + overflow: hidden; + } + + .info-left { + flex: 5; + } + + .info-right { + flex: 1; + } + + .info-right { + margin-left: 10px; + + .info-title { + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + position: relative; + padding: 15px 0 15px 20px; + border-bottom: 1px solid #F2F4F6; + + &::before { + content: ""; + display: block; + width: 4px; + height: 20px; + border-radius: 5px; + position: absolute; + top: 15px; + left: 0px; + background-color: #2F8AE5; + } + } + + .timeline { + padding: 20px; + height: calc(100% - 60px); + overflow-y: scroll; + + .timeline-items { + display: flex; + align-items: center; + margin-bottom: 40px; + + .left-box { + position: relative; + + .main-img { + width: 45px; + margin-right: 20px; + } + + .icon-jt { + position: absolute; + width: 15px; + height: 7px; + bottom: -20px; + left: 15px; + } + } + + .right-box { + display: flex; + flex-direction: column; + justify-content: space-between; + + .span-title { + font-family: Alibaba PuHuiTi; + font-weight: 500; + font-size: 14px; + color: #192734; + margin-bottom: 8px; + } + + .span-time { + font-family: Alibaba PuHuiTiR; + font-weight: 400; + font-size: 14px; + color: #5C6166; + } + } + } + } + } +} + +.audit-pages-box, +.info-left { + height: 100%; + background-color: #fff; + border-radius: 5px; + + .content-info { + padding: 15px 0; + margin-bottom: 15px; + background-color: #fff; + border-radius: 5px; + + .info-title { + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + padding-bottom: 15px; + border-bottom: 1px solid #F2F4F6; + + &::before { + content: ""; + display: block; + width: 4px; + height: 20px; + border-radius: 5px; + position: absolute; + top: 0px; + left: 0px; + background-color: #2F8AE5; + } + } + + .teshu-top-info { + padding: 0px 20px; + } + + .top-info { + padding: 20px; + background: #FAFBFC; + + .top-row { + margin-bottom: 20px; + } + + .el-col { + color: #192733; + font-family: Alibaba PuHuiTi; + font-weight: 400; + font-size: 14px; + + span { + font-family: Alibaba PuHuiTi; + font-weight: 400; + font-size: 14px; + color: #5C6166; + } + } + } + } + + .content-info-two { + // border-bottom: 1px solid #ccc; + // margin-bottom: 20px; + } + + .info-cut-off-rule { + border-bottom: 1px solid #F2F4F6; + display: flex; + margin-bottom: 20px; + + div { + padding: 10px; + padding: 5px 15px; + border: 1px solid #e0dddd; + font-weight: 400; + font-family: Alibaba PuHuiTiR; + font-size: 14px; + color: #000000; + border-bottom: none; + background-color: #e0dddd; + cursor: pointer; + margin-right: 10px; + } + + .left-tab { + margin-left: 20px; + border-right: none; + } + + .active-tab { + color: #fff; + background-color: #1485EF; + border: 1px solid #1485EF; + } + } + + .info-cut-off-rule-my { + padding-top: 15px; + padding-bottom: 15px; + border-bottom: 1px solid #F2F4F6; + margin-bottom: 20px; + + .info-title { + font-family: Alibaba PuHuiTi; + font-weight: bold; + font-size: 16px; + color: #192734; + padding-left: 20px; + position: relative; + + + &::before { + content: ""; + display: block; + width: 4px; + height: 20px; + border-radius: 5px; + position: absolute; + top: 0px; + left: 0px; + background-color: #2F8AE5; + } + } + } + + .info-bottom-box { + padding: 0px 20px; + + section { + .el-table { + th { + background: rgba(98, 153, 204, 0.1); + } + + td { + border-bottom: none; + } + + .evenNumber-row { + background-color: #F6F9FD; + } + } + } + } +} + +.audit-pages-box-two, +.info-left-two { + background-color: #F2F4F6 !important; + display: flex; + flex-direction: column; + + .renwuxiangqing { + flex: 1; + background-color: #fff; + border-radius: 5px; + } +} + +// 任务管理---新增任务弹框 +.taskDialogBox { + .select-box { + position: relative; + + .el-select { + width: 100%; + } + + .btn-box { + position: absolute; + right: calc(-100% - 10px); + + } + } + + .newTask-form-item { + .el-form-item__content { + text-align: center; + } + } +} + +// form表单页面--新增资产 +.L-assets-info { + height: 100%; + padding: 20px 40px 20px 10px; + overflow-y: scroll; + + .assets-info-top { + height: calc(100% - 20px); + + .top-title-box { + font-weight: 700; + font-size: 18px; + color: #3D3D3D; + padding-left: 30px; + } + + .top-title-two-box { + font-weight: 700; + font-size: 16px; + color: #3D3D3D; + padding-left: 50px; + } + + .assets-info-box { + + // padding-bottom: 100px; + .demo-ruleForm { + .upload-file { + cursor: pointer; + } + + .el-select, + .el-autocomplete, + .el-date-editor, + .el-cascader { + width: 100%; + } + + // 访问网址样式 + .fangwenwangzhi { + .el-input-group__prepend { + padding: 0 10px; + } + + .el-input--suffix { + width: 80px; + + .el-input__suffix { + right: 15px; + } + } + + .wangzhispan { + margin-left: 15px; + } + } + + // IpPort样式 + .IpPort { + .line { + text-align: center; + } + } + + // 域名到期时间 + // .yumingdaoqishijian,.shiyongshijian { + // .el-date-editor { + // width: 100%; + // } + // } + + // 到期提醒人样式 + .daoqitixingren { + .el-form-item__content { + .el-row { + display: flex; + } + } + } + } + } + } +} + + +input[aria-hidden="true"] { + display: none !important; +} + +.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner { + box-shadow: none; +} + +.bottomclass { + text-align: center; + background-color: #fff; +} \ No newline at end of file diff --git a/src/views/auditPages/assetsManagement/mobileApplication.vue b/src/views/auditPages/assetsManagement/mobileApplication.vue index d6961b0..4c2cd51 100644 --- a/src/views/auditPages/assetsManagement/mobileApplication.vue +++ b/src/views/auditPages/assetsManagement/mobileApplication.vue @@ -9,7 +9,7 @@ :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" - ref="tree" + ref="treeRef" node-key="id" default-expand-all highlight-current @@ -21,7 +21,7 @@