Skip to content

html / jinmao-community-platform

Go to a project
Commit 48296060 by changjin
Options

修改适配问题

parent 5a326abd
Showing with 85 additions and 120 deletions
index.html
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>智慧社区后台管理系统</title> <title>智慧社区后台管理系统</title>
<!-- <link rel="shortcut icon" href="../static/img/logo.ico"/> --> <!-- <link rel="shortcut icon" href="../static/img/logo.ico"/> -->
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="static/css/IE.css" />
<![endif]-->
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"> <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
</head> </head>
<body> <body>
......
src/components/common/Header.vue
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
this.data.projectName = item.projectName this.data.projectName = item.projectName
this.getData(item.id) this.getData(item.id)
window.sessionStorage.setItem('projectId',item.id) window.sessionStorage.setItem('projectId',item.id)
window.location.reload()
}, },
// 退出登录 // 退出登录
loginout () { loginout () {
......
src/components/page/equipment/attribute.vue
<template> <template>
<div class="mainContent"> <div class="mainContent" :style="{ height: height}">
<div class="tabCont clear"> <div class="tabCont clear">
<p class="font16">{{data.nickname}}<el-button @click="goBack()" class="right">返回</el-button></p> <p class="font16">{{data.nickname}}<el-button @click="goBack()" class="right">返回</el-button></p>
<div class="table font14 mt20"> <div class="table font14 mt20">
...@@ -47,6 +46,7 @@ export default { ...@@ -47,6 +46,7 @@ export default {
}), }),
created () { created () {
this.getData() this.getData()
this.height = (document.documentElement.clientHeight - 150 ) + 'px'
}, },
methods: { methods: {
getData () { getData () {
......
src/components/page/equipment/deviceAlert.vue
...@@ -41,40 +41,40 @@ ...@@ -41,40 +41,40 @@
<div class="infoBox"> <div class="infoBox">
<el-row> <el-row>
<el-col :span="6" class="text-center rightLine"> <el-col :span="6" class="text-center rightLine">
<p>当月报警总数<b class="ml10">10000</b></p> <p>当月报警总数<b class="ml10">{{data.currentDayAlarmCount}}</b></p>
</el-col> </el-col>
<el-col :span="6" class="text-center rightLine"> <el-col :span="6" class="text-center rightLine">
<p>当日报警数量<b class="ml10">10000</b></p> <p>当日报警数量<b class="ml10">{{data.currentMonthAlarmCount}}</b></p>
</el-col> </el-col>
<el-col :span="6" class="text-center rightLine"> <el-col :span="6" class="text-center rightLine">
<p>较上月比较<b class="ml10 red"><i class="upIcon"></i>20%</b></p> <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>
</el-col> </el-col>
<el-col :span="6" class="text-center"> <el-col :span="6" class="text-center">
<p>较前日比较<b class="ml10 green"><i class="downIcon"></i>40%</b></p> <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>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<div class="title">报警列表</div> <div class="title">报警列表</div>
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="当日报警" name="first"> <el-tab-pane label="当日报警" name="first">
<el-table :data="data.list" v-loading="loading"> <el-table :data="data.pageList.list" v-loading="loading">
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="customerName" label="设备名称"></el-table-column> <el-table-column prop="deviceName" label="设备名称"></el-table-column>
<el-table-column prop="allocateName" label="设备类型"></el-table-column> <el-table-column prop="warnDeviceType" label="设备类型"></el-table-column>
<el-table-column prop="allocateTime" label="所在位置"></el-table-column> <el-table-column prop="deviceLocation" label="所在位置"></el-table-column>
<el-table-column prop="setTime" label="报警类型" ></el-table-column> <el-table-column prop="warnState" label="报警类型" ></el-table-column>
<el-table-column prop="setTime" label="报警内容" ></el-table-column> <el-table-column prop="iotInfo" label="报警内容" ></el-table-column>
<el-table-column prop="actualTime" label="报警时间" ></el-table-column> <el-table-column prop="createTime" label="报警时间" ></el-table-column>
</el-table> </el-table>
<div class="block text-right mt20" v-if="data.page && data.count > 0"> <div class="block text-right mt20" v-if="data.pageList.page && data.pageList.count > 0">
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="data.count"> :total="data.pageList.count">
</el-pagination> </el-pagination>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -85,33 +85,33 @@ ...@@ -85,33 +85,33 @@
<el-form-item label="报警时间"> <el-form-item label="报警时间">
<el-date-picker <el-date-picker
v-model="searchForm.date" v-model="searchForm.date"
type="datetimerange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :offset="1"> <el-col :span="8">
<el-button class="mt5" @click="getData()">查询</el-button> <el-button class="mt5" @click="getData()">查询</el-button>
</el-col> </el-col>
</el-form> </el-form>
</el-row> </el-row>
<el-table :data="data.list" v-loading="loading"> <el-table :data="data.pageList.list" v-loading="loading">
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="customerName" label="设备名称"></el-table-column> <el-table-column prop="deviceName" label="设备名称"></el-table-column>
<el-table-column prop="allocateName" label="设备类型"></el-table-column> <el-table-column prop="warnDeviceType" label="设备类型"></el-table-column>
<el-table-column prop="allocateTime" label="所在位置"></el-table-column> <el-table-column prop="deviceLocation" label="所在位置"></el-table-column>
<el-table-column prop="setTime" label="报警类型" ></el-table-column> <el-table-column prop="warnState" label="报警类型" ></el-table-column>
<el-table-column prop="setTime" label="报警内容" ></el-table-column> <el-table-column prop="iotInfo" label="报警内容" ></el-table-column>
<el-table-column prop="actualTime" label="报警时间" ></el-table-column> <el-table-column prop="createTime" label="报警时间" ></el-table-column>
</el-table> </el-table>
<div class="block text-right mt20" v-if="data.page && data.count > 0"> <div class="block text-right mt20" v-if="data.pageList.page && data.pageList.count > 0">
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="data.count"> :total="data.pageList.count">
</el-pagination> </el-pagination>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -128,27 +128,35 @@ export default { ...@@ -128,27 +128,35 @@ export default {
activeName: 'first', activeName: 'first',
searchForm:{}, searchForm:{},
data:{ data:{
pageList:{
page: '1', page: '1',
list:[] list: []
}
}, },
dateType: 'currentDay',
size: '10', size: '10',
typeList: [] typeList: [],
height: 0,
}), }),
created () { created () {
this.projectId = window.sessionStorage.getItem('projectId') this.projectId = window.sessionStorage.getItem('projectId')
this.projectId = 'beijing' this.projectId = 'beijing'
this.height = (document.documentElement.clientHeight - 270 ) + 'px'
this.getTypeList(this.projectId) this.getTypeList(this.projectId)
this.getData() this.getData()
}, },
methods: { methods: {
getData(){ getData(){
this.$axios.post('/deviceVehicle/findAlarmList',{ this.$axios.post('/deviceVehicle/findAlarmList',{
p: this.data.page, p: this.data.pageList.page,
c: this.size, c: this.size,
groupId: this.searchForm.groupId, groupId: this.searchForm.groupId,
deviceName: this.searchForm.deviceName, deviceName: this.searchForm.deviceName,
warnState: this.searchForm.warnState, warnState: this.searchForm.warnState,
projectId: this.projectId, projectId: this.projectId,
dateType: this.dateType,
historyBeginTime: this.searchForm.date ? moment(new Date(this.searchForm.date[0]).getTime()).format('YYYY-MM-DD') : null,
historyEndTime: this.searchForm.date ? moment(new Date(this.searchForm.date[1]).getTime()).format('YYYY-MM-DD') : null
}).then((res) =>{ }).then((res) =>{
if(res.data.code === '0') { if(res.data.code === '0') {
this.data = res.data.data this.data = res.data.data
...@@ -164,7 +172,12 @@ export default { ...@@ -164,7 +172,12 @@ export default {
}) })
}, },
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event); if(tab.label === '历史报警') {
this.dateType = 'history'
} else {
this.dateType = 'currentDay'
}
this.getData()
}, },
handleSizeChange (val) { handleSizeChange (val) {
this.size = val this.size = val
...@@ -187,9 +200,6 @@ export default { ...@@ -187,9 +200,6 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 44px);
}
.infoBox b i{width:20px;height: 20px;display: inline-block;position: relative;top: 3px;} .infoBox b i{width:20px;height: 20px;display: inline-block;position: relative;top: 3px;}
.upIcon{background: url(../../../../static/img/up.png) no-repeat;background-size: 100%;} .upIcon{background: url(../../../../static/img/up.png) no-repeat;background-size: 100%;}
.downIcon{background: url(../../../../static/img/down.png) no-repeat;background-size: 100%;} .downIcon{background: url(../../../../static/img/down.png) no-repeat;background-size: 100%;}
......
src/components/page/equipment/events.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-form-item label="操作时间"> <el-form-item label="操作时间">
<el-date-picker <el-date-picker
v-model="searchForm.date" v-model="searchForm.date"
type="datetimerange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<div class="title">{{deviceName}}操作记录</div> <div class="title">{{deviceName}}操作记录</div>
<el-table :data="data.list" v-loading="loading"> <el-table :data="data.list" v-loading="loading">
...@@ -74,13 +74,15 @@ export default { ...@@ -74,13 +74,15 @@ export default {
size: '10', size: '10',
deviceName: '', deviceName: '',
status: '', status: '',
site: '' site: '',
height: 0,
}), }),
created () { created () {
this.getData() this.getData()
this.deviceName = this.$route.params.name this.deviceName = this.$route.params.name
this.site = this.$route.params.site this.site = this.$route.params.site
this.status = this.$route.params.status this.status = this.$route.params.status
this.height = (document.documentElement.clientHeight - 270 ) + 'px'
}, },
methods: { methods: {
getData () { getData () {
...@@ -88,8 +90,8 @@ export default { ...@@ -88,8 +90,8 @@ export default {
p: this.data.page, p: this.data.page,
c: this.size, c: this.size,
iotId: this.$route.params.iotId, iotId: this.$route.params.iotId,
beginTime: this.searchForm.date ? moment(new Date(this.searchForm.date[0]).getTime()).format('YYYY-MM-DD' + ' 00:00:00') : null, beginTime: this.searchForm.date ? moment(new Date(this.searchForm.date[0]).getTime()).format('YYYY-MM-DD') : null,
endTime: this.searchForm.date ? moment(new Date(this.searchForm.date[1]).getTime()).format('YYYY-MM-DD' + ' 23:59:59') : null endTime: this.searchForm.date ? moment(new Date(this.searchForm.date[1]).getTime()).format('YYYY-MM-DD') : null
}).then((res) =>{ }).then((res) =>{
if(res.data.code === '0') { if(res.data.code === '0') {
this.data = res.data.data this.data = res.data.data
...@@ -117,7 +119,4 @@ export default { ...@@ -117,7 +119,4 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 50px);
}
</style> </style>
\ No newline at end of file
src/components/page/equipment/list.vue
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="160">
<template slot-scope="scope" v-if="isAttribute || isEvents"> <template slot-scope="scope" v-if="isAttribute || isEvents">
<router-link v-if="isAttribute" :to="'/equipment/attribute/' + scope.row.iotId" class="line">属性</router-link> <router-link v-if="isAttribute" :to="'/equipment/attribute/' + scope.row.iotId" class="line">属性</router-link>
<router-link v-if="isEvents" :to="'/equipment/events/' + scope.row.iotId + '/' + scope.row.deviceName + '/' +scope.row.site+ '/' + scope.row.status " class="line ml10">事件</router-link> <router-link v-if="isEvents" :to="'/equipment/events/' + scope.row.iotId + '/' + scope.row.nickname + '/' +scope.row.site+ '/' + scope.row.status " class="line ml10">事件</router-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/components/page/index/externalSystem.vue
<template> <template>
<div class="mainContent"> <div class="mainContent" :style="{ height: height}">
<div class="btnBox"> <div class="btnBox">
<el-button class="addBtn" @click="addBtn(0)"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button> <el-button class="addBtn" @click="addBtn(0)"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button>
</div> </div>
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
}), }),
created () { created () {
this.getData() this.getData()
this.height = (document.documentElement.clientHeight - 150 ) + 'px'
}, },
computed: { computed: {
headers(){ headers(){
...@@ -189,9 +190,6 @@ ...@@ -189,9 +190,6 @@
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.mainContent{
height: calc(100vh - 25px);
}
.btnBox{border-bottom: 1px solid #E9EFF3;margin-left: -15px;margin-right: -15px;padding:0 15px 15px 15px;} .btnBox{border-bottom: 1px solid #E9EFF3;margin-left: -15px;margin-right: -15px;padding:0 15px 15px 15px;}
.addBtn{padding: 6px 20px!important;} .addBtn{padding: 6px 20px!important;}
.addBtn span{position: relative;top: 1px;} .addBtn span{position: relative;top: 1px;}
......
src/components/page/system/log.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<div class="title">日志列表</div> <div class="title">日志列表</div>
<el-table :data="data.list" v-loading="loading"> <el-table :data="data.list" v-loading="loading">
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
created () { created () {
this.projectId = window.sessionStorage.getItem('projectId') this.projectId = window.sessionStorage.getItem('projectId')
this.getData() this.getData()
this.height = (document.documentElement.clientHeight - 200 ) + 'px'
}, },
methods: { methods: {
getData () { getData () {
...@@ -80,8 +81,8 @@ export default { ...@@ -80,8 +81,8 @@ export default {
c: this.size, c: this.size,
projectId: this.projectId, projectId: this.projectId,
logType: this.searchForm.logType, logType: this.searchForm.logType,
startLogTime: this.searchForm.date ? moment(new Date(this.searchForm.date[0]).getTime()).format('YYYY-MM-DD' + ' 00:00:00') : null, startLogTime: this.searchForm.date ? moment(new Date(this.searchForm.date[0]).getTime()).format('YYYY-MM-DD') : null,
endLogTime: this.searchForm.date ? moment(new Date(this.searchForm.date[1]).getTime()).format('YYYY-MM-DD' + ' 23:59:59') : null endLogTime: this.searchForm.date ? moment(new Date(this.searchForm.date[1]).getTime()).format('YYYY-MM-DD') : null
}).then((res) =>{ }).then((res) =>{
if(res.data.code === '0') { if(res.data.code === '0') {
this.data = res.data.data this.data = res.data.data
...@@ -101,8 +102,5 @@ export default { ...@@ -101,8 +102,5 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 33px);
}
.el-form-item{margin-bottom: 0!important;} .el-form-item{margin-bottom: 0!important;}
</style> </style>
\ No newline at end of file
src/components/page/system/project.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<el-button class="addBtn" v-if="isAddBtn" @click="addBtn(0)"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button> <el-button class="addBtn" v-if="isAddBtn" @click="addBtn(0)"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button>
<el-table :data="data.list" v-loading="loading"> <el-table :data="data.list" v-loading="loading">
...@@ -117,6 +117,7 @@ export default { ...@@ -117,6 +117,7 @@ export default {
created () { created () {
this.getData() this.getData()
this.getPermissionsBtn() this.getPermissionsBtn()
this.height = (document.documentElement.clientHeight - 200 ) + 'px'
}, },
methods: { methods: {
getPermissionsBtn () { getPermissionsBtn () {
...@@ -263,9 +264,6 @@ export default { ...@@ -263,9 +264,6 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 33px);
}
.el-form-item{margin-bottom: 0!important;} .el-form-item{margin-bottom: 0!important;}
.addBtn{padding: 6px 20px!important;margin: 15px;} .addBtn{padding: 6px 20px!important;margin: 15px;}
.addBtn span{position: relative;top: 1px;} .addBtn span{position: relative;top: 1px;}
......
src/components/page/system/roleAdd.vue
<template> <template>
<div class="mainContent"> <div class="mainContent" :style="{ height: height}">
<div class="title" v-if="roleId == '0'">新增角色</div> <div class="title" v-if="roleId == '0'">新增角色</div>
<div class="title" v-if="roleId !== '0'">修改角色</div> <div class="title" v-if="roleId !== '0'">修改角色</div>
<el-row class="mt10"> <el-row class="mt10">
...@@ -64,6 +64,7 @@ export default { ...@@ -64,6 +64,7 @@ export default {
created () { created () {
this.roleId = this.$route.params.id this.roleId = this.$route.params.id
this.projectId = window.sessionStorage.getItem('projectId') this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 150 ) + 'px'
this.getMenuList() this.getMenuList()
if (this.roleId !== '0') { if (this.roleId !== '0') {
this.getData() this.getData()
...@@ -157,9 +158,6 @@ export default { ...@@ -157,9 +158,6 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.mainContent{
height: calc(100vh - 25px);
}
.title{padding: 0 15px 15px 15px;border-bottom:1px solid #E9EFF3;margin-left: -15px;margin-right: -15px;} .title{padding: 0 15px 15px 15px;border-bottom:1px solid #E9EFF3;margin-left: -15px;margin-right: -15px;}
.menuList{ .menuList{
.menu{ .menu{
......
src/components/page/system/roleList.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<el-button class="addBtn" @click="addBtn(0)" v-if="isAddBtn"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button> <el-button class="addBtn" @click="addBtn(0)" v-if="isAddBtn"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button>
<el-table :data="data.list" v-loading="loading"> <el-table :data="data.list" v-loading="loading">
...@@ -67,6 +67,7 @@ export default { ...@@ -67,6 +67,7 @@ export default {
}), }),
created () { created () {
this.projectId = window.sessionStorage.getItem('projectId') this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 200 ) + 'px'
this.getData() this.getData()
this.getPermissionsBtn() this.getPermissionsBtn()
}, },
...@@ -162,9 +163,6 @@ export default { ...@@ -162,9 +163,6 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 33px);
}
.el-form-item{margin-bottom: 0!important;} .el-form-item{margin-bottom: 0!important;}
.addBtn{padding: 6px 20px!important;margin: 15px;} .addBtn{padding: 6px 20px!important;margin: 15px;}
.addBtn span{position: relative;top: 1px;} .addBtn span{position: relative;top: 1px;}
......
src/components/page/system/userAdd.vue
<template> <template>
<div class="mainContent"> <div class="mainContent" :style="{ height: height}">
<div class="title" v-if="userId == '0'">新增用户</div> <div class="title" v-if="userId == '0'">新增用户</div>
<div class="title" v-if="userId !== '0'">修改用户</div> <div class="title" v-if="userId !== '0'">修改用户</div>
<el-form label-width="80px" :model="data" class="mt10"> <el-form label-width="80px" :model="data" class="mt10">
...@@ -82,6 +82,7 @@ export default { ...@@ -82,6 +82,7 @@ export default {
created () { created () {
this.userId = this.$route.params.id this.userId = this.$route.params.id
this.projectId = window.sessionStorage.getItem('projectId') this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 150 ) + 'px'
this.getRoleList() this.getRoleList()
this.getProjectList() this.getProjectList()
if (this.userId !== '0') { if (this.userId !== '0') {
...@@ -195,9 +196,6 @@ export default { ...@@ -195,9 +196,6 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.mainContent{
height: calc(100vh - 25px);
}
.title{padding: 0 15px 15px 15px;border-bottom:1px solid #E9EFF3;margin-left: -15px;margin-right: -15px;} .title{padding: 0 15px 15px 15px;border-bottom:1px solid #E9EFF3;margin-left: -15px;margin-right: -15px;}
.border{border: 1px solid #E9EFF3;padding: 0 10px;border-radius: 5px;} .border{border: 1px solid #E9EFF3;padding: 0 10px;border-radius: 5px;}
</style> </style>
src/components/page/system/userList.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<el-button class="addBtn" @click="addBtn(0)" v-if="isAddBtn"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button> <el-button class="addBtn" @click="addBtn(0)" v-if="isAddBtn"><img src="../../../../static/img/add.png" class="addIcon"><span>新增</span></el-button>
<el-table :data="data.list" v-loading="loading"> <el-table :data="data.list" v-loading="loading">
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
}), }),
created () { created () {
this.projectId = window.sessionStorage.getItem('projectId') this.projectId = window.sessionStorage.getItem('projectId')
this.height = (document.documentElement.clientHeight - 200 ) + 'px'
this.getPermissionsBtn() this.getPermissionsBtn()
this.getData() this.getData()
this.getRoleList(this.projectId) this.getRoleList(this.projectId)
...@@ -229,9 +230,6 @@ export default { ...@@ -229,9 +230,6 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 33px);
}
.el-select{width: 150px;} .el-select{width: 150px;}
.el-form-item{margin-bottom: 0!important;} .el-form-item{margin-bottom: 0!important;}
.addBtn{padding: 6px 20px!important;margin: 15px;} .addBtn{padding: 6px 20px!important;margin: 15px;}
......
src/components/page/vehicle/auditRecords.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-form-item label="预计到访时间"> <el-form-item label="预计到访时间">
<el-date-picker <el-date-picker
v-model="value1" v-model="value1"
type="datetimerange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<div class="title">审核记录</div> <div class="title">审核记录</div>
<el-table :data="data.list"> <el-table :data="data.list">
...@@ -82,6 +82,7 @@ export default { ...@@ -82,6 +82,7 @@ export default {
value1: '' value1: ''
}), }),
created () { created () {
this.height = (document.documentElement.clientHeight - 210 ) + 'px'
}, },
methods: { methods: {
handleSizeChange (val) { handleSizeChange (val) {
...@@ -101,7 +102,4 @@ export default { ...@@ -101,7 +102,4 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 35px);
}
</style> </style>
\ No newline at end of file
src/components/page/vehicle/auditSet.vue
<template> <template>
<div class="mainContent"> <div class="mainContent" :style="{ height: height}">
<div class="setDiv"> <div class="setDiv">
<div class="title">审核设置</div> <div class="title">审核设置</div>
<div class="options"> <div class="options">
...@@ -32,10 +32,10 @@ export default { ...@@ -32,10 +32,10 @@ export default {
data: () => ({ data: () => ({
loading: false, loading: false,
checked: false, checked: false,
data:{ data:{}
},
}), }),
created () { created () {
this.height = (document.documentElement.clientHeight - 150 ) + 'px'
}, },
methods: { methods: {
showAlert: function (cont) { showAlert: function (cont) {
...@@ -48,9 +48,6 @@ export default { ...@@ -48,9 +48,6 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.mainContent{
height: calc(100vh - 25px);
}
.setDiv{ .setDiv{
width: 652px; width: 652px;
border-radius: 5px; border-radius: 5px;
......
src/components/page/vehicle/vehicleAudit.vue
<template> <template>
<div> <div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<div class="title">审核列表</div> <div class="title">审核列表</div>
<el-table :data="data.list"> <el-table :data="data.list">
...@@ -50,6 +50,7 @@ export default { ...@@ -50,6 +50,7 @@ export default {
size: '10', size: '10',
}), }),
created () { created () {
this.height = (document.documentElement.clientHeight - 120 ) + 'px'
}, },
methods: { methods: {
handleSizeChange (val) { handleSizeChange (val) {
...@@ -69,7 +70,4 @@ export default { ...@@ -69,7 +70,4 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 20px);
}
</style> </style>
\ No newline at end of file
src/components/page/vehicle/vehicleRecords.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-form-item label="时间"> <el-form-item label="时间">
<el-date-picker <el-date-picker
v-model="value1" v-model="value1"
type="datetimerange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="mainContent tableCont"> <div class="mainContent tableCont" :style="{ height: height}">
<div class="tabCont"> <div class="tabCont">
<div class="title">车辆记录</div> <div class="title">车辆记录</div>
<el-table :data="data.list"> <el-table :data="data.list">
...@@ -79,6 +79,7 @@ export default { ...@@ -79,6 +79,7 @@ export default {
value1: '' value1: ''
}), }),
created () { created () {
this.height = (document.documentElement.clientHeight - 210 ) + 'px'
}, },
methods: { methods: {
handleSizeChange (val) { handleSizeChange (val) {
...@@ -98,9 +99,6 @@ export default { ...@@ -98,9 +99,6 @@ export default {
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tableCont{
height: calc(100vh - 35px);
}
.el-select{ .el-select{
width: 180px; width: 180px;
} }
......
src/main.js
...@@ -74,9 +74,6 @@ router.beforeEach((to, from, next) => { ...@@ -74,9 +74,6 @@ router.beforeEach((to, from, next) => {
store.dispatch('clearCancel'); store.dispatch('clearCancel');
next(); next();
}); });
if(!!window.ActiveXObject || "ActiveXObject" in window){
require('../static/css/IE.css')
}
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ new Vue({
el: '#app', el: '#app',
......
static/css/IE.css deleted 100644 → 0
.login-wrap{
background:url(/static/img/login.png) no-repeat 180px 150px!important;
}
.loginMain{
margin-top: 13%!important;
}
.el-input__icon{
position: relative!important;
top: -3px!important;
}
.el-icon-date,.el-icon-time{
position: relative!important;
top: 2px!important;
}
static/css/main.less
...@@ -23,7 +23,7 @@ body{ ...@@ -23,7 +23,7 @@ body{
font-family: Helvetica Neue, Helvetica, Arial, sans-serif; font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
background-color: #EFF2F4; background-color: #EFF2F4;
} }
a{text-decoration: none;color: #455467;} a{color: #455467;text-decoration: none;}
.sidebarLeft{ .sidebarLeft{
display: block; display: block;
position: absolute; position: absolute;
...@@ -185,8 +185,9 @@ a{text-decoration: none;color: #455467;} ...@@ -185,8 +185,9 @@ a{text-decoration: none;color: #455467;}
clear: both!important; clear: both!important;
} }
.line{ .line{
text-decoration-line: underline!important; text-decoration: underline!important;
} }
.el-table__header,.el-table__body{width: 100%!important;}
.el-button{ .el-button{
padding:7px 12px!important; padding:7px 12px!important;
font-size: 12px!important; font-size: 12px!important;
...@@ -331,7 +332,8 @@ background-color:#bbb!important; ...@@ -331,7 +332,8 @@ background-color:#bbb!important;
font-weight: bold; font-weight: bold;
} }
.el-date-editor .el-range-separator{line-height: 24px!important;} .el-date-editor .el-range-separator{line-height: 24px!important;}
.el-input__icon{line-height: 0!important;} .el-input__icon{line-height: 40px!important;}
.el-icon-time,.el-icon-date,.el-range__close-icon{line-height: 24px!important;}
.el-tabs__header{margin: -10px 25px 15px 15px!important;} .el-tabs__header{margin: -10px 25px 15px 15px!important;}
.el-tabs__item{font-weight: normal!important;} .el-tabs__item{font-weight: normal!important;}
.el-switch__core{width: 36px!important;height: 10px!important;} .el-switch__core{width: 36px!important;height: 10px!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