智慧中心

commandCenter/src/views/commandDispatch/pop/dottingEquipment.vue

@@ -145,7 +145,6 @@ export default {
                 .post('/sc-community/parkingCar/findChannelInfo', parameter)
                 .then(({ status, data, msg }) => {
                     let arrs = [];
-                    debugger;
                     if (status == 0) {
                         data.list.map((item) => {
                             arrs.push({
@@ -161,7 +160,31 @@ export default {
                 })
                 .catch(() => {});
         },
-        findPageCamera() {}
+        findPageCamera() {
+            let parameter = {
+                pageNum: 1,
+                pageSize: 100,
+                communityId: this.$store.getters['getHomeCommunityAll']
+            };
+            this.$http
+                .get('/sc-community/dahuaDevice/getDeviceList', parameter)
+                .then(({ status, data, msg }) => {
+                    let arrs = [];
+                    if (status == 0) {
+                        data.list.map((item) => {
+                            arrs.push({
+                                id: item.id,
+                                name: item.deviceName,
+                                address: ''
+                            });
+                        });
+                    } else {
+                        this.$message.error(msg);
+                    }
+                    this.typeArr = arrs;
+                })
+                .catch(() => {});
+        }
     },
     created() {
         this.deviceArr = this.params.deviceArr;

commandCenter/src/views/commandDispatch/pop/tableList.vue

@@ -66,8 +66,8 @@ export default {
             this.$http
                 .get('/sc-gate-web/alarm/page', { deviceNo: this.params.deviceNo })
                 .then(({ status, data: { list = [], total = 0 }, msg }) => {
-                    this.cols[0].prop = 'alarmContent';
-                    this.cols[1].prop = 'createDate';
+                    this.cols[0].prop = 'alarmName';
+                    this.cols[1].prop = 'waringDate';
 
                     if (0 === status) {
                         this.mixins_list = list;
@@ -81,9 +81,13 @@ export default {
         getCamera() {
             this.$http
                 .get('/sc-community/dahuaDevice/getAlarmList', { deviceId: this.params.row.deviceId })
-                .then(({ status, data, msg }) => {
-                    if (status == 0) {
-                        this.formData = data;
+                .then(({ status, data: { list = [], total = 0 }, msg }) => {
+                    this.cols[0].prop = 'alarmContent';
+                    this.cols[1].prop = 'createDate';
+
+                    if (0 === status) {
+                        this.mixins_list = list;
+                        this.mixins_pageset.total = total * 1;
                     } else {
                         this.$message.error(msg);
                     }

commandCenter/src/views/smallModule/alarmTrendAnalysis.vue

@@ -22,7 +22,19 @@ export default {
             mixins_query: {
                 communityId: ''
             },
-            clientOptions: discountedWave('(次)', ['01-01', '01-02', '01-03', '01-04', '01-05', '01-06', '01-07'], [0, 0, 0, 5, 0, 0, 0])
+            clientOptions: discountedWave(
+                '(次)',
+                [
+                    this.$moment().subtract('days', 6).format('MM-DD'),
+                    this.$moment().subtract('days', 5).format('MM-DD'),
+                    this.$moment().subtract('days', 4).format('MM-DD'),
+                    this.$moment().subtract('days', 3).format('MM-DD'),
+                    this.$moment().subtract('days', 2).format('MM-DD'),
+                    this.$moment().subtract('days', 1).format('MM-DD'),
+                    this.$moment().format('MM-DD')
+                ],
+                [0, 0, 0, 0, 0, 0, 0]
+            )
         };
     },
     methods: {
@@ -39,14 +51,26 @@ export default {
                             total.push(item.total);
                         });
                         this.clientOptions = discountedWave('(次)', times, total);
+                    } else {
+                        this.clientOptions = discountedWave(
+                            '(次)',
+                            [
+                                this.$moment().subtract('days', 6).format('MM-DD'),
+                                this.$moment().subtract('days', 5).format('MM-DD'),
+                                this.$moment().subtract('days', 4).format('MM-DD'),
+                                this.$moment().subtract('days', 3).format('MM-DD'),
+                                this.$moment().subtract('days', 2).format('MM-DD'),
+                                this.$moment().subtract('days', 1).format('MM-DD'),
+                                this.$moment().format('MM-DD')
+                            ],
+                            [0, 0, 0, 0, 0, 0, 0]
+                        );
                     }
                 })
                 .catch((err) => {});
         }
     },
-    created() {
-
-    }
+    created() {}
 };
 </script>
 <style lang="scss" scoped>

commandCenter/src/views/smallModule/indexOptionChart.js

@@ -369,8 +369,8 @@ export const columnOptionsChart = (
       }
     },
     grid: {
-      top: 50,
-      left: 0,
+      top: 40,
+      left: 10,
       bottom: 0,
       right: 0,
       containLabel: true

commandCenter/src/views/smallModule/keyAreas.vue

@@ -5,6 +5,7 @@
                 <span class="text-leftIcon"></span>
                 <span class="text">重点区域视频轮播</span>
                 <span class="text-rightIcon"></span>
+                <span class="text-set"></span>
             </div>
         </div>
         <div class="modeBlock-content">
@@ -28,9 +29,21 @@ export default {
     font-size: 12px;
     position: relative;
 }
-.modeBlock-title-left .text-leftIcon {
-    background-image: url('~@/assets/img/homeIcon/icon_shipinlunbo.png');
+.modeBlock-title-left {
+    .text-leftIcon {
+        background-image: url('~@/assets/img/homeIcon/icon_shipinlunbo.png');
+    }
+    .text-set {
+        width: 20px;
+        height: 20px;
+        float: right;
+        margin-top: 3px;
+        background-image: url('~@/assets/img/homeIcon/icon_set@2x.png');
+        background-size: cover;
+        cursor: pointer;
+    }
 }
+
 video {
     width: 100%;
     height: 100%;

commandCenter/src/views/smallModule/passengerFlowStatistics.vue

@@ -38,7 +38,19 @@ export default {
             },
             datas: {},
             total: 0,
-            clientOptions: discountedWave('(次)', ['01-01', '01-02', '01-03', '01-04', '01-05', '01-06', '01-07'], [0, 0, 0, 5, 0, 0, 0])
+            clientOptions: discountedWave(
+                '(次)',
+                [
+                    this.$moment().subtract('days', 6).format('MM-DD'),
+                    this.$moment().subtract('days', 5).format('MM-DD'),
+                    this.$moment().subtract('days', 4).format('MM-DD'),
+                    this.$moment().subtract('days', 3).format('MM-DD'),
+                    this.$moment().subtract('days', 2).format('MM-DD'),
+                    this.$moment().subtract('days', 1).format('MM-DD'),
+                    this.$moment().format('MM-DD')
+                ],
+                [0, 0, 0, 0, 0, 0, 0]
+            )
         };
     },
     methods: {
@@ -69,13 +81,27 @@ export default {
                             total.push(item.total);
                         });
                         this.clientOptions = discountedWave('(次)', times, total);
+                    } else {
+                        this.clientOptions = discountedWave(
+                            '(次)',
+                            [
+                                this.$moment().subtract('days', 6).format('MM-DD'),
+                                this.$moment().subtract('days', 5).format('MM-DD'),
+                                this.$moment().subtract('days', 4).format('MM-DD'),
+                                this.$moment().subtract('days', 3).format('MM-DD'),
+                                this.$moment().subtract('days', 2).format('MM-DD'),
+                                this.$moment().subtract('days', 1).format('MM-DD'),
+                                this.$moment().format('MM-DD')
+                            ],
+                            [0, 0, 0, 0, 0, 0, 0]
+                        );
                     }
                 })
                 .catch((err) => {});
         }
     },
     created() {
-        
+        this.getData();
     }
 };
 </script>

commandCenter/src/views/smallModule/patrolTaskCompletionRate.vue

@@ -44,7 +44,7 @@ export default {
     methods: {
         getData() {
             this.$http
-                .get('/sc-community/statisticPatrolCompletionRate', this.mixins_query)
+                .get('/sc-community/statisticTodayPatrolCompletionRate', this.mixins_query)
                 .then(({ status, data, msg }) => {
                     if (status == 0 && !!data) {
                         this.clientOptions = ringType([], this.eachartObj(data), {});