From 7a07d12e67e559d4f7e1bfa5f4f3e0de3ba9b774 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 4 Feb 2020 11:14:51 +0800 Subject: [PATCH] =?UTF-8?q?iscs=20=E9=97=AD=E8=B7=AF=E7=94=B5=E8=A7=86=20?= =?UTF-8?q?=E8=BD=A6=E7=AB=99=E6=97=B6=E5=BA=8F=20=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscsSystem/config/cctv/controlCCTV.vue | 42 ++-- .../iscs/iscsSystem/config/cctv/timeCCTV.vue | 220 +++++++++++++++++- .../iscsSystem/config/pis/timePreview.vue | 3 +- 3 files changed, 241 insertions(+), 24 deletions(-) diff --git a/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue b/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue index d50f06927..1087779fa 100644 --- a/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue +++ b/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue @@ -65,7 +65,7 @@ export default { .control-cctv-box{ width: 100%; height: 100%; - padding-top: 30px; + padding-top: 20px; padding-bottom: 40px; .title-name{ width: 100%; @@ -75,17 +75,17 @@ export default { color: #56E5DE; } } -.cctv-box-top{width: 1100px;margin: 0 auto;display:flex;margin-top:10px;} -.cctv-box-top-left{width:500px;height:220px; +.cctv-box-top{width:1300px;margin: 0 auto;display:flex;margin-top:10px;} +.cctv-box-top-left{width:600px;height:300px; border-top: 2px solid #8c8a89; border-left: 2px solid #8c8a89; border-right: 2px solid #fff; border-bottom: 2px solid #fff; } -.cctv-box-top-lefttop{width:492px;background:#000077;text-align:center;color:#fff;padding:5px 0px;font-size:13px;} +.cctv-box-top-lefttop{width:592px;background:#000077;text-align:center;color:#fff;padding:5px 0px;font-size:13px;} .cctv-box-top-left1{width:180px;display:inline-block;vertical-align:top;} -.each-cctv-box-top-btn{margin-left:10px;display:flex;align-items:center;width:60px; -height:34px;font-size:12px;float:left;background:#ccc;margin-top:10px; +.each-cctv-box-top-btn{margin-left:10px;display:flex;align-items:center;width:65px; +height:40px;font-size:12px;float:left;background:#ccc;margin-top:10px; justify-content:center;text-align:center; border-top: 2px solid #f9f9f9; border-left: 2px solid #f6f8f8; @@ -108,27 +108,27 @@ justify-content:center;text-align:center; border-right: 2px solid #fff; border-bottom: 2px solid #fff; } -.cctv-box-top-right1{width:182px;display:inline-block; - margin-left: 30px;margin-top: 4px; +.cctv-box-top-right1{width:242px;display:inline-block; + margin-left: 60px;margin-top:10px; border-top:2px #000077 solid; border-left:2px #000077 solid; } -.cctv-box-top-right1-line{width:180px;display:flex; +.cctv-box-top-right1-line{width:240px;display:flex; } .each-cctv-box-top-right1{ - width: 90px; - height:85px; + width: 120px; + height:120px; border-right:2px #000077 solid; border-bottom:2px #000077 solid; } -.cctv-box-top-middle{width:200px;height:220px; +.cctv-box-top-middle{width:300px;height:300px; border-top: 2px solid #8c8a89; border-left: 2px solid #8c8a89; border-right: 2px solid #fff; border-bottom: 2px solid #fff; margin-left:4px; } -.cctv-box-top-right{width:400px;height:220px; +.cctv-box-top-right{width:400px;height:300px; border-top: 2px solid #8c8a89; border-left: 2px solid #8c8a89; border-right: 2px solid #fff; @@ -136,12 +136,12 @@ justify-content:center;text-align:center; margin-left:4px; } .cctv-box-content{} -.cctv-box-bottom{width: 1100px;margin:30px auto;display:flex;} +.cctv-box-bottom{width: 1300px;margin:30px auto;display:flex;} .cctv-box-bottom-left{display:flex;align-items:center;} .cctv-box-bottom-text{color: #56E5DE;width:80px;font-size:14px;} .cctv-box-bottom-middle{} -.cctv-box-bottom-top{width:800px;height:20px;background:#fff;} -.cctv-box-bottom-bottom{margin-top:5px;width:800px;height:20px;background:#fff;} +.cctv-box-bottom-top{width:1000px;height:20px;background:#fff;} +.cctv-box-bottom-bottom{margin-top:5px;width:1000px;height:20px;background:#fff;} .cctv-box-bottom-right{} .cctv-box-bottom-btn{width:80px;font-size:12px;cursor: pointer; border-top: 3px solid #f9f9f9; @@ -153,7 +153,7 @@ justify-content:center;text-align:center; background: #cccccc;text-align:center;font-weight:bold; } .cctv-box-top-right-title{width:396px;background:#000077;text-align:center;color:#fff;padding:5px 0px;font-size:13px;height:24px;} -.cctv-box-top-middle-title{width:196px;background:#000077;text-align:center;color:#fff;padding:5px 0px;font-size:13px;} +.cctv-box-top-middle-title{width:296px;background:#000077;text-align:center;color:#fff;padding:5px 0px;font-size:13px;} .each-cctv-box-top-r1btn{ border-top: 2px solid #f9f9f9; border-left: 2px solid #f6f8f8; @@ -161,20 +161,20 @@ justify-content:center;text-align:center; border-bottom: 2px solid #636667; background:#ccc; text-align:center; - width:60px; - height:45px; + width:70px; + height:60px; display:flex; align-items: center; justify-content:center; margin:0 auto; font-size:12px; - margin-top:5px; + margin-top:20px; font-weight: bold; cursor: pointer; } .each-cctv-box-top-r1text{ font-size: 12px; - width: 60px; + width: 70px; padding: 2px 5px; background: #fff; margin: 0 auto; diff --git a/src/views/iscs/iscsSystem/config/cctv/timeCCTV.vue b/src/views/iscs/iscsSystem/config/cctv/timeCCTV.vue index 89029708f..6a8291a2b 100644 --- a/src/views/iscs/iscsSystem/config/cctv/timeCCTV.vue +++ b/src/views/iscs/iscsSystem/config/cctv/timeCCTV.vue @@ -1,6 +1,78 @@ + diff --git a/src/views/iscs/iscsSystem/config/pis/timePreview.vue b/src/views/iscs/iscsSystem/config/pis/timePreview.vue index f46ef1aee..04e6419b3 100644 --- a/src/views/iscs/iscsSystem/config/pis/timePreview.vue +++ b/src/views/iscs/iscsSystem/config/pis/timePreview.vue @@ -9,7 +9,8 @@ header-cell-class-name="time_preview_thead" :data="tableData" border - style="width: 100%" + style="width:100%;overflow-y: auto;" + height="496" >