bug修复

src/HManagement/serviceDataScreen/components/datePicker.vue

@@ -7,6 +7,7 @@
         :value-format="value_format"
         :format="format"
         :append-to-body="false"
+        :picker-options="type == 'year'?pickerOptions:''"
         :clearable="false"
         placeholder="选择日期">
     </el-date-picker>
@@ -19,7 +20,16 @@ export default {
   props:['type','format','value_format'],
   data(){
     return {
-      value:""
+      value:"",
+      pickerOptions: {
+        disabledDate(time){
+          // 获取当前时间
+          const today = new Date();
+          //  比较日期，将未来的年份禁用
+            return time.getFullYear() > today.getFullYear();
+
+        }
+      },
     }
   }
 }

src/HManagement/serviceDataScreen/components/profileTemplate.vue

@@ -104,10 +104,10 @@ export default {
 }
 .box-border .box-margin{
   margin: 0 0 1.042vw 1.042vw;
-  /*overflow: auto;*/
+  overflow: auto;
   box-sizing: border-box;
-  /*-ms-overflow-style: none; !* 适用于 Internet Explorer 和旧版 Edge *!*/
-  /*scrollbar-width: none; !* 适用于 Firefox *!*/
+  -ms-overflow-style: none; /* 适用于 Internet Explorer 和旧版 Edge */
+  scrollbar-width: none; /* 适用于 Firefox */
 }
 .box-margin .box-content{
   width: 6.609vw;

src/HManagement/serviceDataScreen/index.vue

@@ -41,12 +41,12 @@
         </div>
         <div class="inline-top-20">
           <!-- 销售面板 -->
-          <salesPanel  ref="panelRef" style="position: relative;z-index: 900"></salesPanel>
+          <salesPanel  ref="panelRef" style="position: relative;z-index: 800"></salesPanel>
         </div>
       </div>
       <div>
         <!-- 销售漏斗 -->
-        <salesFunnel ref="funnelRef" style="position: relative;z-index: 900"></salesFunnel>
+        <salesFunnel ref="funnelRef" style="position: relative;z-index: 700"></salesFunnel>
         <div class="justify-style inline-top-20">
           <!-- 营销费用 -->
           <marketingExpenses ref="expensesRef"></marketingExpenses>

src/HManagement/serviceDataScreen/modules/dataProfile.vue

@@ -242,6 +242,11 @@ export default {
         this.dataProfile = [
           {
             title:'项目总数',
+            value:this.list.totalqty,
+            tips:''
+          },
+          {
+            title:'报备项目数',
             value:this.list.reportProject,
             tips:'报备项目数:统计已报备的项目数量'
           },
@@ -257,7 +262,7 @@ export default {
           },
           {
             title:'项目成交率',
-            value:Math.round(((this.list.cjl * 100)*100)/100) + '%',
+            value:this.list.cjl + '%',
             tips:'项目成交率=有关联审核订单的项目数÷项目总数×100%'
           },
           {

src/HManagement/serviceDataScreen/modules/salesPanel.vue

@@ -425,7 +425,7 @@ export default {
   font-family: Microsoft YaHei, Microsoft YaHei;
   font-weight: bold;
   font-size: 0.833vw !important;
-  color: #E6F4FF;
+  color: #E6F4FF !important;
   font-style: normal;
   text-transform: none;
 }