门禁部分bug

accessControlSystem/src/views/accessControlAuthorization/stepPage/lookPage.vue

@@ -171,7 +171,7 @@ export default {
             token: {
                 [localStorage.getItem('SC_token') && 'Authorization']: 'Bearer ' + localStorage.getItem('SC_token')
             },
-            pickerTime: '',
+            pickerTime: [],
             detailsData: {},
             gateList: [],
             cols: [
@@ -318,9 +318,12 @@ export default {
                             const { appStatus, authType, endDate, startDate, faceStatus, facePictureUrl, gateIds } = data;
                             this.formData.appStatus = appStatus;
                             this.formData.authType = authType;
-                            this.formData.endDate = endDate;
-                            this.formData.startDate = startDate;
-                            this.pickerTime = [!!startDate ? startDate : '', !!endDate ? endDate : ''];
+                            this.formData.endDate = this.$moment(!!endDate ? endDate : '').format('YYYYMMDD');
+                            this.formData.startDate = this.$moment(!!startDate ? startDate : '').format('YYYYMMDD');
+                            this.pickerTime = [
+                                this.$moment(!!startDate ? startDate : '').format('YYYYMMDD'),
+                                this.$moment(!!endDate ? endDate : '').format('YYYYMMDD')
+                            ];
                             this.formData.faceStatus = faceStatus;
                             this.formData.facePictureUrl = facePictureUrl;
                             this.formData.gateIds = gateIds;

accessControlSystem/src/views/deviceManagement/accessControlMachineManagement/popups/temporaryPassword.vue

@@ -58,6 +58,8 @@ export default {
                         delete installData.expirationTime;
                     } else if (this.tempPasswordStatus == 1) {
                         delete installData.tempPassword;
+                    } else if (this.tempPasswordStatus == 2) {
+                        installData.tempPasswordStatus = 1;
                     }
                     this.$http
                         .post('/sc-gate-web/gate/tempPassword', installData)
@@ -94,9 +96,11 @@ export default {
         }
     },
     created() {
-        this.formData.expirationTime = this.params.row.expirationTime || '';
+        this.formData.expirationTime = this.$moment(!!this.params.row.expirationTime ? this.params.row.expirationTime : '').format(
+            'YYYYMMDD'
+        );
         this.formData.tempPassword = this.params.row.tempPassword || '';
-        this.formData.tempPasswordStatus = this.params.row.tempPasswordStatus || '';
+        this.formData.tempPasswordStatus = this.params.row.tempPasswordStatus || 1;
         this.formData.id = this.params.row.id || '';
     }
 };

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

@@ -9,7 +9,7 @@
                 </el-radio-group>
                 <el-input
                     clearable
-                    placeholder="设备名称"
+                    placeholder="输入门禁卡号/设备名称/地址"
                     class="search-input"
                     v-trim
                     v-model.trim="mixins_query.deviceName"

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

@@ -33,13 +33,6 @@
             :pageset="mixins_pageset"
             @page-change="pageChange"
         >
-            <template slot-scope="scope" slot="opt">
-                <div class="opt">
-                    <el-tooltip class="item" effect="light" placement="bottom" content="查看数据信息">
-                        <i class="zoniot_font zoniot-icon-xiangqing" @click="lookAccessControl(scope.row)"></i>
-                    </el-tooltip>
-                </div>
-            </template>
         </zz-table>
     </div>
 </template>
@@ -84,11 +77,6 @@ export default {
                 {
                     label: '替换时间',
                     prop: 'createDate'
-                },
-                {
-                    label: '操作',
-                    slot: 'opt',
-                    width: 150
                 }
             ],
             communityArr: [],
@@ -126,8 +114,7 @@ export default {
                 })
 
                 .catch(function () {});
-        },
-        lookAccessControl(row) {}
+        }
     },
     created() {
         this.getorgTree();

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

@@ -17,9 +17,9 @@
                     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 communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
-                </el-select> -->
+                <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"
@@ -117,11 +117,22 @@ export default {
                 },
                 {
                     label: '开门时间',
-                    prop: 'openTime'
+                    prop: 'openTime',
+                    width:'150px'
                 }
             ],
             thisLeftData: {},
-            // communityArr: [],
+            operateStyleArr: [
+                { label: '住户卡' },
+                { label: '管理卡' },
+                { label: '住户卡' },
+                { label: '人脸识别' },
+                { label: '临时密码' },
+                { label: '呼叫物管机' },
+                { label: '呼叫室内机' },
+                { label: 'APP开门' },
+                { label: '系统远程开门' }
+            ],
             mixins_post: 'post'
         };
     },