Skip to content

html / jinmao-community-platform

Go to a project
Commit e7b2c647 by 袁晓帅
Options

Merge branch 'develop' of http://gitlab.maxrocky.com/html/jinmao-community-platform into develop

parents 1bfb7234 c9b26bb1
Showing with 81 additions and 45 deletions
index.html
......@@ -5,7 +5,9 @@
<title>智慧社区后台管理系统</title>
<!-- <link rel="shortcut icon" href="../static/img/logo.ico"/> -->
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
</head>
<!-- <script src="/static/js/tingyun-rum.js"></script> -->
<script src="/static/js/tingyun-rum-test.js"></script>
</head>
<body>
<div id="app"></div>
</body>
......
src/components/common/Header.vue
......@@ -121,6 +121,8 @@ export default {
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + projectId).then((res) =>{
if(res.data.code === '0') {
this.data = res.data.data
window.TINGYUN.setUid(this.data.userName)
localStorage.setItem('TY_USER_ID',this.data.userName)
window.sessionStorage.setItem('projectId',projectId)
this.reload()
}
......@@ -129,6 +131,8 @@ export default {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
if(res.data.code === '0') {
this.data = res.data.data
window.TINGYUN.setUid(this.data.userName)
localStorage.setItem('TY_USER_ID',this.data.userName)
window.sessionStorage.setItem('projectId',res.data.data.projectId)
}
})
......@@ -177,9 +181,8 @@ export default {
this.showAlert('请输入新密码~')
return false
}
var reg = /^1[0-9]+[a-zA-Z]+[0-9a-zA-Z]*|[a-zA-Z]+[0-9]+[0-9a-zA-Z]*/
if (this.formData.newPassword && (this.formData.newPassword.length < 10 || !reg.test(this.formData.newPassword))) {
this.showAlert('新密码不能少于10位数的字母、数字组合，且不能输入中文~')
if (this.formData.newPassword && (this.formData.newPassword.length < 10 || /[\u4E00-\u9FA5]/g.test(this.formData.newPassword))) {
this.showAlert('新密码不能少于10位数的字母、数字或特殊字符组合，且不能输入中文~')
return false
}
if (!this.formData.confirmPassword) {
......
src/components/page/index/externalSystem.vue
......@@ -31,7 +31,7 @@
<el-form-item label="上传封面" required>
<el-upload
class="avatar-uploader"
:action="this.baseURL + 'baseInfo/uploadPhoto'"
:action="this.baseURL + '/baseInfo/uploadPhoto'"
:show-file-list="false"
:headers="headers"
:on-success="handleAvatarSuccess"
......
src/components/page/system/project.vue
......@@ -24,10 +24,10 @@
<el-table-column prop="cityName" label="城市名称"></el-table-column>
<el-table-column prop="cityId" label="城市ID"></el-table-column>
<el-table-column prop="projectName" label="项目名称"></el-table-column>
<el-table-column prop="projectId" label="项目ID"></el-table-column>
<!-- <el-table-column prop="projectId" label="项目ID"></el-table-column> -->
<el-table-column prop="mainProjectCode" label="主数据项目编码" ></el-table-column>
<el-table-column prop="massif" label="地块名称" ></el-table-column>
<el-table-column prop="massifId" label="地块ID" ></el-table-column>
<!-- <el-table-column prop="massifId" label="地块ID" ></el-table-column> -->
<el-table-column prop="massifCode" label="地块编码" ></el-table-column>
<el-table-column label="操作" width="160" v-if="isEditBtn || isDelBtn">
<template slot-scope="scope">
......
src/components/page/vehicle/faceAudit.vue
......@@ -22,18 +22,19 @@
<el-table :data="data.list">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="ownerName" label="业主姓名"></el-table-column>
<el-table-column prop="ownerPhone" label="业主联系方式"></el-table-column>
<el-table-column prop="ownerAddress" label="业主住所"></el-table-column>
<el-table-column prop="examinedPerson" label="被审核人"></el-table-column>
<el-table-column prop="ownerPhone" width="120" label="业主联系方式"></el-table-column>
<el-table-column width="200" prop="ownerAddress" label="业主住所"></el-table-column>
<el-table-column prop="visitorName" label="被审核人"></el-table-column>
<el-table-column width="120" prop="visitorPhone" label="被审核人手机号"></el-table-column>
<el-table-column prop="identity" label="人员类型">
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span v-if="scope.row.identity == 1">产权⼈</span>
<span v-if="scope.row.identity == 2">家⼈</span>
<span v-if="scope.row.identity == 3">租客</span>
<span v-if="scope.row.identity == 4">朋友</span>
<span v-if="scope.row.identity == 5">保姆/司机</span>
<span v-if="scope.row.identity == 6">其他</span>
</template>
</template> -->
</el-table-column>
<el-table-column prop="facePhotoUrl" label="人脸照片">
<template slot-scope="scope">
......@@ -135,14 +136,28 @@ export default {
},
// 修改状态
changeStatus (item) {
this.$axios.post('/deviceVehicle/handleFaceEmamine',{
status: item.examineStatus ? '1' : '0',
id: item.id
}).then((res) =>{
if(res.data.code === '0') {
this.getData()
}
})
let cont
if (item.examineStatus) {
cont = '开启该人脸照片将在20分钟后生效，是否开启?'
} else {
cont = '禁用该人脸照片将在35分钟后生效，是否禁用?'
}
this.$confirm(cont, '温馨提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$axios.post('/deviceVehicle/handleFaceEmamine',{
status: item.examineStatus ? '1' : '0',
id: item.id
}).then((res) =>{
if(res.data.code === '0') {
this.getData()
}
})
}).catch(() => {
this.getData()
})
},
handleSizeChange (val) {
this.size = val
......
src/components/page/vehicle/vehicleAudit.vue
......@@ -12,8 +12,8 @@
<el-table-column prop="guestPhone" label="访客手机号" ></el-table-column>
<el-table-column prop="guestCarNumber" label="访客车牌号" ></el-table-column>
<el-table-column prop="expectedAtTime" label="预计到访时间" ></el-table-column>
<el-table-column label="操作" width="160">
<template slot-scope="scope" v-if="isRefuseBtn || isAgreeBtn">
<el-table-column label="操作" width="160" >
<template slot-scope="scope">
<span class="line pointer" v-if="isAgreeBtn" @click="auditBtn(1,scope.row.id)">同意</span>
<span class="line ml10 pointer" v-if="isRefuseBtn" @click="auditBtn(0,scope.row.id)">拒绝</span>
</template>
......
src/components/page/vehicle/vehicleRecords.vue
......@@ -7,7 +7,7 @@
<el-col :span="10">
<el-form-item label="时间">
<el-date-picker
v-model="value1"
v-model="searchForm.date"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
......@@ -17,17 +17,16 @@
</el-col>
<el-col :span="6">
<el-form-item label="方式">
<el-select v-model="searchForm.blockId" placeholder="请选择">
<el-option label="不限" value=""></el-option>
<el-option label="男" value="MAN"></el-option>
<el-option label="女" value="WOMAN"></el-option>
<el-option label="未知" value="SECRECY"></el-option>
<el-select v-model="searchForm.inOrOut" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option label="进场" value="0"></el-option>
<el-option label="出场" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="设备名称">
<el-input v-model="searchForm.customerName" placeholder="请输入设备名称"></el-input>
<el-form-item label="车牌号">
<el-input v-model="searchForm.carCode" placeholder="请输入车牌号"></el-input>
</el-form-item>
</el-col>
<el-col :span="2" :offset="1">
......@@ -42,9 +41,9 @@
<div class="title">车辆记录</div>
<el-table :data="data.list">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="name" label="车牌号"></el-table-column>
<el-table-column prop="name" label="方式"></el-table-column>
<el-table-column prop="actualTime" label="时间" ></el-table-column>
<el-table-column prop="carCode" label="车牌号"></el-table-column>
<el-table-column prop="inOrOut" label="方式"></el-table-column>
<el-table-column prop="inTime" label="时间" ></el-table-column>
</el-table>
<div class="block text-right mt20" v-if="data.page">
<el-pagination
......@@ -60,28 +59,39 @@
</template>
<script>
import moment from 'moment'
export default {
data: () => ({
loading: true,
searchForm:{
},
searchForm:{},
data:{
page: '1',
list:[
{
name: '监控摄像001',
id: 'MZ902',
type: '监控设备'
}
]
list:[]
},
size: '10',
value1: ''
size: '10'
}),
created () {
this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 210 ) + 'px'
this.getData()
},
methods: {
getData(){
this.$axios.post('/deviceVehicle/findCarAccessRecords',{
p: this.data.page,
c: this.size,
carCode: this.searchForm.carCode,
inOrOut: this.searchForm.inOrOut,
projectId: this.projectId,
endTime: this.searchForm.date ? moment(new Date(this.searchForm.date[1]).getTime()).format('YYYY-MM-DD') : null,
startTime: this.searchForm.date ? moment(new Date(this.searchForm.date[0]).getTime()).format('YYYY-MM-DD') : null,
}).then((res) =>{
if(res.data.code === '0') {
this.data = res.data.data
this.loading = false
}
})
},
handleSizeChange (val) {
this.size = val
this.getData()
......
src/main.js
......@@ -18,7 +18,6 @@ Vue.prototype.fileUrl = 'https://iotservice-test.jinmaodigital.com/' // 测试
Vue.prototype.baseURL = 'https://iotservice-test.jinmaodigital.com/service' // 测试
// Vue.prototype.baseURL = 'https://iotservice.jinmaodigital.com/service' // 正式
axios.defaults.fileURL = Vue.prototype.fileURL
axios.defaults.baseURL = Vue.prototype.baseURL
axios.defaults.fileUrl = Vue.prototype.fileUrl
axios.defaults.withCredentials = true
......@@ -81,6 +80,13 @@ router.beforeEach((to, from, next) => {
store.dispatch('clearCancel');
next();
});
// 监控代码开始
if (window.TINGYUN && window.TINGYUN.wrapVueRouter) {
window.TINGYUN.wrapVueRouter(router, {
endDelay: 500 //切换路由后延迟结束时间
});
}
// 监控代码结束
/* eslint-disable no-new */
new Vue({
el: '#app',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment