Merge branch 'v4' of http://git.ycjcjy.com/welcome/pc-welcome3 into v4

list.vue

@@ -0,0 +1,134 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="预约人姓名">
+        <el-input v-model="formInline.personName" placeholder="预约人姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="预约人电话">
+        <el-input v-model="formInline.phone" placeholder="预约人电话"></el-input>
+      </el-form-item>   
+      <el-form-item label="车牌号">
+        <el-input v-model="formInline.platNumber" placeholder="车牌号"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+     :data="visitorList.records"
+    border>
+    <el-table-column
+      prop="personName"
+      label="预约人姓名"
+      width="180">
+    </el-table-column>
+    <el-table-column
+      prop="phone"
+      label="预约人电话">
+    </el-table-column>
+    <el-table-column
+      prop="visitDate"
+      label="到访时间">
+       <template slot-scope="scope">
+        <span>{{FormatDate(scope.row.visitDate)}}</span>
+      </template>
+    </el-table-column>
+
+    <el-table-column
+      prop="personNum"
+      label="来访人数">
+    </el-table-column>
+    <el-table-column
+      prop="carNum"
+      label="车辆数目">
+    </el-table-column>
+    <el-table-column
+      prop="platNumber"
+      label="车牌号">
+    </el-table-column>
+    <el-table-column
+      prop="createDate"
+      value-format="yyyy-MM-dd"
+      label="创建时间">
+      <template slot-scope="scope">
+        <span>{{FormatDate(scope.row.createDate)}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="remark"
+      label="备注">
+    </el-table-column>
+  </el-table>
+    <el-pagination
+            style="margin-top:50px;float:right"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="formInline.pageNum"
+            :page-sizes="[1,10, 20, 30, 40]"
+            :page-size="formInline.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="visitorList.total || 0">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapVisitorState, mapActions: mapVisitorActions } = createNamespacedHelpers('visitor')
+
+export default {
+  name: 'visitor-index',
+  data() {
+    return {
+      formInline: {
+        personName: '',
+        phone: '',
+        platNumber: '',
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  computed: {
+    ...mapVisitorState({
+     visitorList: x => x.safety
+    })
+  },
+  created() {
+    this.getPage()
+  },
+  methods: {
+    ...mapVisitorActions([
+      'getVisitor'
+    ]),
+    onSubmit() {
+      this.getPage()
+    },
+    getPage() {
+      this.getVisitor(this.formInline)
+      // window.console.log(this.$store)
+      // this.$store.commit('security/foo')
+      // this.$store.dispatch('security/getSecurity')
+      // this.$store.commit('security/foo')
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+      this.getPage()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.getPage()
+    },
+    FormatDate (date) {
+      if (date) {
+        return date.split('T')[0] === '0001-01-01' ? '' : date.split('T')[0] + '  ' + date.split('T')[1]
+      } else {
+        return ''
+      }
+    },
+  }
+}
+</script>
+

src/config/api.js

@@ -244,7 +244,36 @@ const apis = {
       method: 'get',
       url: `${commPrefix}/sysparam/:id`
     }
+  },
+  cart: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/carRecord`
+    }
+  },
+  security: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/firstUsherRecord`
+    }
+  },
+  visitor: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/visitorAppointmentList`
+    }
+  },
+  lobby: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/mainUsherRecord`
+    }
+  },
+  followupRecord:{
+    list:{
+      method:'get',
+      url: `${commPrefix}/customerList`
+    }
   }
 }
-
 export default apis

src/store/index.js

@@ -11,6 +11,11 @@ import person from './modules/person'
 import sysparam from './modules/sysparam'
 import sysuser from './modules/sysuser'
 import stats from './modules/stats'
+import cart from './modules/cart'
+import security from './modules/security'
+import visitor from './modules/visitor' 
+import lobby from './modules/lobby'
+import followup from './modules/followup'
 
 Vue.use(Vuex)
 
