王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 73e1961df336cea560f108e2641e3594f6fb9479 1 个父辈 f93637b4

修改系统设置，表格显示

内嵌 并排对比
正在显示 4 个修改的文件 包含 54 行增加 和 54 行删除
... ... @@ -15,28 +15,28 @@
</el-form>
</el-col>
<!--列表-->
<el-table :data="logs" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
<el-table-column type="index" width="60">
<el-table :data="logs" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
<el-table-column type="index" width="60" align="center">
</el-table-column>
<el-table-column prop="logid" label="ID" width="80" sortable>
<el-table-column prop="logid" label="ID" width="80" sortable align="center">
</el-table-column>
<el-table-column prop="username" label="操作账号" width="120" sortable>
<el-table-column prop="username" label="操作账号" width="120" sortable align="center">
</el-table-column>
<el-table-column prop="ip" label="IP" width="100" sortable>
<el-table-column prop="ip" label="IP" width="110" sortable align="center">
</el-table-column>
<el-table-column prop="logcreattime" label="操作时间" width="200" sortable>
<el-table-column prop="logcreattime" label="操作时间" width="200" sortable align="center">
</el-table-column>
<el-table-column prop="methodname" label="系统动作" width="120" sortable>
<el-table-column prop="methodname" label="系统动作" width="120" sortable align="center">
</el-table-column>
<el-table-column prop="operatenamecn" label="动作描述" width="120" sortable>
<el-table-column prop="operatenamecn" label="动作描述" width="120" sortable align="center">
</el-table-column>
<el-table-column prop="modelnamecn" label="操作模块" width="120" sortable>
<el-table-column prop="modelnamecn" label="操作模块" width="120" sortable align="center">
</el-table-column>
<el-table-column prop="classname" label="系统类" show-overflow-tooltip width="100" sortable>
<el-table-column prop="classname" label="系统类" show-overflow-tooltip width="100" sortable align="center">
</el-table-column>
<el-table-column prop="parameters" label="参数" show-overflow-tooltip width="100" sortable>
<el-table-column prop="parameters" label="参数" show-overflow-tooltip width="100" sortable align="center">
</el-table-column>
<el-table-column prop="result" label="操作结果" min-width="200" sortable>
<el-table-column prop="result" label="操作结果" min-width="200" sortable align="center">
</el-table-column>
</el-table>
... ... @@ -124,4 +124,4 @@
<style scoped>
</style>
\ No newline at end of file
</style>
... ...
... ... @@ -21,31 +21,31 @@
border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column type="selection" width="55">
<el-table-column type="selection" width="55" align="center">
</el-table-column>
<!--<el-table-column type="index" width="60">-->
<!--</el-table-column>-->
<el-table-column prop="permissionId" label="ID" width="130" sortable>
<el-table-column prop="permissionId" label="ID" width="130" align="center" sortable>
</el-table-column>
<el-table-column prop="name" label="权限名称" min-width="150" sortable>
<el-table-column prop="name" label="权限名称" min-width="150" align="center" sortable>
</el-table-column>
<el-table-column prop="description" label="描述" min-width="120" sortable>
<el-table-column prop="description" label="描述" min-width="120" align="center" sortable>
</el-table-column>
<el-table-column prop="ismenu" label="是否目录" width="100" :formatter="formatState" sortable>
<el-table-column prop="ismenu" label="是否目录" width="120" :formatter="formatState" align="center" sortable>
</el-table-column>
<el-table-column prop="url" label="访问路径" width="300" sortable>
<el-table-column prop="url" label="访问路径" width="250" align="center" sortable>
</el-table-column>
<el-table-column label="操作" min-width="100">
<el-table-column label="操作" min-width="150" align="center">
<template slot-scope="scope">
<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
<el-button size="small" type="success" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-button type="danger" icon="el-icon-delete" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="pageSize" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ... @@ -377,4 +377,4 @@
<style scoped>
</style>
\ No newline at end of file
</style>
... ...
... ... @@ -10,7 +10,7 @@
<el-button type="primary" v-on:click="getRoles()">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleAdd">新增</el-button>
<el-button type="success" @click="handleAdd">新增</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -21,32 +21,32 @@
row-key="roleId"
border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="55">
<el-table-column type="selection" width="60" align="center">
</el-table-column>
<!--<el-table-column type="index" width="60">-->
<!--</el-table-column>-->
<el-table-column prop="roleId" label="ID" width="120">
<el-table-column prop="roleId" label="ID" width="110" align="center">
</el-table-column>
<el-table-column prop="roleName" label="岗位/角色名称" min-width="200" sortable>
<el-table-column prop="roleName" label="岗位/角色名称" width="180" sortable align="center">
</el-table-column>
<!--<el-table-column prop="departmentName" label="部门名称" min-width="200" sortable>-->
<!--</el-table-column>-->
<el-table-column prop="description" label="描述" min-width="160" >
<el-table-column prop="description" label="描述" min-width="100" align="center" >
</el-table-column>
<el-table-column prop="type" label="类型" min-width="80" sortable>
<el-table-column prop="type" label="类型" min-width="100" sortable align="center">
</el-table-column>
<el-table-column prop="businessLicense" label="工商代码" min-width="180" >
<el-table-column prop="businessLicense" label="工商代码" min-width="180" align="center">
</el-table-column>
<el-table-column prop="customsRegCode" label="海关备案代码" min-width="150" >
<el-table-column prop="customsRegCode" label="海关备案代码" min-width="150" align="center" >
</el-table-column>
<el-table-column prop="mqcode" label="海关通道编号" min-width="150" >
<el-table-column prop="mqcode" label="海关通道编号" min-width="150" align="center">
</el-table-column>
<el-table-column label="操作" min-width="230" fixed="right" align="center">
<el-table-column label="操作" width="230px" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleAdd(scope.$index, scope.row)">新增下级</el-button>
<el-button size="small" @click="setPerm(scope.$index, scope.row)">设置权限</el-button>
<el-button style="margin-top: 5px;" size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
<el-button type="success" size="small" @click="handleAdd(scope.$index, scope.row)" style="width:97px;margin-left: 1px;">新增下级</el-button>
<el-button type="warning" size="small" @click="setPerm(scope.$index, scope.row)" style="width:97px;margin-left: 1px;">设置权限</el-button>
<el-button type="primary" style="width:97px;margin-left: 1px;margin-top: 3px;" size="small" @click="handleEdit(scope.$index, scope.row)" >编辑</el-button>
<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)" style="width:97px;margin-left: 1px;">删除</el-button>
</template>
</el-table-column>
</el-table>
... ...
... ... @@ -21,42 +21,42 @@
<!--列表-->
<el-table :data="users" highlight-current-row border v-loading="listLoading" @selection-change="selsChange"
style="width: 100%;">
<el-table-column type="selection" width="55">
<el-table-column type="selection" width="55" align="center">
</el-table-column>
<!--<el-table-column type="index" width="60">-->
<!--</el-table-column>-->
<el-table-column prop="userId" label="ID" width="100" sortable>
<el-table-column prop="userId" label="ID" width="100" align="center" sortable>
</el-table-column>
<el-table-column prop="username" label="账号" width="120" sortable>
<el-table-column prop="username" label="账号" width="120" align="center" sortable>
</el-table-column>
<el-table-column prop="realname" label="姓名" width="120" sortable>
<el-table-column prop="realname" label="姓名" width="120" align="center" sortable>
</el-table-column>
<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" align="center" sortable>
</el-table-column>
<el-table-column prop="mobilephone" label="电话" width="125">
<el-table-column prop="mobilephone" label="电话" width="130" align="center">
</el-table-column>
<el-table-column prop="creattime" label="创建时间" width="170" sortable>
<el-table-column prop="creattime" label="创建时间" width="175" align="center" sortable>
</el-table-column>
<el-table-column prop="updatetime" label="更新时间" width="170" sortable>
<el-table-column prop="updatetime" label="更新时间" width="175" align="center" sortable>
</el-table-column>
<el-table-column prop="address" label="地址" min-width="180">
<el-table-column prop="address" label="地址" min-width="180" align="center">
</el-table-column>
<el-table-column prop="email" label="Email" min-width="180">
<el-table-column prop="email" label="Email" min-width="180" align="center">
</el-table-column>
<el-table-column prop="state" label="启用" width="100" :formatter="formatState" sortable>
<el-table-column prop="state" label="启用" width="100" :formatter="formatState" align="center" sortable>
</el-table-column>
<el-table-column label="操作" width="250" fixed="right" align="center">
<el-table-column label="操作" width="300px" fixed="right" align="center">
<template slot-scope="scope">
<el-button size="small" @click="roleEdit(scope.$index, scope.row)">角色配置</el-button>
<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
<el-button type="primary" icon="el-icon-setting" size="small" @click="roleEdit(scope.$index, scope.row)">角色配置</el-button>
<el-button size="small" type="success" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-button type="danger" icon="el-icon-delete" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="10"
:total="total" style="float:right;">
</el-pagination>
... ...