diff --git a/src/api/renwuApi/index.js b/src/api/renwuApi/index.js new file mode 100644 index 0000000..dd0a5ab --- /dev/null +++ b/src/api/renwuApi/index.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function addassetTaskadd(data) { + return request({ + url: '/unit/assetTask/add', + method: "post", + data, + }) + } \ No newline at end of file diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 00a6fb6..3b78f71 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -4,11 +4,13 @@ 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; @@ -18,6 +20,7 @@ position: relative; padding-bottom: 15px; border-bottom: 1px solid #F2F4F6; + &::before { content: ""; display: block; @@ -30,39 +33,48 @@ 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; @@ -70,7 +82,7 @@ color: #192734; padding-left: 20px; position: relative; - + &::before { content: ""; display: block; @@ -84,19 +96,24 @@ } } } + .search-title-two { padding-bottom: 15px; } + section { margin: 10px 0; padding: 0px 10px; + .el-table { th { - background: rgba(98,153,204,0.1); + background: rgba(98, 153, 204, 0.1); } + td { border-bottom: none; } + .evenNumber-row { background-color: #F6F9FD; } @@ -104,39 +121,49 @@ } } } + #L-pagination { margin-top: 15px; padding: 0px 10px; + .btn-prev, .btn-next { padding: 0px 15px; } } + // 任务管理-任务详情 .L-task-info { height: 100%; width: 100%; overflow-y: scroll; background-color: #f2f2f2; + .el-row { height: 100%; display: flex; + .el-col { height: 100%; } } - .info-left, .info-right{ + + .info-left, + .info-right { height: 100%; background-color: #fff; border-radius: 5px; } + .info-right { margin-left: 10px; + .info-title { font-weight: 700; font-size: 18px; color: #3D3D3D; padding-left: 10px; + &::before { content: ""; display: block; @@ -148,20 +175,25 @@ border-radius: 5px; } } + .timeline { padding: 20px; } } } -.audit-pages-box,.info-left { + +.audit-pages-box, +.info-left { height: 100%; background-color: #fff; border-radius: 5px; + .content-info { padding: 20px 0; margin-bottom: 15px; background-color: #fff; border-radius: 5px; + .info-title { font-family: Alibaba PuHuiTi; font-weight: bold; @@ -171,7 +203,7 @@ position: relative; padding-bottom: 15px; border-bottom: 1px solid #F2F4F6; - + &::before { content: ""; display: block; @@ -184,18 +216,22 @@ background-color: #2F8AE5; } } + .top-info { margin: 20px 20px 0px 20px; 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; @@ -205,14 +241,17 @@ } } } + .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: 10px 20px; @@ -226,21 +265,25 @@ 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; @@ -248,8 +291,8 @@ color: #192734; padding-left: 20px; position: relative; - - + + &::before { content: ""; display: block; @@ -263,16 +306,20 @@ } } } + .info-bottom-box { padding: 0px 20px; + section { .el-table { th { - background: rgba(98,153,204,0.1); + background: rgba(98, 153, 204, 0.1); } + td { border-bottom: none; } + .evenNumber-row { background-color: #F6F9FD; } @@ -280,10 +327,13 @@ } } } -.audit-pages-box-two,.info-left-two { + +.audit-pages-box-two, +.info-left-two { background-color: #F2F4F6 !important; display: flex; flex-direction: column; + .renwuxiangqing { flex: 1; background-color: #fff; @@ -295,65 +345,81 @@ .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: 100%; + .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-date-editor,.el-cascader { + + .el-select, + .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 { @@ -389,3 +455,8 @@ input[aria-hidden="true"] { .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner { box-shadow: none; } + +.bottomclass{ + text-align: center; + background-color: #fff; +} diff --git a/src/views/auditPages/taskManagement/index copy.vue b/src/views/auditPages/taskManagement/index copy.vue new file mode 100644 index 0000000..10ac4ee --- /dev/null +++ b/src/views/auditPages/taskManagement/index copy.vue @@ -0,0 +1,386 @@ + + + diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue index 716c902..15330cc 100644 --- a/src/views/auditPages/taskManagement/index.vue +++ b/src/views/auditPages/taskManagement/index.vue @@ -17,15 +17,8 @@ - + @@ -59,28 +52,17 @@ 任务列表 - 导出 + 导出 - 任务创建 + 任务创建
- - + + @@ -90,9 +72,10 @@ - +
- + - + - + - + - - - + - 单位列表 + - - + + 取消 @@ -161,80 +139,91 @@ + +
+ + + +
+ + + diff --git a/src/views/components/myDialog/index.vue b/src/views/components/myDialog/index.vue index e2b8f33..890cf70 100644 --- a/src/views/components/myDialog/index.vue +++ b/src/views/components/myDialog/index.vue @@ -1,14 +1,7 @@