Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

# Conflicts:
#	VUECODE/smart-operate-manage/config/prod.env.js
#	VUECODE/smart-property-manage/config/prod.env.js

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

@@ -70,4 +70,18 @@ public class VistorController extends BaseController {
         responseBean = vistorServiceI.invateHis(communityId, userId);
         return  responseBean;
     }
+
+    @ApiOperation(value = "查询是否开启了访客邀请的车辆", notes = "查询是否开启了访客邀请的车辆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id")
+    })
+    @RequestMapping(value = "/invate_license/bool", method = RequestMethod.GET)
+    public ResponseBean invateBool(@RequestParam("communityId") Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = vistorServiceI.invateBool(communityId);
+        return responseBean;
+    }
+
+
+
 }

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

@@ -0,0 +1,26 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaVisitorLicenseSetting;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TaVisitorLicenseSettingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaVisitorLicenseSetting record);
+
+    int insertSelective(TaVisitorLicenseSetting record);
+
+    TaVisitorLicenseSetting selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaVisitorLicenseSetting record);
+
+    int updateByPrimaryKey(TaVisitorLicenseSetting record);
+
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_visitor_license_setting where community_id = #{communityId}")
+    TaVisitorLicenseSetting selectByCommunityId(@Param("communityId") Integer communityId);
+}

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

@@ -0,0 +1,45 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaVisitorLicenseSetting {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Date createDate;
+
+    private Integer createUser;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+}

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

@@ -28,4 +28,11 @@ public interface TaVistorServiceI {
      * @return
      */
     ResponseBean invateHis(Integer communityId, Integer userId);
+
+    /**
+     * 查询 邀请访客车辆 是否开启
+     * @param communityId
+     * @return
+     */
+    ResponseBean invateBool(Integer communityId);
 }

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

@@ -142,10 +142,16 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         taUserLicense.setLicenseType(dataType);
 
         taUserLicense.setLicensePlate(carNo);
