diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue index 9985d54..2d0dbd2 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/approveCom.vue @@ -197,11 +197,11 @@ min-height: 2.5rem; display: flex; .info-left { - width: 20%; + width: 25%; text-align: right; } .info-right { - width: 80%; + width: 75%; text-align: left; display: flex; flex-direction: column; diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue index 642234a..185c790 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue @@ -22,11 +22,13 @@
结束时间:
-
{{applyInfo.end_time}}
-
-
合计:
-
{{applyInfo.total_hours + '小时' + '('+applyInfo.total_days+'工作日'+')'}}
-
+ {{applyInfo.end_time}} +
+
+
+
合计:
+
+ {{applyInfo.total_hours + '小时' + '('+applyInfo.total_days+'工作日'+')'}}
@@ -110,11 +112,12 @@ }], (result) => { let res = result[0].data; if (res.code === 2000) { - let dataBox = res.data; if(dataBox.run){ this.applyInfo = dataBox.run; - this.fileList = JSON.parse(dataBox.run.attachment_json); + if(dataBox.run.attachment_json !== ""){ + this.fileList = JSON.parse(dataBox.run.attachment_json); + } } let typeId = dataBox.run.type_id; this.typeStr = this.getTypeStr(typeId); @@ -130,7 +133,6 @@ }) }, getTypeStr:function (typeId) { - console.log(typeId) let str = ""; switch (typeId){ case 1: diff --git a/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue b/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue index 1e033f7..ecf3bc2 100644 --- a/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue +++ b/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue @@ -200,6 +200,11 @@ } } } + scrollbar-width: none; /* Firefox */ + -ms-overflow-style: none; /* IE 10+ */ + ::-webkit-scrollbar { + display: none; /* Chrome Safari */ + } } scrollbar-width: none; /* Firefox */ -ms-overflow-style: none; /* IE 10+ */ diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar.vue index 4cb397d..f11050f 100644 --- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar.vue +++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar.vue @@ -90,7 +90,7 @@ } .school-calendar-content-style{ width: 100%; - height: 350px; + /*min-height: 350px;*/ margin-top: 10px; /deep/ .ant-tabs-bar{ display: none !important; diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_yp.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_yp.vue index 0516d7a..18f219c 100644 --- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_yp.vue +++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_yp.vue @@ -91,7 +91,7 @@ } .school-calendar-content-style{ width: 100%; - height: 350px; + /* height: 350px;*/ margin-top: 10px; /deep/ .ant-tabs-bar{ display: none !important; diff --git a/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue b/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue index 4b5e0de..d1350da 100644 --- a/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue +++ b/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue @@ -17,7 +17,7 @@ \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue b/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue index d152725..ce0d70e 100644 --- a/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue +++ b/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue @@ -17,7 +17,7 @@ \ No newline at end of file