提交相关代码

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

@@ -3,22 +3,55 @@
   height: 57.5rem;
   position: relative;
 }
+
+.bannar .bannar_text_btn {
+  display: inline-block;
+  line-height: 1;
+  white-space: nowrap;
+  cursor: pointer;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  color: #606266;
+  text-align: center;
+  box-sizing: border-box;
+  outline: none;
+  margin: 0;
+  transition: .1s;
+  font-weight: 500;
+  padding: 1.25rem 1.875rem;
+  border-radius: 4px;
+  position: absolute;
+  color: #fff;
+  background-color: #409eff;
+  border-color: #409eff;
+  bottom: 4rem;
+  left: 10rem;
+}
+
+.bannar .bannar_text_btn a {
+  color: #fff;
+  font-size: 1.5rem;
+}
+
 .bannar .bannar_text {
   position: absolute;
   left: 9.875rem;
-  bottom: 4.375rem;
+  bottom: 9.375rem;
 }
+
 .bannar .bannar_text .bannar_text_item {
   font-family: PingFangSC, PingFang SC;
   font-size: 34px;
   color: #5c5d61;
   line-height: 4.375rem;
 }
+
 .bannar .bannar_text .bannar_text_title {
   font-size: 5.625rem;
   color: #12174e;
   margin-bottom: 3.75rem;
 }
+
 .customer_integration {
   width: 100%;
   height: 51.875rem;
@@ -26,42 +59,50 @@
   align-items: center;
   justify-content: center;
 }
+
 .customer_integration .customer_integration_conter {
   display: flex;
   flex-direction: column;
   justify-content: center;
 }
+
 .customer_integration .customer_integration_conter .integrationImg {
   width: 180px;
   height: 180px;
   padding-bottom: 0.625rem;
   margin: auto;
 }
+
 .customer_integration .customer_integration_conter .integrationImg img {
   width: 100%;
   height: 100%;
 }
+
 .customer_integration .customer_integration_conter .integrationText {
   font-size: 34px;
   color: #354155;
 }
+
 .core {
   background: #f8f9ff;
   width: 100%;
   position: relative;
   padding: 6.25rem 0 6rem 0;
 }
+
 .core .core-title {
   color: #000000;
   font-size: 3.125rem;
   padding-bottom: 1.4375rem;
   text-align: center;
 }
+
 .core .core-text {
   color: #5a5a5a;
   font-size: 1.625rem;
   text-align: center;
 }
+
 .core .core-content {
   padding-top: 4.875rem;
   width: 100rem;
@@ -71,6 +112,7 @@
   justify-content: space-between;
   flex-wrap: wrap;
 }
+
 .core .core-content .core-content-item {
   width: 31.875rem;
   height: 18.75rem;
@@ -81,6 +123,7 @@
   position: relative;
   box-shadow: 0px 20px 30px 0px rgba(0, 0, 0, 0.06);
 }
+
 .core .core-content .core-content-item .item-img {
   width: 14.375rem;
   height: 14.375rem;
@@ -88,10 +131,12 @@
   top: 0.875rem;
   right: 3.75rem;
 }
+
 .core .core-content .core-content-item .item-img img {
   width: 100%;
   height: 100%;
 }
+
 .core .core-content .core-content-item .item-text {
   height: 4.125rem;
   display: flex;
@@ -103,11 +148,13 @@
   position: relative;
   z-index: 1;
 }
+
 .core .core-content .core-content-item .item-title {
   font-size: 2rem;
   color: #000000;
   padding-left: 2.3125rem;
 }
+
 .demand {
   background: #fff;
   width: 100%;
@@ -118,31 +165,37 @@
   justify-content: center;
   align-content: space-around;
 }
+
 .demand .demand-title {
   width: 100%;
   text-align: center;
   font-size: 3.125rem;
   color: #000000;
 }
+
 .demand .demand-content {
   position: relative;
   width: 59.375rem;
   height: 46.875rem;
   padding-bottom: 1.375rem;
 }
+
 .demand .demand-content .demand-item {
   position: absolute;
 }
+
 .demand .demand-content .demand-item .demand-item-title {
   display: flex;
   align-items: center;
   font-size: 1.75rem;
   color: #000000;
 }
+
 .demand .demand-content .demand-item .demand-item-title .item-title-img {
   width: 2.5rem;
   height: 2.5rem;
 }
+
 .demand .demand-content .demand-item .demand-item-text {
   font-weight: 500;
   font-size: 1.375rem;
@@ -150,60 +203,73 @@
   line-height: 2.25rem;
   padding-top: 0.25rem;
 }
+
 .demand .demand-content .orientation1 {
   top: 2.75rem;
   left: -6.875rem;
 }
