Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/inva_4_tivo/css/customerNew/customerNew.css

@@ -325,6 +325,28 @@
   margin: auto;
   position: relative;
 }
+.customerReviews .customerReviews-content .carousel-item-box {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+.customerReviews .customerReviews-content .carousel-item-box .carousel-item-title,
+.customerReviews .customerReviews-content .carousel-item-box .carousel-item-text {
+  position: absolute;
+  left: 5.875rem;
+  z-index: 1;
+  color: #255980;
+  font-weight: 500;
+  line-height: 5rem;
+}
+.customerReviews .customerReviews-content .carousel-item-box .carousel-item-title {
+  font-size: 2rem;
+  top: 2.875rem;
+}
+.customerReviews .customerReviews-content .carousel-item-box .carousel-item-text {
+  top: 8.125rem;
+  font-size: 1.625rem;
+}
 .customerReviews .customerReviews-content .carouselImage {
   width: 100%;
   height: 100%;

fhKeeper/formulahousekeeper/inva_4_tivo/css/customerNew/customerNew.less

@@ -336,6 +336,27 @@
     height: 37.5rem;
     margin: auto;
     position: relative;
+    .carousel-item-box {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      .carousel-item-title,  .carousel-item-text {
+        position: absolute;
+        left: 5.875rem;
+        z-index: 1;
+        color: #255980;
+        font-weight: 500;
+        line-height: 5rem;
+      }
+      .carousel-item-title {
+        font-size: 2rem;
+        top: 2.875rem;
+      }
+      .carousel-item-text {
+        top: 8.125rem;
+        font-size: 1.625rem;
+      }
+    }
     .carouselImage {
       width: 100%;
       height: 100%;

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -85,9 +85,9 @@
                 :total="total">
                 </el-pagination>
             </div>
-        </div>
-        <div style="position:fixed;top:170px;left:600px;" v-show="radio==$t('lable.department') && parentDeptId != null">
-            <el-button @click="backToParentDept">{{ $t('returnsuperior') }}</el-button>
+            <div style="position: absolute;top: 58px;left:450px;" v-show="radio==$t('lable.department') && parentDeptId != null">
+                <el-button @click="backToParentDept" size="small">{{ $t('returnsuperior') }}</el-button>
+            </div>
         </div>
 
         <!--导出报表条件选择 -->