From ce9033290e9a42c0094e9968b98acdb73873e26a Mon Sep 17 00:00:00 2001
From: gongdi <410827992@qq.com>
Date: Fri, 14 Jan 2022 17:10:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=8B=E6=B5=A6=E4=B8=AD=E5=AD=A6=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todoHandle/modulComponent/approveCom.vue   |  4 ++--
 .../todoHandle/modulComponent/leaveApprove.vue | 18 ++++++++++--------
 .../adminCenter/workBench/myApplication.vue    |  5 +++++
 .../monitorCenter/schoolDaily/calendar.vue     |  2 +-
 .../monitorCenter/schoolDaily/calendar_yp.vue  |  2 +-
 .../pages/partyCenter/teamBuildingStyle.vue    |  2 +-
 .../pages/partyCenter/teamHelp.vue             |  2 +-
 7 files changed, 21 insertions(+), 14 deletions(-)

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 @@
             <div class="info-row-style">
                 <div class="info-left">结束时间：</div>
                 <div class="info-right">
-                    <div class="left-style">{{applyInfo.end_time}}</div>
-                    <div class="right-style">
-                        <div class="part-left">合计：</div>
-                        <div class="part-right">{{applyInfo.total_hours + '小时' + '('+applyInfo.total_days+'工作日'+')'}}</div>
-                    </div>
+                    {{applyInfo.end_time}}
+                </div>
+            </div>
+            <div class="info-row-style">
+                <div class="info-left">合计：</div>
+                <div class="info-right">
+                    {{applyInfo.total_hours + '小时' + '('+applyInfo.total_days+'工作日'+')'}}
                 </div>
             </div>
             <div class="info-row-style">
@@ -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 @@
 </script>
 <style scoped lang="scss">
     .party-center-team-building-style {
-        width: 605px;
+        width: 605px !important;
         height: 400px !important;
     }
 </style>
\ 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 @@
 </script>
 <style scoped lang="scss">
     .party-center-team-help-style {
-        width: 605px;
+        width: 605px !important;
         height: 400px !important;
     }
 </style>
\ No newline at end of file