@@ -27,6 +32,11 @@ const store = new Vuex.Store({
     sysparam,
     sysuser,
     stats,
+    cart,
+    security,
+    visitor,
+    lobby,
+    followup
   }
 })
 

src/store/modules/cart.js

@@ -0,0 +1,23 @@
+import lodash from 'lodash'
+import { interact } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    carRecord: {}
+  },
+  mutations: {
+    carRecord(state, payload) {
+      state.carRecord = payload || {}
+    }
+  },
+  actions: {
+    getCartRecord({ commit }, payload) { // 查询所有
+      const api = lodash.get(apis, 'cart.list')
+      interact(api, payload).then((data) => {
+        commit('carRecord', data)
+      })
+    }
+  }
+}

src/store/modules/followup.js

@@ -0,0 +1,25 @@
+import lodash from 'lodash'
+import { interact } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    followup : {},
+    sex:""
+  },
+  mutations: {
+    updateFollowup(state, payload) {
+      state.followup  = payload || {}
+    }
+  },
+  actions: {
+    getFollowup({ commit }, payload) { // 查询所有
+      const api = lodash.get(apis, 'followupRecord.list')
+      // const api = lodash.get(apis, 'customerList.list')
+      interact(api, payload).then((data) => {
+        commit('updateFollowup', data)
+      })
+    }
+  }
+}

src/store/modules/lobby.js

@@ -0,0 +1,23 @@
+import lodash from 'lodash'
+import { interact } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    safety : {}
+  },
+  mutations: {
+    updateSafety(state, payload) {
+      state.safety  = payload || {}
+    }
+  },
+  actions: {
+    getLobby({ commit }, payload) { // 查询所有
+      const api = lodash.get(apis, 'lobby.list')
+      interact(api, payload).then((data) => {
+        commit('updateSafety', data)
+      })
+    }
+  }
+}

src/store/modules/security.js

@@ -0,0 +1,23 @@
+import lodash from 'lodash'
+import { interact } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    safety : {}
+  },
+  mutations: {
+    updateSafety(state, payload) {
+      state.safety  = payload || {}
+    }
+  },
+  actions: {
+    getSecurity({ commit }, payload) { // 查询所有
+      const api = lodash.get(apis, 'security.list')
+      interact(api, payload).then((data) => {
+        commit('updateSafety', data)
+      })
+    }
+  }
+}

src/store/modules/visitor.js

@@ -0,0 +1,23 @@
+import lodash from 'lodash'
+import { interact } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    safety : {}
+  },
+  mutations: {
+    updateSafety(state, payload) {
+      state.safety  = payload || {}
+    }
+  },
+  actions: {
+    getVisitor({ commit }, payload) { // 查询所有
+      const api = lodash.get(apis, 'visitor.list')
+      interact(api, payload).then((data) => {
+        commit('updateSafety', data)
+      })
+    }
+  }
+}

src/views/cart/list.vue

