Commit d0a13eb2 authored by xiexingan's avatar xiexingan

调整

parent d8bea079
<template lang="pug">
card-warp(title="室内气象分析", height="45px", showBackground)
card-warp(title="室内气象分析", height="45px")
div(slot="right")
router-link.margin-lr-20(:to="{ name: 'kb-indoor' }")
el-button(size="mini", type="primary") 图形 / 列表
......
......@@ -21,7 +21,7 @@ export default {
},
showBackground: {
type: Boolean,
default: false
default: true
}
}
}
......
<template>
<div class="en-table">
<el-table
stripe
:data="tableData"
style="width: 100%"
:header-cell-style="{
background: 'rgba(0, 151, 255, 0.08)',
color: '#333333',
}"
>
<el-table-column align="center" label="序号" width="100">
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<template v-for="item in tableColums">
<el-table-column
:key="item.id"
v-if="item.slot"
:prop="item.prop"
:label="item.label"
:width="item.width"
:align="item.align"
>
<template slot-scope="scope">
<slot :name="item.prop" :scope="scope.row"></slot>
</template>
</el-table-column>
<el-table-column
:key="item.id"
v-else
:prop="item.prop"
:label="item.label"
:width="item.width"
:align="item.align"
>
</el-table-column>
</template>
<el-table-column align="center" label="操作" :width="opNum * 80">
<template slot-scope="scope">
<slot name="operation" :scope="scope.row"></slot>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script >
export default {
name: 'table-list',
props: {
tableData: {
type: Array
},
tableColums: {
type: Array
},
isShowOp: {
type: Boolean,
default: false
},
opNum: {
type: Number,
default: 3
}
},
data() {
return {}
}
}
</script>
<style lang="scss">
.record-color {
color: #0097ff;
}
.marg_r_18 {
margin-right: 18px;
}
.marg_r_8 {
margin-right: 8px;
}
.en-table {
.el-pagination.is-background .btn-next,
.el-pagination.is-background .btn-prev,
.el-pagination.is-background .el-pager li {
margin: 0 !important;
}
/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
color: #32a5ea !important;
background-color: red !important;
}
}
</style>
This diff is collapsed.
<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-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-main.box_main
el-card()
div.tableCard()
card-warp(title="用户管理", height="45px")
div(slot="content", style="height: 90%")
el-form(:inline="true" :model="dataForm" size="mini" )
el-form-item( label="姓名:" )
el-input.input_width(v-model="dataForm.name" placeholder="姓名" clearable)
......@@ -29,7 +19,21 @@
el-button(@click="getDataList" size="mini" icon="el-icon-search" type="primary") 查询
el-button(@click="reSet()" size="mini" type="primary" icon="el-icon-refresh-right") 重置
el-button( v-if="isAuth('sys:user:save')" style="float:right;" size="mini" icon="el-icon-plus" type="primary" @click="addOrUpdateHandle()") 新增
drag-table( :data="dataList" :header="checkList" :isToLine='false' :option="tableOption" @getDataList="getDataList" v-loading="dataListLoading" :operationNum="4" :isShowOperate="true")
table-list(:tableColums='tableHeader' :tableData='dataList' :isShowOp="true" :opNum='4')
template(#gender='data')
font(v-if='data.scope.gender===0') 女
font(v-if='data.scope.gender===1') 男
template(#status='data' )
font(v-if='data.scope.status===1') 正常
font(v-if='data.scope.status===0') 禁用
template(#operation="data" )
el-button(type="text" size="mini" v-if="isAuth('sys:user:update')" @click="addOrUpdateHandle(data.scope.user_id)") 编辑
el-button(type="text" size="mini" v-if="isAuth('sys:user:delete')" @click="deleteHandle(data.scope.user_id)" :disabled="del_disable(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:update')" @click="resetPassword(data.scope)") 密码重置
//- drag-table( :data="dataList" :header="checkList" :isToLine='false' :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")
......@@ -63,10 +67,17 @@ import AddOrUpdate from './user-add-or-update'
import queryDetail from './query-detail'
import configRole from './config-role'
import resetPassword from './reset-password'
import dragTable from '../../components/tab'
import tableList from '@/pages/components/tableList'
export default {
components: {
AddOrUpdate,
queryDetail,
configRole,
resetPassword,
dragTable,
tableList
},
name: 'sys-user',
filters: {
ellipsis(value) {
......@@ -75,7 +86,7 @@ export default {
return value.slice(0, 20) + '...'
}
return value
},
}
},
data() {
return {
......@@ -90,18 +101,18 @@ export default {
{ label: '民族', prop: 'nationName' },
{ label: '政治面貌', prop: 'politic_countenance' },
{ label: '学历', prop: 'education' },
{ label: '手机号', prop: 'mobile' },
{ label: '手机号', prop: 'mobile', width: 150 },
{ label: '用户权限', prop: 'roleNames' },
{ label: '账号状态', prop: 'status', slot: true },
{ label: '账号状态', prop: 'status', slot: true }
],
tableOption: {
border: false, //是否边框
maxHeight: 500, //高度
maxHeight: 500 //高度
},
data: [],
defaultProps: {
children: 'children',
label: 'name',
label: 'name'
},
isCollapse: true,
dataForm: {
......@@ -109,7 +120,7 @@ export default {
username: '',
jobNumber: '',
gender: '',
status: '',
status: ''
},
sysOrgList: [],
dataList: [],
......@@ -122,16 +133,10 @@ export default {
addOrUpdateVisible: false,
queryDetailVisible: false,
configRoleVisible: false,
allJob: [],
allJob: []
}
},
components: {
AddOrUpdate,
queryDetail,
configRole,
resetPassword,
dragTable,
},
watch: {
totalPage() {
//注意这个函数的名字必须和你监听data中的属性的名字一样,这样才能当你data中的属性发生变化时,触发这个函数
......@@ -141,7 +146,7 @@ export default {
this.pageIndex = pages || 1
this.getDataList() //获取表格数据的方法
}
},
}
},
created() {
// this.getList()
......@@ -158,7 +163,7 @@ export default {
username: '',
jobNumber: '',
gender: '',
status: '',
status: ''
}
this.getDataList()
},
......@@ -175,8 +180,8 @@ export default {
url: this.$http.adornUrl('/sysDictionary/getAllJobList'),
method: 'get',
params: this.$http.adornParams({
stationId: localStorage.getItem('stationId'),
}),
stationId: localStorage.getItem('stationId')
})
}).then((data) => {
if (data && data.code === 0) {
this.allJob = data.list
......@@ -208,8 +213,8 @@ export default {
url: this.$http.adornUrl('/sys/user/updatePassword'),
method: 'POST',
params: this.$http.adornParams({
userIds: userIds,
}),
userIds: userIds
})
}).then((data) => {
if (data && data.code === 0) {
this.$message({
......@@ -219,7 +224,7 @@ export default {
onClose: () => {
this.visible = false
this.$emit('refreshdatalist')
},
}
})
} else {
this.$message.error(data.msg)
......@@ -253,8 +258,8 @@ export default {
size: this.pageSize,
sort: sort,
order: order,
stationId: localStorage.getItem('stationId'),
},
stationId: localStorage.getItem('stationId')
}
}).then((data) => {
// console.log('data', data)
if (data && data.code === 0) {
......@@ -301,13 +306,13 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
closeOnClickModal: false,
closeOnClickModal: false
})
.then(() => {
this.$http({
url: this.$http.adornUrl('/sys/user/delete'),
method: 'post',
data: this.$http.adornData(userIds, false),
data: this.$http.adornData(userIds, false)
}).then((data) => {
if (data && data.code === 0) {
this.$message({
......@@ -316,7 +321,7 @@ export default {
duration: 1500,
onClose: () => {
this.getDataList()
},
}
})
} else {
this.$message.error(data.msg)
......@@ -324,8 +329,8 @@ export default {
})
})
.catch(() => {})
},
},
}
}
}
</script>
<style lang="scss">
......
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