-
+
{{
@@ -254,29 +261,26 @@
-
+
-
+
{{ Math.floor(row.sumDurationMinutes) }}
@@ -286,10 +290,9 @@
prop="prohibitedZb"
label="违禁接待占比"
align="center"
-
>
-
+
{
+ let timeA = a[e.prop] == null ? null : new Date(a[e.prop].replace(/-/g, "/")).getTime();
+ let timeB = b[e.prop] == null ? null : new Date(b[e.prop].replace(/-/g, "/")).getTime();
+ if (e.order == "ascending") {
+ return timeA - timeB;
+ }
+ if (e.order == "descending") {
+ return timeB - timeA;
+ }
+ });
+ } else {
+ this.tableData.sort((a, b) => {
+ if (e.order == "ascending") {
+ return a[e.prop] - b[e.prop];
+ }
+ if (e.order == "descending") {
+ return b[e.prop] - a[e.prop];
+ }
+ });
+ }
+ let index = this.tableData.findIndex((item) => {
+ return item.statDate == null;
+ });
+ if (index != -1) {
+ let obj = this.tableData.splice(index, 1);
+ this.tableData.push(obj[0]);
+ }
+ },
+
+ isSystoleForm() {
+ this.isOpen = !this.isOpen;
},
downLoad() {
let obj = {
@@ -594,7 +630,7 @@ export default {
this.statDateEnd = "";
this.dateType = index;
this.customtime = [];
-
+
//给时间选择器赋值
let num = 24 * 3600 * 1000;
// 获取当前时间戳转换为日期格式
@@ -627,7 +663,6 @@ export default {
return arr;
},
-
timestampToTime(timestamp) {
var date = new Date(timestamp); //时间戳为10位需*1000,时间戳为13位的话不需乘1000
var yyyy = date.getFullYear() + "-";
@@ -734,8 +769,8 @@ export default {
font-weight: 500;
font-size: 16px;
color: #333333;
- display: flex;
- align-items: center;
+ display: flex;
+ align-items: center;
}
.text2 {
flex: 1;
@@ -763,8 +798,8 @@ export default {
font-weight: 500;
font-size: 16px;
color: #333333;
- display: flex;
- align-items: center;
+ display: flex;
+ align-items: center;
}
.text2 {
flex: 1;
@@ -846,27 +881,27 @@ export default {
margin-left: 15px;
min-width: 40px;
}
-/deep/ .el-table__header-wrapper{
- thead{
- tr{
- th{
- background: #F5F7FA;
+/deep/ .el-table__header-wrapper {
+ thead {
+ tr {
+ th {
+ background: #f5f7fa;
color: #333333;
}
}
}
}
-/deep/ .el-dialog--center{
+/deep/ .el-dialog--center {
border-radius: 8px;
- .el-dialog__title{
+ .el-dialog__title {
font-weight: bold;
}
}
-/deep/ .el-button--primary{
- background: #2671E2 !important;
- border: 1px solid #2671E2 !important;
+/deep/ .el-button--primary {
+ background: #2671e2 !important;
+ border: 1px solid #2671e2 !important;
}
-/deep/ .el-button--text{
- color: #2671E2;
+/deep/ .el-button--text {
+ color: #2671e2;
}
diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue
index cc44fc7..a7a274b 100644
--- a/src/views/admin/role/index.vue
+++ b/src/views/admin/role/index.vue
@@ -456,6 +456,7 @@ export default {
if (row.messageType) {
console.log(row.messageType, "这里是messagetype");
this.checkList = row.messageType.split(',')
+ this.$forceUpdate() // 某些浏览器上无法更新
}
},
@@ -473,7 +474,7 @@ export default {
} else {
this.form.messageType = ''
}
- putObj(this.form).then((res) => {
+ this.$api.api.updateMessageType(this.form).then((res) => {
console.log(res);
this.cancelAddPush();
if (res.code == 0) {