@@ -0,0 +1,135 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="车牌">
+        <el-input v-model="formInline.plateNumber" placeholder="车牌"></el-input>
+      </el-form-item>
+      <!-- <el-form-item label="客户姓名">
+        <el-input v-model="formInline.customerName" placeholder="客户姓名"></el-input>
+      </el-form-item> -->
+      <!-- <el-form-item label="手机">
+        <el-input v-model="formInline.phone" placeholder="手机"></el-input>
+      </el-form-item> -->
+      <el-form-item label="来访时间">
+        <el-date-picker
+                v-model="formInline.recordDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="来访时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+            :data="cartList.records"
+            border
+            style="width: 100%">
+      <el-table-column
+              prop="serialNo"
+              label="序号"
+              align='center'
+              width="180"/>
+      <el-table-column
+              prop="plateNumber"
+              align='center'
+              label="车牌"/>
+      <el-table-column
+              prop="driverImage"
+              align='center'
+              label="驾驶员照片">
+        <template slot-scope="scope">
+          <el-image
+                  style="width: 100px; height: 100px"
+                  :src="scope.row.driverImage"
+                  fit="fill"></el-image>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+              prop="customerName"
+              label="客户姓名"/>
+      <el-table-column
+              prop="phone"
+              label="手机号"/> -->
+      <el-table-column
+              prop="createDate"
+              align='center'
+              label="来访时间">
+              <template slot-scope="scope">
+                <span> {{ FormatDate(scope.row.createDate) }} </span>
+              </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+            style="margin-top:50px;float:right"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="formInline.pageNum"
+            :page-sizes="[1,10, 20, 30, 40]"
+            :page-size="formInline.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="cartList.total || 0">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapCartState, mapActions: mapCartActions} = createNamespacedHelpers('cart')
+
+export default {
+  name: 'cart-index',
+  data() {
+    return {
+      formInline: {
+        plateNumber: '',
+        recordDate: '',
+        customerName: '',
+        phone: '',
+        pageNum: 1,
+        pageSize: 10,
+        listLoading: true
+      }
+    }
+   
+  },
+  computed: {
+    ...mapCartState({
+      cartList: x => x.carRecord
+    })
+  },
+  created() {
+    this.getPage()
+  },
+  methods: {
+    ...mapCartActions([
+      'getCartRecord'
+    ]),
+    onSubmit() {
+      this.getPage()
+    },
+    getPage() {
+      this.getCartRecord(this.formInline)
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+      this.getPage()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.getPage()
+    },
+    FormatDate (date) {
+      if (date) {
+        return date.split('T')[0] === '0001-01-01' ? '' : date.split('T')[0] + '  ' + date.split('T')[1]
+      } else {
+        return ''
+      }
+    },
+  }
+}
+</script>
+

src/views/followup/list.vue

