diff --git a/README.md b/README.md
index 8767e3e..78fc421 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
@@ -57,4 +57,11 @@ FIX
FEATURE
- 增加 localStorage存储 src\store\localStorage.js
- 增加 页面显示用户名
-- 修改 首页背景图
\ No newline at end of file
+- 修改 首页背景图
+
+## v1.0.6F
+`2021年12月10日`
+- 增加 标签栏头部logo
+- 增加 移动端分页页码跳转按钮
+- 增加 移动端表格弹窗适配
+- 增加 头部固定配置
\ No newline at end of file
diff --git a/public/favicon.ico b/public/favicon.ico
index 34b63ac..ed759ac 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/App.vue b/src/App.vue
index 563431f..fd063da 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
@@ -34,7 +34,7 @@ export default {
});
},
debug() {
- if (process.env.NODE_ENV !== "production") {
+ if (process.env.NODE_ENV !== "production" && document.body.clientWidth - 1 < 991) {
const script = document.createElement("script");
script.src = "//cdn.jsdelivr.net/npm/eruda";
document.body.appendChild(script);
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 94916f1..2f2e4f7 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -1,102 +1,194 @@
-
+
-
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index a2a0762..f1ed2c8 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,7 +1,7 @@
@@ -32,7 +32,7 @@ export default {
data() {
return {
title: '禁入区域告警系统',
- logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+ logo: require('@/assets/telpo.png')
}
}
}
@@ -53,7 +53,7 @@ export default {
width: 100%;
height: 50px;
line-height: 50px;
- background: #2b2f3a;
+ background: #304156;
text-align: center;
overflow: hidden;
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index e8d0df8..b4f0480 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -1,8 +1,14 @@
+/*
+ * @Date: 2021-11-30 15:34:45
+ * @LastEditors: JinxuChen
+ * @LastEditTime: 2021-12-10 10:19:10
+ * @FilePath: \GpsCardAdmin\src\layout\mixin\ResizeHandler.js
+ * @description:
+ */
import store from '@/store'
const { body } = document
const WIDTH = 992 // refer to Bootstrap's responsive design
-
export default {
watch: {
$route(route) {
diff --git a/src/settings.js b/src/settings.js
index e789109..67ca127 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,7 +1,7 @@
/*
* @Date: 2021-11-29 11:20:34
* @LastEditors: JinxuChen
- * @LastEditTime: 2021-11-29 17:01:03
+ * @LastEditTime: 2021-12-10 10:53:56
* @FilePath: \GpsCardAdmin\src\settings.js
* @description:
*/
@@ -13,11 +13,11 @@ module.exports = {
* @type {boolean} true | false
* @description Whether fix the header
*/
- fixedHeader: false,
+ fixedHeader: true,
/**
* @type {boolean} true | false
* @description Whether show the logo in sidebar
*/
- sidebarLogo: false
+ sidebarLogo: true
}
diff --git a/src/store/localStore.js b/src/store/localStore.js
index 5e72c39..fca7a1c 100644
--- a/src/store/localStore.js
+++ b/src/store/localStore.js
@@ -1,7 +1,7 @@
/*
* @Date: 2021-12-08 16:13:09
* @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 16:24:19
+ * @LastEditTime: 2021-12-10 10:19:33
* @FilePath: \GpsCardAdmin\src\store\localStore.js
* @description: store 使用local Storage
*/
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0062411..7d71597 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -22,8 +22,17 @@
left: 0;
position: relative;
margin: 0 auto;
+ width: 50%;
+ min-width: 375px;
}
+.el-pagination {
+ white-space: pre-wrap;
+ padding: 2px 5px;
+ color: #303133;
+ font-weight: 700;
+ width: 100%;
+}
// refine element ui upload
.upload-container {
.el-upload {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 588523d..480bd4d 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -62,4 +62,7 @@ div:focus {
// main-container global css
.app-container {
padding: 20px 10px;
+ .filter-container {
+ margin: 30px 10px;
+ }
}
diff --git a/src/utils/model.js b/src/utils/model.js
index 2316e14..012c8eb 100644
--- a/src/utils/model.js
+++ b/src/utils/model.js
@@ -1,8 +1,8 @@
/*
* @Date: 2021-11-30 15:09:25
* @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 14:55:27
+ * @LastEditTime: 2021-12-10 10:57:51
* @FilePath: \GpsCardAdmin\src\utils\model.js
* @description: 版本号
*/
-export const VersionModel = '1.0.5';
\ No newline at end of file
+export const VersionModel = '1.0.6';
\ No newline at end of file
diff --git a/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue b/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
index 1533e0e..ceed115 100644
--- a/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
+++ b/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
@@ -1,10 +1,10 @@
@@ -25,6 +25,7 @@
:rules="[{ required: true, message: '类别不能为空' }]"
>
diff --git a/src/views/off-limits-manage/user-exception/index.vue b/src/views/off-limits-manage/user-exception/index.vue
index efe8c1f..324ab0e 100644
--- a/src/views/off-limits-manage/user-exception/index.vue
+++ b/src/views/off-limits-manage/user-exception/index.vue
@@ -1,7 +1,7 @@
@@ -10,7 +10,7 @@