From 972ba28464b6e6c3e010c6576fdf880a4a07a841 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 27 Nov 2020 23:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |   8 +-
 .../communityManage/communityManage.html      |   4 +
 .../common/communityManage/communityManage.js | 159 +++++++++++-------
 3 files changed, 110 insertions(+), 61 deletions(-)

diff --git a/app.js b/app.js
index 8f7dd3ea9..3e248b28b 100644
--- a/app.js
+++ b/app.js
@@ -36,14 +36,14 @@ let opts = {
 //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
 
 
-//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
-//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
+app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
+app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
 
 //app.use('/callComponent',proxy('http://127.0.0.1:8012',opts));
 //app.use('/app',proxy('http://127.0.0.1:8012',opts));
 
- app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
- app.use('/app',proxy('http://192.168.1.16:8012',opts));
+ //app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
+ //app.use('/app',proxy('http://192.168.1.16:8012',opts));
 
 //app.listen(3000);
 app.use(express.json());
diff --git a/public/pages/common/communityManage/communityManage.html b/public/pages/common/communityManage/communityManage.html
index 6667b4c14..02def5047 100644
--- a/public/pages/common/communityManage/communityManage.html
+++ b/public/pages/common/communityManage/communityManage.html
@@ -63,6 +63,7 @@
                             <!--<th>小区地址</th>-->
                             <th width="25%">附近地标</th>
                             <th>城市编码</th>
+                            <th v-for="(item,index) in communityManageInfo.listColumns">{{item}}</th>
                             <th>状态</th>
                             <th class="text-right">操作</th>
                         </tr>
@@ -74,6 +75,9 @@
                             <!--<td>{{community.address}}</td>-->
                             <td>{{community.nearbyLandmarks}}</td>
                             <td>{{community.cityName}}</td>
+                            <td v-for="item in community.listValues">
+                                {{item}}
+                            </td>
                             <td>{{community.stateName}}</td>
                             <td class="text-right">
                                 <div class="btn-group"
diff --git a/public/pages/common/communityManage/communityManage.js b/public/pages/common/communityManage/communityManage.js
index b56ca1b5d..1815bd44f 100644
--- a/public/pages/common/communityManage/communityManage.js
+++ b/public/pages/common/communityManage/communityManage.js
@@ -1,83 +1,128 @@
 /**
     入驻小区
 **/
-(function(vc){
+(function (vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     vc.extends({
-        data:{
-            communityManageInfo:{
-                communitys:[],
-                total:0,
-                records:1,
-                storeTypeCd:vc.getData('/nav/getUserInfo').storeTypeCd,
+        data: {
+            communityManageInfo: {
+                communitys: [],
+                total: 0,
+                records: 1,
+                storeTypeCd: vc.getData('/nav/getUserInfo').storeTypeCd,
                 conditions: {
                     name: '',
-                    cityCode:'',
-                    communityId:''
-                }
-
+                    cityCode: '',
+                    communityId: ''
+                },
+                listColumns: []
             }
         },
-        _initMethod:function(){
-            vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent:function(){
-            vc.on('communityManage','listCommunity',function(_param){
-                  vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+        _initMethod: function () {
+
+            $that._getColumns(function(){
+                vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
             });
-            vc.on("communityManage","communityManage","notifyArea",function(_param){
+        },
+        _initEvent: function () {
+            vc.on('communityManage', 'listCommunity', function (_param) {
+                vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on("communityManage", "communityManage", "notifyArea", function (_param) {
                 vc.component.communityManageInfo.conditions.cityCode = _param.selectArea;
             });
-             vc.on('pagination','page_event',function(_currentPage){
-                vc.component._listCommunitys(_currentPage,DEFAULT_ROWS);
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listCommunitys(_currentPage, DEFAULT_ROWS);
             });
         },
-        methods:{
-            _listCommunitys:function(_page, _rows){
+        methods: {
+            _listCommunitys: function (_page, _rows) {
 
-               vc.component.communityManageInfo.conditions.page = _page;
-               vc.component.communityManageInfo.conditions.row = _rows;
-               var _param = {
-                    params:vc.component.communityManageInfo.conditions
-               }
-               //发送get请求
-               vc.http.get('communityManage',
-                            'list',
-                             _param,
-                             function(json,res){
-                                var _communityManageInfo=JSON.parse(json);
-                                vc.component.communityManageInfo.total = _communityManageInfo.total;
-                                vc.component.communityManageInfo.records = _communityManageInfo.records;
-                                vc.component.communityManageInfo.communitys = _communityManageInfo.communitys;
-                                vc.emit('pagination','init',{
-                                    total:vc.component.communityManageInfo.records,
-                                    currentPage:_page
-                                });
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
+                vc.component.communityManageInfo.conditions.page = _page;
+                vc.component.communityManageInfo.conditions.row = _rows;
+                var _param = {
+                    params: vc.component.communityManageInfo.conditions
+                }
+                //发送get请求
+                vc.http.get('communityManage',
+                    'list',
+                    _param,
+                    function (json, res) {
+                        var _communityManageInfo = JSON.parse(json);
+                        vc.component.communityManageInfo.total = _communityManageInfo.total;
+                        vc.component.communityManageInfo.records = _communityManageInfo.records;
+                        vc.component.communityManageInfo.communitys = _communityManageInfo.communitys;
+                        $that.dealCommunityAttr(_communityManageInfo.communitys);
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.communityManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
             },
-            _openAddCommunityModal:function(){
-                vc.emit('addCommunity','openAddCommunityModal',{});
+            _openAddCommunityModal: function () {
+                vc.emit('addCommunity', 'openAddCommunityModal', {});
             },
-            _openEditCommunityModel:function(_community){
-                vc.emit('editCommunity','openEditCommunityModal',_community);
+            _openEditCommunityModel: function (_community) {
+                vc.emit('editCommunity', 'openEditCommunityModal', _community);
             },
-            _openDeleteCommunityModel:function(_community){
-                vc.emit('deleteCommunity','openDeleteCommunityModal',_community);
+            _openDeleteCommunityModel: function (_community) {
+                vc.emit('deleteCommunity', 'openDeleteCommunityModal', _community);
             },
-            _openRecallCommunityModel:function(_community){
-                vc.emit('recallAuditFinishCommunity','openRecallAuditFinishCommunityModal',_community);
+            _openRecallCommunityModel: function (_community) {
+                vc.emit('recallAuditFinishCommunity', 'openRecallAuditFinishCommunityModal', _community);
             },
-            _queryCommunityMethod:function(){
-                  vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+            _queryCommunityMethod: function () {
+                vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
             },
-            _openDeleteCommunityModel(_community){
-                vc.emit('deleteCommunity','openDeleteCommunityModal',_community);
+            _openDeleteCommunityModel(_community) {
+                vc.emit('deleteCommunity', 'openDeleteCommunityModal', _community);
+            },
+            dealCommunityAttr: function (communitys) {
+                communitys.forEach(item => {
+                    $that._getColumnsValue(item);
+                });
+            },
+            _getColumnsValue: function (_community) {
+                _community.listValues = [];
+                if (!_community.hasOwnProperty('communityAttrDtos') || _community.communityAttrDtos.length < 1) {
+                    $that.communityManageInfo.listColumns.forEach(_value => {
+                        _community.listValues.push('');
+                    })
+                    return;
+                }
+
+                let _communityAttrDtos = _community.communityAttrDtos;
+
+
+
+                $that.communityManageInfo.listColumns.forEach(_value => {
+                    let _tmpValue = '';
+                    _communityAttrDtos.forEach(_attrItem => {
+                        if (_value == _attrItem.specCdName) {
+                            _tmpValue = _attrItem.value;
+                        }
+                    })
+                    _community.listValues.push(_tmpValue);
+                })
+
+            },
+            _getColumns: function (_call) {
+                console.log('_getColumns');
+                $that.communityManageInfo.listColumns = [];
+                vc.getAttrSpec('building_community_attr', function (data) {
+                    $that.communityManageInfo.listColumns = [];
+                    data.forEach(item => {
+                        if (item.listShow == 'Y') {
+                            $that.communityManageInfo.listColumns.push(item.specName);
+                        }
+                    });
+                    _call();
+                });
             }
-
         }
     });
 })(window.vc);
\ No newline at end of file