-        String price = String.valueOf(Double.valueOf(((BigDecimal) jsonParam.get("Cost")).toString()) * 100);
-        taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
+        Object cost = jsonParam.get("Cost");
+        if (null != cost) {
+            String price = String.valueOf(Double.valueOf(((BigDecimal) cost).toString()) * 100);
+            taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
+        }
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
-        taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(jsonParam.get("RenewTime"))));
+        Object renewTime = jsonParam.get("RenewTime");
+        if (null != renewTime) {
+            taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(renewTime)));
+        }
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         try {

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

@@ -5,14 +5,8 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.hk.HKOpenApi;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TaVisitorLicenseMapper;
-import com.community.huiju.dao.TaVisitorMapper;
-import com.community.huiju.dao.TpEquipmentTreeMapper;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TaVisitor;
-import com.community.huiju.model.TaVisitorLicense;
-import com.community.huiju.model.TpEquipmentTree;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.TaVistorServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -46,6 +40,9 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private TpEquipmentTreeMapper tpEquipmentTreeMapper;
 
+    @Autowired
+    private TaVisitorLicenseSettingMapper taVisitorLicenseSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean insertTaVistor(TaVisitor taVisitor, UserElement userElement) {
@@ -145,4 +142,14 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         throw new RuntimeException("创建访问登记失败!" + errorMessage);
 
     }
+
+
+    @Override
+    public ResponseBean invateBool(Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaVisitorLicenseSetting taVisitorLicenseSetting = taVisitorLicenseSettingMapper.selectByCommunityId(communityId);
+        // true 表示启用了访客邀请的车辆， false 表示未启用访客邀请的车辆
+        responseBean.addSuccess(null != taVisitorLicenseSetting ? true : false);
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaVisitorLicenseSettingMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaVisitorLicenseSetting" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, create_date, create_user
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_visitor_license_setting
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_visitor_license_setting
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    insert into ta_visitor_license_setting (id, community_id, create_date, 
+      create_user)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{createUser,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    insert into ta_visitor_license_setting
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    update ta_visitor_license_setting
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaVisitorLicenseSetting" >
+    update ta_visitor_license_setting
+    set community_id = #{communityId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TaVisitorLicenseSettingController.java

@@ -0,0 +1,63 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.ITaVisitorLicenseSettingService;
+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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "录入访客车牌功能开关", description = "录入访客车牌功能开关")
+public class TaVisitorLicenseSettingController extends BaseController {
+
+    @Autowired
+    private ITaVisitorLicenseSettingService taVisitorLicenseSettingService;
+
+    @ApiOperation(value = "是否开启访客邀请车辆", notes = "是否开启访客邀请车辆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Boolean.class, paramType = "form", name = "visitorLicenseBool", value = "true 表示开启  false 关闭"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/visitor/saveOrDelete", method = RequestMethod.POST)
+    public ResponseBean saveOrDelete(HttpSession session, @RequestParam("visitorLicenseBool") Boolean visitorLicenseBool){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taVisitorLicenseSettingService.saveOrDelete(userElement, visitorLicenseBool);
+
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "查看是否开启访客车辆邀请", notes = "查看是否开启访客车辆邀请")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/visitor", method = RequestMethod.GET)
+    public ResponseBean getVisitorLicense(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taVisitorLicenseSettingService.getVisitorLicense(userElement);
+        return responseBean;
+    }
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaVisitorLicenseSettingMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaVisitorLicenseSetting;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+public interface TaVisitorLicenseSettingMapper extends BaseMapper<TaVisitorLicenseSetting> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaVisitorLicenseSetting.java

@@ -0,0 +1,49 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_visitor_license_setting")
+public class TaVisitorLicenseSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 物业端创建人
+     */
+    private Integer createUser;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaVisitorLicenseSettingService.java

@@ -0,0 +1,33 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaVisitorLicenseSetting;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+public interface ITaVisitorLicenseSettingService extends IService<TaVisitorLicenseSetting> {
+
+    /**
+     * true 开启访客邀请的车辆  false 关闭访客邀请的车辆
+     * @param userElement
+     * @param visitorLicenseBool
+     * @return
+     */
+    ResponseBean saveOrDelete(UserElement userElement, Boolean visitorLicenseBool);
+
+    /**
+     * 获取 访客邀请车辆是否开启
+     * @param userElement
+     * @return
+     */
+    ResponseBean getVisitorLicense(UserElement userElement);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaVisitorLicenseSettingServiceImpl.java

@@ -0,0 +1,69 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TaVisitorLicenseSettingMapper;
+import com.community.huiju.model.TaVisitorLicenseSetting;
+import com.community.huiju.service.ITaVisitorLicenseSettingService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 录入访客车牌功能开关表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-27
+ */
+@Service
+public class TaVisitorLicenseSettingServiceImpl extends ServiceImpl<TaVisitorLicenseSettingMapper, TaVisitorLicenseSetting> implements ITaVisitorLicenseSettingService {
+
+    @Override
+    public ResponseBean saveOrDelete(UserElement userElement, Boolean visitorLicenseBool) {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<TaVisitorLicenseSetting> visitorLicenseSettingQueryWrapper = new QueryWrapper<>();
+        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getCommunityId());
+        TaVisitorLicenseSetting taVisitorLicenseSetting = this.getOne(visitorLicenseSettingQueryWrapper);
+
+        // true 表示开启访客邀请车辆
+        if (visitorLicenseBool) {
+            if (null != taVisitorLicenseSetting) {
+                responseBean.addSuccess("操作成功!");
+                return responseBean;
+            }
+            TaVisitorLicenseSetting visitorLicenseSetting = new TaVisitorLicenseSetting();
+            visitorLicenseSetting.setCommunityId(userElement.getCommunityId());
+            visitorLicenseSetting.setCreateDate(LocalDateTime.now());
+            visitorLicenseSetting.setCreateUser(userElement.getId());
+
+            this.save(visitorLicenseSetting);
+
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
+        }
+
+
+        if (null != taVisitorLicenseSetting) {
+            this.removeById(taVisitorLicenseSetting.getId());
+        }
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getVisitorLicense(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<TaVisitorLicenseSetting> visitorLicenseSettingQueryWrapper = new QueryWrapper<>();
+        visitorLicenseSettingQueryWrapper.eq("community_id", userElement.getCommunityId());
+        TaVisitorLicenseSetting visitorLicenseSetting = this.getOne(visitorLicenseSettingQueryWrapper);
+        // true 表示启用了访客邀请的车辆， false 表示未启用访客邀请的车辆
+        responseBean.addSuccess(null != visitorLicenseSetting ? true : false);
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/resources/mapper/TaVisitorLicenseSettingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TaVisitorLicenseSettingMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/api/banner.js

@@ -74,3 +74,21 @@ export function carouselGetBanner() {
   })
 }
 
+// 查看是否开启访客车辆邀请
+export function getVisitorLicenseSetting() {
+  return request({
+    url: '/visitor',
+    method: 'get'
+  })
+}
+
+// 是否开启访客邀请车辆
+export function visitorSaveOrDelete(visitorLicenseBool) {
+  return request({
+    url: '/visitor/saveOrDelete',
+    method: 'post',
+    params: {
+      visitorLicenseBool: visitorLicenseBool
+    }
+  })
+}

VUECODE/smart-property-manage/src/store/modules/banner.js

@@ -1,4 +1,4 @@
-import { getBanner, addBanner, updateBanner, deleteBanner, getByBannerId, carouselAnnouncementBanner, carouselActivityBanner, carouselGetBanner } from '@/api/banner'
+import { getBanner, addBanner, updateBanner, deleteBanner, getByBannerId, carouselAnnouncementBanner, carouselActivityBanner, carouselGetBanner, getVisitorLicenseSetting, visitorSaveOrDelete } from '@/api/banner'
 
 const banner = {
   actions: {
@@ -86,6 +86,24 @@ const banner = {
           reject(error)
         })
       })
+    },
+    GetVisitorLicenseSetting({ commit }) { // 查看是否开启访客车辆邀请
+      return new Promise((resolve, reject) => {
+        getVisitorLicenseSetting().then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    VisitorSaveOrDelete({ commit }, data) { // 是否开启访客邀请车辆
+      return new Promise((resolve, reject) => {
+        visitorSaveOrDelete(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/systemResources/banner/index.vue

@@ -16,6 +16,15 @@
       </el-tooltip>
       <el-button v-if="activityBannerNumBool" type="primary" @click="carouselActivityBanner">保存</el-button>
     </div>
+    <div style="width: 1000px; margin-left: auto; margin-right: auto; margin-top: 20px;">
+      <span style="font-size:0.7vw;color:#666666;">业主邀请访客时，录入访客车牌功能 开还是关？</span>
+      <el-radio v-model="visitorBool" :label="true" style="margin-left: 58px;" @change="visitorSaveOrDelete">开</el-radio>
+      <el-radio v-model="visitorBool" :label="false" @change="visitorSaveOrDelete">关</el-radio>
+      <el-tooltip class="item" effect="dark" content="小区如果实际允许临时车出入停车场，则建议此配置为关。只有小区禁止临时车进入时，业主才需要邀请访客车辆进入小区。" placement="top-start">
+        <i class="el-icon-info"/>
+      </el-tooltip>
+      <el-button v-if="activityBannerNumBool" type="primary" @click="carouselActivityBanner">保存</el-button>
+    </div>
   </div>
 </template>
 
@@ -27,11 +36,13 @@ export default {
       announcementBannerNum: 0, // banner数量
       activityBannerNum: 0, // 活动banner数量
       announcementBannerBool: false, // 是否显示公告的保存按钮
-      activityBannerNumBool: false // 是否显示活动的保存按钮
+      activityBannerNumBool: false, // 是否显示活动的保存按钮
+      visitorBool: false // 是否打开
     }
   },
   mounted() {
     this.carouselGetBanner()
+    this.getVisitorLicenseSetting()
   },
   methods: {
     handleBannerChange(value) {
@@ -78,7 +89,30 @@ export default {
       }).catch(() => {
         console.log('error CarouselGetBanner')
       })
+    },
+    getVisitorLicenseSetting() { // 查看是否开启访客车辆邀请
+      this.$store.dispatch('GetVisitorLicenseSetting').then(res => {
+        const resCode = res.code
+        if (resCode === '0') {
+          this.visitorBool = res.data
+        }
+      }).catch(() => {
+        console.log('error GetVisitorLicenseSetting')
+      })
+    },
+    visitorSaveOrDelete() { // 是否开启访客邀请车辆
+      this.$store.dispatch('VisitorSaveOrDelete', this.visitorBool).then(res => {
+        const resCode = res.code
+        if (resCode === '0') {
+          this.$message.success(res.message)
+          return
+        }
+        this.$message.error(res.message)
+      }).catch(() => {
+        console.log('error VisitorSaveOrDelete')
+      })
     }
+
   }
 
 }

VUECODE/smart-property-manage/src/views/systemResources/homeIndex/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>$Title$</title>
-</head>
-<body>
-$END$
-</body>
-</html>

VUECODE/smart-property-manage/src/views/systemResources/property/index.vue

@@ -5,7 +5,7 @@
         <el-input v-model="formInline.name" placeholder="名称"/>
       </el-form-item>
       <el-form-item label="号码">
-        <el-input v-model="formInline.tel" placeholder="号码"/>
+        <el-input v-model="formInline.tel" placeholder="号码" oninput="value=value.replace(/[^\d]/g,'')"/>
       </el-form-item>
       <el-form-item label="备注">
         <el-input v-model="formInline.remark" placeholder="备注"/>

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app" style="margin-top:30px;font-size: 14px; color: #606266;">
-    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery" style="margin-right: 15px;">
       <div style="transform:translateY(-70%); margin-top:5px;">
         <span style="padding-left:0.8%;font-size: 16px;color: rgb(96, 98, 102);font-weight: bold;">工单详情</span>
       </div>
@@ -103,7 +103,7 @@
                     <tr>
                       <td>
                         <div class="processing_content_detail" style="float:left;width:70%">
-                          <span>{{ itemContent.userName }}:{{ itemContent.content }}
+                          <span>{{ itemContent.userName }}: {{ itemContent.content }}
                             <span style="color:#219AFF"/>
                           </span>
                         </div>
@@ -112,11 +112,10 @@
                     <tr>
                       <td>
                         <div class="processing_content_detail" style="float:left;width:90%">
-                          <div style="float:left;width: 2px;height: 20px; background:#C7D4E9;margin-left:10px;margin-right:10px"/>
                           <!-- <img :src="contentImgURL.imageUrl"  v-for="contentImgURL in itemContent.imgURL" preview preview-text="描述"  width="200" style="margin:5px;"> -->
                           <img v-for="contentImgURL in itemContent.imgURL" :src="contentImgURL.imageUrl" preview width="100" height="100" style="margin:5px;"/>
                           <div><span ><i class="el-icon-time"/>{{ formatDate(itemContent.createDate) }}</span> </div>
-                          <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;" width="200%"></div>
+                          <div> <hr style="height:1px;border:none;border-top:1px solid #99a9bf;" width="200%"></div>
                         </div>
                       </td>
                     </tr>
@@ -126,15 +125,15 @@
             </el-step>
           </el-steps>
         </div>
-        <div v-if="listQuery.status==='0'||listQuery.status==='3'">
+        <div v-if="listQuery.status==='0'||listQuery.status==='3'" style="margin-left: -5px; margin-top: 30px;">
           <div>
-            <span>参与沟通</span>
+            <span style="font-size: 16px;color: rgb(96, 98, 102);font-weight: bold;">参与沟通</span>
           </div>
           <br>
           <div>
             <textarea id="message_textarea" v-model="listQuery.textContent" placeholder="回复TA或向TA提问" class="textarea-inherit" rows="4"/>
           </div>
-          <div>
+          <div style="margin-top: 10px;">
             <el-form-item label="图片附件">
               <el-upload
                 :limit="8"
@@ -155,15 +154,15 @@
             <el-button type="primary" style="margin-left: 90%;transform:translateY(-340%);" @click="submitContent">提交</el-button>
           </div>
         </div>
-        <div v-if="listQuery.status==='3'">
+        <div v-if="listQuery.status==='3'" style="margin-left: -5px;">
           <div>
-            <span>流程操作</span>
+            <span style="font-size: 16px;color: rgb(96, 98, 102);font-weight: bold;">流程操作</span>
           </div>
           <br>
           <div>
             <textarea id="message_textarea" v-model="listQuery.relationContent" placeholder="处理完了?在此填写处理结果，发送给户主让TA给好评~" class="textarea-inherit" rows="4"/>
           </div>
-          <div>
+          <div style="margin-top: 10px;">
             <el-form-item label="图片附件">
               <el-upload
                 :limit="8"
@@ -186,15 +185,15 @@
         </div>
 
         <div v-if="listQuery.status==='0'">
-          <el-form-item style="width:1000px;" >
-            <el-select v-model="listQuery.selectVale" placeholder="请选择工单由谁负责,然后点击受理分配" >
+          <el-form-item>
+            <el-select v-model="listQuery.selectVale" placeholder="请选择工单由谁负责,然后点击受理分配" style="width: 300px;">
               <el-option label="请选择工单由谁负责,然后点击受理分配" value="-1" />
               <el-option :value="listQuery.currentUserName" label="我自己"/>
               <el-option v-for="user in listQuery.userList" :label="user.userName" :value="user.id"/>
             </el-select>
+            <el-button style="margin-left: 30px;" type="primary" @click="addRecord">受理分配</el-button>
           </el-form-item>
-          <el-button type="primary" @click="addRecord">受理分配</el-button>
-          <a><span style="margin-left: 600px;color: #009FCC" @click="noAccept">{{ '拒绝受理?' }}&nbsp;&nbsp;&nbsp;&nbsp;</span></a><span>{{ '拒绝受理即关闭此工单，不再进行后续任何流程，请谨慎' }}</span>
+          <a><span style="color: #009FCC;margin-left: 300px;margin-top: 10px;" @click="noAccept">{{ '拒绝受理?' }}&nbsp;&nbsp;&nbsp;&nbsp;</span></a><span>{{ '拒绝受理即关闭此工单，不再进行后续任何流程，请谨慎' }}</span>
         </div>
       </div>
     </el-form>
@@ -429,19 +428,18 @@ export default {
     },
     // 回复
     submitContent() {
+      if (this.listQuery.textContent === undefined || this.listQuery.textContent === '') {
+        this.$message.error('请输入内容')
+        return
+      }
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      if (this.listQuery.textContent === undefined || this.listQuery.textContent === '') {
-        this.$message.error('请输入内容')
-        loading.close()
-        return
-      }
       this.listQuery.img = this.contentImgAA
-      this.$store.dispatch('AddRecordComment', this.listQuery,).then((res) => {
+      this.$store.dispatch('AddRecordComment', this.listQuery).then((res) => {
         this.Ass = false
         this.contentImgAA = []
         this.dataQuery()
@@ -513,18 +511,17 @@ export default {
     },
     // 流程提交
     succeedClick() {
+      if (this.listQuery.relationContent === undefined || this.listQuery.relationContent === '') {
+        this.$message.error('请输入处理结果')
+        return
+      }
+
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-
-      if (this.listQuery.relationContent === undefined || this.listQuery.relationContent === '') {
-        this.$message.error('请填写内容')
-        loading.close()
-        return
-      }
       this.listQuery.imgIO = this.contentImgIO
       this.$store.dispatch('UpdateTicket', this.listQuery).then((res) => {
         this.Ass = false
@@ -568,11 +565,13 @@ export default {
     background-color: #D9E5F9;
   } */
   .processing_content_detail{
-     margin-left: 10px;
-     margin-top: 3.5px;
-     margin-bottom: 3.5px;
-	   width:200px;
-     display:inline-block;
+    margin-left: 10px;
+    margin-top: 3.5px;
+    margin-bottom: 3.5px;
+    width:200px;
+    display:inline-block;
+    font-size: 14px;
+    color: rgb(96, 98, 102);
   }
   .step-row{
      min-width:400px;

VUECODE/smart-property-manage/src/views/ticket/index.vue

@@ -56,7 +56,7 @@
       <el-table-column prop="ticketTitle" label="标题" align="center">
       <template slot-scope="scope" >
         <a :title="scope.row.ticketTitle" @click="clickTitle(scope.row.id)">
-          <span style="color: #009FCC	">
+          <span style="color: rgb(64, 158, 255);">
            {{ scope.row.ticketTitle.length>='15'?scope.row.ticketTitle.substring(0,15)+'..':scope.row.ticketTitle }}
           </span>
         </a>
@@ -227,4 +227,4 @@ export default {
 .button {
   margin-left: 20px;
 }
-</style>
+</style>