-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/js/pages/manage/components/ReportMy.vue b/resources/assets/js/pages/manage/components/ReportMy.vue
index d50faf09..709b4e42 100644
--- a/resources/assets/js/pages/manage/components/ReportMy.vue
+++ b/resources/assets/js/pages/manage/components/ReportMy.vue
@@ -51,6 +51,7 @@ export default {
createAt: [],
reportType:'',
reportTypeList:[
+ {value:"",label:'全部' },
{value:"weekly",label:'周报' },
{value:"daily",label:'日报' },
],
@@ -123,6 +124,7 @@ export default {
url: 'report/my',
data: {
page: this.listPage,
+ pagesize: this.listPageSize,
created_at: this.createAt,
type: this.reportType
},
diff --git a/resources/assets/js/pages/manage/components/ReportReceive.vue b/resources/assets/js/pages/manage/components/ReportReceive.vue
index c0dde4c9..0876a9f8 100644
--- a/resources/assets/js/pages/manage/components/ReportReceive.vue
+++ b/resources/assets/js/pages/manage/components/ReportReceive.vue
@@ -58,6 +58,7 @@ export default {
reportType:'',
createAt: [],
reportTypeList:[
+ {value:"",label:'全部' },
{value:"weekly",label:'周报' },
{value:"daily",label:'日报' },
],
@@ -87,11 +88,6 @@ export default {
)
}else {
arr.push(
- h('Tag', {
- props: { //传递参数
- color: "lime",
- }
- }, this.$L("已读")),
h('span',params.row.title)
)
}
@@ -145,6 +141,7 @@ export default {
url: 'report/receive',
data: {
page: this.listPage,
+ pagesize: this.listPageSize,
username: this.username,
created_at: this.createAt,
type: this.reportType
diff --git a/resources/assets/sass/components/report.scss b/resources/assets/sass/components/report.scss
index 00231c35..cdc609da 100644
--- a/resources/assets/sass/components/report.scss
+++ b/resources/assets/sass/components/report.scss
@@ -28,6 +28,33 @@
}
}
}
+ .manage-box-report{
+ font-family: "Monospaced Number";
+ line-height: 1;
+ vertical-align: middle;
+ position: absolute;
+ -webkit-transform: translateX(50%);
+ -ms-transform: translateX(50%);
+ transform: translateX(50%);
+ right: 0;
+ height: 20px;
+ border-radius: 10px;
+ min-width: 20px;
+ background: #ed4014;
+ border: 1px solid transparent;
+ color: #fff;
+ line-height: 18px;
+ text-align: center;
+ padding: 0 6px;
+ font-size: 12px;
+ white-space: nowrap;
+ -webkit-transform-origin: -10% center;
+ -ms-transform-origin: -10% center;
+ transform-origin: -10% center;
+ z-index: 10;
+ -webkit-box-shadow: 0 0 0 1px #fff;
+ box-shadow: 0 0 0 1px #fff;
+ }
.page-box {
text-align: center;
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index f34e66d8..0b215661 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -69,6 +69,16 @@
margin: -1px;
}
}
+ .manage-box-top-report {
+ align-items: center;
+ flex-direction: column;
+ justify-content: center;
+ flex: 0 0 auto;
+ > i {
+ font-size: 12px;
+ margin: -1px;
+ }
+ }
}
.manage-menu-report-badge {
margin-left: 6px;