洋浦中学 工作台项目阶段代码提交

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;

src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue

@@ -22,12 +22,14 @@
             <div class="info-row-style">
                 <div class="info-left">结束时间：</div>
                 <div class="info-right">
-                    <div class="left-style">{{applyInfo.end_time}}</div>
+                    {{applyInfo.end_time}}
-                    <div class="right-style">
-                        <div class="part-left">合计：</div>
-                        <div class="part-right">{{applyInfo.total_hours + '小时' + '('+applyInfo.total_days+'工作日'+')'}}</div>
                 </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">
                 <div class="info-left">请假事由：</div>
@@ -110,12 +112,13 @@
                 }], (result) => {
                     let res = result[0].data;
                     if (res.code === 2000) {
-
                         let dataBox = res.data;
                         if(dataBox.run){
                             this.applyInfo = dataBox.run;
+                            if(dataBox.run.attachment_json !== ""){
                                 this.fileList = JSON.parse(dataBox.run.attachment_json);
                             }
+                        }
                         let typeId = dataBox.run.type_id;
                         this.typeStr = this.getTypeStr(typeId);
                         this.hasNext = dataBox.has_next;//是否存在下一审批节点
@@ -130,7 +133,6 @@
                 })
             },
             getTypeStr:function (typeId) {
-                console.log(typeId)
                 let str = "";
                 switch (typeId){
                     case 1:

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+ */

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;

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;

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>

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>