Merge branch 'feature-button' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-10 10:56:47
+ * @LastEditTime: 2021-12-10 11:35:13
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -61,7 +61,12 @@ FEATURE
 
 ## v1.0.6F
 `2021年12月10日`
+FEATURE
 - 增加 标签栏头部logo
 - 增加 移动端分页页码跳转按钮
 - 增加 移动端表格弹窗适配
-- 增加 头部固定配置
+- 增加 头部固定配置
+
+IMPROVEMENT
+- 优化 表格按钮样式
+- 优化 表格在移动端的的显示方式

src/components/TTable/TTable.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 17:19:51
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-01 15:11:35
+ * @LastEditTime: 2021-12-10 11:32:40
  * @FilePath: \GpsCardAdmin\src\components\TTable\TTable.vue
  * @description: 封装通用的table组件
 -->
@@ -16,15 +16,17 @@
                     :key="column.prop"
                     :prop="column.prop"
                     :label="column.title"
+                    :fixed="column.fixed"
                     v-if="!column.action"
                     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">
                         <el-button-group v-for="(fn,index) in column.actions" :key="index">
                             <el-button
-                                type="primary"
+                                :type="fn.type"
+                                :icon="fn.icon"
                                 @click="handleClick(scope.row,fn.fnName)"
                             >{{fn.title}}</el-button>
                         </el-button-group>

src/styles/element-ui.scss

@@ -25,7 +25,6 @@
   width: 50%;
   min-width: 375px;
 }
-
 .el-pagination {
     white-space: pre-wrap;
     padding: 2px 5px;

src/views/off-limits-manage/alarm-query/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @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
  * @description:
 -->
@@ -73,10 +73,10 @@ export default {
             ],
             searchValue: "",
             columns: [
-                { prop: "alarmType", title: "告警类别" },
+                { prop: "alarmType", title: "告警类别", fixed: 'left' },
                 { prop: "imei", title: "设备IMEI" },
                 { prop: "alarmAddress", title: "告警地址/经纬度" },
-                { prop: "createTime", title: "创建时间" }
+                { prop: "createTime", title: "创建时间", fixed: 'right' }
                 /* {
                     action: true,
                     title: "操作",

src/views/off-limits-manage/alarm-recognition/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @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
  * @description:
 -->
@@ -156,7 +156,7 @@ export default {
             modelOptions: [],
             searchValue: "",
             columns: [
-                { prop: "type", title: "类型" },
+                { prop: "type", title: "类型", fixed: 'left' },
                 { prop: "model", title: "类别" },
                 { prop: "content", title: "内容名称" },
                 { prop: "createTime", title: "创建时间" },
@@ -165,8 +165,8 @@ export default {
                     action: true,
                     title: "操作",
                     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' }
                     ]
                 }
             ],

src/views/off-limits-manage/common-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @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
  * @description:
 -->
@@ -136,7 +136,7 @@ export default {
             model: "",
             searchValue: "",
             columns: [
-                { prop: "type", title: "类型" },
+                { prop: "type", title: "类型", fixed: 'left'},
                 { prop: "model", title: "类别" },
                 { prop: "content", title: "内容名称" },
                 { prop: "createTime", title: "创建时间" },
@@ -145,8 +145,8 @@ export default {
                     action: true,
                     title: "操作",
                     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'}
                     ]
                 }
             ],

src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-07 15:14:51
- * @LastEditTime: 2021-12-09 14:10:49
+ * @LastEditTime: 2021-12-10 11:36:42
  * @LastEditors: JinxuChen
  * @Description:  自动报警分类
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue
@@ -114,14 +114,14 @@ export default {
       searchValue: "",
       list: [],
       columns: [
-        { prop: "kindIdName", title: "类型" },
+        { prop: "kindIdName", title: "类型", fixed: 'left' },
         { prop: "categoryName", title: "类别" },
         { prop: "createTime", title: "创建时间" },
         {
           action: true,
           title: "操作",
           actions: [
-            { fnName: "update", title: "修改", type: "primary" },
+            { fnName: "update", title: "修改", type: "primary", icon: 'el-icon-edit' },
             //{ fnName: "delete", title: "删除", type: "error" },
           ],
         },

src/views/off-limits-manage/user-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @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
  * @description:
 -->
@@ -144,7 +144,7 @@ export default {
             modelOptions: [],
             searchValue: "",
             columns: [
-                { prop: "imei", title: "IMEI" },
+                { prop: "imei", title: "IMEI", fixed: 'left' },
                 { prop: "content", title: "内容名称" },
                 { prop: "createTime", title: "创建时间" },
                 { prop: "status", title: "状态" },
@@ -152,12 +152,13 @@ export default {
                     action: true,
                     title: "操作",
                     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",
                             title: "转通用",
-                            type: "primary"
+                            type: "success",
+                            icon: 'el-icon-warning'
                         }
                     ]
                 }