zc

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -85,14 +85,14 @@
             <div :class="rightButtonType == 1 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(1)">传感器监测</div>
             <div :class="rightButtonType == 2 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(2)">物联控制</div>
             <div :class="rightButtonType == 3 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(3)">视频监控</div>
-            <div :class="rightButtonType == 4 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(4)">声光报警器</div>
+            <div :class="rightButtonType == 4 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(4)">声光报警</div>
             <div :class="rightButtonType == 5 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(5)">智能门禁</div>
           </div>
           <!--传感器-->
           <div class="bottom-max-box" :class="rightButtonType == 4?'overflow-box':''">
             <div class="bottom-sensor-box" v-if="rightButtonType == 1">
               <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
-              <div class="sensor-for-max-box" v-if="checkedSubject.sensorFunctionStatusList[0]">
+              <div class="sensor-for-max-box scrollbar-box" v-if="checkedSubject.sensorFunctionStatusList[0]">
                 <div class="sensor-for-big-box"
                      :class="item.type == 1 ? 'sensor-color-a' : (item.type == 2 ? 'sensor-color-b' : 'sensor-color-c')"
                      v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index">
@@ -1100,24 +1100,26 @@ export default {
     flex-direction: column;
     overflow: hidden;
     border-radius:10px;
-    margin:5px 0px 10px 0px;
+    margin:5px 0 0 0;
     //box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
     .subject-page-min{
       flex:1;
       display: flex;
       overflow: hidden;
-      padding: 2px 20px 20px 20px;
+      padding: 2px 0 10px 10px;
       box-sizing: border-box;
     }
     .left-subject-list{
-      flex:1;
+      /*flex:1;*/
+      width:1143px;
       display: flex;
       flex-direction: column;
-      margin-right:12px;
+      margin-right:6px;
       overflow: hidden ;
-      box-shadow: 0px 4px 14px 0px rgba(0,0,0,0.2);
+      box-shadow: 0px 2px 6px 0px rgba(0,0,0,0.2);
       border-radius: 20px 20px 20px 20px;
       padding-top: 24px;
+      margin-bottom:10px;
       .table_border{
         flex:1;
         display: flex;
@@ -1131,13 +1133,13 @@ export default {
       overflow: hidden;
     }
     .right-subject-box{
-      width:428px;
+      /*width:440px;*/
+      flex:1;
       display: flex;
       flex-direction: column;
-      box-shadow: 0px 4px 14px 0px rgba(0,0,0,0.2);
-      border-radius: 0px 0px 20px 20px;
       .top-button-box{
         display: flex;
+        margin-left:6px;
         div{
           padding:0 10px;
           height:40px;
@@ -1151,20 +1153,33 @@ export default {
           font-weight: 500;
         }
         .buttonColorA{
-          color:#FFFFFF;
-          background:#0045AF ;
+          color:#0045AF;
+          background:#fff ;
+          border: 1px solid #E0E0E0;
+          border-bottom: 1px solid rgba(224,224,224,0.3);
         }
         .buttonColorB{
-          color:#999999;
+          color:#333;
           background:#E0E0E0 ;
+          border: 1px solid #E0E0E0;
+          border-bottom:none;
         }
       }
       .bottom-max-box{
+        width:428px;
+        box-shadow: 0px 2px 6px 0px rgba(0,0,0,0.2);
+        border-radius: 0px 0px 20px 20px;
         font-weight:500;
         flex:1;
         display: flex;
         flex-direction: column;
+        margin-left:6px;
+        overflow: hidden;
+        margin-bottom:10px;
         .bottom-sensor-box{
+          overflow: hidden;
+          display: flex;
+          flex-direction: column;
           background: #fff;
           width:424px;
           flex:1;
@@ -1194,7 +1209,7 @@ export default {
               display: inline-block;
               width:180px;
               height:60px;
-              margin:0 0 11px 26px;
+              margin:0 0 11px 22px;
               border-radius: 10px;
               .sensor-for-min-box{
                 display: flex;