Просмотр исходного кода

访客登记流程页面修改

duckweed лет назад: 7
Родитель
Сommit
a28c392def
24 измененных файлов с 1007 добавлено и 1191 удалено
  1. 70 72
      WebService/src/main/resources/components/appPackage/add-app/addApp.js
  2. 75 75
      WebService/src/main/resources/components/appPackage/edit-app/editApp.js
  3. 92 92
      WebService/src/main/resources/components/serviceRegisterPackage/edit-serviceRegister/editServiceRegister.js
  4. 91 91
      WebService/src/main/resources/components/serviceRegisterPackage/serviceRegister-manage/serviceRegisterManage.js
  5. 62 0
      WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.html
  6. 132 0
      WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.js
  7. 12 26
      WebService/src/main/resources/components/visitPackage/choose-visit/chooseVisit.html
  8. 63 0
      WebService/src/main/resources/components/visitInfoPackage/choose-visit/chooseApp.js
  9. 4 4
      WebService/src/main/resources/components/visitPackage/delete-visit/deleteVisit.html
  10. 16 15
      WebService/src/main/resources/components/visitPackage/delete-visit/deleteVisit.js
  11. 11 11
      WebService/src/main/resources/components/visitPackage/edit-visit/editVisit.html
  12. 119 0
      WebService/src/main/resources/components/visitInfoPackage/edit-visit/editVisit.js
  13. 67 0
      WebService/src/main/resources/components/visitInfoPackage/view-visit-info/viewVisitInfo.html
  14. 55 0
      WebService/src/main/resources/components/visitInfoPackage/view-visit-info/viewVisitInfo.js
  15. 70 0
      WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.html
  16. 68 0
      WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.js
  17. 0 83
      WebService/src/main/resources/components/visitPackage/add-visit/addVisit.html
  18. 0 156
      WebService/src/main/resources/components/visitPackage/add-visit/addVisit.js
  19. 0 64
      WebService/src/main/resources/components/visitPackage/choose-visit/chooseVisit.js
  20. 0 147
      WebService/src/main/resources/components/visitPackage/edit-visit/editVisit.js
  21. 0 78
      WebService/src/main/resources/components/visitPackage/view-visit-info/viewVisitInfo.html
  22. 0 54
      WebService/src/main/resources/components/visitPackage/view-visit-info/viewVisitInfo.js
  23. 0 136
      WebService/src/main/resources/components/visitPackage/visit-manage/visitManage.html
  24. 0 87
      WebService/src/main/resources/components/visitPackage/visit-manage/visitManage.js

+ 70 - 72
WebService/src/main/resources/components/appPackage/add-app/addApp.js