+
 .demand .demand-content .orientation2 {
   top: 2.75rem;
   right: -11.75rem;
 }
+
 .demand .demand-content .orientation3 {
   top: 17.875rem;
   left: -23.75rem;
 }
+
 .demand .demand-content .orientation4 {
   top: 17.875rem;
   right: -22.625rem;
 }
+
 .demand .demand-content .orientation5 {
   bottom: 2rem;
   left: -6.4375rem;
 }
+
 .demand .demand-content .orientation6 {
   bottom: 2rem;
   right: -4.0625rem;
 }
+
 .demand img {
   width: 100%;
   height: 100%;
 }
+
 .exhibition {
   width: 100%;
   padding: 6rem 0;
   background: #f8f9ff;
 }
+
 .exhibition .exhibition-title {
   text-align: center;
   font-size: 3.125rem;
   line-height: 4.375rem;
   padding-bottom: 1.6875rem;
 }
+
 .exhibition .exhibition-content {
   width: 103.5625rem;
   margin: auto;
   display: flex;
   justify-content: space-between;
 }
+
 .exhibition .exhibition-content .exhibition-item {
   display: flex;
 }
+
 .exhibition .exhibition-content .exhibition-item .exhibition-item-line {
   width: 0.125rem;
   height: 55rem;
   background: #979797;
   position: relative;
 }
+
 .exhibition .exhibition-content .exhibition-item .exhibition-item-line .optFor {
   width: 0.3125rem;
   height: 5rem;
@@ -213,9 +279,11 @@
   transform: translateX(-50%);
   transition: 0.5s;
 }
+
 .exhibition .exhibition-content .exhibition-item .exhibition-item-text {
   padding-left: 1.75rem;
 }
+
 .exhibition .exhibition-content .exhibition-item .exhibition-item-text .text {
   height: 5rem;
   display: flex;
@@ -224,9 +292,11 @@
   font-size: 1.75rem;
   cursor: pointer;
 }
+
 .exhibition .exhibition-content .exhibition-item .exhibition-item-text .text-On {
   color: #000000;
 }
+
 .exhibition .exhibition-content .exhibition-show {
   margin-top: 4.375rem;
   width: 90.625rem;
@@ -235,6 +305,7 @@
   background-size: cover;
   position: relative;
 }
+
 .exhibition .exhibition-content .exhibition-show .exhibition-show-carouselImage {
   position: absolute;
   top: 3.8125rem;
@@ -242,14 +313,17 @@
   width: 67.0625rem;
   height: 37.6875rem;
 }
+
 .exhibition .exhibition-content .exhibition-show .exhibition-show-carouselImage img {
   width: 100%;
   height: 100%;
 }
+
 .solution {
   padding: 7.375rem 0 0 0;
   background: #fff;
 }
+
 .solution .solution-title {
   font-size: 3.125rem;
   color: #000000;
@@ -257,6 +331,7 @@
   text-align: center;
   margin-bottom: 8.125rem;
 }
+
 .solution .solution-content {
   width: 101.125rem;
   height: 40.625rem;
@@ -265,6 +340,7 @@
   flex-wrap: wrap;
   margin: auto;
 }
+
 .solution .solution-content .solution-item {
   width: 18.75rem;
   height: 18.75rem;
@@ -273,21 +349,27 @@
   overflow: hidden;
   box-shadow: 0px 20px 30px 0px rgba(0, 0, 0, 0.06);
 }
+
 .solution .solution-content .solution-item:nth-child(5n) {
   margin-right: 0;
 }
+
 .solution .solution-content .solution-item:nth-child(2) .solution-item-title {
   background: #58c1f1;
 }
+
 .solution .solution-content .solution-item:nth-child(4) .solution-item-title {
   background: #58c1f1;
 }
+
 .solution .solution-content .solution-item:nth-child(7) .solution-item-title {
   background: #58c1f1;
 }
+
 .solution .solution-content .solution-item:nth-child(9) .solution-item-title {
   background: #58c1f1;
 }
+
 .solution .solution-content .solution-item .solution-item-title {
   width: 100%;
   height: 5.625rem;
@@ -299,6 +381,7 @@
   background: #20a0ff;
   box-sizing: border-box;
 }
+
 .solution .solution-content .solution-item .solution-item-text {
   width: 100%;
   height: 13.125rem;
@@ -308,10 +391,12 @@
   padding: 2.125rem 1.25rem;
   box-sizing: border-box;
 }
+
 .customerReviews {
   padding: 6.25rem 0 7.5rem 0;
   background: #fff;
 }
+
 .customerReviews .customerReviews-title {
   font-size: 3.125rem;
   color: #000000;
@@ -319,17 +404,20 @@
   text-align: center;
   margin-bottom: 7.6875rem;
 }
