Browse Source

工时管家——官网修改

ZhouRuiTing 5 năm trước cách đây
mục cha
commit
38033d7c63

BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_1.png


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_2.jpg


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_2.png


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_3.png


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_4.png


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_5.png


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_6.png


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_7.png


BIN
fhKeeper/formulahousekeeper/inva_4_tivo/images/banner_8.png


+ 10 - 7
fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -246,25 +246,28 @@
                         <div class="swiper-container text-slider">
                             <div class="swiper-wrapper">
                                 <div class="swiper-slide">
-                                    <img class="img-fluid" src="images/banner_1.png" alt="工作桌面">
+                                    <img class="img-fluid" src="images/banner_1.png" alt="">
                                 </div>
                                 <div class="swiper-slide">
-                                    <img class="img-fluid" src="images/banner_2.jpg" alt="工作桌面详情">
+                                    <img class="img-fluid" src="images/banner_2.png" alt="">
                                 </div>
                                 <div class="swiper-slide">
-                                    <img class="img-fluid" src="images/banner_3.png" alt="工时统计">
+                                    <img class="img-fluid" src="images/banner_3.png" alt="">
                                 </div>
                                 <div class="swiper-slide">
-                                    <img class="img-fluid" src="images/banner_4.png" alt="工作日报">
+                                    <img class="img-fluid" src="images/banner_4.png" alt="">
                                 </div>
                                 <div class="swiper-slide">
-                                    <img class="img-fluid" src="images/banner_5.png" alt="项目列表">
+                                    <img class="img-fluid" src="images/banner_5.png" alt="">
                                 </div>
                                 <div class="swiper-slide">
-                                    <img class="img-fluid" src="images/banner_6.png" alt="成本统计">
+                                    <img class="img-fluid" src="images/banner_6.png" alt="">
                                 </div>
                                 <div class="swiper-slide">
-                                    <img class="img-fluid" src="images/banner_7.png" alt="团队管理">
+                                    <img class="img-fluid" src="images/banner_7.png" alt="">
+                                </div>
+                                <div class="swiper-slide">
+                                    <img class="img-fluid" src="images/banner_8.png" alt="">
                                 </div>
                             </div>
                             <div class="swiper-button-next"></div>

+ 19 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -35,6 +35,11 @@
                             </span>
                             <span>系统智能统计:{{item1.calculateTime}}h</span>
                         </span>
+                        <div class="checkbtn">
+                            <el-button type="primary" size="small" @click="submitDepartment">通过</el-button>
+                            <el-button type="danger" size="small" @click="submitDepartment">驳回</el-button>
+                            <el-button type="danger" size="small" @click="submitDepartment">驳回</el-button>
+                        </div>
                         <div class="one_daily_body">
                             <el-timeline>
                                 <el-timeline-item v-for="(item2,index2) in item1.data" :key="index2">
@@ -178,6 +183,7 @@
                     this.listLoading = false;
                     if (res.code == "ok") {
                         this.reportList = res.data;
+                        document.querySelector("#day"+this.choseDay).scrollIntoView(true);
                     } else {
                         this.$message({
                             message: res.msg,
@@ -373,10 +379,10 @@
         },
         created() {
             let height = window.innerHeight;
-            this.tableHeight = height - 170;
+            this.tableHeight = height - 150;
             const that = this;
             window.onresize = function temp() {
-                that.tableHeight = window.innerHeight - 170;
+                that.tableHeight = window.innerHeight - 150;
             };
         },
         mounted() {
@@ -417,15 +423,26 @@
             padding: 0;
         }
     }
+
+    .checkbtn {
+        float: right;
+        margin-top: -10px;
+    }
 </style>
+
 <style lang="scss">
     .daily {
         .el-card__body {
             height: 82%;
             overflow-y: auto;
         }
+
+        .el-card__header {
+            padding: 0 20px;
+        }
     }
 </style>
+
 <style scoped>
 /* 项目标签的样式 */
     .el-tag + .el-tag {