Skip to content

E
energyai_vue
Commit e5bdf3a7 authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

页面调整

parent f27bf4f0
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 42 deletions
src/pages/home/page.vue
View file @ e5bdf3a7
......@@ -16,8 +16,8 @@
<span v-if="index == 0" v-html="item.cardText"></span>
<span v-else-if="index == 1" v-html="item.cardText"></span>
<span v-else>{{ item.cardText }}</span>
<p v-if="item.state==1" style='color:#4ECB74'>开启</p>
<p v-if="item.state==2" style='color:#F2637B'>关闭</p>
<p v-if="item.state == 1" style="color: #4ecb74">开启</p>
<p v-if="item.state == 2" style="color: #f2637b">关闭</p>
</div>
</div>
</div>
......@@ -131,7 +131,7 @@ export default {
{
iconUrl: require('./image/clock_icon.png'),
cardDesc: '系统运行时间',
cardText: `<span>38</span><span class="date-color" style="font-size:16px">天</span><span>38</span><span class="date-color">时`
cardText: `<span>18</span><span class="date-color" style="font-size:16px">天</span><span>15</span><span class="date-color">时`
},
{
iconUrl: require('./image/alarm_icon.png'),
......
src/pages/sys/commandlog/index.vue
View file @ e5bdf3a7
<template lang='pug'>
<template lang="pug">
el-container(style="padding:0px;height:77.6vh;")
el-header(style='height:42px;line-height:42px;border: 1px solid rgba(195, 195, 195, 1);background: #f4f4f4;')
span.title-bold.title-left-color() 历史指令
......@@ -30,33 +30,26 @@
el-button(@click="reSet()" size='mini' type="primary" icon="el-icon-refresh-right") 重置
//- <drag-table :data="dataList" :header="checkList" :option="tableOption" @getDataList="getDataList" v-loading="dataListLoading" :operationNum="3" :isShowOperate="true">
<drag-table :data="dataList" :header="checkList" :option="tableOption" @getDataList="getDataList" v-loading="dataListLoading" >
//- -- 插槽
<el-table-column slot="fixed" fixed prop="" label="序号" width="80" header-align="center" align="center" >
<template slot-scope="scope">
el-table-column(slot="fixed" fixed prop="" label="序号" width="80" header-align="center" align="center")
template( slot-scope="scope")
span {{scope.$index+(pageIndex - 1) * pageSize + 1}}
</template>
</el-table-column>
//- 操作项
<template slot-scope="scope">
<el-button class="el-table-btn" type="text">编辑</el-button>
<el-button class="el-table-btn" type="text">查看</el-button>
<el-button class="el-table-btn" type="text">相关用户</el-button>
</template>
template(slot='comSource' slot-scope='scope')
font(v-if='scope.row.comSource == 1') 算法
font(v-if='scope.row.comSource == 2') 人工
template(slot='comType' slot-scope='scope')
font(v-if='scope.row.comType == 1') 自动
font(v-if='scope.row.comType == 2') 手动
</drag-table>
el-footer.box_footer
el-pagination(@size-change="sizeChangeHandle" background @current-change="currentChangeHandle" :current-page="pageIndex" :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage" layout="total, sizes, prev, pager, next, jumper")
</template>
<script>
import Sortable from 'sortablejs'
import dragTable from '../../components/tab'
let that
export default {
filters: {
ellipsis (value) {
ellipsis(value) {
if (!value) return ''
if (value.length > 12) {
return value.slice(0, 12) + '...'
......@@ -64,15 +57,15 @@ export default {
return value
}
},
data () {
data() {
return {
checkList: [], //筛选数据
tableHeader: [
{ label: '操作员', prop: 'username' }, //是否插槽
{ label: '来源', prop: 'ip' },
{ label: '指令类型', prop: 'operation' },
{ label: '操作时间', prop: 'createDate' },
{ label: '指令内容', prop: 'detail' }
{ label: '操作员', prop: 'createUserName' }, //是否插槽
{ label: '来源', prop: 'comSource', slot: true },
{ label: '指令类型', prop: 'comType', slot: true },
{ label: '操作时间', prop: 'createTime' },
{ label: '指令内容', prop: 'comMark' }
// {label:'操作',prop:''},
],
tableOption: {
......@@ -96,17 +89,17 @@ export default {
dragTable
},
watch: {
totalPage() { //注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数
let pages = Math.ceil(this.totalPage / this.pageSize)//新数据总页数
totalPage() {
//注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数
let pages = Math.ceil(this.totalPage / this.pageSize) //新数据总页数
//总页数小于当前页数则重新加载列表数据
if (pages < this.pageIndex) {
this.pageIndex = pages || 1
this.getDataList()//获取表格数据的方法
this.getDataList() //获取表格数据的方法
}
}
},
created () {
that = this
created() {
this.pageIndex = 1
this.getDataList()
},
......@@ -124,7 +117,7 @@ export default {
this.getDataList()
},
// 获取数据列表
getDataList (sort, order) {
getDataList(sort, order) {
// console.log(sort,'---',order)
this.dataListLoading = true
this.$http({
......@@ -136,7 +129,7 @@ export default {
startTime: this.dataForm.startTime,
endTime: this.dataForm.endTime
}
}).then(data => {
}).then((data) => {
//console.log('data', data)
if (data && data.code === 0) {
this.dataList = data.page.rows
......@@ -150,7 +143,7 @@ export default {
})
},
//排序
sortChange (column) {
sortChange(column) {
if (column.order === 'descending') {
this.order = 'desc'
} else {
......@@ -164,13 +157,13 @@ export default {
this.getDataList()
},
// 每页数
sizeChangeHandle (val) {
sizeChangeHandle(val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
// 当前页
currentChangeHandle (val) {
currentChangeHandle(val) {
this.pageIndex = val
this.getDataList()
}
......
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 to comment