From ef1c0d5baa9d766dfe81a5fa972a6f83225536da Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期三, 30 八月 2023 18:06:25 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before --- src/views/inspectionManagement/reportForInspection/index.vue | 172 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 93 insertions(+), 79 deletions(-) diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue index c70d2a6..09a6b65 100644 --- a/src/views/inspectionManagement/reportForInspection/index.vue +++ b/src/views/inspectionManagement/reportForInspection/index.vue @@ -602,86 +602,100 @@ </script> <style scoped lang="scss"> -.content-main{ - height: 100%; - .top-bar{ - margin: -25px -15px; - background: #fff; - display: flex; - justify-content: space-between; - padding: 24px 24px 0px 24px; - .sermargin{ - margin-right: 60px; - } -} -.rightBtn{ - background-color: rgb(1, 102, 226); -} -.library-table{ - background-color: #fff; - flex: 1; - margin: 0px -15px; - margin-top: 40px; - display: flex; - flex-direction: column; - .table-header{ - padding: 20px; - display: flex; - justify-content: space-between; - .el-form-item{ - margin-bottom: 30px !important; - } - } - .table-box{ - padding: 0px 20px; - margin-top: 0px; - flex: 1; - background: #fff; - /* padding: 20px 20px 10px 20px; */ - display: flex; - flex-direction: column; - .el-table { - flex: 1; - } - >div:nth-child(2){ - display: flex; - justify-content: end; - margin: 10px 0; - } - } - } -.checked { - color: green; -} + .content-main { + height: 100%; -.unchecked { - color: red; -} + .top-bar { + margin: -25px -15px; + background: #fff; + display: flex; + justify-content: space-between; + padding: 24px 24px 0px 24px; -.newPage{ - margin: -25px -15px; - .inspectionForm{ - background-color:#fff; - .formwrapper{ - margin-left: 80px; - padding:10px 0px; - } - } - .inspectionProject{ - margin:10px 0px; - .header{ - display:flex; - justify-content: space-between; - padding-top: -3px; - padding-bottom: 3px; - } - .el-table{ - padding: 10px 10px; - height: 65vh; - overflow-y: auto; - } - } -} -} + .sermargin { + margin-right: 60px; + } + } + .rightBtn { + background-color: rgb(1, 102, 226); + } + + .library-table { + background-color: #fff; + flex: 1; + margin: 0px -15px; + margin-top: 40px; + display: flex; + flex-direction: column; + + .table-header { + padding: 20px; + display: flex; + justify-content: space-between; + + .el-form-item { + margin-bottom: 30px !important; + } + } + + .table-box { + padding: 0px 20px; + margin-top: 0px; + flex: 1; + background: #fff; + /* padding: 20px 20px 10px 20px; */ + display: flex; + flex-direction: column; + + .el-table { + flex: 1; + } + + >div:nth-child(2) { + display: flex; + justify-content: end; + margin: 10px 0; + } + } + } + + .checked { + color: green; + } + + .unchecked { + color: red; + } + + .newPage { + margin: -25px -15px; + + .inspectionForm { + background-color: #fff; + + .formwrapper { + margin-left: 80px; + padding: 10px 0px; + } + } + + .inspectionProject { + margin: 10px 0px; + + .header { + display: flex; + justify-content: space-between; + padding-top: -3px; + padding-bottom: 3px; + } + + .el-table { + padding: 10px 10px; + height: 65vh; + overflow-y: auto; + } + } + } + } </style> -- Gitblit v1.9.3