+
 .customerReviews .customerReviews-content {
   width: 100rem;
   height: 37.5rem;
   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;
@@ -339,24 +427,29 @@
   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%;
   border-radius: 0.375rem;
   overflow: hidden;
 }
+
 .customerReviews .customerReviews-content .carouselImage img {
   width: 100%;
   height: 100%;
 }
+
 .customerReviews .icon {
   position: absolute;
   display: flex;
@@ -368,16 +461,20 @@
   top: 50%;
   transform: translateY(-50%);
 }
+
 .customerReviews .icon img {
   width: 75%;
   height: 75%;
 }
+
 .customerReviews .left {
   left: -7.1875rem;
 }
+
 .customerReviews .right {
   right: -7.1875rem;
 }
+
 /* 咨询 */
 .zhixun {
   display: block;
@@ -390,19 +487,24 @@
   z-index: 99999999;
   text-align: center;
 }
+
 .zhixun p {
   margin: 8px 0;
 }
+
 .zhixun img {
   width: 8rem;
 }
+
 .tabOn {
   background: #fff;
   color: #20a0ff !important;
 }
+
 .white {
   background: #fff !important;
 }
+
 /* 质询图标 */
 .consulting {
   width: 3.125rem;
@@ -419,9 +521,11 @@
   align-items: center;
   justify-content: center;
 }
+
 .consulting:hover {
   background: #3396fb;
 }
+
 .conImgConImg {
   width: 2.5rem;
   height: 2.5rem;
@@ -429,6 +533,7 @@
   margin-top: 1.5625rem;
   margin-left: 1.125rem;
 }
+
 .conImgConImg img {
   width: 100%;
-}
+}

fhKeeper/formulahousekeeper/timesheet/src/components/selectProject.vue

@@ -1,6 +1,7 @@
 <template>
-  <el-select v-model="selectedValue" size="mini" filterable remote @change="updateValue"
-    :remote-method="projectListRemotemethod" :loading="newProjectListLoading" @visible-change="visibleChangeProjrct" @focus="peojectFocus">
+  <el-select v-model="selectedValue" :size="size" filterable remote @change="updateValue" :placeholder="placeholder"
+    :clearable="clearable" :remote-method="projectListRemotemethod" :loading="newProjectListLoading"
+    @visible-change="visibleChangeProjrct" @focus="peojectFocus">
     <div ref="mySelectProject" class="select-project-class">
       <el-option v-for="item in newProjectList" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode"
         :value="item.id">
@@ -21,6 +22,18 @@ export default {
     value: {
       type: [String, Number],
       required: true
+    },
+    size: {
+      type: [String],
+      default: 'mini'
+    },
+    placeholder: {
+      type: [String],
+      default: '请选择'
+    },
+    clearable: {
+      type: [Boolean],
+      default: false
     }
   },
   data() {
@@ -61,7 +74,7 @@ export default {
       this.postData(`/project/getProjectListByPage`, {
         pageIndex: this.newProjectListPage,
         pageSize: this.newProjectListSize,
-        id: this.curProjectId,
+        id: this.value,
         forReport: 0,
         infoString,
       }).then((res) => {
@@ -76,7 +89,7 @@ export default {
       this.postData(`/project/getProjectListByPage`, {
         pageIndex: this.newProjectListPage,
         pageSize: this.newProjectListSize,
-        id: this.curProjectId,
+        id: this.value,
         forReport: 0,
         infoString: this.infoString,
       }).then((res) => {
@@ -172,21 +185,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .select-project-class {
-    position: relative;
-    .itemsLoading {
-      position: absolute;
-      left: 0;
-      bottom: -2px;
-      width: 100%;
-      text-align: center;
-      padding: 10px;
-      background: #fff;
-      box-shadow: 0px -4px 20px 0px #999;
-      font-size: 12px;
-      color: #999;
-      z-index: 99;
-      box-sizing: border-box;
-    }
+.select-project-class {
+  position: relative;
+
+  .itemsLoading {
+    position: absolute;
+    left: 0;
+    bottom: -2px;
+    width: 100%;
+    text-align: center;
+    padding: 10px;
+    background: #fff;
+    box-shadow: 0px -4px 20px 0px #999;
+    font-size: 12px;
+    color: #999;
+    z-index: 99;
+    box-sizing: border-box;
   }
+}
 </style>

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -2194,5 +2194,6 @@
   "zhuanYiChengGong": "Transfer successful",
   "zhuanYiZhi": "Transfer to",
   "cardtimenotfull": "ReportTime less than cardTime data list",
-  "fillReportTime": "Fill report time"
+  "fillReportTime": "Fill report time",
+  "kaoqingjiabanjiaoyanTip": "Man-hour management type"
 }