@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-29 11:14:13 | * @Date: 2021-11-29 11:14:13 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-10 10:56:47 | |||||
* @LastEditTime: 2021-12-10 11:35:13 | |||||
* @FilePath: \GpsCardAdmin\README.md | * @FilePath: \GpsCardAdmin\README.md | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -61,7 +61,12 @@ FEATURE | |||||
## v1.0.6F | ## v1.0.6F | ||||
`2021年12月10日` | `2021年12月10日` | ||||
FEATURE | |||||
- 增加 标签栏头部logo | - 增加 标签栏头部logo | ||||
- 增加 移动端分页页码跳转按钮 | - 增加 移动端分页页码跳转按钮 | ||||
- 增加 移动端表格弹窗适配 | - 增加 移动端表格弹窗适配 | ||||
- 增加 头部固定配置 | |||||
- 增加 头部固定配置 | |||||
IMPROVEMENT | |||||
- 优化 表格按钮样式 | |||||
- 优化 表格在移动端的的显示方式 |
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 17:19:51 | * @Date: 2021-11-30 17:19:51 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-01 15:11:35 | |||||
* @LastEditTime: 2021-12-10 11:32:40 | |||||
* @FilePath: \GpsCardAdmin\src\components\TTable\TTable.vue | * @FilePath: \GpsCardAdmin\src\components\TTable\TTable.vue | ||||
* @description: 封装通用的table组件 | * @description: 封装通用的table组件 | ||||
--> | --> | ||||
@@ -16,15 +16,17 @@ | |||||
:key="column.prop" | :key="column.prop" | ||||
:prop="column.prop" | :prop="column.prop" | ||||
:label="column.title" | :label="column.title" | ||||
:fixed="column.fixed" | |||||
v-if="!column.action" | v-if="!column.action" | ||||
height="460" | height="460" | ||||
/> | /> | ||||
<!-- 操作列 --> | <!-- 操作列 --> | ||||
<el-table-column :label="column.title" :key="column.prop" v-else > | |||||
<el-table-column :label="column.title" :key="column.prop" v-else fixed="right" min-width="100"> | |||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<el-button-group v-for="(fn,index) in column.actions" :key="index"> | <el-button-group v-for="(fn,index) in column.actions" :key="index"> | ||||
<el-button | <el-button | ||||
type="primary" | |||||
:type="fn.type" | |||||
:icon="fn.icon" | |||||
@click="handleClick(scope.row,fn.fnName)" | @click="handleClick(scope.row,fn.fnName)" | ||||
>{{fn.title}}</el-button> | >{{fn.title}}</el-button> | ||||
</el-button-group> | </el-button-group> | ||||
@@ -25,7 +25,6 @@ | |||||
width: 50%; | width: 50%; | ||||
min-width: 375px; | min-width: 375px; | ||||
} | } | ||||
.el-pagination { | .el-pagination { | ||||
white-space: pre-wrap; | white-space: pre-wrap; | ||||
padding: 2px 5px; | padding: 2px 5px; | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-08 15:15:42 | |||||
* @LastEditTime: 2021-12-10 11:40:14 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -73,10 +73,10 @@ export default { | |||||
], | ], | ||||
searchValue: "", | searchValue: "", | ||||
columns: [ | columns: [ | ||||
{ prop: "alarmType", title: "告警类别" }, | |||||
{ prop: "alarmType", title: "告警类别", fixed: 'left' }, | |||||
{ prop: "imei", title: "设备IMEI" }, | { prop: "imei", title: "设备IMEI" }, | ||||
{ prop: "alarmAddress", title: "告警地址/经纬度" }, | { prop: "alarmAddress", title: "告警地址/经纬度" }, | ||||
{ prop: "createTime", title: "创建时间" } | |||||
{ prop: "createTime", title: "创建时间", fixed: 'right' } | |||||
/* { | /* { | ||||
action: true, | action: true, | ||||
title: "操作", | title: "操作", | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-08 15:16:20 | |||||
* @LastEditTime: 2021-12-10 11:37:39 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-recognition\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-recognition\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -156,7 +156,7 @@ export default { | |||||
modelOptions: [], | modelOptions: [], | ||||
searchValue: "", | searchValue: "", | ||||
columns: [ | columns: [ | ||||
{ prop: "type", title: "类型" }, | |||||
{ prop: "type", title: "类型", fixed: 'left' }, | |||||
{ prop: "model", title: "类别" }, | { prop: "model", title: "类别" }, | ||||
{ prop: "content", title: "内容名称" }, | { prop: "content", title: "内容名称" }, | ||||
{ prop: "createTime", title: "创建时间" }, | { prop: "createTime", title: "创建时间" }, | ||||
@@ -165,8 +165,8 @@ export default { | |||||
action: true, | action: true, | ||||
title: "操作", | title: "操作", | ||||
actions: [ | actions: [ | ||||
{ fnName: "update", title: "修改", type: "primary" }, | |||||
{ fnName: "delete", title: "删除", type: "error" } | |||||
{ fnName: "update", title: "修改", type: "primary", icon: 'el-icon-edit' }, | |||||
{ fnName: "delete", title: "删除", type: "danger", icon: 'el-icon-delete' } | |||||
] | ] | ||||
} | } | ||||
], | ], | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-08 15:16:43 | |||||
* @LastEditTime: 2021-12-10 11:32:57 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -136,7 +136,7 @@ export default { | |||||
model: "", | model: "", | ||||
searchValue: "", | searchValue: "", | ||||
columns: [ | columns: [ | ||||
{ prop: "type", title: "类型" }, | |||||
{ prop: "type", title: "类型", fixed: 'left'}, | |||||
{ prop: "model", title: "类别" }, | { prop: "model", title: "类别" }, | ||||
{ prop: "content", title: "内容名称" }, | { prop: "content", title: "内容名称" }, | ||||
{ prop: "createTime", title: "创建时间" }, | { prop: "createTime", title: "创建时间" }, | ||||
@@ -145,8 +145,8 @@ export default { | |||||
action: true, | action: true, | ||||
title: "操作", | title: "操作", | ||||
actions: [ | actions: [ | ||||
{ fnName: "update", title: "修改", type: "primary" }, | |||||
{ fnName: "delete", title: "删除", type: "error" } | |||||
{ fnName: "update", title: "修改", type: "primary", icon: 'el-icon-edit' }, | |||||
{ fnName: "delete", title: "删除", type: "danger", icon: 'el-icon-delete'} | |||||
] | ] | ||||
} | } | ||||
], | ], | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: your name | * @Author: your name | ||||
* @Date: 2021-12-07 15:14:51 | * @Date: 2021-12-07 15:14:51 | ||||
* @LastEditTime: 2021-12-09 14:10:49 | |||||
* @LastEditTime: 2021-12-10 11:36:42 | |||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @Description: 自动报警分类 | * @Description: 自动报警分类 | ||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue | ||||
@@ -114,14 +114,14 @@ export default { | |||||
searchValue: "", | searchValue: "", | ||||
list: [], | list: [], | ||||
columns: [ | columns: [ | ||||
{ prop: "kindIdName", title: "类型" }, | |||||
{ prop: "kindIdName", title: "类型", fixed: 'left' }, | |||||
{ prop: "categoryName", title: "类别" }, | { prop: "categoryName", title: "类别" }, | ||||
{ prop: "createTime", title: "创建时间" }, | { prop: "createTime", title: "创建时间" }, | ||||
{ | { | ||||
action: true, | action: true, | ||||
title: "操作", | title: "操作", | ||||
actions: [ | actions: [ | ||||
{ fnName: "update", title: "修改", type: "primary" }, | |||||
{ fnName: "update", title: "修改", type: "primary", icon: 'el-icon-edit' }, | |||||
//{ fnName: "delete", title: "删除", type: "error" }, | //{ fnName: "delete", title: "删除", type: "error" }, | ||||
], | ], | ||||
}, | }, | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-09 16:49:54 | |||||
* @LastEditTime: 2021-12-10 11:43:39 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -144,7 +144,7 @@ export default { | |||||
modelOptions: [], | modelOptions: [], | ||||
searchValue: "", | searchValue: "", | ||||
columns: [ | columns: [ | ||||
{ prop: "imei", title: "IMEI" }, | |||||
{ prop: "imei", title: "IMEI", fixed: 'left' }, | |||||
{ prop: "content", title: "内容名称" }, | { prop: "content", title: "内容名称" }, | ||||
{ prop: "createTime", title: "创建时间" }, | { prop: "createTime", title: "创建时间" }, | ||||
{ prop: "status", title: "状态" }, | { prop: "status", title: "状态" }, | ||||
@@ -152,12 +152,13 @@ export default { | |||||
action: true, | action: true, | ||||
title: "操作", | title: "操作", | ||||
actions: [ | actions: [ | ||||
{ fnName: "update", title: "修改", type: "primary" }, | |||||
{ fnName: "delete", title: "删除", type: "error" }, | |||||
{ fnName: "update", title: "修改", type: "primary", icon: 'el-icon-edit' }, | |||||
{ fnName: "delete", title: "删除", type: "danger", icon: 'el-icon-delete' }, | |||||
{ | { | ||||
fnName: "transform", | fnName: "transform", | ||||
title: "转通用", | title: "转通用", | ||||
type: "primary" | |||||
type: "success", | |||||
icon: 'el-icon-warning' | |||||
} | } | ||||
] | ] | ||||
} | } | ||||