diff --git a/src/assets/title.png b/src/assets/title.png
index 900d143..54dd6dc 100644
Binary files a/src/assets/title.png and b/src/assets/title.png differ
diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js
index b13191c..f73ba35 100644
--- a/src/layout/mixin/ResizeHandler.js
+++ b/src/layout/mixin/ResizeHandler.js
@@ -1,7 +1,7 @@
import store from '@/store'
const { body } = document
-const WIDTH = 992 // refer to Bootstrap's responsive design
+const WIDTH = 768 // refer to Bootstrap's responsive design
export default {
watch: {
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index bf5f6ec..996aa04 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -51,3 +51,44 @@
.el-submenu.is-active .el-submenu__title {
border-bottom: 2px solid;
}
+
+// 时间选择器移动端 适配begin
+@media (max-width: 768px) {
+ .el-date-range-picker .el-picker-panel__body {
+ min-width: 100%;
+ }
+
+ .el-date-range-picker__content {
+ width: 100% !important;
+ }
+
+ .el-date-range-picker {
+ width: 80% !important;
+ }
+
+ .el-date-range-picker__content {
+ margin: 0px;
+ padding: 5px;
+ }
+
+ .el-date-range-picker__content.is-left {
+ padding-bottom: 0px;
+ }
+
+ .el-date-range-picker__content.is-right {
+ padding-top: 0px;
+ }
+
+ .el-date-table th {
+ padding: 0px;
+ }
+
+ .el-date-table td {
+ padding: 0px;
+ }
+}
+@media (max-width: 720px) {
+ .el-message-box {
+ width: 320px !important;
+ }
+}
diff --git a/src/styles/navbar.scss b/src/styles/navbar.scss
index 07ab72d..193dcd4 100644
--- a/src/styles/navbar.scss
+++ b/src/styles/navbar.scss
@@ -22,7 +22,6 @@
.navbar-brand__img {
height: 20px;
- filter: drop-shadow(0 2px 4px #00000077);
margin-left: 10px;
}
.navbar-brand__logo {
@@ -61,8 +60,6 @@
display: flex;
justify-content: center;
align-items: center;
- min-width: 2rem;
- min-height: 2rem;
-webkit-box-pack: center;
.el-badge__content:not(.is-dot) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 1880f52..f09e249 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -83,4 +83,12 @@ export default {
diff --git a/src/views/system/DashboardComponents/department.vue b/src/views/system/DashboardComponents/department.vue
index f10409d..b7f84f7 100644
--- a/src/views/system/DashboardComponents/department.vue
+++ b/src/views/system/DashboardComponents/department.vue
@@ -102,7 +102,7 @@ export default {
},
series: [
{
- barWidth: 20,
+ barWidth: this.$store.getters.device === 'desktop' ? 20 : 10,
type: 'bar',
stack: 'a',
name: '合计金额(元)',
@@ -125,7 +125,7 @@ export default {
data: this.list.map(item => (parseFloat(item.money_total_2) ? parseFloat(item.money_total_2) : parseFloat(item.money_total_1) - parseFloat(item.use_money_total)))
},
{
- barWidth: 20,
+ barWidth: this.$store.getters.device === 'desktop' ? 20 : 10,
type: 'bar',
stack: 'a',
name: '已使用金额(元)',
diff --git a/src/views/system/DashboardComponents/toDo.vue b/src/views/system/DashboardComponents/toDo.vue
index dd80856..440c8b1 100644
--- a/src/views/system/DashboardComponents/toDo.vue
+++ b/src/views/system/DashboardComponents/toDo.vue
@@ -15,10 +15,10 @@
style="width: 100%;"
size="mini"
:header-cell-style="{
- 'font-weight': '600',
- 'background': '#f8f8f9',
- 'color': '#515a6e'
- }"
+ 'font-weight': '600',
+ 'background': '#f8f8f9',
+ 'color': '#515a6e'
+ }"
element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(255, 255, 255, 0.8)"
@@ -39,7 +39,7 @@
:align="item.align"
:formatter="item.formatter"
/>
-
+
查看
办理
@@ -53,12 +53,13 @@
v-model="isShowModal"
transfer
show-zoom
+ :fullscreen="$store.getters.device === 'mobile'"
title="办理"
width="86vw"
height="80vh"
esc-closable
>
-
+
@@ -125,86 +126,6 @@ export default {
'show-overflow-tooltip': true,
minWidth: 200
}
- // {
- // title: '查看',
- // key: 'show',
- // width: 180,
- // render: (h, { row }) => {
- // return h('div', [
- // h(
- // 'Button',
- // {
- // props: {
- // type: 'default',
- // size: 'small'
- // },
- // style: {
- // background: '#f0f3fa',
- // color: '#333',
- // border: '1px solid #dae1f0',
- // fontSize: '13px'
- // },
- // on: {
- // 'click': (_) => {
- // if (row.from_type === 'contract') {
- // this.$router.push({
- // path: '/contract/contract/contractList',
- // query: {
- // keyword: /\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : ''
- // }
- // })
- // } else {
- // window.open(
- // `${process.env.VUE_APP_OUT_OLD}/flow/view/${row.id}?auth_token=${this.$store.getters.oa_token}`,
- // 'edit',
- // `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
- // )
- // }
- // }
- // }
- // },
- // '查看'
- // ),
- // h(
- // 'Button',
- // {
- // props: {
- // type: 'primary',
- // size: 'small'
- // },
- // style: {
- // 'margin-left': '6px',
- // fontSize: '13px'
- // },
- // on: {
- // 'click': (_) => {
- // if (row.from_type === 'contract') {
- // const toUrl = this.$router.resolve({
- // path: '/contract/contract/contractList',
- // query: {
- // keyword: /\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : ''
- // }
- // })
- // window.open(
- // toUrl.href,
- // 'edit',
- // `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
- // )
- // } else {
- // window.open(
- // `${process.env.VUE_APP_OUT_OLD}/flow/deal/${row.id}?auth_token=${this.$store.getters.oa_token}`,
- // 'edit',
- // `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
- // )
- // }
- // }
- // }
- // },
- // '办理'
- // )
- // ])
- // }
- // }
]
}
},