王勇 / dispatch_sys_vue · 提交

转到一个项目

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

修改系统设置，表格显示

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