diff --git a/public/components/property/cameraControlVideo/cameraControlVideo.js b/public/components/property/cameraControlVideo/cameraControlVideo.js
index 3d4a40b06..b0ca5405d 100644
--- a/public/components/property/cameraControlVideo/cameraControlVideo.js
+++ b/public/components/property/cameraControlVideo/cameraControlVideo.js
@@ -60,7 +60,7 @@
                 );
             },
             _initMachineVideo:function(_machines){
-                $that._playVideo('rtc_media_player1','webrtc://112.124.21.207/live/34020000002000000010@34020000001320000010');
+                $that._playVideo('rtc_media_player1','webrtc://117.159.177.191/live/34020000002000000010@34020000001320000010');
                 $that._playVideo('rtc_media_player2','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010');
                 $that._playVideo('rtc_media_player3','webrtc://112.124.21.207/live/34020000001320000001@34020000001320000010');
                 $that._playVideo('rtc_media_player4','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010');
diff --git a/public/components/property/commonReportTable/commonReportTable.html b/public/components/property/commonReportTable/commonReportTable.html
index d51a8e708..6b5207beb 100644
--- a/public/components/property/commonReportTable/commonReportTable.html
+++ b/public/components/property/commonReportTable/commonReportTable.html
@@ -43,8 +43,8 @@
                         </thead>
                         <tbody>
                             <tr v-for="(itemData,indexData) in item.data" >
-                                <td class="text-center" v-for="(itemTd,key) of itemData">
-                                    {{itemData[key]}}</td>
+                                <td class="text-center" v-for="(tmpItemTh,key) in item.th">
+                                    {{itemData[tmpItemTh]}}</td>
                             </tr>
                         </tbody>
                         <tfoot>
diff --git a/public/components/property/commonReportTable/commonReportTable.js b/public/components/property/commonReportTable/commonReportTable.js
index 6077abd47..b82503548 100644
--- a/public/components/property/commonReportTable/commonReportTable.js
+++ b/public/components/property/commonReportTable/commonReportTable.js
@@ -3,7 +3,7 @@
 **/
 (function (vc) {
     var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 10;
+    var DEFAULT_ROWS = 15;
     vc.extends({
         data: {
             commonReportTableInfo: {
@@ -22,12 +22,17 @@
                 $that._listReportCustomTableComponent();
             })
             vc.on('commonReportTable', 'paginationPlus', 'page_event', function (_currentPage) {
-                vc.component._listOaWorkflowPools(_currentPage, DEFAULT_ROWS);
+                vc.component._listReportCustomTableDatas(_currentPage, DEFAULT_ROWS,$that.commonReportTableInfo.components[0]);
             });
         },
         methods: {
-            _queryReportTableMethod: function (data) {
+            _queryReportTableMethod: function (item) {
+                let _condition = {};
+                item.conditions.forEach(_item => {
+                    _condition[_item.param] = _item.value;
+                })
 
+                $that._listReportCustomTableDatas(1, 15, item, _condition);
             },
             _listReportCustomTableComponent: function () {
                 var param = {
@@ -54,11 +59,17 @@
                 );
             },
             _listReportCustomTableConditions: function (_component) {
+                let _community = vc.getCurrentCommunity();
+                let _communityId = '';
+                if (_community) {
+                    _communityId = _community.communityId
+                }
                 let param = {
                     params: {
                         page: 1,
                         row: 50,
-                        componentId: _component.componentId
+                        componentId: _component.componentId,
+                        communityId: _communityId
                     }
                 };
                 //发送get请求
@@ -74,14 +85,22 @@
                 );
 
             },
-            _listReportCustomTableDatas: function (_page, _row, _component) {
-                let param = {
-                    params: {
+            _listReportCustomTableDatas: function (_page, _row, _component, _conditions) {
+                if (_conditions) {
+                    _conditions.page = _page;
+                    _conditions.row = _row;
+                    _conditions.componentId = _component.componentId;
+                } else {
+                    _conditions = {
                         page: _page,
                         row: _row,
                         componentId: _component.componentId
                     }
+                }
+                let param = {
+                    params: _conditions
                 };
+
                 //发送get请求
                 vc.http.apiGet('/reportCustomComponent.listReportCustomComponentData',
                     param,
@@ -94,7 +113,7 @@
                         let _data = _componentDataManageInfo.data;
                         _component.th = _data.th;
                         _component.data = _data.td;
-                        vc.emit('commonReportTable', 'pagination', 'init', {
+                        vc.emit('commonReportTable', 'paginationPlus', 'init', {
                             total: _componentDataManageInfo.records,
                             currentPage: _page
                         });