Skip to content

html / jinmao-community-platform

Go to a project
Commit 4ddfef64 by changjin
Options

修改bug

parent f66066f0
Showing with 168 additions and 95 deletions
src/components/common/Header.vue
......@@ -3,7 +3,7 @@
<div class="header">
<div class="logo">智慧社区后台管理系统</div>
<div class="user-info">
<el-dropdown :hide-on-click="false" class="projectStyle">
<el-dropdown :hide-on-click="false" class="projectStyle" trigger="click">
<span class="el-dropdown-link">
{{data.projectName}}
<i class="el-icon-sort"></i>
......@@ -63,26 +63,29 @@
<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-dialog title="操作手册" :visible.sync="dialogVisible1" :close-on-click-modal="false" width="38%">
<el-row class="border">
<el-col :span="4">
<img class="icon" src="../../../static/img/icon-doc.png">
</el-col>
<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 :span="8">
<el-button @click="download(0)" class="right mt10">下载</el-button>
</el-col>
</el-row>
<el-row class="mt20">
<el-row class="border mt20">
<el-col :span="4">
<img class="icon" src="../../../static/img/icon-ppt.png">
</el-col>
<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 :span="8">
<el-button @click="download(1)" 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-row><br>
</el-dialog>
</div>
</template>
......@@ -302,4 +305,11 @@ export default {
.el-breadcrumb__item{
font-size: 12px;
}
.border{
border: 1px solid #E9EFF3;
box-sizing: border-box;
border-radius: 4px;
padding: 16px 20px;
}
.icon{width: 44px;height: 44px;}
</style>
src/components/common/Home.vue
<template>
<div class="wrapper">
<v-head></v-head>
<v-sidebar></v-sidebar>
<v-sidebar v-if="isRouterAlive"></v-sidebar>
<div class="content" v-if="pageNameList[1].pageName !== '外部系统管理' && pageNameList[1].pageName !== '首页'">
<transition name="move" mode="out-in"><router-view v-if="isRouterAlive"></router-view></transition>
</div>
......
src/components/common/Sidebar.vue
......@@ -205,32 +205,57 @@ export default {
}
},
created () {
this.getData()
},
update (){
this.getData()
this.projectId = window.sessionStorage.getItem('projectId')
this.getData(this.projectId)
},
// update (){
// this.projectId = window.sessionStorage.getItem('projectId')
// this.getData(this.projectId)
// },
methods: {
getData () {
getData (projectId) {
let that = this
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
if(res.data.code === '0') {
this.items = res.data.data.menuResponseList
if (that.items.length > 0) {
that.items.forEach(function (info, index) {
if (that.pageNameList[1].pageName === info.name) {
that.changeMenu(info)
}
})
} else {
this.$alert('您暂无任何权限，请联系管理员', '温馨提示', {
type: 'warning',
confirmButtonText: ''
})
if (projectId) {
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + projectId).then((res) =>{
if(res.data.code === '0') {
this.items = res.data.data.menuResponseList
if (that.items.length > 0) {
that.items.forEach(function (info, index) {
if (that.pageNameList[1].pageName === info.name) {
that.changeMenu(info)
}
})
} else {
this.$alert('您暂无任何权限，请联系管理员', '温馨提示', {
type: 'warning',
confirmButtonText: ''
})
this.$router.push('/index')
}
window.sessionStorage.setItem('projectId',res.data.data.projectId)
}
window.sessionStorage.setItem('projectId',res.data.data.projectId)
}
})
})
} else {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
if(res.data.code === '0') {
this.items = res.data.data.menuResponseList
if (that.items.length > 0) {
that.items.forEach(function (info, index) {
if (that.pageNameList[1].pageName === info.name) {
that.changeMenu(info)
}
})
} else {
this.$alert('您暂无任何权限，请联系管理员', '温馨提示', {
type: 'warning',
confirmButtonText: ''
})
this.$router.push('/index')
}
window.sessionStorage.setItem('projectId',res.data.data.projectId)
}
})
}
},
changeMenu (menu, type) {
if (type && menu) {
......
src/components/page/equipment/deviceAlert.vue
......@@ -41,10 +41,10 @@
<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>
<p>较上月比较<b class="ml10" :class="{'red': data.lastDayStatus == 'up' || data.lastDayStatus == 'level','green': data.lastDayStatus == 'down'}"><i class="downIcon" v-if="data.lastDayStatus == 'down'"></i><i class="upIcon" v-if="data.lastDayStatus == 'up'"></i>{{data.compareToLastMonth}}</b></p>
</el-col>
<el-col :span="6" class="text-center">
<p>较前日比较<b class="ml10" :class="{'red': data.lastMonthStstus == 'down' || data.lastMonthStstus == 'level','green': data.lastMonthStstus == 'up'}"><i class="downIcon" v-if="data.lastMonthStstus !== 'level'"></i>{{data.compareToLastDay}}</b></p>
<p>较前日比较<b class="ml10" :class="{'red': data.lastMonthStstus == 'up' || data.lastMonthStstus == 'level','green': data.lastMonthStstus == 'down'}"><i class="downIcon" v-if="data.lastMonthStstus == 'down'"></i><i class="upIcon" v-if="data.lastMonthStstus == 'up'"></i>{{data.compareToLastDay}}</b></p>
</el-col>
</el-row>
</div>
......@@ -57,9 +57,18 @@
<el-table :data="data.pageList.list" v-loading="loading">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="deviceName" label="设备名称"></el-table-column>
<el-table-column prop="warnDeviceType" label="设备类型"></el-table-column>
<el-table-column prop="warnDeviceType" label="设备类型">
<template slot-scope="scope">
<span v-if="scope.row.warnDeviceType === 'PERIMETER'">周界设备</span>
</template>
</el-table-column>
<el-table-column prop="deviceLocation" label="所在位置"></el-table-column>
<el-table-column prop="warnState" label="报警类型" ></el-table-column>
<el-table-column prop="warnState" label="报警类型" >
<template slot-scope="scope">
<span v-if="scope.row.warnState === 'INVADE'">入侵</span>
<span v-if="scope.row.warnState === 'FIRE'">火警</span>
</template>
</el-table-column>
<el-table-column prop="iotInfo" label="报警内容" ></el-table-column>
<el-table-column prop="createTime" label="报警时间" ></el-table-column>
</el-table>
......@@ -94,9 +103,18 @@
<el-table :data="data.pageList.list" v-loading="loading">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="deviceName" label="设备名称"></el-table-column>
<el-table-column prop="warnDeviceType" label="设备类型"></el-table-column>
<el-table-column prop="warnDeviceType" label="设备类型">
<template slot-scope="scope">
<span v-if="scope.row.warnDeviceType === 'PERIMETER'">周界设备</span>
</template>
</el-table-column>
<el-table-column prop="deviceLocation" label="所在位置"></el-table-column>
<el-table-column prop="warnState" label="报警类型" ></el-table-column>
<el-table-column prop="warnState" label="报警类型">
<template slot-scope="scope">
<span v-if="scope.row.warnState === 'INVADE'">入侵</span>
<span v-if="scope.row.warnState === 'FIRE'">火警</span>
</template>
</el-table-column>
<el-table-column prop="iotInfo" label="报警内容" ></el-table-column>
<el-table-column prop="createTime" label="报警时间" ></el-table-column>
</el-table>
......@@ -174,6 +192,10 @@ export default {
} else {
this.dateType = 'currentDay'
}
this.searchForm = {
groupId: '',
warnState: ''
}
this.data.pageList.page = 1
this.getData()
},
......
src/components/page/equipment/list.vue
......@@ -115,8 +115,8 @@ export default {
height: 0,
}),
created () {
// this.projectId = window.sessionStorage.getItem('projectId')
this.projectId = 'beijing61'
this.projectId = window.sessionStorage.getItem('projectId')
// this.projectId = 'beijing61'
this.getPermissionsBtn()
this.getTypeList(this.projectId)
this.getData()
......@@ -124,15 +124,15 @@ export default {
},
methods: {
getPermissionsBtn () {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + this.projectId).then((res) =>{
if(res.data.code === '0') {
res.data.data.menuResponseList.forEach(item=>{
item.childrenList.forEach(info=>{
info.childrenList.forEach(btn=>{
if(btn.id === '1003-03-001-001') {
if(btn.menuFlag === '1003-03-001-001') {
this.isAttribute= true
}
if (btn.id === '1003-03-001-002') {
if (btn.menuFlag === '1003-03-001-002') {
this.isEvents = true
}
})
......
src/components/page/index/externalSystem.vue
......@@ -15,7 +15,7 @@
</div>
</div>
<el-dialog :title="title" :visible.sync="dialogVisible" width="35%">
<el-row class="searchBox">
<el-row class="">
<el-form label-width="100px" :model="dataForm">
<el-col :span="18" :offset="1">
<el-form-item label="系统名称" required>
......
src/components/page/system/project.vue
......@@ -115,24 +115,25 @@ export default {
isDelBtn: false
}),
created () {
this.projectId = window.sessionStorage.getItem('projectId')
this.getData()
this.getPermissionsBtn()
this.height = (document.documentElement.clientHeight - 200 ) + 'px'
},
methods: {
getPermissionsBtn () {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + this.projectId).then((res) =>{
if(res.data.code === '0') {
res.data.data.menuResponseList.forEach(item=>{
item.childrenList.forEach(info=>{
info.childrenList.forEach(btn=>{
if(btn.id === '1003-01-001-003') {
if(btn.menuFlag === '1003-01-001-003') {
this.isDelBtn = true
}
if (btn.id === '1003-01-001-002') {
if (btn.menuFlag === '1003-01-001-002') {
this.isEditBtn = true
}
if (btn.id === '1003-01-001-001') {
if (btn.menuFlag === '1003-01-001-001') {
this.isAddBtn = true
}
})
......
src/components/page/system/roleList.vue
......@@ -74,21 +74,21 @@ export default {
},
methods: {
getPermissionsBtn () {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + this.projectId).then((res) =>{
if(res.data.code === '0') {
res.data.data.menuResponseList.forEach(item=>{
item.childrenList.forEach(info=>{
info.childrenList.forEach(btn=>{
if(btn.id === '1003-01-002-003') {
if(btn.menuFlag === '1003-01-002-003') {
this.isDelBtn = true
}
if (btn.id === '1003-01-002-002') {
if (btn.menuFlag === '1003-01-002-002') {
this.isEditBtn = true
}
if (btn.id === '1003-01-002-001') {
if (btn.menuFlag === '1003-01-002-001') {
this.isAddBtn = true
}
if (btn.id === '1003-01-002-006') {
if (btn.menuFlag === '1003-01-002-006') {
this.isUpdateStatusBtn = true
}
})
......
src/components/page/system/userList.vue
......@@ -3,8 +3,8 @@
<div class="mainContent">
<div class="searchBox">
<el-row>
<el-form label-width="70px" :model="searchForm">
<el-col :span="5">
<el-form label-width="60px" :model="searchForm">
<el-col :span="5" style="margin-left: -10px;">
<el-form-item label="角色">
<el-select v-model="searchForm.roleId" placeholder="请选择">
<el-option value="" label="全部">全部</el-option>
......@@ -114,24 +114,24 @@ export default {
},
methods: {
getPermissionsBtn () {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + this.projectId).then((res) =>{
if(res.data.code === '0') {
res.data.data.menuResponseList.forEach(item=>{
item.childrenList.forEach(info=>{
info.childrenList.forEach(btn=>{
if(btn.id === '1003-01-003-003') {
if(btn.menuFlag === '1003-01-003-003') {
this.isDelBtn = true
}
if (btn.id === '1003-01-003-002') {
if (btn.menuFlag === '1003-01-003-002') {
this.isEditBtn = true
}
if (btn.id === '1003-01-003-001') {
if (btn.menuFlag === '1003-01-003-001') {
this.isAddBtn = true
}
if (btn.id === '1003-01-003-006') {
if (btn.menuFlag === '1003-01-003-006') {
this.isUpdateStatusBtn = true
}
if (btn.id === '1003-01-003-007') {
if (btn.menuFlag === '1003-01-003-007') {
this.isUpdatePwd = true
}
})
......
src/components/page/vehicle/auditSet.vue
......@@ -16,7 +16,7 @@
<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.autoPassTime" class="inputStyle"></el-input>分钟，自动审核通过</span>
<span class="font12 gray"><div class="left ml10" style="margin-top: 2px;">超过</div><el-input v-model="data.autoPassTime" class="inputStyle left"></el-input>分钟，自动审核通过</span>
</el-col>
</el-row>
<el-row class="mt30 text-center">
......@@ -33,18 +33,19 @@ export default {
isSaveBtn: false
}),
created () {
this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 150 ) + 'px'
this.getPermissionsBtn()
this.getData()
},
methods: {
getPermissionsBtn () {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + this.projectId).then((res) =>{
if(res.data.code === '0') {
res.data.data.menuResponseList.forEach(item=>{
item.childrenList.forEach(info=>{
info.childrenList.forEach(btn=>{
if(btn.id === '1003-04-004-001') {
if(btn.menuFlag === '1003-04-004-001') {
this.isSaveBtn = true
}
})
......@@ -98,7 +99,7 @@ export default {
margin: auto;
text-align: center;
padding: 40px 0;
.inputStyle{width: 50px;margin: 0 10px;}
.inputStyle{width: 50px;margin: 0 10px;margin-top: -5px;}
}
}
</style>
\ No newline at end of file
src/components/page/vehicle/faceAudit.vue
......@@ -22,26 +22,35 @@
<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="ownerContact" 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="ideatity" label="人员类型"></el-table-column>
<el-table-column prop="identity" label="人员类型">
<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>
</el-table-column>
<el-table-column prop="facePhotoUrl" label="人脸照片">
<template slot-scope="scope">
<img @click="bigimg(scope.row.facePhotoUrl)" :src="scope.row.facePhotoUrl" style="width:60px;height: 60px;margin-top: 8px;">
</template>
</el-table-column>
<el-table-column prop="commitTime" label="提交时间"></el-table-column>
<el-table-column prop="status" label="状态">
<el-table-column prop="createTime" label="提交时间"></el-table-column>
<el-table-column prop="examineStatus" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.status == 0">禁用</span>
<span v-if="scope.row.status == 1">启用</span>
<span v-if="!scope.row.examineStatus" class="red">已禁用</span>
<span v-if="scope.row.examineStatus" class="green">已启用</span>
</template>
</el-table-column>
<el-table-column prop="actualAtTime" label="操作" v-if="isSetBtn">
<el-table-column label="操作" v-if="isSetBtn">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
v-model="scope.row.examineStatus"
active-color="#DF9F01"
inactive-color="#929EAC" @change="changeStatus(scope.row)">
</el-switch>
......@@ -69,8 +78,7 @@
export default {
data: () => ({
loading: true,
searchForm:{
},
searchForm:{},
data:{
page: '1',
list:[]
......@@ -81,18 +89,19 @@ export default {
photoUrl: ''
}),
created () {
this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 210 ) + 'px'
this.getPermissionsBtn()
this.getData()
},
methods: {
getPermissionsBtn () {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + this.projectId).then((res) =>{
if(res.data.code === '0') {
res.data.data.menuResponseList.forEach(item=>{
item.childrenList.forEach(info=>{
info.childrenList.forEach(btn=>{
if(btn.id === '1003-04-000-002') {
if(btn.menuFlag === '1003-04-000-002') {
this.isSetBtn = true
}
})
......@@ -110,10 +119,10 @@ export default {
if(res.data.code === '0') {
this.data = res.data.data
res.data.data.list.forEach(item => {
if (item.status == '0') {
item.status = false
if (item.examineStatus == 'NO') {
item.examineStatus = false
} else {
item.status = true
item.examineStatus = true
}
})
this.loading = false
......@@ -127,7 +136,7 @@ export default {
// 修改状态
changeStatus (item) {
this.$axios.post('/deviceVehicle/handleFaceEmamine',{
status: item.status ? '1' : '0',
status: item.examineStatus ? '1' : '0',
id: item.id
}).then((res) =>{
if(res.data.code === '0') {
......
src/components/page/vehicle/vehicleAudit.vue
......@@ -45,21 +45,22 @@ export default {
isAgreeBtn: false
}),
created () {
this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 120 ) + 'px'
this.getPermissionsBtn()
this.getData()
},
methods: {
getPermissionsBtn () {
this.$axios.get('/baseInfo/initPersonalMenu').then((res) =>{
this.$axios.get('/baseInfo/initPersonalMenu?projectId=' + this.projectId).then((res) =>{
if(res.data.code === '0') {
res.data.data.menuResponseList.forEach(item=>{
item.childrenList.forEach(info=>{
info.childrenList.forEach(btn=>{
if(btn.id === '1003-04-001-001') {
if(btn.menuFlag === '1003-04-001-001') {
this.isAgreeBtn = true
}
if(btn.id === '1003-04-001-002') {
if(btn.menuFlag === '1003-04-001-002') {
this.isRefuseBtn = true
}
})
......
src/main.js
......@@ -62,12 +62,12 @@ axios.interceptors.response.use(function (response) {
}else {
let errMsg = err.response ? err.response.data.msg : err.message;
if (errMsg !== '' && errMsg !== null) {
Message({
message: errMsg,
type: 'error',
duration: 3 * 1000,
dangerouslyUseHTMLString: false
});
// Message({
// message: errMsg,
// type: 'error',
// duration: 3 * 1000,
// dangerouslyUseHTMLString: false
// });
}
return Promise.reject(err);
}
......
static/css/main.less
......@@ -254,7 +254,7 @@ a{color: #455467;text-decoration: none;}
font-size: 18px!important;
margin-top: -2px!important;
}
.el-dialog__body{padding: 20px}
.el-dialog__body{padding: 20px;color: #596A7E!important;}
.el-dialog__footer{padding: 20px 20px 20px;text-align: center;border-top: 1px solid #E9EFF3;}
::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色，还可以设置边框属性
background-color:#f8f8f8;
......@@ -316,6 +316,9 @@ background-color:#bbb!important;
.el-form-item{
margin-bottom: 10px!important;
}
.searchBox .el-form-item{
margin-bottom: 0px!important;
}
.inlineBlock{
display:inline-block!important;
}
......@@ -339,7 +342,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: 24px!important;padding: 0!important;text-align: center;}
.setDiv .el-input__inner{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