暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java

@@ -77,7 +77,17 @@ public class HKConstant {
      * 根据设备UUID集异动下载门禁权限
      */
     public static final String DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS = "/openapi/service/acs/auth/downloadAuthorityByDeviceUuids";
-    
+
+    /**
+     * 指定人员的门禁权限下载
+     */
+    public static final String DOWNLOAD_AUTHORITY_BY_PERSONIDS = "/openapi/service/acs/auth/downloadAuthorityByPersonIds";
+
+    /**
+     * 分页获取计划模板
+     */
+    public static final String GETPLANS = "/openapi/service/acs/plan/getPlans";
+
     /**
      * 指定人员人脸/指纹权限下载
      */

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -346,7 +346,7 @@ public class HKOpenApi {
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("deviceUuids","57231a05fd3b45f7a2570a28a85821c4,efcb9a3fe4e64e2f9c0f546c54465524,9da7c0073138453fa7782b629743cff7,85c22fde220d4b35ac13f805f05fd04c");
+        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c,8bb843f484544998a01f73c545b8e07b,8bb843f484544998a01f73c545b8e07b");
         String params =  JSON.toJSONString(parMap);
         log.info("根据设备UUID集异动下载门禁权限请求参数：{}", params);
         String data = null;
@@ -362,6 +362,73 @@ public class HKOpenApi {
         return data;
     }
 
+    /**
+     * 指定人员的门禁权限下载
+     *
+     * @param personIds 人员ID, 多个用 "," 隔开
+     * @return
+     */
+    public static String downloadAuthorityByPersonIds(String personIds){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("personIds",personIds);
+        parMap.put("doorUuids","57231a05fd3b45f7a2570a28a85821c4,efcb9a3fe4e64e2f9c0f546c54465524,9da7c0073138453fa7782b629743cff7,85c22fde220d4b35ac13f805f05fd04c");
+        parMap.put("planUuid","plan0000000000000000000000000001");
+        parMap.put("operateType",1);
+        parMap.put("includeFinger",1);
+        String params =  JSON.toJSONString(parMap);
+        log.info("指定人员的门禁权限下载请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("获取 指定人员的门禁权限下载 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("指定人员的门禁权限下载获取失败!",e);
+            throw new RuntimeException("指定人员的门禁权限下载获取失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 分页获取计划模板
+     *
+     * @param pageNo 第几页
+     * @param pageSize 一页多少行
+     * @return
+     */
+    public static String getPlans(Integer pageNo, Integer pageSize) {
+
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETPLANS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("pageNo",pageNo);
+        parMap.put("pageSize",pageSize);
+        String params =  JSON.toJSONString(parMap);
+        log.info("分页获取计划模板请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("获取 分页获取计划模板 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("分页获取计划模板获取失败!",e);
+            throw new RuntimeException("分页获取计划模板获取失败!");
+        }
+
+        return data;
+    }
+
     /**
      * 指定人员人脸/指纹权限下载
      * @return
@@ -374,7 +441,7 @@ public class HKOpenApi {
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c");
+        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c,6d4b9c4ad10b47bdbdccd8710c4d1d71,765532274ae84f9bb495d801444a7f1e");
         parMap.put("personIds",personIds);
         parMap.put("type",1);
         String params =  JSON.toJSONString(parMap);
@@ -543,29 +610,6 @@ public class HKOpenApi {
     }
     
     public static void main(String[] args) {
-        Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + "/openapi/service/eps/subscribeEventsFromMQEx";
-        //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
-        //设置时间参数
-        parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("eventTypes","198914,199941");
-        //parMap.put("subSystemUuid","3145728");
-        String params =  JSON.toJSONString(parMap);
-        log.info("分页获取门禁点信息请求参数：{}", params);
-        String data = null;
-        try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
-            log.info(" 请求返回结果：{}",data);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("获取失败!",e);
-            throw new RuntimeException("获取失败!");
-        }
-
-        System.out.println(data);
-
     }
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AssembleController.java

@@ -61,7 +61,7 @@ public class AssembleController extends BaseController {
 		//获取菜单数据
 		List<TaSysMenu> menuList = menuService.getMenuList(communityId);
 		//获取首页banner数据
-		List<ToBanner> toBannerList = bannerService.viewAllBannerImg();
+		List<ToBanner> toBannerList = bannerService.viewAllBannerImg(1);
 		//获取消息总数接口
 		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
 		

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/BannerController.java

@@ -33,7 +33,7 @@ public class BannerController {
     @Autowired
     private BannerServiceI bannerService;
 
-    @ApiOperation(value = "首页运营banner接口", notes = "获取首页运营banner")
+    @ApiOperation(value = "获取首页运营banner接口详情", notes = "获取首页运营banner详情")
     @RequestMapping(value = "/banner/{bannerId}", method = RequestMethod.GET)
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "bannerId", value = "运营banner图Id") })
     public ResponseBean selectToBannerImg(@PathVariable("bannerId")Integer bannerId){
@@ -43,11 +43,14 @@ public class BannerController {
         return responseBean;
     }
 
-    @ApiOperation(value = "首页运营所有banner接口", notes = "获取首页所有运营banner")
+    @ApiOperation(value = "获取首页运营所有banner接口", notes = "获取首页所有运营banner")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = "banner位: 1首页banner 2服务端banner")
+    })
     @RequestMapping(value = "/banners", method = RequestMethod.GET)
-    public ResponseBean selectAllToBannerImg(){
+    public ResponseBean selectAllToBannerImg(@RequestParam Integer bannerPosition){
         ResponseBean responseBean = new ResponseBean();
-        List<ToBanner> toBannerList = bannerService.viewAllBannerImg();
+        List<ToBanner> toBannerList = bannerService.viewAllBannerImg(bannerPosition);
         responseBean.addSuccess(toBannerList);
         return responseBean;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/FaceController.java

@@ -26,47 +26,47 @@ public class FaceController {
     @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserID",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
     })
     
     @RequestMapping(value = "/addFace",method = RequestMethod.POST)
     public Object getTaFace(HttpSession session,
                             @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
-                            @RequestParam(required = false) Integer otherUserID){
+                            @RequestParam(required = false) Integer otherUserId){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        responseBean = faceServicel.addFace(userId ,uploadFile,otherUserID);
+        responseBean = faceServicel.addFace(userId ,uploadFile,otherUserId);
         return responseBean;
     }
 
     @ApiOperation(value = "修改人脸图片", notes = "修改人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserID",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
     })
     @RequestMapping(value = "/upDateFace",method = RequestMethod.POST)
     public Object upDateTaFace(HttpSession session,
                                @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
-                               @RequestParam(required = false) Integer otherUserID
+                               @RequestParam(required = false) Integer otherUserId
                                ){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-         responseBean = faceServicel.upDateFace(userId,uploadFile,otherUserID);
+         responseBean = faceServicel.upDateFace(userId,uploadFile,otherUserId);
         return responseBean;
     }
 
     @ApiOperation(value = "获取当前已录入人脸信息", notes = "获取当前已录入人脸信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserID",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
     })
     @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
-    public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserID){
+    public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserId){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId,otherUserID);
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId,otherUserId);
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/VistorController.java

@@ -38,7 +38,7 @@ public class VistorController extends BaseController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "carLicense:车牌(数组),drivingStatus:0 是不开车 1是开车," +
-                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStatrtTime:访问人电话,visitorEndTime:访问人结束时间")})
+                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人电话,visitorEndTime:访问人结束时间")})
     public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -52,10 +52,10 @@ public interface TaUserMapper {
     /**
      * 判断当前用户的关联关系
      * @param userId
-     * @param otherUserID
+     * @param otherUserId
      * @return
      */
-    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID")Integer otherUserID);
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserId")Integer otherUserId);
 
     /**
      * 查询此电话在小区是否存在

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/ToBannerMapper.java

@@ -11,5 +11,5 @@ public interface ToBannerMapper {
 
     ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId, @Param("nowTime") String nowTime);
 
-    List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num);
+    List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num, @Param("bannerPosition") Integer bannerPosition);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaVisitor.java

@@ -14,7 +14,7 @@ public class TaVisitor {
 
     private String visitorNum;
 
-    private Date visitorStatrtTime;
+    private Date visitorStartTime;
 
     private Date visitorEndTime;
 
@@ -75,15 +75,15 @@ public class TaVisitor {
     public void setVisitorNum(String visitorNum) {
         this.visitorNum = visitorNum == null ? null : visitorNum.trim();
     }
-
-    public Date getVisitorStatrtTime() {
-        return visitorStatrtTime;
+    
+    public Date getVisitorStartTime() {
+        return visitorStartTime;
     }
-
-    public void setVisitorStatrtTime(Date visitorStatrtTime) {
-        this.visitorStatrtTime = visitorStatrtTime;
+    
+    public void setVisitorStartTime(Date visitorStartTime) {
+        this.visitorStartTime = visitorStartTime;
     }
-
+    
     public Date getVisitorEndTime() {
         return visitorEndTime;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/BannerServiceI.java

@@ -12,5 +12,5 @@ import java.util.List;
 public interface BannerServiceI {
 
     ToBanner viewBannerImg(Integer bannerId);
-    List<ToBanner> viewAllBannerImg();
+    List<ToBanner> viewAllBannerImg(Integer bannerPosition);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/FaceServiceI.java

@@ -9,24 +9,24 @@ public interface FaceServiceI {
      * 添加人脸
      * @param userId 登入人ID
      *  @param  uploadFile
-     *  @param otherUserID 关联家属或者租客ID
+     *  @param otherUserId 关联家属或者租客ID
      * @return
      */
-    ResponseBean addFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
+    ResponseBean addFace(Integer userId ,MultipartFile uploadFile,Integer otherUserId);
 
     /**
      * 更新当前人脸
      * @param userId 登入人ID
      *  @param  uploadFile
-     *  @param otherUserID 关联家属或者租客ID
+     *  @param otherUserId 关联家属或者租客ID
      * @return
      */
-    ResponseBean upDateFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
+    ResponseBean upDateFace(Integer userId ,MultipartFile uploadFile,Integer otherUserId);
 
     /**
      * 当前登入人是否有人脸信息
      * @param userId
      * @return
      */
-    ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID);
+    ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java

@@ -32,11 +32,11 @@ public class BannerServiceImpl implements BannerServiceI {
     }
 
     @Override
-    public List<ToBanner> viewAllBannerImg() {
+    public List<ToBanner> viewAllBannerImg(Integer bannerPosition) {
         //查询轮播图数量
         Integer bannerNum = tpCarouselSettingMapper.selectCarouselNum(Constant.BANNER);
 
         String nowTime = DateUtils.getDate("yyyy-MM-dd");
-        return toBannerMapper.selectAllByNum(nowTime, bannerNum);
+        return toBannerMapper.selectAllByNum(nowTime, bannerNum, bannerPosition);
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -40,18 +40,18 @@ public class FaceServicelimpl implements FaceServiceI {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserID) {
+    public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserId) {
         ResponseBean responseBean= new ResponseBean();
          String faceImg =img(uploadFile);
-        /**当otherUserID不为空时判断它是否是业主下的租客或者家属*/
-        if (null!= otherUserID && !userid.equals(otherUserID)) {
-                 responseBean = getTaFaceParentId(userid, otherUserID);
+        /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
+        if (null!= otherUserId && !userid.equals(otherUserId)) {
+                 responseBean = getTaFaceParentId(userid, otherUserId);
             if ("1".equals(responseBean.getCode())){
                 responseBean.getMessage();
                 return responseBean;
             }
         }
-            Integer activeUser = otherUserID == null?userid:otherUserID;
+            Integer activeUser = otherUserId == null?userid:otherUserId;
             TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
             TaFace taFace = new TaFace();
             taFace.setFaceImg(faceImg);
@@ -63,7 +63,7 @@ public class FaceServicelimpl implements FaceServiceI {
             taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean=addVerify( activeUser,  uploadFile, otherUserID, faceImg, taFace) ;
+        responseBean=addVerify( activeUser,  uploadFile, otherUserId, faceImg, taFace) ;
         return responseBean;
     }
 
@@ -71,22 +71,22 @@ public class FaceServicelimpl implements FaceServiceI {
      * 修改人脸信息
       * @param userId 登入人ID
      * @param  uploadFile
-     * @param otherUserID 关联家属或者租客ID
+     * @param otherUserId 关联家属或者租客ID
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserID) {
+    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserId) {
         boolean isA = false;
       ResponseBean responseBean= new ResponseBean();
         String faceImg =img(uploadFile);
-        if (null!= otherUserID && !userId.equals(otherUserID)) {
-                 responseBean = getTaFaceParentId(userId, otherUserID);
+        if (null!= otherUserId && !userId.equals(otherUserId)) {
+                 responseBean = getTaFaceParentId(userId, otherUserId);
             if ("1".equals(responseBean.getCode())) {
                 responseBean.getMessage();
                 return responseBean;
                }}
-            Integer activeUser = otherUserID == null?userId:otherUserID;
+            Integer activeUser = otherUserId == null?userId:otherUserId;
             //当前修改的id否存在
              TaFace face = taFaceMapper.getByUserId(activeUser);
              if (null == face){
@@ -157,17 +157,17 @@ public class FaceServicelimpl implements FaceServiceI {
      *获得用户，租客，家属，其中一种身份的信息
      */
     @Override
-    public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID) {
+    public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId) {
         ResponseBean responseBean= new ResponseBean();
-        /**当otherUserID不为空时判断它是否是业主下的租客或者家属*/
-        if (null!= otherUserID && !userId.equals(otherUserID)) {
-            responseBean = getTaFaceParentId(userId, otherUserID);
+        /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
+        if (null!= otherUserId && !userId.equals(otherUserId)) {
+            responseBean = getTaFaceParentId(userId, otherUserId);
             if ("1".equals(responseBean.getCode())) {
                 responseBean.getMessage();
                 return responseBean;
             }
         }
-        Integer id = otherUserID == null?userId:otherUserID;
+        Integer id = otherUserId == null?userId:otherUserId;
         TaFace face = taFaceMapper.getByUserId(id);
          if (null!= face){
             responseBean.addSuccess(face);
@@ -181,10 +181,10 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      *判断当前用户下的人员关系（家属，租客）
      */
-    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserID){
+    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
        ResponseBean  responseBean= new ResponseBean();
-/*         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);*/
-        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserID);
+/*         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserId);*/
+        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserId);
         if (null!= users && !users.getParentId().equals(userId)){
             responseBean.addError("您输入的家属或租户ID有误");
             return responseBean;
@@ -208,7 +208,7 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      *各种身份校验
      */
-    public ResponseBean addVerify(Integer userid, MultipartFile uploadFile,Integer otherUserID,String faceImg,TaFace taFace) {
+    public ResponseBean addVerify(Integer userid, MultipartFile uploadFile,Integer otherUserId,String faceImg,TaFace taFace) {
         ResponseBean response = new ResponseBean();
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java

@@ -101,7 +101,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     private void temporaryRegister(Integer userId,TaVisitor visitor,ResponseBean response){
         TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
         String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
-                Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStatrtTime().getTime(),
+                Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStartTime().getTime(),
                 visitor.getVisitorEndTime().getTime(),taUser.getHkUserId());
 
         JSONObject resultJSON = JSONObject.parseObject(result);

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

@@ -314,8 +314,8 @@
       <include refid="Base_Column_List" />
     from ta_user
     where 1=1
-    <if test="otherUserID != null" >
-     and id = #{otherUserID,jdbcType=INTEGER}
+    <if test="otherUserId != null" >
+     and id = #{otherUserId,jdbcType=INTEGER}
     </if>
     <if test="id != null" >
      and parent_id = #{id}
@@ -328,7 +328,7 @@
     <include refid="Base_Column_List" />
     from ta_user
     where community_id = #{communityId,jdbcType=INTEGER}
-    <if test="otherUserID != null" >
+    <if test="otherUserId != null" >
       and login_name = #{phone}
     </if>
 

CODE/smart-community/app-api/src/main/resources/mapper/TaVisitorMapper.xml

@@ -7,7 +7,7 @@
     <result column="visitor_name" property="visitorName" jdbcType="VARCHAR" />
     <result column="visitor_tel" property="visitorTel" jdbcType="VARCHAR" />
     <result column="visitor_num" property="visitorNum" jdbcType="VARCHAR" />
-    <result column="visitor_statrt_time" property="visitorStatrtTime" jdbcType="TIMESTAMP" />
+    <result column="visitor_start_time" property="visitorStartTime" jdbcType="TIMESTAMP" />
     <result column="visitor_end_time" property="visitorEndTime" jdbcType="TIMESTAMP" />
     <result column="driving_status" property="drivingStatus" jdbcType="CHAR" />
     <result column="pay_entity" property="payEntity" jdbcType="VARCHAR" />
@@ -19,7 +19,7 @@
     <result column="update_darte" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, visitor_name, visitor_tel, visitor_num, visitor_statrt_time, visitor_end_time, 
+    id, community_id, visitor_name, visitor_tel, visitor_num, visitor_start_time, visitor_end_time,
     driving_status, pay_entity, visitor_code, ta_user_id, create_user, create_date, update_user, 
     update_darte
   </sql>
@@ -35,13 +35,13 @@
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TaVisitor" >
     insert into ta_visitor (id, community_id, visitor_name, 
-      visitor_tel, visitor_num, visitor_statrt_time, 
+      visitor_tel, visitor_num, visitor_start_time,
       visitor_end_time, driving_status, pay_entity, 
       visitor_code, ta_user_id, create_user, 
       create_date, update_user, update_darte
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{visitorName,jdbcType=VARCHAR}, 
-      #{visitorTel,jdbcType=VARCHAR}, #{visitorNum,jdbcType=VARCHAR}, #{visitorStatrtTime,jdbcType=TIMESTAMP}, 
+      #{visitorTel,jdbcType=VARCHAR}, #{visitorNum,jdbcType=VARCHAR}, #{visitorStartTime,jdbcType=TIMESTAMP},
       #{visitorEndTime,jdbcType=TIMESTAMP}, #{drivingStatus,jdbcType=CHAR}, #{payEntity,jdbcType=VARCHAR},
       #{visitorCode,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{createUser,jdbcType=INTEGER}, 
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
@@ -65,8 +65,8 @@
       <if test="visitorNum != null" >
         visitor_num,
       </if>
-      <if test="visitorStatrtTime != null" >
-        visitor_statrt_time,
+      <if test="visitorStartTime != null" >
+        visitor_start_time,
       </if>
       <if test="visitorEndTime != null" >
         visitor_end_time,
@@ -112,8 +112,8 @@
       <if test="visitorNum != null" >
         #{visitorNum,jdbcType=VARCHAR},
       </if>
-      <if test="visitorStatrtTime != null" >
-        #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      <if test="visitorStartTime != null" >
+        #{visitorStartTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
         #{visitorEndTime,jdbcType=TIMESTAMP},
@@ -159,8 +159,8 @@
       <if test="visitorNum != null" >
         visitor_num = #{visitorNum,jdbcType=VARCHAR},
       </if>
-      <if test="visitorStatrtTime != null" >
-        visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      <if test="visitorStartTime != null" >
+        visitor_start_time = #{visitorStartTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
         visitor_end_time = #{visitorEndTime,jdbcType=TIMESTAMP},
@@ -198,7 +198,7 @@
       visitor_name = #{visitorName,jdbcType=VARCHAR},
       visitor_tel = #{visitorTel,jdbcType=VARCHAR},
       visitor_num = #{visitorNum,jdbcType=VARCHAR},
-      visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      visitor_start_time = #{visitorStartTime,jdbcType=TIMESTAMP},
       visitor_end_time = #{visitorEndTime,jdbcType=TIMESTAMP},
       driving_status = #{drivingStatus,jdbcType=CHAR},
       pay_entity = #{payEntity,jdbcType=VARCHAR},
@@ -229,8 +229,8 @@
       <if test="visitorNum != null" >
         visitor_num,
       </if>
-      <if test="visitorStatrtTime != null" >
-        visitor_statrt_time,
+      <if test="visitorStartTime != null" >
+        visitor_start_time,
       </if>
       <if test="visitorEndTime != null" >
         visitor_end_time,
@@ -276,8 +276,8 @@
       <if test="visitorNum != null" >
         #{visitorNum,jdbcType=VARCHAR},
       </if>
-      <if test="visitorStatrtTime != null" >
-        #{visitorStatrtTime,jdbcType=TIMESTAMP},
+      <if test="visitorStartTime != null" >
+        #{visitorStartTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
         #{visitorEndTime,jdbcType=TIMESTAMP},

CODE/smart-community/app-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -35,9 +35,12 @@
     id, community_id, banner_description, sort, banner_cover, banner_position, eff_time,
     exp_time, banner_type, external_link, banner_title, create_user, create_date
     <![CDATA[
-    from to_banner t where date_format(t.eff_time,'%Y-%m-%d') <= date_format('2018-11-23','%Y-%m-%d')
-    and date_format(t.exp_time,'%Y-%m-%d') >= date_format('2018-11-23','%Y-%m-%d')
+    from to_banner t where date_format(t.eff_time,'%Y-%m-%d') <= date_format(NOW(),'%Y-%m-%d')
+    and date_format(t.exp_time,'%Y-%m-%d') >= date_format(NOW(),'%Y-%m-%d')
     ]]>
+    <if test="bannerPosition != null">
+      and banner_position = #{bannerPosition,jdbcType=INTEGER}
+    </if>
     order by t.sort, t.eff_time
     <if test="num != null">
       limit #{num}

CODE/smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml

@@ -224,6 +224,7 @@
           and type = #{type,jdbcType=CHAR}
         </if>
       </trim>
+    order by create_date DESC
   </select>
 
   <select id="selectByTicketId" resultMap="BaseResultMap" >

CODE/smart-community/mq-message/src/main/java/com/community/huiju/common/code/impl/PhoneCodeImpl.java

@@ -1,74 +0,0 @@
-package com.community.huiju.common.code.impl;
-
-import com.community.commom.constant.Constant;
-import com.community.commom.utils.AccountValidatorUtil;
-import com.community.huiju.common.code.ICode;
-import com.community.huiju.common.code.cache.AppkeyCache;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 手机验证码
- * @author weiximei
- */
-@Service("phoneCodeImpl")
-@Slf4j
-public class PhoneCodeImpl implements ICode {
-
-    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
-    @Autowired
-    private RestTemplate restTemplate;
-
-    public OkHttpClient getClient() {
-        OkHttpClient client  = new OkHttpClient.Builder()
-                .connectTimeout(10, TimeUnit.SECONDS)
-                .writeTimeout(10,TimeUnit.SECONDS)
-                .readTimeout(20, TimeUnit.SECONDS)
-                .build();
-        return client;
-    }
-
-    @Override
-    public boolean sendCode(String phone, String code) {
-        boolean bool = false;
-
-        try {
-            String result = null;
-            OkHttpClient client = getClient();
-            RequestBody body = RequestBody.create(JSON, "{\"code\":\""+Constant.CODE+"\"," + "\"tel\":\""+phone+"\"," + "\"params\":[\""+code+"\"]}");
-            Request request = new Request.Builder()
-                    .url(Constant.REQUEST_URL)
-                    .post(body)
-                    .build();
-            Response response = client.newCall(request).execute();
-            if (response.isSuccessful()) {
-                result = response.body().string();
-            } else {
-                throw new IOException("Unexpected code " + response);
-            }
-
-
-
-            if ("发送成功".equals(result)) {
-                bool = true;
-                log.info("手机号 {} 验证码 {} 发送成功!",phone,code);
-            }else {
-                bool = false;
-                log.error("短信发送验证码失败!{}", result);
-            }
-        } catch (Exception e){
-            e.printStackTrace();
-            log.error("短信发送错误!",e);
-            bool = false;
-        }
-
-        return bool;
-    }
-}

CODE/smart-community/mq-message/src/main/java/com/community/huiju/runner/MqRunner.java

@@ -24,6 +24,7 @@ import javax.jms.Topic;
 public class MqRunner implements ApplicationRunner {
 	
 	public static final String BROKER_URL = "failover:(tcp://192.168.0.122:61618)?timeout=2000";
+	//public static final String BROKER_URL = "failover:(tcp://localhost:8087)?timeout=2000";
 	
 	public static final String TARGET = "openapi.acs.topic";
 	

CODE/smart-community/operate-api/src/main/java/com/community/huiju/OperateApplication.java

@@ -1,9 +1,14 @@
 package com.community.huiju;
 
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
@@ -15,4 +20,15 @@ public class OperateApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(OperateApplication.class, args);
 	}
+
+	@Bean
+	public HttpMessageConverters fastJsonConfigure(){
+		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+		FastJsonConfig fastJsonConfig = new FastJsonConfig();
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat);
+		//日期格式化
+		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		converter.setFastJsonConfig(fastJsonConfig);
+		return new HttpMessageConverters(converter);
+	}
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/config/HttpSessionConfig.java

@@ -2,6 +2,7 @@ package com.community.huiju.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.session.MapSession;
 import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
 import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
 
@@ -9,7 +10,7 @@ import org.springframework.session.web.http.HttpSessionIdResolver;
 
 
 @Configuration
-@EnableJdbcHttpSession
+@EnableJdbcHttpSession(maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS*48*7)
 public class HttpSessionConfig {
 
     @Bean
@@ -17,9 +18,4 @@ public class HttpSessionConfig {
         return HeaderHttpSessionIdResolver.xAuthToken();
     }
 
-//    @Bean
-//    public HttpSessionStrategy httpSessionStrategy() {
-//        return new HeaderHttpSessionStrategy();
-//    }
-
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/AppUserController.java

@@ -1,8 +1,15 @@
 package com.community.huiju.controller;
 
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.ITaUserService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -11,6 +18,19 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = " App 用户 控制器")
 public class AppUserController {
 
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @ApiOperation(value = "获取用户人数", notes = "获取用户人数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/user/count",method = RequestMethod.GET)
+    public ResponseBean getUserCount() {
+        ResponseBean response = new ResponseBean();
+        response = iTaUserService.getByUserTypeCount();
+        return response;
+    }
 
 
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -52,10 +52,10 @@ public interface TaUserMapper {
     /**
      * 判断当前用户的关联关系
      * @param userId
-     * @param otherUserID
+     * @param otherUserId
      * @return
      */
-    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID") Integer otherUserID);
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserId") Integer otherUserId);
 
     /**
      * 查询此电话在小区是否存在

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToBanner.java

@@ -1,8 +1,6 @@
 package com.community.huiju.model;
 
-import javax.validation.constraints.Future;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.*;
 import java.util.Date;
 
 public class ToBanner {
@@ -11,22 +9,27 @@ public class ToBanner {
     @NotBlank(message = "标题不能为空!")
     private String title;
 
-    @Min(value = 0,message = "小区不能为空!")
+    @Min(value = 0,message = "请选择有效的小区!")
+    @NotNull(message = "小区不能空!")
     private Integer communityId;
 
     // @NotBlank(message = "跳转描述不能为空!")
     private String bannerDescription;
 
+    @NotNull(message = "权重不能空!")
     private Integer sort;
 
     @NotBlank(message = "banner图片不能为空!")
     private String bannerCover;
 
     @Min(value = 0,message = "请选择有效的banner位!")
+    @NotNull(message = "banner位不能空!")
     private Integer bannerPosition;
 
+    @NotNull(message = "生效时间不能为空!")
     private Date effTime;
 
+    @NotNull(message = "失效时间不能为空!")
     private Date expTime;
 
     @NotBlank(message = "banner类型不能为空!")

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -21,9 +21,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -45,25 +48,45 @@ public class ToBannerServiceImpl implements IToBannerService {
     @Autowired
     private SysDictionaryMapper sysDictionaryMapper;
 
+    /**
+     * 校验 url 合法性
+     */
+    private Pattern patternUrl = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\/])+$");
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addBanner(ToBanner banner,Integer currentUserId) {
 
         ResponseBean response = new ResponseBean();
         if (Constant.BANNER_TYPE_ARTICLE.equals(banner.getBannerType())) {
+            if (StringUtils.isBlank(banner.getBannerTitle())) {
+                response.addError("Banner内容标题不能为空");
+                return response;
+            }
             if (StringUtils.isBlank(banner.getBannerContent())) {
                 response.addError("Banner内容不能为空");
                 return response;
             }
         }else {
             if (StringUtils.isBlank(banner.getExternalLink())) {
-                response.addError("跳转URL不能为空");
+                response.addError("跳转链接不能为空");
+                return response;
+            }
+            if (!patternUrl.matcher(banner.getExternalLink()).matches()) {
+                response.addError("请输入合法的跳转链接!");
                 return response;
             }
         }
 
         Date effTime = banner.getEffTime();
         Date currentDate = new Date();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String formatCurrentDate = simpleDateFormat.format(currentDate);
+        try {
+            currentDate = simpleDateFormat.parse(formatCurrentDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         if (effTime.getTime() < currentDate.getTime()) {
             response.addError("生效时间不能小于当前时间!");
             return response;
@@ -71,7 +94,7 @@ public class ToBannerServiceImpl implements IToBannerService {
 
         Date expTime = banner.getExpTime();
         if (expTime.getTime() <= effTime.getTime()) {
-            response.addError("失效时间不能小于生效时间!");
+            response.addError("失效时间不能小于或等于生效时间!");
             return response;
         }
 
@@ -106,19 +129,38 @@ public class ToBannerServiceImpl implements IToBannerService {
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean modifyBanner(ToBanner banner,Integer currentUserId) {
         ResponseBean response = new ResponseBean();
+
+        ToBanner selectBanner = toBannerMapper.selectByPrimaryKey(banner.getId());
+
         if (Constant.BANNER_TYPE_ARTICLE.equals(banner.getBannerType())) {
             if (StringUtils.isBlank(banner.getBannerTitle())) {
-                response.addError("Banner标题不能为空");
+                response.addError("Banner内容标题不能为空");
                 return response;
             }
             if (StringUtils.isBlank(banner.getBannerContent())) {
                 response.addError("Banner内容不能为空");
                 return response;
             }
+        }else {
+            if (StringUtils.isBlank(banner.getExternalLink())) {
+                response.addError("跳转URL不能为空");
+                return response;
+            }
+            if (!patternUrl.matcher(banner.getExternalLink()).matches()) {
+                response.addError("请输入合法的跳转链接!");
+                return response;
+            }
         }
 
         Date effTime = banner.getEffTime();
         Date currentDate = new Date();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String formatCurrentDate = simpleDateFormat.format(currentDate);
+        try {
+            currentDate = simpleDateFormat.parse(formatCurrentDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         if (effTime.getTime() < currentDate.getTime()) {
             response.addError("生效时间不能小于当前时间!");
             return response;
@@ -126,14 +168,16 @@ public class ToBannerServiceImpl implements IToBannerService {
 
         Date expTime = banner.getExpTime();
         if (expTime.getTime() <= effTime.getTime()) {
-            response.addError("失效时间不能小于生效时间!");
+            response.addError("失效时间不能小于或等于生效时间!");
             return response;
         }
 
         ToUser toUser = toUserMapper.selectByPrimaryKey(currentUserId);
 
-        banner.setUpdateDate(new Date());
-        banner.setUpdateUser(toUser.getId());
+        BeanUtils.copyProperties(banner,selectBanner);
+
+        selectBanner.setUpdateDate(new Date());
+        selectBanner.setUpdateUser(toUser.getId());
 
         int result = toBannerMapper.updateByPrimaryKeySelective(banner);
         if (result > 0) {

CODE/smart-community/operate-api/src/main/resources/mapper/TaUserMapper.xml

@@ -314,8 +314,8 @@
       <include refid="Base_Column_List" />
     from ta_user
     where 1=1
-    <if test="otherUserID != null" >
-     and id = #{otherUserID,jdbcType=INTEGER}
+    <if test="otherUserId != null" >
+     and id = #{otherUserId,jdbcType=INTEGER}
     </if>
     <if test="id != null" >
      and parent_id = #{id}
@@ -328,7 +328,7 @@
     <include refid="Base_Column_List" />
     from ta_user
     where community_id = #{communityId,jdbcType=INTEGER}
-    <if test="otherUserID != null" >
+    <if test="otherUserId != null" >
       and login_name = #{phone}
     </if>
 

VUECODE/smart-operate-manage/config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8085/operate-api"',
+  BASE_API: '"http://192.168.0.164:8085/operate-api"',
 })

VUECODE/smart-operate-manage/config/index.js

@@ -9,8 +9,7 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {
-    },
+    proxyTable: {},
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST

VUECODE/smart-operate-manage/src/api/index.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// 硬件数据统计
+export function getHardData () {
+  return request({
+    url: '/mq/open',
+    method: 'get'
+  })
+}
+
+// 注册用户统计
+export function getSignUser () {
+  return request({
+    url: '/user/count',
+    method: 'get'
+  })
+}

VUECODE/smart-operate-manage/src/components/chart/chart1.vue

@@ -64,7 +64,7 @@ export default {
       })
       chart.guide().html({
         position: ['50%', '50%'],
-        html: '<div class="g2-guide-html"><p class="title">总计</p><p class="value">500</p></div>'
+        html: '<div class="g2-guide-html"><p class="title">总计</p><p class="value">200</p></div>'
       })
       chart.guide().html({
         position: ['50%', '-10%'],
@@ -79,7 +79,7 @@ export default {
 
       chart.on('interval:mouseleave', function () {
         $(".g2-guide-html .title").text('总计')
-        $(".g2-guide-html .value").text(500)
+        $(".g2-guide-html .value").text(200)
       })
       chart.render()
     }

VUECODE/smart-operate-manage/src/components/chart/chart2.vue

@@ -13,19 +13,19 @@ export default {
   methods: {
     rander () {
       var data = [{
-        item: '工单一',
+        item: '报修单一',
         count: 40,
         percent: 0.4
       }, {
-        item: '工单二',
+        item: '报修单二',
         count: 21,
         percent: 0.21
       }, {
-        item: '工单三',
+        item: '报修单三',
         count: 17,
         percent: 0.17
       }, {
-        item: '工单四',
+        item: '报修单四',
         count: 13,
         percent: 0.13
       }]
@@ -33,7 +33,6 @@ export default {
         container: 'node2',
         forceFit: true,
         height: 282,
-        // height: window.innerHeight / 3 - 50,
         padding: [40, 'auto', 'auto', 'auto']
       })
       chart.source(data, {
@@ -56,18 +55,22 @@ export default {
         itemTpl: '<li><span style="background-color:{color}" class="g2-tooltip-marker"></span>{name}: {value}</li>'
       })
       chart.intervalStack().position('percent').color('item', function (val) {
-        if (val === '工单一') {
+        if (val === '报修单一') {
           return '#53F9FF'
-        } else if (val === '工单二') {
+        } else if (val === '报修单二') {
           return '#83BB41'
-        } else if (val === '工单三') {
+        } else if (val === '报修单三') {
           return '#FFC400'
-        } else if (val === '工单四') {
+        } else if (val === '报修单四') {
           return '#454D54'
         }
       }).label('percent', {
         formatter: function formatter (val, item) {
           return item._origin.item + ': ' + val
+        },
+        textStyle: {
+          fill: '#a4b6c5', // 文本的颜色
+          fontSize: '12', // 文本大小
         }
       }).tooltip('item*percent', function (item, percent) {
         percent = percent * 100 + '%'

VUECODE/smart-operate-manage/src/components/chart/chart3.vue

@@ -1,8 +1,14 @@
 <template>
   <div id="node3">
-    <div class="title">昨日所有小区智能硬件数据统计</div>
+    <div class="title">今日所有小区智能硬件数据统计</div>
     <div class="table">
-      <div v-for="(item,index) in arr" :key="index" @mouseover='item.active = true' @mouseout="item.active=false" :class="{active:item.active}">
+      <div
+        v-for="(item,index) in arr"
+        :key="index"
+        @mouseover="item.active = true"
+        @mouseout="item.active=false"
+        :class="{active:item.active}"
+      >
         <div>{{item.text}}</div>
         <div>{{item.num}}</div>
       </div>
@@ -11,8 +17,14 @@
 </template>
 
 <script>
+import { mapState, mapActions } from 'vuex'
 
 export default {
+  computed: {
+    ...mapState('trunkIndex', {
+      hardData: item => item.trunkIndex.hardData
+    })
+  },
   data () {
     return {
       arr: [
@@ -25,11 +37,18 @@ export default {
       ]
     }
   },
-  mounted () {
-
+  created () {
+    this.GetHardData().then(() => {
+      console.log(this.hardData)
+      this.arr[0].num = this.hardData.count + '次'
+      // this.arr[0].text = this.hardData.message
+      this.arr = JSON.parse(JSON.stringify(this.arr))
+    })
   },
   methods: {
-
+    ...mapActions('trunkIndex', [
+      'GetHardData'
+    ]),
   }
 }
 </script>

VUECODE/smart-operate-manage/src/components/chart/chart4.vue

@@ -1,7 +1,23 @@
 <template>
   <div id="node4">
-    <el-amap ref="map" vid="amapDemo" :center="mapCenter" :zoom="8" class="amap-demo"  :mapStyle='setMapStyle'>
-      <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item.position" :icon='item.icon' :title="item.title"></el-amap-marker>
+    <div class="top-title">已合作社区分布图</div>
+    <el-amap
+      ref="map"
+      vid="amapDemo"
+      :center="mapCenter"
+      :zoom="7"
+      class="amap-demo"
+      :mapStyle="setMapStyle"
+    >
+      <el-amap-marker
+        v-for="(item,index) in markers"
+        :key="index"
+        :position="item.position"
+        :icon="item.icon"
+        :title="item.title"
+        :offset="item.offset"
+        :content="item.content"
+      ></el-amap-marker>
     </el-amap>
   </div>
 </template>
@@ -9,7 +25,7 @@
 <script>
 // import G2 from '@antv/g2'
 // import DataSet from '@antv/data-set'
-// import $ from 'jquery'
+import $ from 'jquery'
 // import AMapUI from 'AMapUI'
 import light1 from '@/assets/light1.png'
 import light2 from '@/assets/light2.png'
@@ -23,134 +39,87 @@ export default {
       light3,
       light4,
       markers: [{
-        position: [119.63803900, 32.58482400],
-        icon: light1, // 添加 Icon 图标 URL
-        title: '悦见山'
+        position: [118.633516, 32.069878],
+        title: '悦见山',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light1}'>
+        <span>悦见山</span>
+        </div>`
       }, {
-        position: [118.29096500, 33.92855800],
-        icon: light2, // 添加 Icon 图标 URL
-        title: '银山'
+        position: [117.161777, 34.154014],
+        title: '致享城',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light2}'>
+        <span>致享城</span>
+        </div>`
       }, {
-        position: [120.07075000, 32.43910000],
-        icon: light3, // 添加 Icon 图标 URL
-        title: '智慧社区'
+        position: [118.753086, 31.972501],
+        title: '智慧社区',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light3}'>
+        <span>智慧社区</span>
+        </div>`
       }, {
-        position: [118.79317400, 32.07443900],
-        icon: light4, // 添加 Icon 图标 URL
-        title: '帝景天誉'
+        position: [120.064082, 30.343891],
+        title: '云谷天境',
+        offset: [-60, -60],
+        content: `<div class='point'>
+        <img src='${light4}'>
+        <span>云谷天境</span>
+        </div>`
       }],
-      mapCenter: [119.63803900, 32.58482400],
+      mapCenter: [118.753086, 31.972501],
       setMapStyle: 'amap://styles/blue'
     }
   },
   mounted () {
-    this.rander()
+    setInterval(() => {
+      this.rander()
+    }, 1600)
   },
   methods: {
     rander () {
-      // AMap.plugin('AMap.DistrictLayer', function () {//异步加载插件
-      //   var DistrictLayer = new AMap.DistrictLayer();
-      //   map.addControl(DistrictLayer);
-      // });
-      // var adCode = 320000;
-      // var depth = 2;
-      // var map = new AMap.Map("node4", {
-      //   zoom: 8,
-      //   center: [119.63803900, 32.58482400],
-      //   pitch: 0,
-      //   viewMode: '3D',
-      // });
-
-      // // 创建省份图层
-      // var disProvince;
-      // function initPro (code, dep) {
-      //   dep = typeof dep == 'undefined' ? 2 : dep;
-      //   adCode = code;
-      //   depth = dep;
-
-      //   disProvince && disProvince.setMap(null);
-
-      //   disProvince = new AMap.DistrictLayer.Province({
-      //     zIndex: 12,
-      //     adcode: [code],
-      //     depth: dep,
-      //     styles: {
-      //       'fill': function (properties) {
-      //         // properties为可用于做样式映射的字段，包含
-      //         // NAME_CHN:中文名称
-      //         // adcode_pro
-      //         // adcode_cit
-      //         // adcode
-      //         var adcode = properties.adcode;
-      //         return getColorByAdcode(adcode);
-      //       },
-      //       'province-stroke': 'cornflowerblue',
-      //       'city-stroke': 'white', // 中国地级市边界
-      //       'county-stroke': 'rgba(255,255,255,0.5)' // 中国区县边界
-      //     }
-      //   });
-
-      //   disProvince.setMap(map);
-      // }
-
-      // // 颜色辅助方法
-      // var colors = {};
-      // var getColorByAdcode = function (adcode) {
-      //   if (!colors[adcode]) {
-      //     var gb = Math.random() * 155 + 50;
-      //     colors[adcode] = 'rgb(' + gb + ',' + gb + ',255)';
-      //   }
-      //   return colors[adcode];
-      // }
-      // initPro(adCode, depth);
-      // map.setMapStyle('amap://styles/blue')
-      // var marker1 = new AMap.Marker({
-      //   position: new AMap.LngLat(119.63803900, 32.58482400),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light1, // 添加 Icon 图标 URL
-      //   title: '悦见山'
-      // });
-      // var marker2 = new AMap.Marker({
-      //   position: new AMap.LngLat(118.29096500, 33.92855800),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light2, // 添加 Icon 图标 URL
-      //   title: '银山'
-      // });
-      // var marker3 = new AMap.Marker({
-      //   position: new AMap.LngLat(120.07075000, 32.43910000),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light3, // 添加 Icon 图标 URL
-      //   title: '智慧社区'
-      // });
-      // var marker4 = new AMap.Marker({
-      //   position: new AMap.LngLat(119.63803900, 32.58482400),
-      //   offset: new AMap.Pixel(-10, -10),
-      //   icon: this.light4, // 添加 Icon 图标 URL
-      //   title: '帝景天誉'
-      // });
-      // var markerList = [marker1, marker2, marker3, marker4];
-      // map.add(markerList);
+      $('.point img').animate({ opacity: 0 }, 800).animate({ opacity: 1 }, 800)
     }
   }
 }
 </script>
 
 <style lang="scss">
-#node4 {
-  .g2-guide-html {
-    color: #a4b6c5;
-    .title {
-      text-align: "ceter";
-    }
-    .value {
-      text-align: center;
-    }
+#node4{
+  border-radius: 5px;
+}
+.top-title{
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  text-align: center;
+  margin-top: 30px;
+  z-index: 20;
+  color: #A6B9C8;
+  font-size: 18px;
+}
+.point{
+  position: relative;
+  width: 120px;
+  height: 120px;
+  img{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
   }
-  .g2-guide-title {
-    color: #a4b6c5;
-    .title {
-      font-size: 16px;
-    }
+  span{
+    position: absolute;
+    top: 80%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    font-size: 12px;
+    color: white;
   }
 }
 </style>

VUECODE/smart-operate-manage/src/components/chart/chart5.vue

@@ -5,26 +5,26 @@
 <script>
 import G2 from '@antv/g2'
 import DataSet from '@antv/data-set'
+import { mapState, mapActions } from 'vuex'
 
 export default {
+  computed: {
+    ...mapState('trunkIndex', {
+      signUser: item => item.trunkIndex.signUser
+    })
+  },
   mounted () {
-    this.rander()
+    this.GetSignUser().then(() => {
+      this.rander()
+    })
   },
   methods: {
+    ...mapActions('trunkIndex', [
+      'GetSignUser'
+    ]),
     rander () {
-      var data = [{
-        type: '总户数',
-        sales: 500
-      }, {
-        type: '业主',
-        sales: 400
-      }, {
-        type: '家属',
-        sales: 1000
-      }, {
-        type: '租客',
-        sales: 200
-      }];
+      console.log(this.signUser)
+      var data = this.signUser
       var chart = new G2.Chart({
         container: 'node5',
         forceFit: true,
@@ -32,6 +32,35 @@ export default {
         padding: [80, 20, 30, 40]
       });
       chart.source(data);
+      console.log(chart)
+      chart.axis('count', {
+        line: {
+          lineWidth: 1, // 设置线的宽度
+          stroke: '#a4b6c5', // 设置线的颜色
+        },
+        grid: null,
+        label: {
+          textStyle: {
+            textAlign: 'end', // 文本对齐方向，可取值为： start middle end
+            fill: '#a4b6c5', // 文本的颜色
+            fontSize: '12', // 文本大小
+            textBaseline: 'middle' // 文本基准线，可取 top middle bottom，默认为middle
+          }
+        }
+      });
+      chart.axis('message', {
+        line: {
+          lineWidth: 1, // 设置线的宽度
+          stroke: '#a4b6c5', // 设置线的颜色
+        },
+        grid: null,
+        label: {
+          textStyle: {
+            fill: '#a4b6c5', // 文本的颜色
+            fontSize: '12', // 文本大小
+          }
+        }
+      });
       chart.scale('', {
         tickInterval: 200
       });
@@ -39,8 +68,13 @@ export default {
         position: ['5%', '-25%'],
         html: '<div class="chart5-title"><p class="title">注册用户统计</p></div>'
       })
-      chart.interval().position('type*sales').color('type', function (val) {
-        if (val === '总户数' || val === '家属') {
+      chart.guide().html({
+        position: ['90%', '-15%'],
+        html: `<div class="chart-right-btn"><span>18/11/27</span>&nbsp;<i class='el-icon-date'></i></div>`
+      })
+
+      chart.interval().position('message*count').color('message', function (val) {
+        if (val === '业主总数' || val === '家属总数') {
           return '#53F9FF';
         }
         return '#FF5367';
@@ -58,4 +92,16 @@ export default {
     color: #a4b6c5;
   }
 }
+.chart-right-btn{
+  padding: 0px 8px;
+  display: flex;
+  border: 1px solid #a4b6c5;
+  border-radius: 9px;
+  justify-content: center;
+  align-items: center;
+  span,i{
+    font-size: 10px;
+    color: #a4b6c5;
+  }
+}
 </style>

VUECODE/smart-operate-manage/src/components/chart/chart6.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="node6"></div>  
+  <div id="node6"></div>
 </template>
 
 <script>
@@ -50,16 +50,48 @@ export default {
         value: {
           alias: 'The Share Price in Dollars',
           formatter: function formatter (val) {
-            return '$' + val;
+            return val;
           }
         },
         year: {
           range: [0, 1]
         }
       });
+      chart.axis('value', {
+        line: {
+          lineWidth: 1, // 设置线的宽度
+          stroke: '#a4b6c5', // 设置线的颜色
+        },
+        grid: null,
+        label: {
+          textStyle: {
+            textAlign: 'end', // 文本对齐方向，可取值为： start middle end
+            fill: '#a4b6c5', // 文本的颜色
+            fontSize: '12', // 文本大小
+            textBaseline: 'middle' // 文本基准线，可取 top middle bottom，默认为middle
+          }
+        }
+      });
+      chart.axis('year', {
+        line: {
+          lineWidth: 1, // 设置线的宽度
+          stroke: '#a4b6c5', // 设置线的颜色
+        },
+        grid: null,
+        label: {
+          textStyle: {
+            fill: '#a4b6c5', // 文本的颜色
+            fontSize: '12', // 文本大小
+          }
+        }
+      });
       chart.tooltip({
         crosshairs: true
       });
+      chart.guide().html({
+        position: ['90%', '-15%'],
+        html: `<div class="chart-right-btn"><span>日活跃量</span>&nbsp;<i class='el-icon-arrow-down'></i></div>`
+      })
       chart.area().position('year*value').color('type', function (val) { return '#53F9FF' }).shape('smooth');
       chart.line().position('year*value').color('type', function (val) { return '#53F9FF' }).size(2).shape('smooth');
       chart.guide().html({

VUECODE/smart-operate-manage/src/components/chart/chart7.vue

@@ -36,6 +36,38 @@ export default {
         position: ['5%', '-25%'],
         html: '<div class="chart7-title"><p class="title">内容运营统计</p></div>'
       })
+      chart.guide().html({
+        position: ['90%', '-15%'],
+        html: `<div class="chart-right-btn"><span>发布数量</span>&nbsp;<i class='el-icon-arrow-down'></i></div>`
+      })
+      chart.axis('sales', {
+        line: {
+          lineWidth: 1, // 设置线的宽度
+          stroke: '#a4b6c5', // 设置线的颜色
+        },
+        grid: null,
+        label: {
+          textStyle: {
+            textAlign: 'end', // 文本对齐方向，可取值为： start middle end
+            fill: '#a4b6c5', // 文本的颜色
+            fontSize: '12', // 文本大小
+            textBaseline: 'middle' // 文本基准线，可取 top middle bottom，默认为middle
+          }
+        }
+      });
+      chart.axis('type', {
+        line: {
+          lineWidth: 1, // 设置线的宽度
+          stroke: '#a4b6c5', // 设置线的颜色
+        },
+        grid: null,
+        label: {
+          textStyle: {
+            fill: '#a4b6c5', // 文本的颜色
+            fontSize: '12', // 文本大小
+          }
+        }
+      });
       chart.interval().position('type*sales').color('type', function (val) {
         if (val === '公告') {
           return '#53F9FF';

VUECODE/smart-operate-manage/src/icons/svg/banner.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543202545074" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4972" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M895.461997 64.288189 128.54005 64.288189c-35.296901 0-63.908542 28.612665-63.908542 63.908542l0 638.941134c0 35.294854 28.611641 63.910589 63.908542 63.910589l766.91683 0c35.293831 0 63.910589-28.615735 63.910589-63.910589L959.367469 128.197754C959.367469 92.900853 930.750711 64.288189 895.461997 64.288189L895.461997 64.288189zM895.461997 767.137865l-248.417813-262.040065L524.378423 611.632161 340.300988 441.194374 156.237879 611.632161l-27.697829 31.635511 0-515.070942 766.91683 0L895.461997 767.137865 895.461997 767.137865 895.461997 767.137865zM732.900597 388.742768c54.035684 0 97.879238-43.922349 97.879238-98.031711 0-54.151317-43.844577-98.048083-97.879238-98.048083-54.05922 0-97.883331 43.896766-97.883331 98.048083C635.017266 344.825536 678.841378 388.742768 732.900597 388.742768L732.900597 388.742768zM732.900597 388.742768" p-id="4973"></path><path d="M927.628604 959.710788 96.36935 959.710788c-17.454534 0-31.737842-14.280238-31.737842-31.739888l0 0c0-17.455557 14.283308-31.732725 31.737842-31.732725l831.259254 0c17.454534 0 31.738865 14.277168 31.738865 31.732725l0 0C959.367469 945.43055 945.083138 959.710788 927.628604 959.710788L927.628604 959.710788zM927.628604 959.710788" p-id="4974"></path></svg>

VUECODE/smart-operate-manage/src/icons/svg/community.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543202441123" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3897" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M874.7 382.5H805L525.8 103.2c-7.6-7.6-19.9-7.6-27.5 0L219 382.5h-69.7c-28.6 0-51.8 23.2-51.8 51.8v440.4c0 28.6 23.2 51.8 51.8 51.8h725.4c28.6 0 51.8-23.2 51.8-51.8V434.3c0-28.6-23.2-51.8-51.8-51.8zM512 144.4l238.1 238.1H274l238-238.1zM260 822.9c-21.5 0-38.9-17.4-38.9-38.9s17.4-38.9 38.9-38.9 38.9 17.4 38.9 38.9-17.4 38.9-38.9 38.9z m0-129.6c-21.5 0-38.9-17.4-38.9-38.9s17.4-38.9 38.9-38.9 38.9 17.4 38.9 38.9-17.4 38.9-38.9 38.9z m0-129.5c-21.5 0-38.9-17.4-38.9-38.9S238.5 486 260 486s38.9 17.4 38.9 38.9-17.4 38.9-38.9 38.9z m542.9 239.6H388.4c-10.7 0-19.4-8.7-19.4-19.4s8.7-19.4 19.4-19.4h414.5c10.7 0 19.4 8.7 19.4 19.4s-8.7 19.4-19.4 19.4z m0-129.5H388.4c-10.7 0-19.4-8.7-19.4-19.4s8.7-19.4 19.4-19.4h414.5c10.7 0 19.4 8.7 19.4 19.4s-8.7 19.4-19.4 19.4z m0-129.5H388.4c-10.7 0-19.4-8.7-19.4-19.4s8.7-19.4 19.4-19.4h414.5c10.7 0 19.4 8.7 19.4 19.4s-8.7 19.4-19.4 19.4z" p-id="3898"></path></svg>

VUECODE/smart-operate-manage/src/icons/svg/communitydata.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543202407856" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3299" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M791.5 831H249l0.1-358.3H92.8L518.4 96.6l413.4 376.1H791.4l0.1 358.3zM299 781h442.4l-0.1-358.3h61.1l-284.6-259-293 259H299V781z" fill="#000000" p-id="3300"></path><path d="M519.3 726.9c-4.4 0-8.9-1.2-12.8-3.6-1.6-0.9-38.9-23.4-76.7-56-54.4-46.8-82-90.5-82-129.9 0-64.1 52.1-116.2 116.2-116.2 19.6 0 38.5 4.8 55.4 14 16.9-9.2 35.7-14 55.4-14 64.1 0 116.2 52.1 116.2 116.2 0 39.9-27.6 83.8-82 130.4-37.9 32.4-75.3 54.6-76.8 55.6-4.1 2.3-8.5 3.5-12.9 3.5z m-55.4-255.6c-36.5 0-66.2 29.7-66.2 66.2 0 23.4 22.8 55.9 64.1 91.6 21.9 18.9 44.1 34.4 57.6 43.3 13.4-8.8 35.6-24.1 57.5-42.9 41.3-35.5 64-68.1 64-92 0-36.5-29.7-66.2-66.2-66.2-14.7 0-28.6 4.7-40.2 13.6-9 6.9-21.4 6.9-30.4 0-11.6-8.9-25.5-13.6-40.2-13.6z" fill="#000000" p-id="3301"></path></svg>

VUECODE/smart-operate-manage/src/icons/svg/index.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543202883234" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10581" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M816.4 545.1l0 337.4c0 28.7-23.2 51.9-51.9 51.9L609.2 934.4 609.2 673.9c0-14.3-11.6-25.9-25.9-25.9L427.6 648c-14.3 0-25.9 11.6-25.9 25.9l0 260.4L246.3 934.3c-28.7 0-51.9-23.2-51.9-51.9L194.4 545.1 142 545.1l0 389.1c0 28.7 16.7 51.9 45.4 51.9l221.1 0 0-0.8 45.1 0L453.6 686.9l103 0 0.8 298.3 45.1 0 0 0.8 221.1 0c28.7 0 45.4-23.2 45.4-51.9L869 545.1 816.4 545.1zM505.4 63.8c-6.9 0-13.8 2.5-18.6 7.6L41.7 531.7c-10 10.3-9.7 26.7 0.6 36.7 5 4.9 11.5 7.3 18 7.3 6.8 0 13.6-2.6 18.7-7.9l426.4-441.1 426.4 441.1c5.1 5.3 11.9 7.9 18.6 7.9 6.5 0 13-2.4 18-7.3 10.3-10 10.6-26.4 0.6-36.7L524.1 71.3C519.2 66.3 512.3 63.8 505.4 63.8L505.4 63.8z" p-id="10582"></path></svg>

VUECODE/smart-operate-manage/src/icons/svg/operate.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543202499761" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4706" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M362.8 197.04a318.72 318.72 0 0 1 345.52 30.64 96 96 0 1 0 38.4-51.68 384 384 0 0 0-419.92-32.64l1.36 1.2a157.52 157.52 0 0 1 34.64 52.48zM192 480a317.52 317.52 0 0 1 26.96-128h6.08A96 96 0 1 0 160 326.48a384 384 0 0 0 200.88 506.64 160.64 160.64 0 0 1 14.48-64A320 320 0 0 1 192 480z m631.2-74.4a320 320 0 0 1-224.88 382.48 96 96 0 1 0 8.56 64 384 384 0 0 0 276.64-469.44 158.96 158.96 0 0 1-60.32 22.96z" p-id="4707"></path></svg>

VUECODE/smart-operate-manage/src/permission.js

@@ -5,7 +5,7 @@ import 'nprogress/nprogress.css'// Progress 进度条样式
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // 验权
 
-const whiteList = ['/login','/index'] // 不重定向白名单
+const whiteList = ['/login'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {

VUECODE/smart-operate-manage/src/router/index.js

@@ -48,7 +48,7 @@ export const constantRouterMap = [
         path: '',
         component: () => import('@/views/index/index'),
         name: 'index',
-        meta: { title: '首页', icon: 'table' }
+        meta: { title: '首页', icon: 'index' }
       }
     ]
   },
@@ -64,7 +64,7 @@ export const constantRouterMap = [
         path: 'community',
         component: () => import('@/views/community/communityTable'),
         name: 'community',
-        meta: { title: '社区列表', icon: 'table' }
+        meta: { title: '社区列表', icon: 'community' }
       }
     ]
   },
@@ -80,7 +80,7 @@ export const constantRouterMap = [
         path: 'index',
         component: () => import('@/views/banner/index'),
         name: 'banner-index',
-        meta: { title: 'banner运营', icon: 'table' }
+        meta: { title: 'banner运营', icon: 'banner' }
       },
       {
         path: '/banner/addBanner',
@@ -95,6 +95,13 @@ export const constantRouterMap = [
         name: 'banner-edi',
         hidden: true,
         meta: { title: '修改banner', icon: 'table' }
+      },
+      {
+        path: '/banner/infoBanner',
+        component: () => import('@/views/banner/infoBanner/index'),
+        name: 'banner-info',
+        hidden: true,
+        meta: { title: '查看banner', icon: 'table' }
       }
     ]
   },

VUECODE/smart-operate-manage/src/store/getters.js

@@ -5,6 +5,7 @@ const getters = {
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   roles: state => state.user.roles,
-  userData: state => state.user.userData
+  userData: state => state.user.userData,
+  trunkIndex: state => state.trunkIndex.trunkIndex,
 }
 export default getters

VUECODE/smart-operate-manage/src/store/index.js

@@ -4,6 +4,7 @@ import app from './modules/app'
 import user from './modules/user'
 import banner from './modules/banner'
 import community from './modules/community'
+import trunkIndex from './modules/trunkIndex'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -13,7 +14,8 @@ const store = new Vuex.Store({
     app,
     user,
     community,
-    banner
+    banner,
+    trunkIndex
   },
   getters
 })

VUECODE/smart-operate-manage/src/store/modules/community.js

@@ -5,7 +5,10 @@ const community = {
   state: {
     total: '',
     list: [],
-    detail: {},
+    detail: {
+      longitude: '',
+      latitude: ''
+    },
     provinceList: [],
     cityList: [],
     districtList: [],
@@ -58,7 +61,9 @@ const community = {
           timestamp: new Date(),
           title: '',
           status: 'published',
-          type: ''
+          type: '',
+          longitude: '',
+          latitude: ''
         }
       }
     }
@@ -116,7 +121,7 @@ const community = {
         fetchCityList(provinceId).then(response => {
           const data = response.data
           commit('SET_CITY_LIST', data)
-          resolve()
+          resolve(response)
         }).catch(error => {
           reject(error)
         })
@@ -128,7 +133,7 @@ const community = {
         fetchDistrictList(cityId).then(response => {
           const data = response.data
           commit('SET_DISTRICT_LIST', data)
-          resolve()
+          resolve(response)
         }).catch(error => {
           reject(error)
         })

VUECODE/smart-operate-manage/src/store/modules/trunkIndex.js

@@ -0,0 +1,48 @@
+import { getHardData, getSignUser } from '@/api/index'
+
+const trunkIndex = {
+  namespaced: true,
+  state: {
+    trunkIndex: {
+      hardData: null,
+      signUser: null
+    }
+  },
+  mutations: {
+    upDateHardData: (state, data) => {
+      state.trunkIndex.hardData = data
+    },
+    upDateSignUser: (state, data) => {
+      state.trunkIndex.signUser = data
+    }
+  },
+  actions: {
+    // 硬件数据统计
+    GetHardData ({ commit }) {
+      return new Promise((resolve, reject) => {
+        getHardData().then(response => {
+          const data = response.data
+          commit('upDateHardData', data)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 注册用户统计
+    GetSignUser ({ commit }) {
+      return new Promise((resolve, reject) => {
+        getSignUser().then(response => {
+          const data = response.data
+          commit('upDateSignUser', data)
+          resolve(data)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default trunkIndex

VUECODE/smart-operate-manage/src/utils/auth.js

@@ -7,7 +7,7 @@ export function getToken() {
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token)
+  return Cookies.set(TokenKey, token, { expires: 7 })
 }
 
 export function removeToken() {

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -10,17 +10,25 @@
        <el-form-item :label-width="formLabelWidth" label="生效时间">
         <el-date-picker
           v-model="addForm.effTime"
-          type="datetime"
+          type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="失效时间">
         <el-date-picker
           v-model="addForm.expTime"
-          type="datetime"
+          type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="banner图">
-        <el-input v-model="addForm.bannerCover"/>
+        <el-upload
+          class="avatar-uploader"
+          action="http://localhost:8085/operate-api/uploadimage"
+          name="uploadFiles"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess">
+          <img v-if="imageUrl" :src="imageUrl" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="banner位">
         <el-select v-model="addForm.bannerPosition" placeholder="请选择位置">
@@ -116,6 +124,7 @@ export default {
       listLoading: true,
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
+      imageUrl: '', // 图片预览
       listQuery: [], // 接收查询参数,在返回给首页
       addForm: {
         title: '',
@@ -140,10 +149,6 @@ export default {
         { id: 1, value: '首页banner' },
         { id: 2, value: '服务banner' }
       ],
-      communityArr: [
-        { id: 3, value: '智慧社区' },
-        { id: 2, value: '测试社区' }
-      ]
     }
   },
   computed: {
@@ -153,6 +158,7 @@ export default {
   },
   created() {
     this.listQuery = this.$route.params.listQuery
+    this.getCommuniryList()
   },
   methods: {
     ...mapActions('community', [
@@ -160,6 +166,10 @@ export default {
       'CreateCommunity',
       'UpdateCommunity'
     ]),
+    handleAvatarSuccess(res, file) { // 上传成功回调
+      this.imageUrl = URL.createObjectURL(file.raw)
+      this.addForm.bannerCover = res.data[0]
+    },
     dialogAddForm() {
       this.dialogFormVisible = true
       this.addForm.title = ''
@@ -237,5 +247,28 @@ export default {
 .dialog-footer {
   text-align: center;
 }
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>
 

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -10,17 +10,25 @@
       <el-form-item :label-width="formLabelWidth" label="生效时间">
         <el-date-picker
           v-model="form.effTime"
-          type="datetime"
+          type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="失效时间">
         <el-date-picker
           v-model="form.expTime"
-          type="datetime"
+          type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="banner图">
-        <el-input v-model="form.bannerCover"/>
+        <el-upload
+          class="avatar-uploader"
+          action="http://localhost:8085/operate-api/uploadimage"
+          name="uploadFiles"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess">
+          <img v-if="imageUrl" :src="imageUrl" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="banner位">
         <el-select v-model="form.bannerPosition" placeholder="请选择位置">
@@ -41,19 +49,19 @@
           <!-- <el-option label="区域一" value="shanghai"/> -->
         </el-select>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="跳转描述">
+      <!-- <el-form-item :label-width="formLabelWidth" label="跳转描述">
         <el-input
           v-model="form.bannerDescription"
           :autosize="{ minRows: 2, maxRows: 4}"
           type="textarea"
           placeholder="请输入跳转描述"/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label-width="formLabelWidth" label="banner跳转">
         <el-radio v-model="form.bannerType" label="1" @change="showContent">外部超链接</el-radio>
         <el-radio v-model="form.bannerType" label="2" @change="showContent">自写文章</el-radio>
       </el-form-item>
-      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="URL">
-        <el-input v-model="form.externalLink" placeholder="URL"/>
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
+        <el-input v-model="form.externalLink" placeholder="跳转链接"/>
       </el-form-item>
       <div v-if="showContentVisible">
         <el-form-item :label-width="formLabelWidth" label="内容标题">
@@ -116,6 +124,7 @@ export default {
       list: null,
       total: 0,
       listLoading: true,
+      imageUrl: '', // 图片预览
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
       listQuery: [],
@@ -141,10 +150,6 @@ export default {
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
         { id: 2, value: '服务banner' }
-      ],
-      communityArr: [
-        { id: 3, value: '智慧社区' },
-        { id: 2, value: '测试社区' }
       ]
     }
   },
@@ -154,6 +159,7 @@ export default {
     })
   },
   created() {
+    this.getCommuniryList()
     this.getByBannerId(this.$route.params.id)
     this.listQuery = this.$route.params.listQuery
   },
@@ -166,6 +172,10 @@ export default {
       'CreateCommunity',
       'UpdateCommunity'
     ]),
+    handleAvatarSuccess(res, file) { // 上传成功回调
+      this.imageUrl = URL.createObjectURL(file.raw)
+      this.addForm.bannerCover = res.data[0]
+    },
     dialogAddForm() {
       this.dialogFormVisible = true
       this.form.title = ''
@@ -224,6 +234,7 @@ export default {
     getByBannerId(bannerId) {
       this.$store.dispatch('GetByBannerId', bannerId).then(res => {
         this.form = res
+        this.imageUrl = this.form.bannerCover
         // this.catchData(this.form.bannerContent)
         this.showContent()
       })
@@ -249,5 +260,28 @@ export default {
 .dialog-footer {
   text-align: center;
 }
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>
 

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -42,7 +42,7 @@
       <el-table-column label="标题" align="center" min-width="250px">
         <template slot-scope="scope">
           <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
-          <el-tag>{{ scope.row.title }}</el-tag>
+          <span class="link-type" @click="infoBanner(scope.row.id)">{{ scope.row.title }}</span>
         </template>
       </el-table-column>
       <el-table-column label="适用社区" align="center">
@@ -230,6 +230,9 @@ export default {
     updateBanner(bannerId) {
       this.$router.push({ name: 'banner-edi', params: { id: bannerId, listQuery: this.listQuery }})
     },
+    infoBanner(bannerId) {
+      this.$router.push({ name: 'banner-info', params: { id: bannerId, listQuery: this.listQuery }})
+    },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.listQuery.pageSize = val
@@ -240,19 +243,16 @@ export default {
       this.listQuery.pageNum = val
       this.getList()
     },
-    padDate(value) {
-      value = value < 10 ? '0' + value : value
-      return value
-    },
     formatDate(val) {
       var value = new Date(val)
       var year = value.getFullYear()
-      var month = this.padDate(value.getMonth() + 1)
-      var day = this.padDate(value.getDate())
-      var hour = this.padDate(value.getHours())
-      var minutes = this.padDate(value.getMinutes())
-      var seconds = this.padDate(value.getSeconds())
-      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
     },
     getList() {
       this.listLoading = true

VUECODE/smart-operate-manage/src/views/banner/infoBanner/index.vue

@@ -0,0 +1,292 @@
+<template>
+  <div id="app" class="app-container">
+    <el-form ref="form" :model="form">
+      <el-form-item :label-width="formLabelWidth" label="标题">
+        <span>{{ form.title }}</span>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="权重">
+        <span>{{ form.sort }}</span>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="生效时间">
+        <span>{{ formatDate(form.effTime) }}</span>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="失效时间">
+        <span>{{ formatDate(form.expTime) }}</span>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner图">
+          <img v-if="imageUrl" :src="imageUrl" class="avatar">
+          <span v-else >无Banner图</span>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner位">
+          <span>{{ getBanner(form.bannerPosition) }}</span>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="投放社区">
+        <span>{{ getCommunity(form.communityId) }}</span>
+      </el-form-item>
+      <!-- <el-form-item :label-width="formLabelWidth" label="跳转描述">
+        <el-input
+          v-model="form.bannerDescription"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          type="textarea"
+          placeholder="请输入跳转描述"/>
+      </el-form-item> -->
+      <el-form-item :label-width="formLabelWidth" label="banner跳转">
+        <span v-show="showURLVisible" label="1" @change="showContent">外部超链接</span>
+        <span v-show="showContentVisible" label="2" @change="showContent">自写文章</span>
+      </el-form-item>
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
+        <span><a :href="form.externalLink" target="_blank">{{ form.externalLink }}</a></span>
+      </el-form-item>
+      <div v-if="showContentVisible">
+        <el-form-item :label-width="formLabelWidth" label="内容标题">
+          <span>{{ form.bannerTitle }}</span>
+        </el-form-item>
+        <!-- <el-form-item :label-width="formLabelWidth" label="内容详情">
+          <el-input v-model="form.bannerContent" placeholder="内容详情"/>
+        </el-form-item> -->
+        <el-form-item :label-width="formLabelWidth" label="内容详情">
+          <div id="father" v-html="this.form.bannerContent"></div>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogForm('0')">返 回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+// import { updateArticle, createBanner } from '@/api/banner' // Banner
+import { mapState, mapActions } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+// arr to obj ,such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+export default {
+  name: 'UpdateBanner',
+  components: { Pagination, Wangeditor },
+  directives: { waves },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: 0,
+      listLoading: true,
+      imageUrl: '', // 图片预览
+      importanceOptions: [1, 2, 3],
+      calendarTypeOptions,
+      listQuery: [],
+      form: {
+        title: '',
+        sort: '1',
+        bannerCover: '',
+        bannerPosition: '',
+        communityId: '',
+        effTime: '',
+        expTime: '',
+        bannerType: '1',
+        externalLink: '',
+        bannerTitle: '',
+        bannerContent: '',
+        bannerDescription: ''
+      },
+      dialogStatus: '',
+      downloadLoading: false,
+      formLabelWidth: '120px',
+      showContentVisible: false,
+      showURLVisible: true,
+      bannerPositionArr: [
+        { id: 1, value: '首页banner' },
+        { id: 2, value: '服务banner' }
+      ]
+    }
+  },
+  computed: {
+    ...mapState('community', {
+      communityList: s => s.list
+    })
+  },
+  created() {
+    this.getCommuniryList()
+    this.getByBannerId(this.$route.params.id)
+    this.listQuery = this.$route.params.listQuery
+  },
+  mounted() {
+    window.addEventListener('beforeunload', e => {
+      this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+    })
+  },
+  methods: {
+    ...mapActions('community', [
+      'FetchCommunityList',
+      'CreateCommunity',
+      'UpdateCommunity'
+    ]),
+    handleAvatarSuccess(res, file) { // 上传成功回调
+      this.imageUrl = URL.createObjectURL(file.raw)
+      this.addForm.bannerCover = res.data[0]
+    },
+    dialogAddForm() {
+      this.dialogFormVisible = true
+      this.form.title = ''
+      this.form.sort = '1'
+      this.form.bannerCover = ''
+      this.form.bannerPosition = '-1'
+      this.form.communityId = '-1'
+      this.form.effTime = ''
+      this.form.expTime = ''
+      this.form.bannerType = '1'
+      this.form.externalLink = ''
+      this.form.bannerTitle = ''
+      this.form.bannerContent = ''
+      this.form.bannerDescription = ''
+    },
+    wangeditorValue(value){
+      console.log("富文本内容:" + value)
+      this.form.bannerContent = value      //在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    dialogForm(isVaule) {
+      if (isVaule === '0') {
+        this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+      } else {
+        this.updateData()
+      }
+    },
+    showContent() {
+      if (this.form.bannerType === '1') {
+        this.showContentVisible = false
+        this.showURLVisible = true
+      } else {
+        this.showContentVisible = true
+        this.showURLVisible = false
+      }
+    },
+    updateData() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('UpdateBanner', this.form).then((res) => {
+            if (res.code === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+            } else {
+              this.$message({
+                message: res.message,
+                type: 'warning'
+              })
+            }
+          })
+        }
+      })
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    getByBannerId(bannerId) {
+      this.$store.dispatch('GetByBannerId', bannerId).then(res => {
+        this.form = res
+        this.imageUrl = this.form.bannerCover
+        // this.catchData(this.form.bannerContent)
+        this.showContent()
+      })
+    },
+    getCommuniryList() {
+      this.listLoading = true
+      this.FetchCommunityList().then(() => {
+        this.listLoading = false
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    },
+    getBanner(bannerId) {
+      const bannerPosition = this.bannerPositionArr
+      for (const i in bannerPosition) {
+        if (bannerPosition[i].id === bannerId) {
+          return bannerPosition[i].value
+        }
+      }
+    },
+    getCommunity(communityId) {
+      const community = this.communityList
+      for (const i in community) {
+        if (community[i].id === communityId) {
+          return community[i].communityName
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container {
+  width: 50%;
+  margin: auto;
+}
+.dialog-footer {
+  text-align: center;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -38,7 +38,7 @@
       </el-table-column>
       <el-table-column label="社区名称" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.communityName }}</span>
+          <span @click="handleLook(scope.row)" style="color: #409EFF;cursor: pointer">{{ scope.row.communityName }}</span>
         </template>
       </el-table-column>
       <el-table-column label="社区别名" align="center">
@@ -153,6 +153,56 @@
       </div>
     </el-dialog>
 
+    <el-dialog :title="查看" :visible.sync="dialogLookFormVisible">
+      <el-form ref="dataForm" :rules="rules" :model="detail" label-position="left" label-width="100px" style="margin-left:50px;">
+        <el-form-item label="社区名称">
+          <el-input v-model="detail.communityName"/>
+        </el-form-item>
+        <el-form-item label="社区别名">
+          <el-input v-model="detail.communityAlias"/>
+        </el-form-item>
+        <el-form-item label="所在区县">
+          <el-select v-model="detail.provinceId" placeholder="省" clearable style="width: 90px" class="filter-item" @change="getEditCityList">
+            <el-option v-for="item in provinceList" :key="item.id" :label="item.province" :value="item.id"/>
+          </el-select>
+          <el-select v-model="detail.cityId" placeholder="市" clearable class="filter-item" style="width: 130px" @change="getEditDistrictList">
+            <el-option v-for="item in editCityList" :key="item.id" :label="item.city" :value="item.id"/>
+          </el-select>
+          <el-select v-model="detail.districtId" placeholder="区县乡" clearable class="filter-item" style="width: 130px">
+            <el-option v-for="item in editDistrictList" :key="item.id" :label="item.district" :value="item.id"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="高德坐标">
+          <el-input
+            v-model="detail.longitude"
+            placeholder="经度"/>
+          <el-input
+            v-model="detail.latitude"
+            placeholder="纬度"/>
+        </el-form-item>
+        <!-- <el-amap-search-box class="search-box" :search-option="searchOption" :on-search-result="onSearchResult"></el-amap-search-box> -->
+        <div style="width:100%;height:200px;">
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo" >
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+        <el-form-item label="管理员姓名">
+          <el-input
+            v-model="detail.userName"
+            placeholder="建议先填写运营人员姓名"/>
+        </el-form-item>
+        <el-form-item label="管理员账号">
+          <el-input
+            v-model="detail.loginName"
+            placeholder="建议先填写运营人员手机号"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogLookFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogLookFormVisible = false,handleUpdate(detail)">修 改</el-button>
+      </div>
+    </el-dialog>
+
     <el-dialog :visible.sync="dialogPvVisible" title="Reading statistics">
       <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
         <el-table-column prop="key" label="Channel"/>
@@ -247,6 +297,7 @@ export default {
       statusOptions: ['published', 'draft', 'deleted'],
       showReviewer: false,
       dialogFormVisible: false,
+      dialogLookFormVisible: false,
       dialogStatus: '',
       textMap: {
         update: '编辑',
@@ -331,7 +382,6 @@ export default {
       })
     },
     getEditCityList() {
-      console.log(this.detail.provinceId)
       this.FetchEditCityList(this.detail.provinceId).then(() => {
       }).catch(() => {
         console.log('get list error')
@@ -388,14 +438,6 @@ export default {
       }
       this.handleFilter()
     },
-    handleCreate() {
-      this.resetDetail()
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
@@ -427,6 +469,23 @@ export default {
       this.getEditCityList()
       this.getEditDistrictList()
     },
+    handleLook(row) {
+      this.setCurrent(row)
+      this.dialogLookFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.getEditCityList()
+      this.getEditDistrictList()
+    },
+    handleCreate() {
+      this.resetDetail()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {

VUECODE/smart-operate-manage/src/views/index/index.vue

@@ -57,6 +57,7 @@ export default {
       margin: 8px;
       background: #2c343a;
       border-radius: 5px;
+      overflow: hidden;
     }
   }
   .middle {

VUECODE/smart-operate-manage/src/views/layout/components/Navbar.vue

@@ -1,18 +1,20 @@
 <template>
   <el-menu class="navbar" mode="horizontal">
-    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
-    <breadcrumb />
+    <hamburger
+      :toggle-click="toggleSideBar"
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+    />
+    <breadcrumb/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
-        <span>{{ userData.userName }}</span>
+        <span style="position: relative;top: -15px;right:5px">{{ userData.userName }}</span>
         <img :src="userData.headPortrait" class="user-avatar" v-if="userData.headPortrait != ''">
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
         <router-link class="inlineBlock" to="/">
-          <el-dropdown-item>
-            首页
-          </el-dropdown-item>
+          <el-dropdown-item>首页</el-dropdown-item>
         </router-link>
         <el-dropdown-item divided>
           <span style="display:block;" @click="logout">注销</span>
@@ -40,10 +42,10 @@ export default {
     ])
   },
   methods: {
-    toggleSideBar() {
+    toggleSideBar () {
       this.$store.dispatch('ToggleSideBar')
     },
-    logout() {
+    logout () {
       this.$store.dispatch('LogOut').then(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       })
@@ -57,11 +59,14 @@ export default {
   height: 50px;
   line-height: 50px;
   border-radius: 0px !important;
+  background-color:#1f2d3d;
+  border: 0px;
   .hamburger-container {
     line-height: 58px;
     height: 50px;
     float: left;
     padding: 0 10px;
+    color: #fff;
   }
   .screenfull {
     position: absolute;
@@ -90,6 +95,9 @@ export default {
         font-size: 12px;
       }
     }
+    span{
+      color: #fff;
+    }
   }
 }
 </style>

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -1,13 +1,30 @@
 <template>
   <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
-      <img src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543283673332.png?Expires=1545111060&OSSAccessKeyId=LTAIkc75dpkJw8Lb&Signature=HqQy2E2tWJ4Vbc8HClE3jqPTx0s%3D">
+    <el-form
+      ref="loginForm"
+      :model="loginForm"
+      :rules="loginRules"
+      class="login-form"
+      auto-complete="on"
+      label-position="left"
+    >
+      <div class="logo">
+        <img
+          src="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/1543283673332.png?Expires=1545111060&OSSAccessKeyId=LTAIkc75dpkJw8Lb&Signature=HqQy2E2tWJ4Vbc8HClE3jqPTx0s%3D"
+        >
+      </div>
       <h3 class="title">智慧社区运营系统</h3>
       <el-form-item prop="username">
         <span class="svg-container">
-          <svg-icon icon-class="user" />
+          <svg-icon icon-class="user"/>
         </span>
-        <el-input v-model="loginForm.username" name="username" type="text" auto-complete="on" placeholder="请输入手机号" />
+        <el-input
+          v-model="loginForm.username"
+          name="username"
+          type="text"
+          auto-complete="on"
+          placeholder="请输入手机号"
+        />
       </el-form-item>
       <div class="pwdSend">
         <el-form-item prop="password">
@@ -17,13 +34,17 @@
             type="text"
             auto-complete="on"
             placeholder="请输入验证码"
-            @keyup.enter.native="handleLogin" />
+            @keyup.enter.native="handleLogin"
+          />
         </el-form-item>
         <el-button type="primary" @click="sendCode();">发送验证码</el-button>
       </div>
-      <el-button :loading="loading" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
-        登录
-      </el-button>
+      <el-button
+        :loading="loading"
+        type="primary"
+        style="width:100%;"
+        @click.native.prevent="handleLogin"
+      >登录</el-button>
     </el-form>
   </div>
 </template>
@@ -135,6 +156,12 @@ $light_gray: #eee;
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.logo{
+  text-align:center;
+  img{
+    margin-bottom:10px;
+  }
+}
 $bg: #2d3a4b;
 $dark_gray: #889aa4;
 $light_gray: #eee;