门禁

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

@@ -113,9 +113,9 @@ export default {
                     prop: 'status',
                     format(val) {
                         if (val == 0) {
-                            return `离线`;
+                            return `<span class="redText">离线</span>`;
                         } else if (val == 1) {
-                            return `正常`;
+                            return `<span class="mainText">正常</span>`;
                         }
                     }
                 },
@@ -124,7 +124,7 @@ export default {
                     prop: 'sendStatus',
                     format(val) {
                         if (val == 0) {
-                            return `失败`;
+                               return `下发中`;
                         } else if (val == 1) {
                             return `成功`;
                         }
@@ -214,7 +214,7 @@ export default {
                     format(val) {
                         switch (val) {
                             case 0:
-                                return `失败`;
+                                return `下发中`;
                             case 1:
                                 return `成功`;
                         }

accessControlSystem/src/views/trafficRecord/accessControlCapture/index.vue

@@ -19,6 +19,7 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                     @change="timeToggle"
+                    @blur="handlePickerBlur"
                     :picker-options="pickerOptions"
                     :editable="false"
                 ></el-date-picker>
@@ -52,13 +53,14 @@
 
 <script>
 import list from '@utils/list.js';
-
 export default {
     mixins: [list],
     data() {
+        var _this = this;
         return {
             currentId: '',
-            pickerTime: '',
+            _minDate: 0,
+            pickerTime: [],
             cols: [
                 {
                     label: '社区',
@@ -91,8 +93,20 @@ export default {
                 }
             ],
             pickerOptions: {
+                onPick: ({ maxDate, minDate }) => {
+                    _this._minDate = minDate && new Date(minDate).getTime();
+                },
                 disabledDate(time) {
-                    return time.getTime() > Date.now();
+                    let one = 1 * 24 * 3600 * 1000;
+                    let dayRange = 7;
+                    if (_this._minDate > 0) {
+                        return (
+                            time.getTime() > Math.min(Date.now(), _this._minDate + 2 * one) ||
+                            time.getTime() < Math.max(_this._minDate - 2 * one, Date.now() - dayRange * one)
+                        );
+                    } else {
+                        return time.getTime() > Date.now() || time.getTime() < Date.now() - dayRange * one;
+                    }
                 }
             },
             thisLeftData: {},
@@ -102,6 +116,9 @@ export default {
         };
     },
     methods: {
+        handlePickerBlur(date) {
+            this._minDate = 0;
+        },
         currentOrganId(data) {
             this.currentId = data || '';
         },
@@ -158,9 +175,13 @@ export default {
     created() {
         this.getorgTree();
         this.getOrganList();
+
+        this.pickerTime = [this.$moment().format('YYYY-MM-DD'), this.$moment().format('YYYY-MM-DD')];
         this.mixins_dataUrl = '/sc-gate-web/record/visitor/page'; // 分页查询接口
         this.mixins_query = {
-            userTypeId: 0
+            userTypeId: 0,
+            beginDate: `${this.pickerTime[0]} 00:00:00`,
+            endDate: `${this.pickerTime[1]} 23:59:59`
         };
         this.mixins_search();
     }

accessControlSystem/src/views/trafficRecord/accessRecord/index.vue

@@ -6,7 +6,7 @@
             </div>
             <div class="leftBottom">
                 <div class="title">门禁机列表</div>
-                <list-organ @doorGuid="doorGuid" :currentOrganId='currentId'></list-organ>
+                <list-organ @doorGuid="doorGuid" :currentOrganId="currentId"></list-organ>
             </div>
         </div>
         <div class="content-right">
@@ -17,9 +17,6 @@
                     class="search-input"
                     v-model.trim="mixins_query.likeValue"
                 ></el-input>
-                <el-select v-model="mixins_query.operateStyleName" placeholder="开门方式" clearable>
-                    <el-option v-for="(item, index) in operateStyleArr" :key="index" :label="item.label" :value="item.label"></el-option>
-                </el-select>
                 <el-date-picker
                     v-model="pickerTime"
                     value-format="yyyy-MM-dd"
@@ -118,30 +115,20 @@ export default {
                 {
                     label: '开门时间',
                     prop: 'openTime',
-                    width:'150px'
+                    width: '150px'
                 }
             ],
             thisLeftData: {},
-            operateStyleArr: [
-                { label: '住户卡' },
-                { label: '管理卡' },
-                { label: '住户卡' },
-                { label: '人脸识别' },
-                { label: '临时密码' },
-                { label: '呼叫物管机' },
-                { label: '呼叫室内机' },
-                { label: 'APP开门' },
-                { label: '系统远程开门' }
-            ],
             mixins_post: 'post'
         };
     },
     methods: {
         currentOrganId(data) {
             this.currentId = data || '';
+            delete this.mixins_query.doorGuid
         },
-        doorGuid({ id,duoduId } = data) {
-            this.mixins_query.doorGuid = duoduId;
+        doorGuid({ id, duoduId ,deviceNo} = data) {
+            this.mixins_query.doorGuid = deviceNo;
             this.mixins_search();
         },
         CheckChinese(val, name) {