Skip to content

E
energyai_vue
Commit 0c2a7e93 authored by xiexingan's avatar xiexingan
Browse files
Options

调整

parent 4808d319
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 708 additions and 446 deletions
public/config.js
View file @ 0c2a7e93
...@@ -5,10 +5,10 @@ CONFIG.TITLE = 'AI节能管理系统' ...@@ -5,10 +5,10 @@ CONFIG.TITLE = 'AI节能管理系统'
// 网络请求公用地址 // 网络请求公用地址
CONFIG.requestPath = 'http://localhost:8046' // CONFIG.requestPath = 'http://localhost:8046'
// CONFIG.requestPath = 'http://10.20.72.31:8046' // CONFIG.requestPath = 'http://10.20.72.31:8046'
// CONFIG.requestPath = 'http://59.110.43.122:8046' CONFIG.requestPath = 'http://59.110.43.122:8046'
// 文件上传 // 文件上传
// CONFIG.urlPath = 'http://10.20.72.33/' // CONFIG.urlPath = 'http://10.20.72.33/'
......
src/pages/components/tableList.vue
View file @ 0c2a7e93
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
:label="item.label" :label="item.label"
:width="item.width" :width="item.width"
:align="item.align" :align="item.align"
header-align="center"
align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<slot :name="item.prop" :scope="scope.row"></slot> <slot :name="item.prop" :scope="scope.row"></slot>
...@@ -34,11 +37,14 @@ ...@@ -34,11 +37,14 @@
:label="item.label" :label="item.label"
:width="item.width" :width="item.width"
:align="item.align" :align="item.align"
header-align="center"
align="center"
> >
</el-table-column> </el-table-column>
</template> </template>
<el-table-column align="center" label="操作" :width="opNum * 80"> <el-table-column v-if='showOpr' align="center" label="操作" :width="opNum * 80">
<template slot-scope="scope"> <template slot-scope="scope">
<slot name="operation" :scope="scope.row"></slot> <slot name="operation" :scope="scope.row"></slot>
</template> </template>
...@@ -57,13 +63,13 @@ export default { ...@@ -57,13 +63,13 @@ export default {
tableColums: { tableColums: {
type: Array type: Array
}, },
isShowOp: {
type: Boolean,
default: false
},
opNum: { opNum: {
type: Number, type: Number,
default: 3 default: 3
},
showOpr: {
type: Boolean,
default: true
} }
}, },
data() { data() {
......
src/pages/sys/commandlog/index copyy.vue 0 → 100644
View file @ 0c2a7e93
<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() 历史指令
<el-popover placement="bottom" width="150" >
<el-button slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)'> 筛选</el-button>
<el-checkbox-group v-model="checkList">
<el-col :span="24">
<el-checkbox v-for="(item,index) in tableHeader" :label="item" :key="index" >
span {{item.label}}
</el-checkbox>
</el-col>
</el-checkbox-group>
</el-popover>
el-main.box_main
el-card()
div.tableCard()
el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" )
el-form-item( label="关键词:")
el-input( v-model="dataForm.comMark" placeholder="" clearable)
el-form-item( label="指令类型:")
el-select( v-model="dataForm.comType" placeholder="请选择" clearable)
el-option( label="自动" value="1")
el-option( label="人工" value="2")
el-form-item( label="操作时间:")
el-date-picker(type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.startTime" placeholder="选择开始时间" clearable)
el-form-item( label="至")
el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable)
el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询
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")
span {{scope.$index+(pageIndex - 1) * pageSize + 1}}
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 dragTable from '../../components/tab'
export default {
filters: {
ellipsis(value) {
if (!value) return ''
if (value.length > 12) {
return value.slice(0, 12) + '...'
}
return value
}
},
data() {
return {
checkList: [], //筛选数据
tableHeader: [
{ label: '操作员', prop: 'createUserName' }, //是否插槽
{ label: '来源', prop: 'comSource', slot: true },
{ label: '指令类型', prop: 'comType', slot: true },
{ label: '操作时间', prop: 'createTime' },
{ label: '指令内容', prop: 'comMark' }
// {label:'操作',prop:''},
],
tableOption: {
border: false, //是否边框
maxHeight: 500 //高度
},
dataForm: {
comMark: '',
comType: null,
startTime: '',
endTime: ''
},
dataList: [],
pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false
}
},
components: {
dragTable
},
watch: {
totalPage() {
//注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数
let pages = Math.ceil(this.totalPage / this.pageSize) //新数据总页数
//总页数小于当前页数则重新加载列表数据
if (pages < this.pageIndex) {
this.pageIndex = pages || 1
this.getDataList() //获取表格数据的方法
}
}
},
created() {
this.pageIndex = 1
this.getDataList()
},
mounted() {
this.checkList = [...this.tableHeader]
},
methods: {
toLine(name) {
return name.replace(/([A-Z])/g, '_$1').toLowerCase()
},
//重置
reSet() {
this.dataForm = {}
this.pageIndex = 1
this.getDataList()
},
// 获取数据列表
getDataList(sort, order) {
// console.log(sort,'---',order)
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sysCommandLog/pageList'),
method: 'post',
data: {
comMark: this.dataForm.comMark,
comType: this.dataForm.comType,
startTime: this.dataForm.startTime,
endTime: this.dataForm.endTime
}
}).then((data) => {
//console.log('data', data)
if (data && data.code === 0) {
this.dataList = data.page.rows
// console.log(this.dataList)
this.totalPage = data.page.total
} else {
this.dataList = []
this.totalPage = 0
}
this.dataListLoading = false
})
},
//排序
sortChange(column) {
if (column.order === 'descending') {
this.order = 'desc'
} else {
this.order = 'asc'
}
if (column.column.columnKey) {
this.sort = column.column.columnKey
} else {
this.sort = column.prop
}
this.getDataList()
},
// 每页数
sizeChangeHandle(val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
// 当前页
currentChangeHandle(val) {
this.pageIndex = val
this.getDataList()
}
}
}
</script>
src/pages/sys/commandlog/index.vue
View file @ 0c2a7e93
<template lang="pug"> <template lang="pug">
el-container(style="padding:0px;height:77.6vh;") 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;') card-warp(title="历史指令 ", height="45px")
span.title-bold.title-left-color() 历史指令 div(slot='content')
<el-popover placement="bottom" width="150" > div.tableCard()
<el-button slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)'> 筛选</el-button> el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" )
<el-checkbox-group v-model="checkList"> el-form-item( label="关键词:")
<el-col :span="24"> el-input( v-model="dataForm.comMark" placeholder="" clearable)
<el-checkbox v-for="(item,index) in tableHeader" :label="item" :key="index" > el-form-item( label="指令类型:")
span {{item.label}} el-select( v-model="dataForm.comType" placeholder="请选择" clearable)
</el-checkbox> el-option( label="自动" value="1")
</el-col> el-option( label="人工" value="2")
</el-checkbox-group> el-form-item( label="操作时间:")
</el-popover> el-date-picker(type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.startTime" placeholder="选择开始时间" clearable)
el-main.box_main el-form-item( label="至")
el-card() el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable)
div.tableCard() el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询
el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" ) el-button(@click="reSet()" size='mini' type="primary" icon="el-icon-refresh-right") 重置
el-form-item( label="关键词:") table-list(:tableColums='tableHeader' :tableData='dataList' :showOpr='false' :opNum='2')
el-input( v-model="dataForm.comMark" placeholder="" clearable) template(#comSource='data')
el-form-item( label="指令类型:") font(v-if='data.scope.comSource == 1') 算法
el-select( v-model="dataForm.comType" placeholder="请选择" clearable) font(v-if='data.scope.comSource == 2') 人工
el-option( label="自动" value="1") template(#comType='data' )
el-option( label="人工" value="2") font(v-if='data.scope.comType == 1') 自动
el-form-item( label="操作时间:") font(v-if='data.scope.comType == 2') 手动
el-date-picker(type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.startTime" placeholder="选择开始时间" clearable) el-footer.box_footer
el-form-item( label="至") 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")
el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable)
el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询
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")
span {{scope.$index+(pageIndex - 1) * pageSize + 1}}
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> </template>
<script> <script>
import dragTable from '../../components/tab' import tableList from '@/pages/components/tableList'
export default { export default {
filters: { filters: {
ellipsis(value) { ellipsis(value) {
...@@ -86,7 +69,7 @@ export default { ...@@ -86,7 +69,7 @@ export default {
} }
}, },
components: { components: {
dragTable tableList
}, },
watch: { watch: {
totalPage() { totalPage() {
......
src/pages/sys/dictionary/index copy1.vue 0 → 100644
View file @ 0c2a7e93
This diff is collapsed.
src/pages/sys/dictionary/index.vue
View file @ 0c2a7e93
...@@ -12,9 +12,8 @@ ...@@ -12,9 +12,8 @@
div.tree_point div.tree_point
span &nbsp; {{ node.label }} span &nbsp; {{ node.label }}
el-container() el-container()
el-header(style='height:42px;line-height:42px;background: #f4f4f4;z-index:1001;border: 1px solid rgba(196, 196, 196, 1);') card-warp(:title="listTitle?listTitle :'数据字典项' ", height="45px")
span.title-bold.title-left-color(v-if="listTitle") {{listTitle}} span(slot='right')
span.title-bold.title-left-color(v-else) 数据字典项
el-popover( placement="bottom" width="150") el-popover( placement="bottom" width="150")
el-button( slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)') 筛选 el-button( slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)') 筛选
el-checkbox-group( v-model="checkList") el-checkbox-group( v-model="checkList")
...@@ -22,28 +21,13 @@ ...@@ -22,28 +21,13 @@
el-checkbox( v-for="(item,index) in tableHeader" :label="item" :key="index" ) el-checkbox( v-for="(item,index) in tableHeader" :label="item" :key="index" )
span {{item.label}} span {{item.label}}
el-button(v-if="isAuth('sys:dic:save')",type='primary' size='mini' icon='el-icon-plus',style='float:right;transform:translateY(6px);margin-right:20px;' :disabled="flag" @click='addOrUpdateHandle()') 新增 el-button(v-if="isAuth('sys:dic:save')",type='primary' size='mini' icon='el-icon-plus',style='float:right;transform:translateY(6px);margin-right:20px;' :disabled="flag" @click='addOrUpdateHandle()') 新增
el-main.box_main div(slot='content')
el-card.tableCard table-list(:tableColums='tableHeader' :tableData='dataList' :opNum='2')
//- el-table(:data='dataList' @sort-change='sortChange' :stripe='true' v-loading='dataListLoading' style='width: 100%;' highlight-current-row :header-cell-style="{background:'#EEF8FF',color:'#333333'}") //- 操作项
//- el-table-column(type='index', header-align='center', align='center', label='序号') template( #operation='data' )
//- template(scope="scope") el-button(type="text" v-if="isAuth('sys:dic:update')" @click="addOrUpdateHandle(data.scope)") 编辑
//- span {{scope.$index+(pageIndex - 1) * pageSize + 1}} el-button(type="text" v-if="isAuth('sys:dic:delete')" @click="deleteHandle(data.scope)") 删除
//- el-table-column(prop='name', header-align='center', align='center', label='字典项名称' sortable='custom')
//- el-table-column(prop='value', header-align='center', align='center', label='字典项值' sortable='custom')
//- el-table-column(prop='sortValue',column-key='sort_value', header-align='center', align='center', label='排序值' sortable='custom')
//- el-table-column(prop='',header-align='center',align='center',label='操作' width='200px')
//- template(slot-scope="scope")
//- el-button(type="text" v-if="isAuth('sys:dic:update')" @click="addOrUpdateHandle(scope.row)") 编辑
//- el-button(type="text" v-if="isAuth('sys:dic:delete')" @click="deleteHandle(scope.row)") 删除
drag-table( :data="dataList" :header="checkList" :isToLine='true' :option="tableOption" @getDataList="getDataList" v-loading="dataListLoading" :operationNum="4" :isShowOperate="true")
//- -- 插槽
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( slot-scope="scope" )
el-button(type="text" v-if="isAuth('sys:dic:update')" @click="addOrUpdateHandle(scope.row)") 编辑
el-button(type="text" v-if="isAuth('sys:dic:delete')" @click="deleteHandle(scope.row)") 删除
el-footer.box_footer 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') 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')
el-dialog(width="40%",:append-to-body='true' :visible.sync='visible' :modal-append-to-body='false' @close="closeForm('ruleForm')") el-dialog(width="40%",:append-to-body='true' :visible.sync='visible' :modal-append-to-body='false' @close="closeForm('ruleForm')")
...@@ -70,7 +54,8 @@ ...@@ -70,7 +54,8 @@
</template> </template>
<script> <script>
import dragTable from '../../components/tab' import tableList from '@/pages/components/tableList'
export default { export default {
data () { data () {
let validateNumber = (rule, value, callback) => { let validateNumber = (rule, value, callback) => {
...@@ -131,7 +116,7 @@ export default { ...@@ -131,7 +116,7 @@ export default {
} }
}, },
components: { components: {
dragTable tableList
}, },
watch: { watch: {
totalPage() { //注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数 totalPage() { //注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数
......
src/pages/sys/logs/index copy 2.vue deleted 100644 → 0
View file @ 4808d319
This diff is collapsed.
src/pages/sys/logs/index copy.vue
View file @ 0c2a7e93
...@@ -2,11 +2,16 @@ ...@@ -2,11 +2,16 @@
el-container(style="padding:0px;height:77.6vh;") 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;') el-header(style='height:42px;line-height:42px;border: 1px solid rgba(195, 195, 195, 1);background: #f4f4f4;')
span.title-bold.title-left-color() 系统日志 span.title-bold.title-left-color() 系统日志
el-popover( placement="bottom" width="150" ) <el-popover placement="bottom" width="150" >
el-button(slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px);') 筛选 <el-button slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)'> 筛选</el-button>
el-checkbox-group( v-model="checkList") <el-checkbox-group v-model="checkList">
el-col( :span="24" ) <el-col :span="24">
el-checkbox( v-for="item in checkGroup" :label="item.label" :key="item.id" @change='changeCheck(item.id)') {{item.label}} <el-checkbox v-for="(item,index) in tableHeader" :label="item" :key="index" >
span {{item.label}}
</el-checkbox>
</el-col>
</el-checkbox-group>
</el-popover>
el-main.box_main el-main.box_main
el-card() el-card()
div.tableCard() div.tableCard()
...@@ -22,25 +27,32 @@ ...@@ -22,25 +27,32 @@
el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable) el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable)
el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询 el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询
el-button(@click="reSet()" size='mini' type="primary" icon="el-icon-refresh-right") 重置 el-button(@click="reSet()" size='mini' type="primary" icon="el-icon-refresh-right") 重置
el-table(:data="dataList" class='myTable' row-key="id" ref='tables' @sort-change='sortChange' style="width: 100%;" v-loading="dataListLoading" :stripe="true" :header-cell-style="{background:'#EEF8FF',color:'#333333'}") //- <drag-table :data="dataList" :header="checkList" :option="tableOption" @getDataList="getDataList" v-loading="dataListLoading" :operationNum="3" :isShowOperate="true">
el-table-column(v-if='checkList.includes("序号")' class='tablesItem' type="index" header-align="center" align="center" label="序号" width="100") <drag-table :data="dataList" :header="checkList" :option="tableOption" @getDataList="getDataList" v-loading="dataListLoading" >
template(scope="scope")
span {{scope.$index+(pageIndex - 1) * pageSize + 1}} //- -- 插槽
el-table-column(v-if='checkList.includes("操作员")' class='tablesItem' prop="username" header-align="center" align="center" label="操作员" sortable='custom') <el-table-column slot="fixed" fixed prop="" label="序号" width="80" header-align="center" align="center" >
el-table-column(v-if='checkList.includes("操作时间")' prop="createDate" columnKey='create_date' header-align="center" align="center" label="操作时间" sortable='custom') <template slot-scope="scope">
el-table-column(v-if='checkList.includes("主机ip")' prop="ip" header-align="center" align="center" label="主机ip" sortable='custom') span {{scope.$index+(pageIndex - 1) * pageSize + 1}}
el-table-column(v-if='checkList.includes("模块名称")' prop="blockName" columnKey='block_name' header-align="center" align="center" label="模块名称" sortable='custom') </template>
el-table-column(v-if='checkList.includes("操作类型")' prop="operation" header-align="center" align="center" label="操作类型" sortable='custom') </el-table-column>
el-table-column(v-if='checkList.includes("描述")' prop="detail" header-align="center" align="center" label="描述" width='360' sortable='custom')
div(slot-scope='scope') //- 操作项
span(:title='scope.row.detail') {{scope.row.detail |ellipsis}} <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>
</drag-table>
el-footer.box_footer 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") 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> </template>
<script> <script>
import Sortable from "sortablejs"; import Sortable from 'sortablejs'
import dragTable from '../../components/tab'
let that
export default { export default {
filters: { filters: {
ellipsis (value) { ellipsis (value) {
...@@ -53,63 +65,58 @@ export default { ...@@ -53,63 +65,58 @@ export default {
}, },
data () { data () {
return { return {
isShow:true, checkList: [], //筛选数据
checkList:["序号", "操作员", "操作时间", "主机ip", "模块名称", "操作类型"], tableHeader: [
checkGroup:[], { label: '操作员', prop: 'username' }, //是否插槽
{ label: '操作时间', prop: 'createDate' },
{ label: '主机ip', prop: 'ip' },
{ label: '模块名称', prop: 'blockName' },
{ label: '操作类型', prop: 'operation' },
{ label: '描述', prop: 'detail' }
// {label:'操作',prop:''},
],
tableOption: {
border: false, //是否边框
maxHeight: 500 //高度
},
dataForm: { dataForm: {
username: '', username: '',
operation: '', operation: '',
startTime: '', startTime: '',
endTime: '' endTime: ''
}, },
operationList: ['登录', '注销', '新增', '修改', '删除'], operationList: ['登录', '注销', '新增', '修改', '删除', '查看', '上传'],
dataList: [], dataList: [],
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
totalPage: 0, totalPage: 0,
dataListLoading: false dataListLoading: false
} }
},
components: {
dragTable
},
watch: {
totalPage() { //注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数
let pages = Math.ceil(this.totalPage / this.pageSize)//新数据总页数
//总页数小于当前页数则重新加载列表数据
if (pages < this.pageIndex) {
this.pageIndex = pages || 1
this.getDataList()//获取表格数据的方法
}
}
}, },
created () { created () {
that = this
this.pageIndex = 1 this.pageIndex = 1
this.getDataList() this.getDataList()
}, },
mounted() { mounted(){
this.getTableList() this.checkList = [...this.tableHeader]
this.columnDrop();
}, },
methods: { methods: {
getTableList(){ toLine(name) {
this.checkGroup=this.$refs.tables.$children.map(obj=>{ return name.replace(/([A-Z])/g, '_$1').toLowerCase()
if(obj.label){
return {label:obj.label,id:obj._uid}
}
})
this.checkGroup=this.checkGroup.filter(e=>e!==undefined)
// console.log(this.checkGroup);
this.checkList=this.checkGroup.map(e=>e.label)
},
changeCheck(id){
// console.log(this.checkList)
// console.log(id);
},
// 列拖拽
columnDrop() {
const wrapperTr = document.querySelector(".myTable .el-table__header-wrapper tr");
this.sortable = Sortable.create(wrapperTr, {
animation: 180,
delay: 0,
onEnd: (evt) => {
console.log(evt)
const oldItem = this.$refs.tables.$children[evt.oldIndex];
// console.log(oldItem,1111111)
this.$nextTick(()=>{
this.$refs.tables.$children.splice(evt.oldIndex, 1);
this.$refs.tables.$children.splice(evt.newIndex, 0, oldItem);
})
},
});
}, },
//重置 //重置
reSet() { reSet() {
...@@ -118,7 +125,8 @@ export default { ...@@ -118,7 +125,8 @@ export default {
this.getDataList() this.getDataList()
}, },
// 获取数据列表 // 获取数据列表
getDataList () { getDataList (sort, order) {
// console.log(sort,'---',order)
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/sys/log/list'), url: this.$http.adornUrl('/sys/log/list'),
...@@ -130,15 +138,15 @@ export default { ...@@ -130,15 +138,15 @@ export default {
operation: this.dataForm.operation, operation: this.dataForm.operation,
startTime: this.dataForm.startTime, startTime: this.dataForm.startTime,
endTime: this.dataForm.endTime, endTime: this.dataForm.endTime,
sort: this.sort, sort: sort,
order: this.order, order: order,
stationId: localStorage.getItem('stationId') stationId: localStorage.getItem('stationId')
}) })
}).then(data => { }).then(data => {
//console.log('data', data) //console.log('data', data)
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.records this.dataList = data.page.records
console.log(this.dataList) // console.log(this.dataList)
this.totalPage = data.page.total this.totalPage = data.page.total
} else { } else {
this.dataList = [] this.dataList = []
......
src/pages/sys/logs/index.vue
View file @ 0c2a7e93
<template lang='pug'> <template lang='pug'>
el-container(style="padding:0px;height:77.6vh;") 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;') card-warp(title="系统日志 ", height="45px")
span.title-bold.title-left-color() 系统日志 div(slot='content')
<el-popover placement="bottom" width="150" > div.tableCard()
<el-button slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)'> 筛选</el-button> el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" )
<el-checkbox-group v-model="checkList"> el-form-item( label="操作员:")
<el-col :span="24"> el-input( v-model="dataForm.username" placeholder="操作员" clearable)
<el-checkbox v-for="(item,index) in tableHeader" :label="item" :key="index" > el-form-item( label="操作类型:")
span {{item.label}} el-select( v-model="dataForm.operation" placeholder="请选择" clearable)
</el-checkbox> el-option( v-for="(item,index) in operationList" :key="index" :label="item" :value="item")
</el-col> el-form-item( label="操作时间:")
</el-checkbox-group> el-date-picker(type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.startTime" placeholder="选择开始时间" clearable)
</el-popover> el-form-item( label="至")
el-main.box_main el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable)
el-card() el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询
div.tableCard() el-button(@click="reSet()" size='mini' type="primary" icon="el-icon-refresh-right") 重置
el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" ) table-list(:tableColums='tableHeader' :tableData='dataList' :showOpr='false' :opNum='2')
el-form-item( label="操作员:") el-footer.box_footer
el-input( v-model="dataForm.username" placeholder="操作员" clearable) 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")
el-form-item( label="操作类型:")
el-select( v-model="dataForm.operation" placeholder="请选择" clearable)
el-option( v-for="(item,index) in operationList" :key="index" :label="item" :value="item")
el-form-item( label="操作时间:")
el-date-picker(type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.startTime" placeholder="选择开始时间" clearable)
el-form-item( label="至")
el-date-picker( type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width:175px;" v-model="dataForm.endTime" placeholder="选择结束时间" clearable)
el-button( type="primary" size='mini' icon="el-icon-search" @click="getDataList()") 查询
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">
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>
</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> </template>
<script> <script>
import Sortable from 'sortablejs' import tableList from '@/pages/components/tableList'
import dragTable from '../../components/tab'
let that let that
export default { export default {
filters: { filters: {
...@@ -94,7 +65,7 @@ export default { ...@@ -94,7 +65,7 @@ export default {
} }
}, },
components: { components: {
dragTable tableList
}, },
watch: { watch: {
totalPage() { //注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数 totalPage() { //注意这个函数的名字必须和你监听data中的属性的名字一样，这样才能当你data中的属性发生变化时，触发这个函数
...@@ -111,7 +82,7 @@ export default { ...@@ -111,7 +82,7 @@ export default {
this.pageIndex = 1 this.pageIndex = 1
this.getDataList() this.getDataList()
}, },
mounted(){ mounted() {
this.checkList = [...this.tableHeader] this.checkList = [...this.tableHeader]
}, },
methods: { methods: {
......
src/pages/sys/user/index.vue
View file @ 0c2a7e93
<template lang="pug"> <template lang="pug">
el-container(style="padding:0px;height:77.6vh;")
card-warp(title="用户管理", height="45px") card-warp(title="用户管理", height="45px")
div(slot="content", style="height: 90%") div(slot="content", style="height: 90%")
el-form(:inline="true" :model="dataForm" size="mini" ) el-form(:inline="true" :model="dataForm" size="mini" )
...@@ -32,34 +33,13 @@ ...@@ -32,34 +33,13 @@
el-button(type="text" size="mini" @click="queryHandle(data.scope.user_id)") 详情 el-button(type="text" size="mini" @click="queryHandle(data.scope.user_id)") 详情
el-button(type="text" size="mini" v-if="isAuth('sys:user:role')" @click="configHandle(data.scope)" ) 配置角色 el-button(type="text" size="mini" v-if="isAuth('sys:user:role')" @click="configHandle(data.scope)" ) 配置角色
el-button(type="text" size="mini" v-if="isAuth('sys:user:update')" @click="resetPassword(data.scope)") 密码重置 el-button(type="text" size="mini" v-if="isAuth('sys:user:update')" @click="resetPassword(data.scope)") 密码重置
el-footer.box_footer
//- drag-table( :data="dataList" :header="checkList" :isToLine='false' :option="tableOption" @getDataList="getDataList" v-loading="dataListLoading" :operationNum="4" :isShowOperate="true") 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")
//- -- 插槽 //- 弹窗, 新增 / 修改
el-table-column(slot="fixed" fixed prop="" label="序号" width="80" header-align="center" align="center") add-or-update(v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshdatalist="getDataList")
template( slot-scope="scope") query-detail(v-if="queryDetailVisible" ref="queryView" @refreshdatalist="getDataList")
span {{scope.$index+(pageIndex - 1) * pageSize + 1}} config-role(v-if="configRoleVisible" ref="configView" @refreshdatalist="getDataList")
reset-password(v-if="resetPasswordVisible" ref="resetView" @refreshdatalist="getDataList")
template( slot='gender' slot-scope="scope")
font(v-if='scope.row.gender===0') 女
font(v-if='scope.row.gender===1') 男
template(slot='status' slot-scope='scope')
font(v-if='scope.row.status===1') 正常
font(v-if='scope.row.status===0') 禁用
//- 操作项
template( slot-scope="scope" )
el-button(type="text" size="mini" v-if="isAuth('sys:user:update')" @click="addOrUpdateHandle(scope.row.user_id)") 编辑
el-button(type="text" size="mini" v-if="isAuth('sys:user:delete')" @click="deleteHandle(scope.row.user_id)" :disabled="del_disable(scope.row.user_id)") 删除
el-button(type="text" size="mini" @click="queryHandle(scope.row.user_id)") 详情
el-button(type="text" size="mini" v-if="isAuth('sys:user:role')" @click="configHandle(scope.row)" ) 配置角色
el-button(type="text" size="mini" v-if="isAuth('sys:user:update')" @click="resetPassword(scope.row)") 密码重置
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")
//- 弹窗, 新增 / 修改
add-or-update(v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshdatalist="getDataList")
query-detail(v-if="queryDetailVisible" ref="queryView" @refreshdatalist="getDataList")
config-role(v-if="configRoleVisible" ref="configView" @refreshdatalist="getDataList")
reset-password(v-if="resetPasswordVisible" ref="resetView" @refreshdatalist="getDataList")
</template> </template>
<script> <script>
......
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