222

accessControlSystem/src/views/deviceManagement/accessControlMachineManagement/index.vue

@@ -46,6 +46,11 @@
                 @page-change="pageChange"
                 @selection-change="selectionChange"
             >
+                <template slot-scope="scope" slot="faceStatus">
+                    {{ !!scope.row.appStatus ? `${scope.row.appStatus == 0 ? '不支持/' : '支持/'}` : '' }}
+                    {{ !!scope.row.faceStatus ? `${scope.row.faceStatus == 0 ? '关闭' : '开启'}` : '' }}
+                </template>
+
                 <template slot-scope="scope" slot="opt">
                     <div class="opt">
                         <el-tooltip class="item" effect="light" placement="bottom" content="详情">
@@ -116,11 +121,20 @@ export default {
                 },
                 {
                     label: 'APP开门',
-                    prop: 'appStatus'
+                    prop: 'appStatus',
+                    format(val) {
+                        switch (val) {
+                            case 0:
+                                return `不支持`;
+                            case 1:
+                                return `支持`;
+                        }
+                    }
                 },
                 {
                     label: '人脸开门',
-                    prop: 'faceStatus'
+                    prop: 'faceStatus',
+                    slot: 'faceStatus'
                 },
                 {
                     label: '临时密码开门',

operationSupport/src/views/newWorkBench/index.vue

@@ -1,5 +1,7 @@
 <template>
-    <div class="workbench"></div>
+    <div class="workbench">
+        <div class="list_1x1"></div>
+    </div>
 </template>
         
 <script>
@@ -11,16 +13,22 @@ export default {};
     background: #2c354a;
     height: 100%;
     .list_1x1 {
-        width: calc(100% - #{rem(60)});
+        width: calc((100% - #{rem(60)}) / 4);
         height: rem(238);
+        display: inline-block;
+        background: #171f32;
     }
     .list_1x2 {
         width: calc(100% - #{rem(20)});
         height: rem(238);
+        display: inline-block;
+        background: #171f32;
     }
     .list_2x2 {
         width: calc(100% - #{rem(20)});
-      height: rem(794);
+        height: rem(794);
+        display: inline-block;
+        background: #171f32;
     }
 }
 </style>