@@ -1,94 +1,92 @@
-(function(vc){
+(function (vc) {
 
     vc.extends({
         propTypes: {
-               callBackListener:vc.propTypes.string, //父组件名称
-               callBackFunction:vc.propTypes.string //父组件监听方法
+            callBackListener: vc.propTypes.string, //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
         },
-        data:{
-            addAppInfo:{
-                appId:'',
-                name:'',
-securityCode:'',
-whileListIp:'',
-blackListIp:'',
-remark:'',
+        data: {
+            addAppInfo: {
+                appId: '',
+                name: '',
+                securityCode: '',
+                whileListIp: '',
+                blackListIp: '',
+                remark: '',
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function () {
 
-         },
-         _initEvent:function(){
-            vc.on('addApp','openAddAppModal',function(){
+        },
+        _initEvent: function () {
+            vc.on('addApp', 'openAddAppModal', function () {
                 $('#addAppModel').modal('show');
             });
         },
-        methods:{
-            addAppValidate(){
+        methods: {
+            addAppValidate() {
                 return vc.validate.validate({
-                    addAppInfo:vc.component.addAppInfo
-                },{
-                    'addAppInfo.name':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"应用名称不能为空"
+                    addAppInfo: vc.component.addAppInfo
+                }, {
+                    'addAppInfo.name': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "应用名称不能为空"
                         },
- {
-                            limit:"maxin",
-                            param:"2,50",
-                            errInfo:"应用名称必须在2至50字符之间"
+                        {
+                            limit: "maxin",
+                            param: "2,50",
+                            errInfo: "应用名称必须在2至50字符之间"
                         },
                     ],
-'addAppInfo.securityCode':[
- {
-                            limit:"maxLength",
-                            param:"64",
-                            errInfo:"秘钥太长超过64位"
+                    'addAppInfo.securityCode': [
+                        {
+                            limit: "maxLength",
+                            param: "64",
+                            errInfo: "秘钥太长超过64位"
                         },
                     ],
-'addAppInfo.whileListIp':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"白名单内容不能超过200"
+                    'addAppInfo.whileListIp': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "白名单内容不能超过200"
                         },
                     ],
-'addAppInfo.blackListIp':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"黑名单内容不能超过200"
+                    'addAppInfo.blackListIp': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "黑名单内容不能超过200"
                         },
                     ],
-'addAppInfo.remark':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"备注内容不能超过200"
+                    'addAppInfo.remark': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "备注内容不能超过200"
                         },
                     ],
 
 
-
-
                 });
             },
-            saveAppInfo:function(){
-                if(!vc.component.addAppValidate()){
+            saveAppInfo: function () {
+                if (!vc.component.addAppValidate()) {
                     vc.message(vc.validate.errInfo);
 
-                    return ;
+                    return;
                 }
 
                 vc.component.addAppInfo.communityId = vc.getCurrentCommunity().communityId;
 
                 //不提交数据将数据 回调给侦听处理
-                if(vc.notNull($props.callBackListener)){
-                    vc.emit($props.callBackListener,$props.callBackFunction,vc.component.addAppInfo);
+                if (vc.notNull($props.callBackListener)) {
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addAppInfo);
                     $('#addAppModel').modal('hide');
-                    return ;
+                    return;
                 }
 
                 vc.http.post(
@@ -96,37 +94,37 @@ remark:'',
                     'save',
                     JSON.stringify(vc.component.addAppInfo),
                     {
-                        emulateJSON:true
-                     },
-                     function(json,res){
+                        emulateJSON: true
+                    },
+                    function (json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
+                        if (res.status == 200) {
                             //关闭model
                             $('#addAppModel').modal('hide');
                             vc.component.clearAddAppInfo();
-                            vc.emit('appManage','listApp',{});
+                            vc.emit('appManage', 'listApp', {});
 
-                            return ;
+                            return;
                         }
                         vc.message(json);
 
-                     },
-                     function(errInfo,error){
+                    },
+                    function (errInfo, error) {
                         console.log('请求失败处理');
 
                         vc.message(errInfo);
 
-                     });
+                    });
             },
-            clearAddAppInfo:function(){
+            clearAddAppInfo: function () {
                 vc.component.addAppInfo = {
-                                            name:'',
-securityCode:'',
-whileListIp:'',
-blackListIp:'',
-remark:'',
+                    name: '',
+                    securityCode: '',
+                    whileListIp: '',
+                    blackListIp: '',
+                    remark: '',
 
-                                        };
+                };
             }
         }
     });

+ 75 - 75
WebService/src/main/resources/components/appPackage/edit-app/editApp.js

@@ -1,86 +1,86 @@
-(function(vc,vm){
+(function (vc, vm) {
 
     vc.extends({
-        data:{
-            editAppInfo:{
-                appId:'',
-name:'',
-securityCode:'',
-whileListIp:'',
-blackListIp:'',
-remark:'',
+        data: {
+            editAppInfo: {
+                appId: '',
+                name: '',
+                securityCode: '',
+                whileListIp: '',
+                blackListIp: '',
+                remark: '',
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function () {
 
-         },
-         _initEvent:function(){
-             vc.on('editApp','openEditAppModal',function(_params){
+        },
+        _initEvent: function () {
+            vc.on('editApp', 'openEditAppModal', function (_params) {
                 vc.component.refreshEditAppInfo();
                 $('#editAppModel').modal('show');
                 vc.component.editAppInfo = _params;
                 vc.component.editAppInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
-        methods:{
-            editAppValidate:function(){
-                        return vc.validate.validate({
-                            editAppInfo:vc.component.editAppInfo
-                        },{
-                            'editAppInfo.name':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"应用名称不能为空"
+        methods: {
+            editAppValidate: function () {
+                return vc.validate.validate({
+                    editAppInfo: vc.component.editAppInfo
+                }, {
+                    'editAppInfo.name': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "应用名称不能为空"
                         },
- {
-                            limit:"maxin",
-                            param:"2,50",
-                            errInfo:"应用名称必须在2至50字符之间"
+                        {
+                            limit: "maxin",
+                            param: "2,50",
+                            errInfo: "应用名称必须在2至50字符之间"
                         },
                     ],
-'editAppInfo.securityCode':[
- {
-                            limit:"maxLength",
-                            param:"64",
-                            errInfo:"秘钥太长超过64位"
+                    'editAppInfo.securityCode': [
+                        {
+                            limit: "maxLength",
+                            param: "64",
+                            errInfo: "秘钥太长超过64位"
                         },
                     ],
-'editAppInfo.whileListIp':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"白名单内容不能超过200"
+                    'editAppInfo.whileListIp': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "白名单内容不能超过200"
                         },
                     ],
-'editAppInfo.blackListIp':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"黑名单内容不能超过200"
+                    'editAppInfo.blackListIp': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "黑名单内容不能超过200"
                         },
                     ],
-'editAppInfo.remark':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"备注内容不能超过200"
+                    'editAppInfo.remark': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "备注内容不能超过200"
                         },
                     ],
-'editAppInfo.appId':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"应用Id不能为空"
+                    'editAppInfo.appId': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "应用Id不能为空"
                         }]
 
-                        });
-             },
-            editApp:function(){
-                if(!vc.component.editAppValidate()){
+                });
+            },
+            editApp: function () {
+                if (!vc.component.editAppValidate()) {
                     vc.message(vc.validate.errInfo);
-                    return ;
+                    return;
                 }
 
                 vc.http.post(
@@ -88,36 +88,36 @@ remark:'',
                     'update',
                     JSON.stringify(vc.component.editAppInfo),
                     {
-                        emulateJSON:true
-                     },
-                     function(json,res){
+                        emulateJSON: true
+                    },
+                    function (json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
+                        if (res.status == 200) {
                             //关闭model
                             $('#editAppModel').modal('hide');
-                             vc.emit('appManage','listApp',{});
-                            return ;
+                            vc.emit('appManage', 'listApp', {});
+                            return;
                         }
                         vc.message(json);
-                     },
-                     function(errInfo,error){
+                    },
+                    function (errInfo, error) {
                         console.log('请求失败处理');
 
                         vc.message(errInfo);
-                     });
+                    });
             },
-            refreshEditAppInfo:function(){
-                vc.component.editAppInfo= {
-                  appId:'',
-name:'',
-securityCode:'',
-whileListIp:'',
-blackListIp:'',
-remark:'',
+            refreshEditAppInfo: function () {
+                vc.component.editAppInfo = {
+                    appId: '',
+                    name: '',
+                    securityCode: '',
+                    whileListIp: '',
+                    blackListIp: '',
+                    remark: '',
 
                 }
             }
         }
     });
 
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);

+ 92 - 92
WebService/src/main/resources/components/serviceRegisterPackage/edit-serviceRegister/editServiceRegister.js

@@ -1,106 +1,106 @@
-(function(vc,vm){
+(function (vc, vm) {
 
     vc.extends({
-        data:{
-            editServiceRegisterInfo:{
-                id:'',
-appId:'',
-serviceId:'',
-orderTypeCd:'',
-invokeLimitTimes:'1000',
-invokeModel:'',
+        data: {
+            editServiceRegisterInfo: {
+                id: '',
+                appId: '',
+                serviceId: '',
+                orderTypeCd: '',
+                invokeLimitTimes: '1000',
+                invokeModel: '',
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function () {
 
-         },
-         _initEvent:function(){
-             vc.on('editServiceRegister','openEditServiceRegisterModal',function(_params){
+        },
+        _initEvent: function () {
+            vc.on('editServiceRegister', 'openEditServiceRegisterModal', function (_params) {
                 vc.component.refreshEditServiceRegisterInfo();
                 $('#editServiceRegisterModel').modal('show');
-                vc.copyObject(_params, vc.component.editServiceRegisterInfo );
+                vc.copyObject(_params, vc.component.editServiceRegisterInfo);
                 vc.component.editServiceRegisterInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
-        methods:{
-            editServiceRegisterValidate:function(){
-                        return vc.validate.validate({
-                            editServiceRegisterInfo:vc.component.editServiceRegisterInfo
-                        },{
-                            'editServiceRegisterInfo.appId':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"应用ID不能为空"
+        methods: {
+            editServiceRegisterValidate: function () {
+                return vc.validate.validate({
+                    editServiceRegisterInfo: vc.component.editServiceRegisterInfo
+                }, {
+                    'editServiceRegisterInfo.appId': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "应用ID不能为空"
                         },
- {
-                            limit:"maxLength",
-                            param:"50",
-                            errInfo:"应用ID不能超过50位"
+                        {
+                            limit: "maxLength",
+                            param: "50",
+                            errInfo: "应用ID不能超过50位"
                         },
                     ],
-'editServiceRegisterInfo.serviceId':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"服务ID不能为空"
+                    'editServiceRegisterInfo.serviceId': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "服务ID不能为空"
                         },
- {
-                            limit:"maxLength",
-                            param:"50",
-                            errInfo:"服务ID不能超过50位"
+                        {
+                            limit: "maxLength",
+                            param: "50",
+                            errInfo: "服务ID不能超过50位"
                         },
                     ],
-'editServiceRegisterInfo.orderTypeCd':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"订单类型不能为空"
+                    'editServiceRegisterInfo.orderTypeCd': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "订单类型不能为空"
                         },
- {
-                            limit:"maxin",
-                            param:"1,4",
-                            errInfo:"订单类型错误"
+                        {
+                            limit: "maxin",
+                            param: "1,4",
+                            errInfo: "订单类型错误"
                         },
                     ],
-'editServiceRegisterInfo.invokeLimitTimes':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"调用次数不能为空"
+                    'editServiceRegisterInfo.invokeLimitTimes': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "调用次数不能为空"
                         },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"调用次数错误"
+                        {
+                            limit: "num",
+                            param: "",
+                            errInfo: "调用次数错误"
                         },
                     ],
-'editServiceRegisterInfo.invokeModel':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"调用方式不能为空"
+                    'editServiceRegisterInfo.invokeModel': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "调用方式不能为空"
                         },
- {
-                            limit:"maxLength",
-                            param:"50",
-                            errInfo:"消息队列不能超过50"
+                        {
+                            limit: "maxLength",
+                            param: "50",
+                            errInfo: "消息队列不能超过50"
                         },
                     ],
-'editServiceRegisterInfo.id':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"绑定ID不能为空"
+                    'editServiceRegisterInfo.id': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "绑定ID不能为空"
                         }]
 
-                        });
-             },
-            editServiceRegister:function(){
-                if(!vc.component.editServiceRegisterValidate()){
+                });
+            },
+            editServiceRegister: function () {
+                if (!vc.component.editServiceRegisterValidate()) {
                     vc.message(vc.validate.errInfo);
-                    return ;
+                    return;
                 }
 
                 vc.http.post(
@@ -108,36 +108,36 @@ invokeModel:'',
                     'update',
                     JSON.stringify(vc.component.editServiceRegisterInfo),
                     {
-                        emulateJSON:true
-                     },
-                     function(json,res){
+                        emulateJSON: true
+                    },
+                    function (json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
+                        if (res.status == 200) {
                             //关闭model
                             $('#editServiceRegisterModel').modal('hide');
-                             vc.emit('serviceRegisterManage','listServiceRegister',{});
-                            return ;
+                            vc.emit('serviceRegisterManage', 'listServiceRegister', {});
+                            return;
                         }
                         vc.message(json);
-                     },
-                     function(errInfo,error){
+                    },
+                    function (errInfo, error) {
                         console.log('请求失败处理');
 
                         vc.message(errInfo);
-                     });
+                    });
             },
-            refreshEditServiceRegisterInfo:function(){
-                vc.component.editServiceRegisterInfo= {
-                  id:'',
-appId:'',
-serviceId:'',
-orderTypeCd:'',
-invokeLimitTimes:'1000',
-invokeModel:'',
+            refreshEditServiceRegisterInfo: function () {
+                vc.component.editServiceRegisterInfo = {
+                    id: '',
+                    appId: '',
+                    serviceId: '',
+                    orderTypeCd: '',
+                    invokeLimitTimes: '1000',
+                    invokeModel: '',
 
                 }
             }
         }
     });
 
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);

+ 91 - 91
WebService/src/main/resources/components/serviceRegisterPackage/serviceRegister-manage/serviceRegisterManage.js

@@ -1,136 +1,136 @@
 /**
-    入驻小区
-**/
-(function(vc){
+ 入驻小区
+ **/
+(function (vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     vc.extends({
-        data:{
-            serviceRegisterManageInfo:{
-                serviceRegisters:[],
-                total:0,
-                records:1,
-                moreCondition:false,
-                name:'',
-                conditions:{
-                    appName:'',
-appId:'',
-serviceName:'',
-serviceCode:'',
-serviceUrl:'',
+        data: {
+            serviceRegisterManageInfo: {
+                serviceRegisters: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                name: '',
+                conditions: {
+                    appName: '',
+                    appId: '',
+                    serviceName: '',
+                    serviceCode: '',
+                    serviceUrl: '',
 
                 }
             }
         },
-        _initMethod:function(){
+        _initMethod: function () {
             //vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
             vc.component._loadDataByParam(DEFAULT_PAGE, DEFAULT_ROWS);
         },
-        _initEvent:function(){
-            vc.on('serviceRegisterManage','chooseApp',function(_param){
-              vc.copyObject(_param,vc.component.serviceRegisterManageInfo.conditions);
+        _initEvent: function () {
+            vc.on('serviceRegisterManage', 'chooseApp', function (_param) {
+                vc.copyObject(_param, vc.component.serviceRegisterManageInfo.conditions);
             });
 
-            vc.on('serviceRegisterManage','listServiceRegister',function(_param){
-                  vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.on('serviceRegisterManage', 'listServiceRegister', function (_param) {
+                vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
             });
-             vc.on('pagination','page_event',function(_currentPage){
-                vc.component._listServiceRegisters(_currentPage,DEFAULT_ROWS);
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listServiceRegisters(_currentPage, DEFAULT_ROWS);
             });
         },
-        methods:{
-            _listServiceRegisters:function(_page, _rows){
+        methods: {
+            _listServiceRegisters: function (_page, _rows) {
 
                 vc.component.serviceRegisterManageInfo.conditions.page = _page;
                 vc.component.serviceRegisterManageInfo.conditions.row = _rows;
                 var param = {
-                    params:vc.component.serviceRegisterManageInfo.conditions
-               };
+                    params: vc.component.serviceRegisterManageInfo.conditions
+                };
 
-               //发送get请求
-               vc.http.get('serviceRegisterManage',
-                            'list',
-                             param,
-                             function(json,res){
-                                var _serviceRegisterManageInfo=JSON.parse(json);
-                                vc.component.serviceRegisterManageInfo.total = _serviceRegisterManageInfo.total;
-                                vc.component.serviceRegisterManageInfo.records = _serviceRegisterManageInfo.records;
-                                vc.component.serviceRegisterManageInfo.serviceRegisters = _serviceRegisterManageInfo.serviceRegisters;
-                                vc.emit('pagination','init',{
-                                     total:vc.component.serviceRegisterManageInfo.records,
-                                     currentPage:_page
-                                 });
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
+                //发送get请求
+                vc.http.get('serviceRegisterManage',
+                    'list',
+                    param,
+                    function (json, res) {
+                        var _serviceRegisterManageInfo = JSON.parse(json);
+                        vc.component.serviceRegisterManageInfo.total = _serviceRegisterManageInfo.total;
+                        vc.component.serviceRegisterManageInfo.records = _serviceRegisterManageInfo.records;
+                        vc.component.serviceRegisterManageInfo.serviceRegisters = _serviceRegisterManageInfo.serviceRegisters;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.serviceRegisterManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
             },
-            _openAddServiceRegisterModal:function(){
+            _openAddServiceRegisterModal: function () {
                 //vc.emit('addServiceRegister','openAddServiceRegisterModal',{});
                 vc.jumpToPage("/flow/serviceBindingFlow");
             },
-            _openEditServiceRegisterModel:function(_serviceRegister){
-                vc.emit('editServiceRegister','openEditServiceRegisterModal',_serviceRegister);
+            _openEditServiceRegisterModel: function (_serviceRegister) {
+                vc.emit('editServiceRegister', 'openEditServiceRegisterModal', _serviceRegister);
             },
-            _openDeleteServiceRegisterModel:function(_serviceRegister){
-                vc.emit('deleteServiceRegister','openDeleteServiceRegisterModal',_serviceRegister);
+            _openDeleteServiceRegisterModel: function (_serviceRegister) {
+                vc.emit('deleteServiceRegister', 'openDeleteServiceRegisterModal', _serviceRegister);
             },
-            _queryServiceRegisterMethod:function(){
+            _queryServiceRegisterMethod: function () {
                 vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
 
             },
-            _moreCondition:function(){
-                if(vc.component.serviceRegisterManageInfo.moreCondition){
+            _moreCondition: function () {
+                if (vc.component.serviceRegisterManageInfo.moreCondition) {
                     vc.component.serviceRegisterManageInfo.moreCondition = false;
-                }else{
+                } else {
                     vc.component.serviceRegisterManageInfo.moreCondition = true;
                 }
             }
 
-             ,
-             _openChooseAppMethod:function(){
-                            vc.emit('chooseApp','openChooseAppModel',{});
+            ,
+            _openChooseAppMethod: function () {
+                vc.emit('chooseApp', 'openChooseAppModel', {});
 
             },
-            _loadDataByParam: function(){
-                    vc.component.serviceRegisterManageInfo.conditions.appId = vc.getParam("appId");
-                    //如果 floodId 没有传 则,直接结束
-                    if(vc.component.serviceRegisterManageInfo.conditions.appId == null
-                        || vc.component.serviceRegisterManageInfo.conditions.appId == undefined
-                        || vc.component.serviceRegisterManageInfo.conditions.appId == ''){
-                        vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
-                        return ;
-                    }
+            _loadDataByParam: function () {
+                vc.component.serviceRegisterManageInfo.conditions.appId = vc.getParam("appId");
+                //如果 floodId 没有传 则,直接结束
+                if (vc.component.serviceRegisterManageInfo.conditions.appId == null
+                    || vc.component.serviceRegisterManageInfo.conditions.appId == undefined
+                    || vc.component.serviceRegisterManageInfo.conditions.appId == '') {
+                    vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
+                    return;
+                }
 
-                    var param = {
-                        params:{
-                            page:DEFAULT_PAGE,
-                            row:DEFAULT_ROWS,
-                            communityId:vc.getCurrentCommunity().communityId,
-                            appId:vc.component.serviceRegisterManageInfo.conditions.appId
-                        }
+                var param = {
+                    params: {
+                        page: DEFAULT_PAGE,
+                        row: DEFAULT_ROWS,
+                        communityId: vc.getCurrentCommunity().communityId,
+                        appId: vc.component.serviceRegisterManageInfo.conditions.appId
                     }
+                }
 
-                    vc.http.get(
-                        'serviceRegisterManage',
-                        'loadApp',
-                         param,
-                         function(json,res){
-                            if(res.status == 200){
-                                var _appInfo = JSON.parse(json);
-                                var _tmpApp = _appInfo.apps[0];
-                                vc.component.serviceRegisterManageInfo.conditions.appName = _tmpApp.name;
-                                return ;
-                            }
-                            vc.message(json);
-                         },
-                         function(errInfo,error){
-                            console.log('请求失败处理');
+                vc.http.get(
+                    'serviceRegisterManage',
+                    'loadApp',
+                    param,
+                    function (json, res) {
+                        if (res.status == 200) {
+                            var _appInfo = JSON.parse(json);
+                            var _tmpApp = _appInfo.apps[0];
+                            vc.component.serviceRegisterManageInfo.conditions.appName = _tmpApp.name;
+                            return;
+                        }
+                        vc.message(json);
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
 
-                            vc.message(errInfo);
-                         });
+                        vc.message(errInfo);
+                    });
 
-                    vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
+                vc.component._listServiceRegisters(DEFAULT_PAGE, DEFAULT_ROWS);
             }
         }
     });

+ 62 - 0
WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.html

@@ -0,0 +1,62 @@
+<div id = "addAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">添加应用</h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            <!--<div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼名称</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填,请填写名称" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼编号</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填,请填写编号" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填,请填写备注" class="form-control"></div>
+                            </div>-->
+
+                            <div class="form-group row">
+         <label class="col-sm-2 col-form-label">应用名称</label>
+         <div class="col-sm-10">
+           <input v-model="addAppInfo.name"                   type="text" placeholder="必填,请填写应用名称" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">秘钥</label>
+         <div class="col-sm-10">
+           <input v-model="addAppInfo.securityCode"                   type="text" placeholder="选填,请填写秘钥" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">白名单</label>
+         <div class="col-sm-10">
+           <input v-model="addAppInfo.whileListIp"                   type="text" placeholder="选填,请填写白名单" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">黑名单</label>
+         <div class="col-sm-10">
+           <input v-model="addAppInfo.blackListIp"                   type="text" placeholder="选填,请填写黑名单" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">备注</label>
+         <div class="col-sm-10">
+<textarea  placeholder="选填,请填写备注" class="form-control" v-model="addAppInfo.remark"></textarea>         </div>
+</div>
+
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveAppInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

+ 132 - 0
WebService/src/main/resources/components/visitInfoPackage/add-visit/addVisit.js

@@ -0,0 +1,132 @@
+(function (vc) {
+
+    vc.extends({
+        propTypes: {
+            callBackListener: vc.propTypes.string, //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
+        },
+        data: {
+            addAppInfo: {
+                appId: '',
+                name: '',
+                securityCode: '',
+                whileListIp: '',
+                blackListIp: '',
+                remark: '',
+
+            }
+        },
+        _initMethod: function () {
+
+        },
+        _initEvent: function () {
+            vc.on('addApp', 'openAddAppModal', function () {
+                $('#addAppModel').modal('show');
+            });
+        },
+        methods: {
+            addAppValidate() {
+                return vc.validate.validate({
+                    addAppInfo: vc.component.addAppInfo
+                }, {
+                    'addAppInfo.name': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "应用名称不能为空"
+                        },
+                        {
+                            limit: "maxin",
+                            param: "2,50",
+                            errInfo: "应用名称必须在2至50字符之间"
+                        },
+                    ],
+                    'addAppInfo.securityCode': [
+                        {
+                            limit: "maxLength",
+                            param: "64",
+                            errInfo: "秘钥太长超过64位"
+                        },
+                    ],
+                    'addAppInfo.whileListIp': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "白名单内容不能超过200"
+                        },
+                    ],
+                    'addAppInfo.blackListIp': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "黑名单内容不能超过200"
+                        },
+                    ],
+                    'addAppInfo.remark': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "备注内容不能超过200"
+                        },
+                    ],
+
+
+                });
+            },
+            saveAppInfo: function () {
+                if (!vc.component.addAppValidate()) {
+                    vc.message(vc.validate.errInfo);
+
+                    return;
+                }
+
+                vc.component.addAppInfo.communityId = vc.getCurrentCommunity().communityId;
+
+                //不提交数据将数据 回调给侦听处理
+                if (vc.notNull($props.callBackListener)) {
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addAppInfo);
+                    $('#addAppModel').modal('hide');
+                    return;
+                }
+
+                vc.http.post(
+                    'addApp',
+                    'save',
+                    JSON.stringify(vc.component.addAppInfo),
+                    {
+                        emulateJSON: true
+                    },
+                    function (json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if (res.status == 200) {
+                            //关闭model
+                            $('#addAppModel').modal('hide');
+                            vc.component.clearAddAppInfo();
+                            vc.emit('appManage', 'listApp', {});
+
+                            return;
+                        }
+                        vc.message(json);
+
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+
+                    });
+            },
+            clearAddAppInfo: function () {
+                vc.component.addAppInfo = {
+                    name: '',
+                    securityCode: '',
+                    whileListIp: '',
+                    blackListIp: '',
+                    remark: '',
+
+                };
+            }
+        }
+    });
+
+})(window.vc);

+ 12 - 26
WebService/src/main/resources/components/visitPackage/choose-visit/chooseVisit.html

@@ -1,8 +1,8 @@
-<div id = "chooseVisitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseVisitModelLabel" aria-hidden="true" >
+<div id = "chooseAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseAppModelLabel" aria-hidden="true" >
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h3 class="modal-title" id="chooseVisitModelLabel">选择访客登记</h3>
+                <h3 class="modal-title" id="chooseAppModelLabel">选择应用</h3>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -17,9 +17,9 @@
                                 </div>
                                 <div class="col-sm-5">
                                     <div class="input-group">
-                                        <input placeholder="输入访客登记名称" type="text" v-model="chooseVisitInfo._currentVisitName" class="form-control form-control-sm">
+                                        <input placeholder="输入应用名称" type="text" v-model="chooseAppInfo._currentAppName" class="form-control form-control-sm">
                                         <span class="input-group-append">
-                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="queryVisits()">查询</button>
+                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="queryApps()">查询</button>
                                             </span>
                                     </div>
                                 </div>
@@ -28,31 +28,17 @@
                                 <table class="table table-striped">
                                     <thead>
                                         <tr>
-                                                                        <th class="text-center">访客记录ID</th>
-                            <th class="text-center">访客姓名</th>
-                            <th class="text-center">访客性别</th>
-                            <th class="text-center">访客性别</th>
-                            <th class="text-center">访客联系方式</th>
-                            <th class="text-center">访客拜访时间</th>
-                            <th class="text-center">访客离开时间</th>
-                            <th class="text-center">描述</th>
-                            <th class="text-center">操作</th>
-
+                                            <th>应用Id</th>
+                                            <th>应用名称</th>
+                                            <th>操作</th>
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        <tr v-for="visit in chooseVisitInfo.visits">
-                                                                        <td class="text-center">{{visit.vId}}</td>
-                            <td class="text-center">{{visit.name}}</td>
-                            <td class="text-center">{{visit.visitGender}}</td>
-                            <td class="text-center">{{visit.visitGender}}</td>
-                            <td class="text-center">{{visit.phoneNumber}}</td>
-                            <td class="text-center">{{visit.visitTime}}</td>
-                            <td class="text-center">{{visit.departureTime}}</td>
-                            <td class="text-center">{{visit.visitCase}}</td>
-
+                                        <tr v-for="app in chooseAppInfo.apps">
+                                            <td>{{app.appId}}</td>
+                                            <td>{{app.name}}</td>
                                             <td>
-                                                <button class="btn btn-primary btn-xs" v-on:click="chooseVisit(visit)">选择</button>
+                                                <button class="btn btn-primary btn-xs" v-on:click="chooseApp(app)">选择</button>
                                             </td>
                                         </tr>
                                     </tbody>
@@ -65,4 +51,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

+ 63 - 0
WebService/src/main/resources/components/visitInfoPackage/choose-visit/chooseApp.js

@@ -0,0 +1,63 @@
+(function(vc){
+    vc.extends({
+        propTypes: {
+           emitChooseApp:vc.propTypes.string,
+           emitLoadData:vc.propTypes.string
+        },
+        data:{
+            chooseAppInfo:{
+                apps:[],
+                _currentAppName:'',
+            }
+        },
+        _initMethod:function(){
+        },
+        _initEvent:function(){
+            vc.on('chooseApp','openChooseAppModel',function(_param){
+                console.log("打开业主成员界面")
+                $('#chooseAppModel').modal('show');
+                vc.component._refreshChooseAppInfo();
+                vc.component._loadAllAppInfo(1,10,'');
+            });
+        },
+        methods:{
+            _loadAllAppInfo:function(_page,_row,_name){
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_row,
+                        communityId:vc.getCurrentCommunity().communityId,
+                        name:_name
+                    }
+                };
+
+                //发送get请求
+               vc.http.get('chooseApp',
+                            'list',
+                             param,
+                             function(json){
+                                var _appInfo = JSON.parse(json);
+                                vc.component.chooseAppInfo.apps = _appInfo.apps;
+                             },function(){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            chooseApp:function(_app){
+                _app.appName = _app.name;
+                vc.emit($props.emitChooseApp,'chooseApp',_app);
+                vc.emit($props.emitLoadData,'listAppData',{
+                    appId:_app.appId
+                });
+                $('#chooseAppModel').modal('hide');
+            },
+            queryApps:function(){
+                vc.component._loadAllAppInfo(1,10,vc.component.chooseAppInfo._currentAppName);
+            },
+            _refreshChooseAppInfo:function(){
+                vc.component.chooseAppInfo._currentAppName = "";
+            }
+        }
+
+    });
+})(window.vc);

+ 4 - 4
WebService/src/main/resources/components/visitPackage/delete-visit/deleteVisit.html

@@ -1,4 +1,4 @@
-<div class="modal fade" id="deleteVisitModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+<div class="modal fade" id="deleteAppModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -8,11 +8,11 @@
                 </button>
             </div>
             <div class="modal-body">
-                <tr align="center"><th>确定删除访客登记</th></tr>
+                <tr align="center"><th>确定删除应用</th></tr>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDeleteVisitModel()">点错了</button>
-                <button type="button" class="btn btn-primary" v-on:click="deleteVisit()">确认删除</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDeleteAppModel()">点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteApp()">确认删除</button>
             </div>
         </div>
     </div>

+ 16 - 15
WebService/src/main/resources/components/visitPackage/delete-visit/deleteVisit.js

@@ -2,7 +2,7 @@
 
     vc.extends({
         data:{
-            deleteVisitInfo:{
+            deleteAppInfo:{
 
             }
         },
@@ -10,20 +10,21 @@
 
          },
          _initEvent:function(){
-             vc.on('deleteVisit','openDeleteVisitModal',function(_params){
-
-                vc.component.deleteVisitInfo = _params;
-                $('#deleteVisitModel').modal('show');
-
-            });
+            //  vc.on('deleteApp','openDeleteAppModal',function(_params){
+            //      alert("监听成功");
+            //      console.log(_params);
+            //     vc.component.deleteAppInfo = _params;
+            //     $('#deleteAppModel').modal('show');
+            //
+            // });
         },
         methods:{
-            deleteVisit:function(){
-                vc.component.deleteVisitInfo.communityId=vc.getCurrentCommunity().communityId;
+            deleteApp:function(){
+                vc.component.deleteAppInfo.communityId=vc.getCurrentCommunity().communityId;
                 vc.http.post(
-                    'deleteVisit',
+                    'deleteApp',
                     'delete',
-                    JSON.stringify(vc.component.deleteVisitInfo),
+                    JSON.stringify(vc.component.deleteAppInfo),
                     {
                         emulateJSON:true
                      },
@@ -31,8 +32,8 @@
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                         if(res.status == 200){
                             //关闭model
-                            $('#deleteVisitModel').modal('hide');
-                            vc.emit('visitManage','listVisit',{});
+                            $('#deleteAppModel').modal('hide');
+                            vc.emit('appManage','listApp',{});
                             return ;
                         }
                         vc.message(json);
@@ -43,8 +44,8 @@
 
                      });
             },
-            closeDeleteVisitModel:function(){
-                $('#deleteVisitModel').modal('hide');
+            closeDeleteAppModel:function(){
+                $('#deleteAppModel').modal('hide');
             }
         }
     });

+ 11 - 11
WebService/src/main/resources/components/visitPackage/edit-visit/editVisit.html

@@ -1,9 +1,9 @@
-<div id="editVisitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+<div id="editAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
      aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">访客修改</h3>
+                <h3 class="m-t-none m-b ">修改访客</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
@@ -17,9 +17,9 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">访客性别</label>
                                 <div class="col-sm-10">
-                                    <select class="form-control-sm form-control input-s-sm inline"
-                                            v-model="editVisitInfo.visitGender">
-                                        <option selected value="">请选择访客性别</option>
+<!--                                    <input v-model="editAppInfo.securityCode" type="text" placeholder="选填,请填访客性别"-->
+<!--                                           class="form-control">-->
+                                    <select v-model="editVisitInfo.visitGender" class="form-control" :value="editVisitInfo.visitGender">
                                         <option value="1">男</option>
                                         <option value="0">女</option>
                                     </select>
@@ -28,28 +28,28 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">访客联系方式</label>
                                 <div class="col-sm-10">
-                                    <input v-model="editVisitInfo.phoneNumber" type="tel" placeholder="必填,请填写访客联系方式"
+                                    <input v-model="editVisitInfo.phoneNumber" type="text" placeholder="选填,请填写联系方式"
                                            class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">访客拜访时间</label>
+                                <label class="col-sm-2 col-form-label">访客来访时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="editVisitInfo.visitTime" type="datetime-local" placeholder="必填,请填写访客拜访时间"
+                                    <input v-model="editVisitInfo.visitTime" type="date" placeholder="选填,请填写来访时间"
                                            class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">访客离开时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="editVisitInfo.departureTime" type="datetime-local" placeholder="选填,请填写访客离开时间"
+                                    <input v-model="editVisitInfo.departureTime" type="date" placeholder="选填,请填写离开时间"
                                            class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">描述</label>
+                                <label class="col-sm-2 col-form-label">访客来访事由</label>
                                 <div class="col-sm-10">
-                                    <textarea cols="5" placeholder="选填,请填写描述" class="form-control"
+                                    <textarea placeholder="选填,请填写访客来访事由" class="form-control"
                                               v-model="editVisitInfo.visitCase"></textarea></div>
                             </div>
 

+ 119 - 0
WebService/src/main/resources/components/visitInfoPackage/edit-visit/editVisit.js

@@ -0,0 +1,119 @@
+(function (vc, vm) {
+
+    vc.extends({
+        data: {
+            editVisitInfo: {
+
+            }
+        },
+        _initMethod: function () {
+        },
+        _initEvent: function () {
+            vc.on('editVisit', 'openEditVisitModel', function (_params) {
+                vc.component.refreshEditAppInfo();
+                $('#editAppModel').modal('show');
+                console.log(_params);
+                vc.component.editVisitInfo = _params;
+
+            });
+        },
+        methods: {
+            editAppValidate: function () {
+                return vc.validate.validate({
+                    editVisitInfo: vc.component.editVisitInfo
+                }, {
+                    'editVisitInfo.name': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "访客姓名不能为空"
+                        }
+                    ],
+                    'editVisitInfo.visitGender': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "访客性别不能为空"
+                        },
+                    ],
+                    'editVisitInfo.phoneNumber': [
+                        {
+                            limit: "phone",
+                            param: "",
+                            errInfo: "访客联系方式不能为空"
+                        },
+                        {
+                            limit: "num",
+                            param: "",
+                            errInfo: "访客联系方式必须是数字"
+                        }
+                    ],
+                    'editVisitInfo.visitTime': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "访客到访时间不能为空"
+                        },
+                    ],
+                    'editVisitInfo.departureTime': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "访客到访时间不能为空"
+                        },
+                    ],
+                    'editVisitInfo.visitCase': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "访客到访原因不能为空"
+                        },
+                    ]
+
+
+                });
+            },
+            editVisit: function () {
+                if (!vc.component.editAppValidate()) {
+                    vc.message(vc.validate.errInfo);
+                    return;
+                }
+
+                vc.http.post(
+                    'editVisit',
+                    'update',
+                    JSON.stringify(vc.component.editVisitInfo),
+                    {
+                        emulateJSON: true
+                    },
+                    function (json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if (res.status == 200) {
+                            //关闭model
+                            $('#editAppModel').modal('hide');
+                            vc.emit('appManage', 'listApp', {});
+                            return;
+                        }
+                        vc.message(json);
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                    });
+            },
+            refreshEditAppInfo: function () {
+                vc.component.editAppInfo = {
+                    name: '',
+                    visitGender: '',
+                    phoneNumber: '',
+                    visitTime: '',
+                    departureTime: '',
+                    visitCase: '',
+
+                }
+            }
+        }
+    });
+
+})(window.vc, window.vc.component);

+ 67 - 0
WebService/src/main/resources/components/visitInfoPackage/view-visit-info/viewVisitInfo.html

@@ -0,0 +1,67 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>应用信息</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" v-if="viewAppInfo.index != 2" class="btn btn-primary btn-sm" style="margin-right:10px;"  v-on:click="_openSelectAppInfoModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择访客</button>
+
+                    <button type="button" v-if="viewAppInfo.index != 2 && viewAppInfo.needShowAddAppButton== 'true'" class="btn btn-primary btn-sm" v-on:click="_openAddAppInfoModel()">
+                        <i class="glyphicon glyphicon-plus"></i> 添加访客</button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >访客ID:</label>
+                            <label class="">{{viewAppInfo.appId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">访客姓名:</label>
+                            <label class="">{{viewAppInfo.name}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >访客联系方式:</label>
+                            <label class="">{{viewAppInfo.securityCode}}</label>
+                        </div>
+                    </div>
+
+
+                </div>
+
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >访客性别:</label>
+                            <label class="">{{viewAppInfo.whileListIp}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >访客到访事由:</label>
+                            <label class="">{{viewAppInfo.blackListIp}}</label>
+                        </div>
+                    </div>
+<!--                   viewVisitInfo-->
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <vc:create name="addApp"
+               callBackListener="viewAppInfo"
+               callBackFunction="chooseApp"
+    ></vc:create>
+
+
+    <vc:create name="chooseApp"
+               emitChooseApp="viewAppInfo"
+               emitLoadData="viewAppInfo"
+    ></vc:create>
+</div>

+ 55 - 0
WebService/src/main/resources/components/visitInfoPackage/view-visit-info/viewVisitInfo.js

@@ -0,0 +1,55 @@
+/**
+    权限组
+**/
+(function(vc){
+
+    vc.extends({
+        propTypes: {
+           callBackListener:vc.propTypes.string, //父组件名称
+           callBackFunction:vc.propTypes.string, //父组件监听方法
+           needShowAddAppButton:vc.propTypes.string = 'true' // 是否显示添加应用button
+        },
+        data:{
+            viewAppInfo:{
+                index:0,
+                flowComponent:'visit',
+                appId:"",
+                name:"",
+                securityCode:"",
+                whileListIp:"",
+                blackListIp:"",
+                remark:"",
+                needShowAddAppButton:$props.needShowAddAppButton
+            }
+        },
+        _initMethod:function(){
+            //根据请求参数查询 查询 业主信息
+            vc.component._loadAppInfoData();
+        },
+        _initEvent:function(){
+            vc.on('viewAppInfo','chooseApp',function(_app){
+                vc.copyObject(_app, vc.component.viewAppInfo);
+                vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewAppInfo);
+            });
+
+            vc.on('viewAppInfo', 'onIndex', function(_index){
+                vc.component.viewAppInfo.index = _index;
+            });
+
+        },
+        methods:{
+
+            _openSelectAppInfoModel(){
+                alert("打开查询访客模态框");
+                // vc.emit('chooseApp','openChooseAppModel',{});
+            },
+            _openAddAppInfoModel(){
+                // vc.emit('addApp','openAddAppModal',{});
+            },
+            _loadAppInfoData:function(){
+
+            }
+        }
+    });
+
+})(window.vc);

+ 70 - 0
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.html

@@ -0,0 +1,70 @@
+<div id="component">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>应用信息</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddAppModal()">
+                            <i class="glyphicon glyphicon-plus"></i>
+                            添加访客
+                        </button>
+                    </div>
+                </div>
+                <div class="ibox-content">
+
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                        <thead>
+                        <tr>
+                            <th>访客ID</th>
+                            <th>访客姓名</th>
+                            <th>访客联系方式</th>
+                            <th>访客性别</th>
+                            <th>来访事由</th>
+                            <th>来访时间</th>
+                            <th>离开时间</th>
+                            <th class="text-right">操作</th>
+
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="visit in appManageInfo.visits">
+                            <td>{{visit.vId}}</td>
+                            <td>{{visit.name}}</td>
+                            <td>{{visit.phoneNumber}}</td>
+                            <td>{{visit.visitGenderName}}</td>
+                            <td>{{visit.visitCase}}</td>
+                            <td>{{visit.visitTime}}</td>
+                            <td>{{visit.departureTime}}</td>
+                            <td>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改</button>
+                                </div>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteAppModel(visit)">删除
+                                    </button>
+                                </div>
+                            </td>
+
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create name="pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <vc:create name="editVisit"></vc:create>
+    <vc:create name="deleteApp"></vc:create>
+
+</div>

+ 68 - 0
WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.js

@@ -0,0 +1,68 @@
+/**
+    入驻小区
+**/
+(function(vc){
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data:{
+            appManageInfo:{
+                apps:[],
+                total:0,
+                records:1
+            }
+        },
+        _initMethod:function(){
+            vc.component._listApps(DEFAULT_PAGE, DEFAULT_ROWS);
+        },
+        _initEvent:function(){
+            vc.on('appManage','listApp',function(_param){
+                  vc.component._listApps(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+             vc.on('pagination','page_event',function(_currentPage){
+                vc.component._listApps(_currentPage,DEFAULT_ROWS);
+            });
+        },
+        methods:{
+            _listApps:function(_page, _rows){
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_rows
+                    }
+
+               }
+               //发送get请求
+               vc.http.get('visitManage',
+                            'list',
+                             param,
+                             function(json,res){
+                                var _visitManageInfo=JSON.parse(json);
+                                console.log(_visitManageInfo);
+                                vc.component.appManageInfo.total = _visitManageInfo.total;
+                                vc.component.appManageInfo.records = _visitManageInfo.records;
+                                vc.component.appManageInfo.visits = _visitManageInfo.visits;
+                                vc.emit('pagination','init',{
+                                     total:vc.component.appManageInfo.records,
+                                     currentPage:_page
+                                 });
+                             },function(errInfo,error){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            _openAddAppModal:function(){
+                vc.jumpToPage("/flow/visitAddFlow")
+                // vc.emit('addApp','openAddAppModal',{});
+            },
+            _openEditVisitModel:function(_app){
+                vc.emit('editVisit','openEditVisitModel',_app);
+                // vc.emit('deleteApp','openDeleteAppModal',_app);
+
+            },
+            _openDeleteAppModel:function(_app){
+                vc.emit('deleteApp','openDeleteAppModal',_app);
+            }
+        }
+    });
+})(window.vc);

+ 0 - 83
WebService/src/main/resources/components/visitPackage/add-visit/addVisit.html

@@ -1,83 +0,0 @@
-<div id="addVisitModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-     aria-hidden="true">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-body">
-                <h3 class="m-t-none m-b ">访客登记</h3>
-                <div class="ibox-content">
-                    <div>
-                        <div>
-                            <!--<div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼名称</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填,请填写名称" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼编号</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填,请填写编号" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填,请填写备注" class="form-control"></div>
-                            </div>-->
-
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">访客姓名</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addVisitInfo.name" type="text" placeholder="必填,请填写访客姓名"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">访客性别</label>
-                                <div class="col-sm-10">
-                                    <select class="form-control-sm form-control input-s-sm inline"
-                                            v-model="addVisitInfo.visitGender">
-                                        <option selected value="">请选择访客性别</option>
-                                        <option value="1">男</option>
-                                        <option value="0">女</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">访客联系方式</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addVisitInfo.phoneNumber" type="tel" placeholder="必填,请填写访客联系方式"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">访客拜访时间</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addVisitInfo.visitTime" type="datetime-local" placeholder="必填,请填写访客拜访时间"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">访客离开时间</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addVisitInfo.departureTime" type="datetime-local" placeholder="选填,请填写访客离开时间"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">描述</label>
-                                <div class="col-sm-10">
-                                    <textarea cols="5" placeholder="选填,请填写描述" class="form-control"
-                                              v-model="addVisitInfo.visitCase"></textarea></div>
-                            </div>
-
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveVisitInfo()">
-                                    <i class="fa fa-check"></i>&nbsp;保存
-                                </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                        data-dismiss="modal">取消
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

+ 0 - 156
WebService/src/main/resources/components/visitPackage/add-visit/addVisit.js

@@ -1,156 +0,0 @@
-(function (vc) {
-
-    vc.extends({
-        propTypes: {
-            callBackListener: vc.propTypes.string, //父组件名称
-            callBackFunction: vc.propTypes.string //父组件监听方法
-        },
-        data: {
-            addVisitInfo: {
-                vId: '',
-                name: '',
-                visitGender: '',
-                visitGender: '',
-                phoneNumber: '',
-                visitTime: '',
-                departureTime: '',
-                visitCase: '',
-            }
-        },
-        _initMethod: function () {
-
-        },
-        _initEvent: function () {
-            vc.on('addVisit', 'openAddVisitModal', function () {
-                $('#addVisitModel').modal('show');
-            });
-        },
-        methods: {
-            addVisitValidate() {
-                return vc.validate.validate({
-                    addVisitInfo: vc.component.addVisitInfo
-                }, {
-                    'addVisitInfo.name': [
-                        {
-                            limit: "required",
-                            param: "",
-                            errInfo: "访客姓名不能为空"
-                        },
-                        {
-                            limit: "maxin",
-                            param: "2,10",
-                            errInfo: "访客姓名必须在2至10字符之间"
-                        },
-                    ],
-                    'addVisitInfo.visitGender': [
-                        {
-                            limit: "required",
-                            param: "",
-                            errInfo: "访客性别不能为空"
-                        },
-                        {
-                            limit: "num",
-                            param: "",
-                            errInfo: "性别错误"
-                        },
-                    ],
-                    'addVisitInfo.phoneNumber': [
-                        {
-                            limit: "required",
-                            param: "",
-                            errInfo: "访客联系方式不能为空"
-                        },
-                        {
-                            limit: "phone",
-                            param: "",
-                            errInfo: "不是有效的手机号"
-                        },
-                    ],
-                    'addVisitInfo.visitTime': [
-                        {
-                            limit: "required",
-                            param: "",
-                            errInfo: "访客拜访时间不能为空"
-                        },
-                        {
-                            limit: "date",
-                            param: "",
-                            errInfo: "访客拜访时间格式错误,如:2019-09-11"
-                        },
-                    ],
-                    'addVisitInfo.departureTime': [
-                       {
-                           limit: "date",
-                           param: "",
-                           errInfo: "访客离开时间格式错误,如:2019-09-11"
-                       },
-                    ],
-                    'addVisitInfo.visitCase': [
-                        {
-                            limit: "maxLength",
-                            param: "200",
-                            errInfo: "备注内容不能超过200"
-                        },
-                    ],
-
-
-                });
-            },
-            saveVisitInfo: function () {
-                if (!vc.component.addVisitValidate()) {
-                    vc.message(vc.validate.errInfo);
-
-                    return;
-                }
-
-                vc.component.addVisitInfo.communityId = vc.getCurrentCommunity().communityId;
-                //不提交数据将数据 回调给侦听处理
-                if (vc.notNull($props.callBackListener)) {
-                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addVisitInfo);
-                    $('#addVisitModel').modal('hide');
-                    return;
-                }
-
-                vc.http.post(
-                    'addVisit',
-                    'save',
-                    JSON.stringify(vc.component.addVisitInfo),
-                    {
-                        emulateJSON: true
-                    },
-                    function (json, res) {
-                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if (res.status == 200) {
-                            //关闭model
-                            $('#addVisitModel').modal('hide');
-                            vc.component.clearAddVisitInfo();
-                            vc.emit('visitManage', 'listVisit', {});
-
-                            return;
-                        }
-                        vc.message(json);
-
-                    },
-                    function (errInfo, error) {
-                        console.log('请求失败处理');
-
-                        vc.message(errInfo);
-
-                    });
-            },
-            clearAddVisitInfo: function () {
-                vc.component.addVisitInfo = {
-                    name: '',
-                    visitGender: '',
-                    visitGender: '',
-                    phoneNumber: '',
-                    visitTime: '',
-                    departureTime: '',
-                    visitCase: '',
-
-                };
-            }
-        }
-    });
-
-})(window.vc);

+ 0 - 64
WebService/src/main/resources/components/visitPackage/choose-visit/chooseVisit.js

@@ -1,64 +0,0 @@
-(function(vc){
-    vc.extends({
-        propTypes: {
-           emitChooseVisit:vc.propTypes.string,
-           emitLoadData:vc.propTypes.string
-        },
-        data:{
-            chooseVisitInfo:{
-                visits:[],
-                _currentVisitName:'',
-            }
-        },
-        _initMethod:function(){
-        },
-        _initEvent:function(){
-            vc.on('chooseVisit','openChooseVisitModel',function(_param){
-                $('#chooseVisitModel').modal('show');
-                vc.component._refreshChooseVisitInfo();
-                vc.component._loadAllVisitInfo(1,10,'');
-            });
-        },
-        methods:{
-            _loadAllVisitInfo:function(_page,_row,_name){
-                var param = {
-                    params:{
-                        page:_page,
-                        row:_row,
-                        communityId:vc.getCurrentCommunity().communityId,
-                        name:_name
-                    }
-                };
-
-                //发送get请求
-               vc.http.get('chooseVisit',
-                            'list',
-                             param,
-                             function(json){
-                                var _visitInfo = JSON.parse(json);
-                                vc.component.chooseVisitInfo.visits = _visitInfo.visits;
-                             },function(){
-                                console.log('请求失败处理');
-                             }
-                           );
-            },
-            chooseVisit:function(_visit){
-                if(_visit.hasOwnProperty('name')){
-                     _visit.visitName = _visit.name;
-                }
-                vc.emit($props.emitChooseVisit,'chooseVisit',_visit);
-                vc.emit($props.emitLoadData,'listVisitData',{
-                    visitId:_visit.visitId
-                });
-                $('#chooseVisitModel').modal('hide');
-            },
-            queryVisits:function(){
-                vc.component._loadAllVisitInfo(1,10,vc.component.chooseVisitInfo._currentVisitName);
-            },
-            _refreshChooseVisitInfo:function(){
-                vc.component.chooseVisitInfo._currentVisitName = "";
-            }
-        }
-
-    });
-})(window.vc);

+ 0 - 147
WebService/src/main/resources/components/visitPackage/edit-visit/editVisit.js

@@ -1,147 +0,0 @@
-(function(vc,vm){
-
-    vc.extends({
-        data:{
-            editVisitInfo:{
-                vId:'',
-                name:'',
-                visitGender:'',
-                phoneNumber:'',
-                visitTime:'',
-                departureTime:'',
-                visitCase:'',
-            }
-        },
-         _initMethod:function(){
-
-         },
-         _initEvent:function(){
-             vc.on('editVisit','openEditVisitModal',function(_params){
-                vc.component.refreshEditVisitInfo();
-                $('#editVisitModel').modal('show');
-                vc.copyObject(_params, vc.component.editVisitInfo );
-                vc.component.editVisitInfo.communityId = vc.getCurrentCommunity().communityId;
-            });
-        },
-        methods:{
-            editVisitValidate:function(){
-                        return vc.validate.validate({
-                            editVisitInfo:vc.component.editVisitInfo
-                        },{
-                            'editVisitInfo.name':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"访客姓名不能为空"
-                        },
- {
-                            limit:"maxin",
-                            param:"2,10",
-                            errInfo:"访客姓名必须在2至10字符之间"
-                        },
-                    ],
-'editVisitInfo.visitGender':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"访客性别不能为空"
-                        },
- {
-                             limit: "num",
-                             param: "",
-                             errInfo: "性别错误"
-                         },
-                    ],
-'editVisitInfo.phoneNumber':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"访客联系方式不能为空"
-                        },
- {
-                             limit: "phone",
-                             param: "",
-                             errInfo: "不是有效的手机号"
-                         },
-                    ],
-'editVisitInfo.visitTime':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"访客拜访时间不能为空"
-                        },
-   {
-                             limit: "date",
-                             param: "",
-                             errInfo: "访客拜访时间格式错误,如:2019-09-11"
-                         },
-                    ],
-'editVisitInfo.departureTime':[
- {
-                            limit: "date",
-                            param: "",
-                            errInfo: "访客离开时间格式错误,如:2019-09-11"
-                        },
-                    ],
-'editVisitInfo.visitCase':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"备注内容不能超过200"
-                        },
-                    ],
-'editVisitInfo.vId':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"访客记录ID不能为空"
-                        }]
-
-                        });
-             },
-            editVisit:function(){
-                if(!vc.component.editVisitValidate()){
-                    vc.message(vc.validate.errInfo);
-                    return ;
-                }
-
-                vc.http.post(
-                    'editVisit',
-                    'update',
-                    JSON.stringify(vc.component.editVisitInfo),
-                    {
-                        emulateJSON:true
-                     },
-                     function(json,res){
-                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
-                            //关闭model
-                            $('#editVisitModel').modal('hide');
-                             vc.emit('visitManage','listVisit',{});
-                            return ;
-                        }
-                        vc.message(json);
-                     },
-                     function(errInfo,error){
-                        console.log('请求失败处理');
-
-                        vc.message(errInfo);
-                     });
-            },
-            refreshEditVisitInfo:function(){
-                vc.component.editVisitInfo= {
-                  vId:'',
-name:'',
-visitGender:'',
-visitGender:'',
-phoneNumber:'',
-visitTime:'',
-departureTime:'',
-visitCase:'',
-
-                }
-            }
-        }
-    });
-
-})(window.vc,window.vc.component);

+ 0 - 78
WebService/src/main/resources/components/visitPackage/view-visit-info/viewVisitInfo.html

@@ -1,78 +0,0 @@
-<div class="row">
-    <div class="col-lg-12">
-        <div class="ibox ">
-            <div class="ibox-title">
-                <h5>访客登记信息</h5>
-                <div class="ibox-tools" style="top:10px;">
-                    <button type="button" v-if="viewVisitInfo.index != 2" class="btn btn-primary btn-sm" style="margin-right:10px;"  v-on:click="_openSelectVisitInfoModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择访客登记</button>
-
-                    <button type="button" v-if="viewVisitInfo.index != 2" class="btn btn-primary btn-sm" v-on:click="_openAddVisitInfoModel()">
-                        <i class="glyphicon glyphicon-plus"></i> 添加访客登记</button>
-                </div>
-            </div>
-            <div class="ibox-content">
-                <div class="row">
-<div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >访客姓名:</label>
-                            <label class="">{{viewVisitInfo.name}}</label>
-                        </div>
-</div>
-<div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >访客性别:</label>
-                            <label class="">{{viewVisitInfo.visitGender}}</label>
-                        </div>
-</div>
-<div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >访客性别:</label>
-                            <label class="">{{viewVisitInfo.visitGender}}</label>
-                        </div>
-</div>
-</div>
-<div class="row">
-<div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >访客联系方式:</label>
-                            <label class="">{{viewVisitInfo.phoneNumber}}</label>
-                        </div>
-</div>
-<div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >访客拜访时间:</label>
-                            <label class="">{{viewVisitInfo.visitTime}}</label>
-                        </div>
-</div>
-<div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >访客离开时间:</label>
-                            <label class="">{{viewVisitInfo.departureTime}}</label>
-                        </div>
-</div>
-</div>
-<div class="row">
-<div class="col-sm-4">
-                        <div class="form-group">
-                            <label class="col-form-label" >描述:</label>
-                            <label class="">{{viewVisitInfo.visitCase}}</label>
-                        </div>
-</div>
-</div>
-
-            </div>
-        </div>
-    </div>
-
-    <vc:create name="addVisit"
-               callBackListener="viewVisitInfo"
-               callBackFunction="chooseVisit"
-    ></vc:create>
-
-
-    <vc:create name="chooseVisit"
-               emitChooseVisit="viewVisitInfo"
-               emitLoadData="viewVisitInfo"
-    ></vc:create>
-</div>

+ 0 - 54
WebService/src/main/resources/components/visitPackage/view-visit-info/viewVisitInfo.js

@@ -1,54 +0,0 @@
-/**
-    访客登记 组件
-**/
-(function(vc){
-
-    vc.extends({
-        propTypes: {
-           callBackListener:vc.propTypes.string, //父组件名称
-           callBackFunction:vc.propTypes.string //父组件监听方法
-        },
-        data:{
-            viewVisitInfo:{
-                index:0,
-                flowComponent:'viewVisitInfo',
-                name:'',
-visitGender:'',
-visitGender:'',
-phoneNumber:'',
-visitTime:'',
-departureTime:'',
-visitCase:'',
-
-            }
-        },
-        _initMethod:function(){
-            //根据请求参数查询 查询 业主信息
-            vc.component._loadVisitInfoData();
-        },
-        _initEvent:function(){
-            vc.on('viewVisitInfo','chooseVisit',function(_app){
-                vc.copyObject(_app, vc.component.viewVisitInfo);
-                vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewVisitInfo);
-            });
-
-            vc.on('viewVisitInfo', 'onIndex', function(_index){
-                vc.component.viewVisitInfo.index = _index;
-            });
-
-        },
-        methods:{
-
-            _openSelectVisitInfoModel(){
-                vc.emit('chooseVisit','openChooseVisitModel',{});
-            },
-            _openAddVisitInfoModel(){
-                vc.emit('addVisit','openAddVisitModal',{});
-            },
-            _loadVisitInfoData:function(){
-
-            }
-        }
-    });
-
-})(window.vc);

+ 0 - 136
WebService/src/main/resources/components/visitPackage/visit-manage/visitManage.html

@@ -1,136 +0,0 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                v-on:click="_moreCondition()">{{visitManageInfo.moreCondition == true?'隐藏':'更多'}}
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input type="text" placeholder="请输入访客ID" v-model="visitManageInfo.conditions.vId"
-                                       class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input type="text" placeholder="请输入访客姓名" v-model="visitManageInfo.conditions.name"
-                                       class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <select class="form-control-sm form-control input-s-sm inline"
-                                        v-model="visitManageInfo.conditions.visitGender">
-                                    <option selected value="">请选择访客性别</option>
-                                    <option value="1">男</option>
-                                    <option value="0">女</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryVisitMethod()"><i
-                                    class="glyphicon glyphicon-search"></i> 查询
-                            </button>
-                        </div>
-
-                    </div>
-
-                    <div class="row"  v-if="visitManageInfo.moreCondition == true">
-                        <div class="col-sm-4">
-                            <div class="form-group">
-                                <input type="date" placeholder="请选择访客拜访时间" v-model="visitManageInfo.conditions.visitTime"
-                                       class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input type="date" placeholder="请选择访客离开时间" v-model="visitManageInfo.conditions.departureTime"
-                                       class=" form-control">
-                            </div>
-                        </div>
-                    </div>
-
-
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>访客登记信息</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddVisitModal()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            访客登记
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
-                        <thead>
-                        <tr>
-                            <th class="text-center">访客记录ID</th>
-                            <th class="text-center">访客姓名</th>
-                            <th class="text-center">访客性别</th>
-                            <th class="text-center">访客联系方式</th>
-                            <th class="text-center">访客拜访时间</th>
-                            <th class="text-center">访客离开时间</th>
-                            <th class="text-center">操作</th>
-
-
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="visit in visitManageInfo.visits">
-                            <td class="text-center">{{visit.vId}}</td>
-                            <td class="text-center">{{visit.name}}</td>
-                            <td class="text-center">{{visit.visitGenderName}}</td>
-                            <td class="text-center">{{visit.phoneNumber}}</td>
-                            <td class="text-center">{{visit.visitTime}}</td>
-                            <td class="text-center">{{visit.departureTime}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改
-                                    </button>
-                                </div>
-                            </td>
-
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create name="pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    <vc:create name="addVisit"
-               callBackListener=""
-               callBackFunction=""
-    ></vc:create>
-    <vc:create name="editVisit"></vc:create>
-    <!--<vc:create name="deleteVisit"></vc:create>-->
-
-</div>

+ 0 - 87
WebService/src/main/resources/components/visitPackage/visit-manage/visitManage.js

@@ -1,87 +0,0 @@
-/**
-    入驻小区
-**/
-(function(vc){
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 10;
-    vc.extends({
-        data:{
-            visitManageInfo:{
-                visits:[],
-                total:0,
-                records:1,
-                moreCondition:false,
-                name:'',
-                conditions:{
-                    vId:'',
-                    name:'',
-                    visitGender:'',
-                    visitTime:'',
-                    departureTime:''
-                }
-            }
-        },
-        _initMethod:function(){
-            vc.component._listVisits(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent:function(){
-            
-            vc.on('visitManage','listVisit',function(_param){
-                  vc.component._listVisits(DEFAULT_PAGE, DEFAULT_ROWS);
-            });
-             vc.on('pagination','page_event',function(_currentPage){
-                vc.component._listVisits(_currentPage,DEFAULT_ROWS);
-            });
-        },
-        methods:{
-            _listVisits:function(_page, _rows){
-
-                vc.component.visitManageInfo.conditions.page = _page;
-                vc.component.visitManageInfo.conditions.row = _rows;
-                var param = {
-                    params:vc.component.visitManageInfo.conditions
-               };
-
-               //发送get请求
-               vc.http.get('visitManage',
-                            'list',
-                             param,
-                             function(json,res){
-                                var _visitManageInfo=JSON.parse(json);
-                                vc.component.visitManageInfo.total = _visitManageInfo.total;
-                                vc.component.visitManageInfo.records = _visitManageInfo.records;
-                                vc.component.visitManageInfo.visits = _visitManageInfo.visits;
-                                vc.emit('pagination','init',{
-                                     total:vc.component.visitManageInfo.records,
-                                     currentPage:_page
-                                 });
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
-            },
-            _openAddVisitModal:function(){
-                vc.emit('addVisit','openAddVisitModal',{});
-            },
-            _openEditVisitModel:function(_visit){
-                vc.emit('editVisit','openEditVisitModal',_visit);
-            },
-            _openDeleteVisitModel:function(_visit){
-                vc.emit('deleteVisit','openDeleteVisitModal',_visit);
-            },
-            _queryVisitMethod:function(){
-                vc.component._listVisits(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition:function(){
-                if(vc.component.visitManageInfo.moreCondition){
-                    vc.component.visitManageInfo.moreCondition = false;
-                }else{
-                    vc.component.visitManageInfo.moreCondition = true;
-                }
-            }
-
-             
-        }
-    });
-})(window.vc);