@@ -0,0 +1,218 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="客户姓名">
+        <el-input v-model="formInline.customerName" placeholder="客户姓名"></el-input>
+      </el-form-item> 
+      <el-form-item label="客户电话">
+        <el-input v-model="formInline.phone" placeholder="客户电话"></el-input>
+      </el-form-item>   
+      <el-form-item label="客户车牌号">
+        <el-input v-model="formInline.platNumber" placeholder="车牌号"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="clear">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+    :data="FollowupList.records"
+    border>
+    <el-table-column
+      prop="customerId"
+      align='center'
+      label="客户ID">
+    </el-table-column>
+    <el-table-column
+      prop="customerName"
+      align='center'
+      label="客户姓名">
+    </el-table-column>
+    <el-table-column
+      prop="sex"
+      align='center'
+      label="性别">
+      <template slot-scope="scope">
+        <span>{{scope.row.sex ===1? '男':'女' }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="phone"
+      align='center'
+      label="电话">
+    </el-table-column>
+    <el-table-column
+      prop="avatar"
+      align='center'
+      label="头像">
+      <template slot-scope="scope">
+        <el-image
+          style="width: 100px; height: 100px"
+          :src="scope.row.avatar"
+          fit="fill">
+        </el-image>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="plateNumber"
+      align='center'
+      label="车牌">
+    </el-table-column>
+    <el-table-column
+      prop="carModel"
+      align='center'
+      label="车型">
+    </el-table-column>
+    <el-table-column
+      prop="channel"
+      align='center'
+      label="客户来源">
+    </el-table-column>
+    <el-table-column
+      prop="purpose"
+      align='center'
+      label="来访目的">
+      <template slot-scope="scope">
+        <span>{{scope.row.purpose ===1? '看房':'其他' }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="favorHouse"
+      align='center'
+      label="意向房源">
+      <template slot-scope="scope">
+        <span>{{favorHouse(scope.row.favorHouse)}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="favorLevel"
+      align='center'
+      label="意向等级">
+      <template slot-scope="scope">
+        <span>{{favorLevel(scope.row.favorLevel)}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column prop="remark" label="备注" align="center">
+          <template slot-scope="scope">
+            <a :title="scope.row.remark" v-if="scope.row.remark != null ">
+              <span style="color: #8B8378  ">
+              {{ scope.row.remark.length>='15'?scope.row.remark.substring(0,15)+'..':scope.row.remark }}
+              </span>
+              <span v-if="scope.row.remark==='null'">
+              {{ scope.row.remark='' }}
+              </span>
+            </a>
+          </template>
+      </el-table-column>
+    <!-- <el-table-column
+      prop="status"
+      label="状态">
+    </el-table-column> -->
+    <el-table-column
+      prop="createDate"
+      label="创建时间">
+    </el-table-column>
+    <!-- <el-table-column
+      prop="consultantId"
+      label="置业ID">
+    </el-table-column> -->
+    <!-- <el-table-column
+      prop="realtyConsultant"
+      label="置业名称">
+    </el-table-column> -->
+  </el-table>
+    <el-pagination
+            style="margin-top:50px;float:right"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="formInline.pageNum"
+            :page-sizes="[1,10, 20, 30, 40]"
+            :page-size="formInline.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="FollowupList.total || 0">
+    </el-pagination>
+  </div>
+</template>
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapFollowupState, mapActions: mapFollowupActions } = createNamespacedHelpers('followup')
+
+export default {
+  name: 'followup-index',
+  data() {
+    return {
+      formInline: {
+        customerName:'',
+        personName: '',
+        phone: '',
+        platNumber: '',
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  computed: {
+    ...mapFollowupState({
+    FollowupList: x => x.followup
+    })
+  },
+  created() {
+    this.getPage()
+  },
+  methods: {
+    ...mapFollowupActions([
+      'getFollowup'
+    ]),
+    onSubmit() {
+      this.getPage()
+    },
+    getPage() {
+      this.getFollowup(this.formInline)
+      // window.console.log(this.$store)
+      // this.$store.commit('security/foo')
+      // this.$store.dispatch('security/getSecurity')
+      // this.$store.commit('security/foo')
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+     c
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.getPage()
+    },
+    favorHouse (msg) {
+      if (msg == '1') {
+        return "三房"
+      } else if(msg == '2'){
+        return "四房"
+      }else if(msg == '3'){
+        return "四房以上"
+      }
+    },
+    favorLevel (msg) {
+      if (msg == 'A') {
+        return "买房"
+      } else if(msg == 'B'){
+        return "有意向金"
+      }else if(msg == 'C'){
+        return "考虑中"
+      }else if(msg == 'D'){
+        return "不买"
+      }
+    },
+    clear(){
+      this.formInline.customerName = ''
+      this.formInline.phone = ''
+      this.formInline.platNumber = ''
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.getPage()
+    }
+   
+  }
+}
+</script>
+

src/views/index.js

@@ -108,8 +108,44 @@ const pages = [
           title: '来访致辞编辑',
         },
       },
+      {
+        path: 'cartRecord',
+        name: 'cartRecord',
+        component: () => import('./cart/list.vue'),
+        meta: {
+          menuShow: true,
+          title: '访客车辆记录',
+        },
+      },
+      {
+        path: 'visitor',
+        name: 'visitor',
+        component: () => import('./visitor/list.vue'),
+        meta: {
+          menuShow: true,
+          title: '访客预约信息',
+        },
+      },
     ]
   },
+  {
+    path: 'security',
+    name: 'securitylist',
+    component: () => import('./security/list.vue'),
+    meta: {
+      menuShow: true,
+      title: '安保记录',
+    },
+  },
+  {
+    path: 'lobby',
+    name: 'lobby',
+    component: () => import('./lobby/list.vue'),
+    meta: {
+      menuShow: true,
+      title: '大厅迎宾列表',
+    },
+  },
   {
     path: 'person',
     name: 'personlist',
@@ -119,6 +155,15 @@ const pages = [
       title: '人员列表',
     },
   },
+  {
+    path: 'followup',
+    name: 'followuplist',
+    component: () => import('./followup/list.vue'),
+    meta: {
+      menuShow: true,
+      title: '客户列表',
+    },
+  },
   {
     path: 'person/edit',
     name: 'personedit',

src/views/lobby/list.vue

@@ -0,0 +1,190 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="来访人电话">
+        <el-input v-model="formInline.phone" placeholder="预约人电话"></el-input>
+      </el-form-item>   
+      <el-form-item label="来访人车牌号">
+        <el-input v-model="formInline.platNumber" placeholder="车牌号"></el-input>
+      </el-form-item>
+      <el-form-item label="来访人员姓名">
+        <el-input v-model="formInline.personName" placeholder="来访人员姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="是否预约">
+        <el-select v-model="formInline.appointment" clearable placeholder="请选择">
+          <el-option label="是" value="1" />
+          <el-option label="否" value="0"/>
+        </el-select>
+        <el-form-item>
+      </el-form-item>   
+        <el-button type="primary" @click="onSubmit">查询</el-button> 
+        <el-button type="info" @click="clear">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+    :data="lobbyList.records"
+    border>
+    <el-table-column
+      prop="recId"
+      label="来访人员ID"
+      align='center'>
+    </el-table-column>
+    <el-table-column
+      prop="plateNumber"
+      label="车牌"
+      align='center'>
+    </el-table-column>
+    <el-table-column
+      prop="carModel"
+      label="车型"
+      align='center'>
+    </el-table-column>
+    <el-table-column
+      prop="color"
+      label="颜色"
+      align='center'>
+    </el-table-column>
+    <el-table-column label="头像" width="150" >
+           <template scope="scope">
+              <img :src="scope.row.carImage" width="150" class="head_pic"/>
+          </template>
+    </el-table-column>
+    <el-table-column
+      prop="personName"
+      label="来访人姓名"
+      align='center'>
+    </el-table-column>
+    <el-table-column
+      prop="visiteDate"
+      label="来访时间"
+      width="160%">
+       <template slot-scope="scope">
+        <span>{{FormatDate(scope.row.visiteDate)}}</span>
+      </template>
+    </el-table-column>
+
+    <el-table-column
+      prop="phone"
+      label="来访手机"
+      align='center'>
+    </el-table-column>
+    <el-table-column
+      prop="sex"
+      label="性别"
+      align='center'>
+          <template slot-scope="scope">
+             <span>{{ scope.row.sex =='1'? '男':'女' }}</span>
+          </template>
+    </el-table-column>
+    <el-table-column
+      prop="personNum"
+      label="来访人数">
+    </el-table-column>
+    <el-table-column
+      prop="appointment"
+      label="是否预约"
+      align='center'>
+            <template slot-scope="scope">
+                <span>{{scope.row.appointment ==1? '是':'否' }}</span>      
+            </template>
+    </el-table-column>
+    <el-table-column
+      prop="channel"
+      label="来访渠道"
+      align='center'>
+            <template slot-scope="scope">
+                <span>{{ scope.row.purpose == 1?'到访':'其他' }} </span>
+            </template>
+    </el-table-column>
+    <el-table-column
+      prop="purpose"
+      label="来访目的"
+      align='center'>
+            <template slot-scope="scope">
+                <span>{{ scope.row.purpose == 1?'看房':'其他' }} </span>
+            </template>
+    </el-table-column>
+  </el-table>
+    <el-pagination
+            style="margin-top:50px;float:right"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="formInline.pageNum"
+            :page-sizes="[1,10, 20, 30, 40]"
+            :page-size="formInline.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="lobbyList.total || 0">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapLobbyState, mapActions: mapLobbyActions } = createNamespacedHelpers('lobby')
+
+export default {
+  name: 'visitor-index',
+  data() {
+    return {
+      formInline: {
+        personName: '',
+        phone: '',
+        platNumber: '',
+        appointment: '',
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  computed: {
+    ...mapLobbyState({
+    lobbyList: x => x.safety
+    })
+  },
+  created() {
+    this.getPage()
+  },
+  methods: {
+    ...mapLobbyActions([
+      'getLobby'
+    ]),
+    onSubmit() {
+      this.getPage()
+    },
+    getPage() {
+      this.getLobby(this.formInline)
+      // window.console.log(this.$store)
+      // this.$store.commit('security/foo')
+      // this.$store.dispatch('security/getSecurity')
+      // this.$store.commit('security/foo')
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+      this.getPage()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.getPage()
+    },
+    FormatDate (date) {
+      if (date) {
+        return date.split('T')[0] === '0001-01-01' ? '' : date.split('T')[0] + '  ' + date.split('T')[1]
+      } else {
+        return ''
+      }
+    },
+    clear(){
+      this.formInline.personName = ''
+      this.formInline.phone = ''
+      this.formInline.platNumber = ''
+      this.formInline.appointment = ''
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.getPage()
+    }
+  }
+}
+</script>
+

src/views/security/list.vue

@@ -0,0 +1,157 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="车牌">
+        <el-input v-model="formInline.plateNumber" placeholder="车牌"></el-input>
+      </el-form-item>
+      <el-form-item label="来访时间">
+        <el-date-picker
+                v-model="formInline.visiteDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="来访时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+            :data="securityList.records"
+            border
+            style="width: 100%">
+      <!-- <el-table-column
+              prop="recId"
+              label="序号"
+              width="180"/> -->
+      <el-table-column
+              prop="plateNumber"
+              label="车牌"/>
+      <el-table-column
+              prop="carModel"
+              label="车型">
+      </el-table-column>
+      <el-table-column
+              prop="color"
+              label="颜色"/>
+      <el-table-column
+              prop="personNum"
+              label="人数"/>
+      <el-table-column
+              prop="appointment"
+              label="是否预约">
+              <template slot-scope="scope">
+                <span>{{scope.row.appointment ==1? '是':'否' }}</span>
+              </template>
+      </el-table-column>
+      <el-table-column
+              prop="appointment"
+              label="来访时间">
+              <template slot-scope="scope">
+                <span>{{FormatDate(scope.row.visiteDate)}}</span>
+              </template>
+      </el-table-column>
+      <el-table-column
+              prop="channel"
+              label="来访渠道">
+              <template slot-scope="scope">
+                <span>{{ scope.row.channel == 1?'到访':'其他' }} </span>
+              </template>
+      </el-table-column>
+      <el-table-column
+              prop="purpose"
+              label="来访目的">
+               <template slot-scope="scope">
+                <span>{{ scope.row.purpose == 1?'看房':'其他' }} </span>
+              </template>
+      </el-table-column>
+      <el-table-column
+              prop="carImage"
+              label="车辆图片">
+              <template slot-scope="scope">
+              <el-image
+                  style="width: 100px; height: 100px"
+                  :src="scope.row.carImage"
+                  fit="fill"></el-image>
+              </template>
+      </el-table-column>
+       <el-table-column
+              prop="personName"
+              label="来访人">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+            style="margin-top:50px;float:right"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="formInline.pageNum"
+            :page-sizes="[1,10, 20, 30, 40]"
+            :page-size="formInline.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="securityList.total || 0">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapSecurityState, mapActions: mapSecurityActions } = createNamespacedHelpers('security')
+
+export default {
+  name: 'security-index',
+  data() {
+    return {
+      formInline: {
+        plateNumber: '',
+        recId: '',
+        visiteDate: '',
+        customerName: '',
+        phone: '',
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  computed: {
+    ...mapSecurityState({
+     securityList: x => x.safety
+    })
+  },
+  created() {
+    this.getPage()
+  },
+  methods: {
+    ...mapSecurityActions([
+      'getSecurity'
+    ]),
+    onSubmit() {
+      this.getPage()
+    },
+    getPage() {
+      this.getSecurity(this.formInline)
+      // window.console.log(this.$store)
+      // this.$store.commit('security/foo')
+      // this.$store.dispatch('security/getSecurity')
+      // this.$store.commit('security/foo')
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+      this.getPage()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.getPage()
+    },
+    FormatDate (date) {
+      if (date) {
+        return date.split('T')[0] === '0001-01-01' ? '' : date.split('T')[0] + '  ' + date.split('T')[1]
+      } else {
+        return ''
+      }
+    },
+  }
+}
+</script>
+

src/views/visitor/list.vue

@@ -0,0 +1,144 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="预约人姓名">
+        <el-input v-model="formInline.personName" placeholder="预约人姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="预约人电话">
+        <el-input v-model="formInline.phone" placeholder="预约人电话"></el-input>
+      </el-form-item>   
+      <el-form-item label="车牌号">
+        <el-input v-model="formInline.platNumber" placeholder="车牌号"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+     :data="visitorList.records"
+    border>
+    <el-table-column
+      prop="personName"
+      label="预约人姓名"
+      width="180">
+    </el-table-column>
+    <el-table-column
+      prop="phone"
+      label="预约人电话">
+    </el-table-column>
+    <el-table-column
+      prop="visitDate"
+      label="到访时间">
+       <template slot-scope="scope">
+        <span>{{FormatDate(scope.row.visitDate)}}</span>
+      </template>
+    </el-table-column>
+
+    <el-table-column
+      prop="personNum"
+      label="来访人数">
+    </el-table-column>
+    <el-table-column
+      prop="carNum"
+      label="车辆数目">
+    </el-table-column>
+    <el-table-column
+      prop="platNumber"
+      label="车牌号">
+    </el-table-column>
+    <el-table-column
+      prop="createDate"
+      value-format="yyyy-MM-dd"
+      label="创建时间">
+      <template slot-scope="scope">
+        <span>{{FormatDate(scope.row.createDate)}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="remark"
+      label="备注">
+      <template slot-scope="scope">
+            <a :title="scope.row.remark" v-if="scope.row.remark != null ">
+              <span style="color: #8B8378  ">
+              {{ scope.row.remark.length>='15'?scope.row.remark.substring(0,15)+'..':scope.row.remark }}
+              </span>
+              <span v-if="scope.row.remark==='null'">
+              {{ scope.row.remark='' }}
+              </span>
+            </a>
+          </template>
+    </el-table-column>
+  </el-table>
+    <el-pagination
+            style="margin-top:50px;float:right"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="formInline.pageNum"
+            :page-sizes="[1,10, 20, 30, 40]"
+            :page-size="formInline.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="visitorList.total || 0">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapVisitorState, mapActions: mapVisitorActions } = createNamespacedHelpers('visitor')
+
+export default {
+  name: 'visitor-index',
+  data() {
+    return {
+      formInline: {
+        personName: '',
+        phone: '',
+        platNumber: '',
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  computed: {
+    ...mapVisitorState({
+     visitorList: x => x.safety
+    })
+  },
+  created() {
+    this.getPage()
+  },
+  methods: {
+    ...mapVisitorActions([
+      'getVisitor'
+    ]),
+    onSubmit() {
+      this.getPage()
+    },
+    getPage() {
+      this.getVisitor(this.formInline)
+      // window.console.log(this.$store)
+      // this.$store.commit('security/foo')
+      // this.$store.dispatch('security/getSecurity')
+      // this.$store.commit('security/foo')
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+      this.getPage()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.getPage()
+    },
+    FormatDate (date) {
+      if (date) {
+        return date.split('T')[0] === '0001-01-01' ? '' : date.split('T')[0] + '  ' + date.split('T')[1]
+      } else {
+        return ''
+      }
+    },
+  }
+}
+</script>
+

vue.config.js

@@ -3,7 +3,7 @@ module.exports = {
   devServer: {
     proxy: {
       '/api': {
-        target: 'http://localhost:8080',
+        target: 'http://192.168.0.172:8080',
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/'