Skip to content

html / jinmao-community-platform

Go to a project
Commit d933884d by changjin
Options

联调车辆管理的接口

parent 439b4cf3
Showing with 169 additions and 76 deletions
src/components/common/Header.vue
......@@ -19,8 +19,9 @@
<i class="el-icon-caret-bottom"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item><span class="info" @click="handbook()">操作手册</span></el-dropdown-item>
<el-dropdown-item><span class="info" @click="changePwd()">修改密码</span></el-dropdown-item>
<el-dropdown-item><span class="info" @click="loginout()">退出登录</span></el-dropdown-item>
<el-dropdown-item><span class="info" @click="loginout()">退出登录</span></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -62,6 +63,27 @@
<el-button class="ml10" v-on:click="dialogVisible = false">取消</el-button>
</div>
</el-dialog>
<el-dialog title="操作手册" :visible.sync="dialogVisible1" :close-on-click-modal="false" width="35%">
<el-row>
<el-col :span="12">
中国金茂智慧社区后台管理系统-用户操作手册（文字版）.docx
</el-col>
<el-col :span="12">
<el-button @click="download(0)" icon="el-icon-download" class="right mt10">下载</el-button>
</el-col>
</el-row>
<el-row class="mt20">
<el-col :span="12">
中国金茂智慧社区后台管理系统-用户操作手册（视频版）.pptx
</el-col>
<el-col :span="12">
<el-button @click="download(1)"icon="el-icon-download" class="right mt10">下载</el-button>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer text-center">
<el-button class="ml10" v-on:click="dialogVisible1 = false">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -72,6 +94,7 @@ export default {
sideMenu: [],
menuActive: '',
dialogVisible: false,
dialogVisible1: false,
projectId: '',
data: {},
formData: {}
......@@ -112,6 +135,17 @@ export default {
choose (item) {
this.getData(item.id)
},
// 操作手册
handbook () {
this.dialogVisible1 = true
},
download (type) {
if (type === 0) {
window.open('http://39.97.169.207/static/doc/博智林项目需求文档.docx')
} else {
window.open('http://39.97.169.207/static/doc/金茂智慧案场app项目汇报方案0513.pptx')
}
},
// 退出登录
loginout () {
this.$confirm('是否退出当前账号?', '温馨提示', {
......
src/components/page/equipment/deviceAlert.vue
......@@ -8,22 +8,16 @@
<el-form-item label="设备类型">
<el-select v-model="searchForm.groupId" placeholder="请选择">
<el-option value="" label="全部">全部</el-option>
<el-option
v-for="item in typeList"
:key="item.groupId"
:label="item.groupName"
:value="item.groupId">
</el-option>
<el-option label="周界设备" value="PERIMETER"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="报警类型">
<el-select v-model="searchForm.warnState" 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-option label="全部" value="">全部</el-option>
<el-option label="入侵" value="INVADE"></el-option>
<el-option label="火警" value="FIRE"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -41,10 +35,10 @@
<div class="infoBox">
<el-row>
<el-col :span="6" class="text-center rightLine">
<p>当月报警总数<b class="ml10">{{data.currentDayAlarmCount}}</b></p>
<p>当月报警总数<b class="ml10">{{data.currentMonthAlarmCount}}</b></p>
</el-col>
<el-col :span="6" class="text-center rightLine">
<p>当日报警数量<b class="ml10">{{data.currentMonthAlarmCount}}</b></p>
<p>当日报警数量<b class="ml10">{{data.currentDayAlarmCount}}</b></p>
</el-col>
<el-col :span="6" class="text-center rightLine">
<p>较上月比较<b class="ml10" :class="{'red': data.lastDayStatus == 'down' || data.lastDayStatus == 'level','green': data.lastDayStatus == 'up'}"><i class="upIcon" v-if="data.lastDayStatus !== 'level'"></i>{{data.compareToLastMonth}}</b></p>
......@@ -126,7 +120,10 @@ export default {
data: () => ({
loading: false,
activeName: 'first',
searchForm:{},
searchForm:{
groupId: '',
warnState: ''
},
data:{
pageList:{
page: '1',
......@@ -140,7 +137,7 @@ export default {
}),
created () {
this.projectId = window.sessionStorage.getItem('projectId')
this.projectId = 'beijing'
this.projectId = 'beijing61'
this.height = (document.documentElement.clientHeight - 270 ) + 'px'
this.getTypeList(this.projectId)
this.getData()
......
src/components/page/equipment/list.vue
......@@ -20,7 +20,7 @@
<el-col :span="6">
<el-form-item label="在线状态">
<el-select v-model="searchForm.status" placeholder="请选择">
<el-option label="不限" value=""></el-option>
<el-option label="全部" value="">全部</el-option>
<el-option label="禁用" value="DISABLE"></el-option>
<el-option label="离线" value="OFFLINE"></el-option>
<el-option label="在线" value="ONLINE"></el-option>
......@@ -99,7 +99,10 @@
export default {
data: () => ({
loading: true,
searchForm:{},
searchForm:{
groupId: '',
status: ''
},
data:{
page: '1',
list:[]
......@@ -113,7 +116,7 @@ export default {
}),
created () {
// this.projectId = window.sessionStorage.getItem('projectId')
this.projectId = 'beijing'
this.projectId = 'beijing61'
this.getPermissionsBtn()
this.getTypeList(this.projectId)
this.getData()
......
src/components/page/system/log.vue
......@@ -63,7 +63,7 @@ import moment from 'moment'
export default {
data: () => ({
loading: true,
searchForm:{},
searchForm:{logType:''},
data:{page:'1'},
size: '10',
value1: '',
......
src/components/page/system/userList.vue
......@@ -20,7 +20,7 @@
<el-col :span="5">
<el-form-item label="状态">
<el-select v-model="searchForm.accountStatus" placeholder="请选择">
<el-option label="不限" value=""></el-option>
<el-option label="全部" value="">全部</el-option>
<el-option label="已启用" value="1"></el-option>
<el-option label="已禁用" value="0"></el-option>
</el-select>
......@@ -90,7 +90,10 @@
export default {
data: () => ({
loading: true,
searchForm:{},
searchForm:{
roleId: '',
accountStatus: ''
},
data:{
page: '1',
},
......
src/components/page/vehicle/auditRecords.vue
......@@ -7,7 +7,7 @@
<el-col :span="11">
<el-form-item label="预计到访时间">
<el-date-picker
v-model="value1"
v-model="searchForm.date"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
......@@ -17,11 +17,11 @@
</el-col>
<el-col :span="8">
<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.examineStatus" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option label="未审核" value="2"></el-option>
<el-option label="已通过" value="1"></el-option>
<el-option label="已拒绝" value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -37,17 +37,23 @@
<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="name" 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="name" 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="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="ownerName" label="业主姓名"></el-table-column>
<el-table-column prop="ownerContact" label="业主联系方式"></el-table-column>
<el-table-column prop="ownerAddress" label="业主住所"></el-table-column>
<el-table-column prop="guestName" label="访客姓名"></el-table-column>
<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 prop="actualAtTime" label="实际到访时间"></el-table-column>
<el-table-column prop="examineStatus" label="审核状态">
<!-- <template slot-scope="scope">
<span v-if="scope.row.examineStatus === '1'">已通过</span>
<span v-if="scope.row.examineStatus === '0'">已拒绝</span>
<span v-if="scope.row.examineStatus === '2'">未审核</span>
</template> -->
</el-table-column>
<el-table-column prop="examineUser" label="审核人"></el-table-column>
<el-table-column prop="examineTime" label="审核时间" ></el-table-column>
</el-table>
<div class="block text-right mt20" v-if="data.page">
<el-pagination
......@@ -63,28 +69,39 @@
</template>
<script>
import moment from 'moment'
export default {
data: () => ({
loading: false,
loading: true,
searchForm:{
examineStatus: ''
},
data:{
page: '1',
list:[
{
name: '监控摄像001',
id: 'MZ902',
type: '监控设备'
}
]
list:[]
},
size: '10',
value1: ''
}),
created () {
this.height = (document.documentElement.clientHeight - 210 ) + 'px'
this.getData()
},
methods: {
getData(){
this.$axios.post('/deviceVehicle/findExamineRecord',{
p: this.data.page,
c: this.size,
examineStatus: this.searchForm.examineStatus,
expectedAtStartTime: this.searchForm.date ? moment(new Date(this.searchForm.date[0]).getTime()).format('YYYY-MM-DD') : null,
expectedAtEndTime: this.searchForm.date ? moment(new Date(this.searchForm.date[1]).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/components/page/vehicle/auditSet.vue
......@@ -5,7 +5,7 @@
<div class="options">
<el-row>
<el-col :span="6">
<el-checkbox v-model="checked">自动审核</el-checkbox>
<el-radio v-model="data.configType" label="auto">自动审核</el-radio>
</el-col>
<el-col :span="16">
<span class="font12 gray">设置自动审核时，业主申请自动通过</span>
......@@ -13,15 +13,14 @@
</el-row>
<el-row class="mt30">
<el-col :span="6">
<el-checkbox v-model="checked">人工审核</el-checkbox>
<el-radio v-model="data.configType" label="person">人工审核</el-radio>
</el-col>
<el-col :span="16">
<span class="font12 gray">超过<el-input v-model="data.s" class="inputStyle"></el-input>分钟，自动审核通过</span>
<span class="font12 gray">超过<el-input v-model="data.autoPassTime" class="inputStyle"></el-input>分钟，自动审核通过</span>
</el-col>
</el-row>
<el-row class="mt30 text-center">
<el-button type="primary" class="mt20">保存</el-button>
<el-button class="ml20 mt20">取消</el-button>
<el-button type="primary" class="mt20" @click="saveBtn">保存</el-button>
</el-row>
</div>
</div>
......@@ -30,14 +29,32 @@
<script>
export default {
data: () => ({
loading: false,
checked: false,
data:{}
}),
created () {
this.height = (document.documentElement.clientHeight - 150 ) + 'px'
this.getData()
},
methods: {
getData () {
this.$axios.get('/deviceVehicle/findEmamineConfig').then((res) =>{
if(res.data.code === '0') {
this.data = res.data.data
}
})
},
saveBtn () {
this.$axios.post('/deviceVehicle/editEmamineConfig', {
"autoPassTime": this.data.autoPassTime,
"configType": this.data.configType,
"id": this.data.id
}).then((res) =>{
if (res.data.code === '0') {
this.$message({message: '保存成功~',type: 'success'});
this.getData()
}
}).catch(function (eMsg) {})
},
showAlert: function (cont) {
this.$alert(cont, '温馨提示', {
confirmButtonText: '确定'
......@@ -64,7 +81,7 @@ export default {
margin: auto;
text-align: center;
padding: 40px 0;
.inputStyle{width: 40px;margin: 0 10px;}
.inputStyle{width: 50px;margin: 0 10px;}
}
}
</style>
\ No newline at end of file
src/components/page/vehicle/vehicleAudit.vue
......@@ -5,17 +5,17 @@
<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="id" label="业主联系方式"></el-table-column>
<el-table-column prop="allocateName" label="业主住所"></el-table-column>
<el-table-column prop="allocateTime" label="访客姓名"></el-table-column>
<el-table-column prop="setTime" label="访客手机号" ></el-table-column>
<el-table-column prop="actualTime" label="访客车牌号" ></el-table-column>
<el-table-column prop="actualTime" label="预计到访时间" ></el-table-column>
<el-table-column prop="ownerName" label="业主姓名"></el-table-column>
<el-table-column prop="ownerContact" label="业主联系方式"></el-table-column>
<el-table-column prop="ownerAddress" label="业主住所"></el-table-column>
<el-table-column prop="guestName" label="访客姓名"></el-table-column>
<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">
<span class="line pointer">同意</span>
<span class="line ml10 pointer">拒绝</span>
<span class="line pointer" @click="auditBtn(1,scope.row.id)">同意</span>
<span class="line ml10 pointer" @click="auditBtn(0,scope.row.id)">拒绝</span>
</template>
</el-table-column>
</el-table>
......@@ -34,25 +34,46 @@
<script>
export default {
data: () => ({
loading: false,
searchForm:{
},
loading: true,
searchForm:{},
data:{
page: '1',
list:[
{
name: '监控摄像001',
id: 'MZ902',
type: '监控设备'
}
]
list:[]
},
size: '10',
}),
created () {
this.height = (document.documentElement.clientHeight - 120 ) + 'px'
this.getData()
},
methods: {
getData(){
this.$axios.post('/deviceVehicle/findExamine',{
p: this.data.page,
c: this.size,
applyEndTime: "",
applyStartTime: "",
guestCarNumber: "",
ownerName: "",
}).then((res) =>{
if(res.data.code === '0') {
this.data = res.data.data
this.loading = false
}
})
},
// 同意/拒绝
auditBtn (type,id) {
this.$axios.post('/deviceVehicle/handleEmamine',{
"id": id,
"status": type
}).then((res) =>{
if(res.data.code === '0') {
this.getData()
this.$message({message: '操作成功~',type: 'success'});
}
})
},
handleSizeChange (val) {
this.size = val
this.getData()
......
src/components/page/vehicle/vehicleRecords.vue
......@@ -62,7 +62,7 @@
<script>
export default {
data: () => ({
loading: false,
loading: true,
searchForm:{
},
data:{
......
src/router/index.js
......@@ -59,7 +59,7 @@ export default new Router({
require(['../components/page/equipment/attribute.vue'], resolve),
},
{
path: '/equipment/events/:id/:name/:site/:status',
path: '/equipment/events/:iotId/:name/:site/:status',
name: 'equipmentEvents',
meta: {
pageName: '操作事件'
......
static/css/main.less
......@@ -339,7 +339,7 @@ background-color:#bbb!important;
.el-switch__core{width: 36px!important;height: 10px!important;}
.el-switch__core:after{top: -4px!important;left: -1px!important;box-shadow: 0px 2px 4px rgba(159, 168, 180, 0.6);}
.el-switch.is-checked .el-switch__core::after{margin-left: 20px!important;}
.setDiv .el-input__inner{height: 18px!important;}
.setDiv .el-input__inner{height: 24px!important;padding: 0!important;text-align: center;}
.el-button--primary{
color: #fff!important;
background-color: #DF9F01!important;
......
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