业务数据大屏样式调整

src/HManagement/serviceDataScreen/components/funnelBox.vue

@@ -115,7 +115,7 @@ export default {
   margin: auto;
 }
 .box-margin-top{
-  margin-top: 0.321vw;
+  margin-top: 0.171vw;
 }
 .box-circle-style{
   width: 0.521vw;

src/HManagement/serviceDataScreen/components/profileTemplate.vue

@@ -98,7 +98,7 @@ export default {
   box-shadow: 0.000vw 0.156vw 0.313vw 0.052vw rgba(0,0,0,0.16);
   border-radius: 0.313vw 0.313vw 0.313vw 0.313vw;
   border: 0.052vw solid #CFDCE5;
-  margin-top: 1.521vw;
+  margin-top: 1.042vw;
 }
 .box-border{
   margin: 0.705vw 0 1.042vw 1.042vw;

src/HManagement/serviceDataScreen/index.vue

@@ -31,7 +31,7 @@
         </div>
       </div>
     </div>
-    <div style="margin: auto">
+    <div>
       <div class="content-style justify-style">
         <div>
           <div class="justify-style">
@@ -514,6 +514,7 @@ export default {
 .select-style{
   width: 30%;
   padding-top: 0.625vw;
+  margin-left: 0.5vw;
 }
 .title-style {
   width: 30%;
@@ -535,7 +536,8 @@ export default {
   text-align: right;
   font-style: normal;
   text-transform: none;
-  padding-top: 0.938vw;
+  padding-top: 0.538vw;
+  padding-right: 0.5vw;
 }
 .time-style .span {
   margin-right: 1.042vw;

src/HManagement/serviceDataScreen/modules/dataProfile.vue

@@ -63,9 +63,9 @@
         </div>
        <div v-show="typeSelect !== '报价'">
          <div  style="display:flex;justify-content: left;margin-top: 1.042vw">
-           <PieCharts ref="proTypRef" height="10.844vw" width="12.125vw" h-chart="8.633vw" w-chart="10.125vw" title="项目类型分析"></PieCharts>
-           <PieCharts ref="proFowRef" height="10.844vw" width="11.125vw" h-chart="8.633vw" w-chart="10.125vw" title="项目跟进情况"></PieCharts>
-           <PieCharts ref="cusFowRef" height="10.844vw" width="11.125vw" h-chart="8.633vw" w-chart="10.125vw" title="客户跟进情况"></PieCharts>
+           <PieCharts ref="proTypRef" height="11.844vw" width="12.125vw" h-chart="9.633vw" w-chart="10.125vw" title="项目类型分析"></PieCharts>
+           <PieCharts ref="proFowRef" height="11.844vw" width="11.125vw" h-chart="9.633vw" w-chart="10.125vw" title="项目跟进情况"></PieCharts>
+           <PieCharts ref="cusFowRef" height="11.844vw" width="11.125vw" h-chart="9.633vw" w-chart="10.125vw" title="客户跟进情况"></PieCharts>
          </div>
        </div>
       </template>
@@ -461,4 +461,8 @@ export default {
  /deep/ .element.style {
    font-size: 0.830vw;
 }
+ /deep/ .el-button {
+   line-height: 0.5;
+   padding: 0.521vw 0.521vw;
+ }
 </style>

src/HManagement/serviceDataScreen/modules/jobData.vue

@@ -2,8 +2,8 @@
   <div>
     <borderTemplate borderBox="width: 15.208vw;height: 12.500vw;" title="作业数据" detailTitle="查看详情" @dialog="detailClick" systemappid="42" push_path="/dataanalysis">
       <template slot="content">
-        <div style="display: flex;justify-content: right">
-          <el-select v-model="dateType"  class="inline-16" size="small"  @change="dateTypeChange" :popper-append-to-body="false">
+        <div style="display: flex;justify-content: right;margin-top: 0.242vw;">
+          <el-select v-model="dateType"   size="small"  @change="dateTypeChange" :popper-append-to-body="false">
             <el-option :label="$t('本周')" value="本周"></el-option>
             <el-option :label="$t('本月')" value="本月"></el-option>
             <el-option :label="$t('本年')" value="本年"></el-option>
@@ -119,7 +119,7 @@ export default {
   box-shadow: 0.000vw 0.156vw 0.313vw 0.052vw rgba(0,0,0,0.16);
   border-radius: 0.313vw 0.313vw 0.313vw 0.313vw;
   border: 0.052vw solid #CFDCE5;
-  margin-top: 1.042vw;
+  margin-top: 0.642vw;
 }
 .box-style .data-font{
   font-family: Microsoft YaHei, Microsoft YaHei;

src/HManagement/serviceDataScreen/modules/marketingExpenseStatistics.vue

@@ -3,16 +3,16 @@
     <borderTemplate borderBox="width: 17.083vw;height: 12.500vw;" title="营销费用统计" detailTitle="查看详情" @dialog="$emit('dialog')" systemappid="290" push_path="/salerpriceData">
       <template slot="content">
         <div>
-          <div style="display: flex;justify-content: right">
-            <el-button  type="text" class="inline-16" @click="onChange(true)">{{$t(`切换`)}}{{$t(btnTitle)}}</el-button>
-            <el-select v-model="param.content.dateType"  class="inline-16" size="small" @change="onChange(false)" :popper-append-to-body="false">
+          <div style="display: flex;justify-content: right;">
+            <el-button type="text" class="inline-16" @click="onChange(true)">{{$t(`切换`)}}{{$t(btnTitle)}}</el-button>
+            <el-select v-model="param.content.dateType"  class="inline-16" size="small" @change="onChange(false)" :popper-append-to-body="false" >
               <el-option :label="$t('全部')" value="全部"></el-option>
               <el-option :label="$t('本年')" value="本年"></el-option>
             </el-select>
           </div>
-          <div v-show="btnTitle == '项目'" style="width: 16.025vw;height: 6.533vw;margin-top: 0.164vw;position: relative;z-index: 999999" ref="customerRefChar">
+          <div v-show="btnTitle == '项目'" style="width: 16.025vw;height: 6.533vw;margin-top: 0.164vw;" ref="customerRefChar">
           </div>
-          <div v-show="btnTitle == '客户'" style="width: 16.025vw;height: 6.533vw;margin-top: 0.164vw;position: relative;z-index: 999999" ref="projectRefChar">
+          <div v-show="btnTitle == '客户'" style="width: 16.025vw;height: 6.533vw;margin-top: 0.164vw;" ref="projectRefChar">
           </div>
         </div>
       </template>

src/HManagement/serviceDataScreen/modules/marketingExpenses.vue

@@ -61,6 +61,7 @@ export default {
   text-align: left;
   font-style: normal;
   text-transform: none;
+  margin-top: 0.542vw;
 }
 .title-style {
   font-family: Microsoft YaHei, Microsoft YaHei;

src/HManagement/serviceDataScreen/modules/salesFunnel.vue

@@ -25,7 +25,7 @@
           </div>
         </div>
         <div>
-          <funnelBox style="margin-top: 0.625vw;" v-for="(item,index) in list"  :key="item.index" :width="width - (index * 1.042)" :data="item"></funnelBox>
+          <funnelBox style="margin-top: 0.625vw;" v-for="(item,index) in list"  :key="item.index" :width="width - (index * 1.042)"  :data="item"></funnelBox>
         </div>
       </template>
     </borderTemplate>

src/HManagement/serviceDataScreen/modules/salesPanel.vue

@@ -101,10 +101,10 @@
           <div style="display:flex;justify-content: right">
             <datePicker v-show="typeSelect !== '回款'" ref="pickerRef" type="year" @selectTime="pickerChange" format="yyyy" value_format="yyyy"></datePicker>
           </div>
-          <DualAxesCharts v-show="typeSelect == '订单'" :param="paramChart" heightChart="13.6vw" ref-charts="orderPanelChart" ref="orderPanelRef"></DualAxesCharts>
-          <DualAxesLineCharts v-show="typeSelect == '出货'" :param="paramShipmentChart" heightChart="13.6vw" ref-charts="shipmentPanelChart" ref="shipmentPanelRef"></DualAxesLineCharts>
-          <DualAxesCharts v-show="typeSelect == '开票'" :param="paramInvoiceChart" heightChart="13.6vw" ref-charts="invoicePanelChart" ref="invoicePanelRef"></DualAxesCharts>
-          <BarCharts v-show="typeSelect == '回款'" :param="paramRefundChart" heightChart="13.6vw" ref-charts="refundPanelChart" ref="refundPanelRef"></BarCharts>
+          <DualAxesCharts v-show="typeSelect == '订单'" :param="paramChart" heightChart="14.0vw" ref-charts="orderPanelChart" ref="orderPanelRef"></DualAxesCharts>
+          <DualAxesLineCharts v-show="typeSelect == '出货'" :param="paramShipmentChart" heightChart="14.0vw" ref-charts="shipmentPanelChart" ref="shipmentPanelRef"></DualAxesLineCharts>
+          <DualAxesCharts v-show="typeSelect == '开票'" :param="paramInvoiceChart" heightChart="14.0vw" ref-charts="invoicePanelChart" ref="invoicePanelRef"></DualAxesCharts>
+          <BarCharts v-show="typeSelect == '回款'" :param="paramRefundChart" heightChart="14.0vw" ref-charts="refundPanelChart" ref="refundPanelRef"></BarCharts>
         </div>
       </template>
     </borderTemplate>
@@ -381,7 +381,7 @@ export default {
   box-shadow: 0.000vw 0.156vw 0.313vw 0.052vw rgba(0,0,0,0.16);
   border-radius: 5.729vw 5.729vw 0.313vw 5.729vw;
   border: 0.052vw solid #CFDCE5;
-  margin-top: 1.542vw;
+  margin-top: 1.042vw;
   box-sizing: border-box;
   display: flex;
   justify-content: left;
@@ -478,4 +478,8 @@ export default {
 ::v-deep .el-progress__text {
   white-space: pre;
 }
+/deep/ .el-button {
+  line-height: 0.5;
+  padding: 0.521vw 0.521vw;
+}
 </style>

src/HManagement/serviceDataScreen/modules/salesmanAccount.vue

@@ -60,6 +60,7 @@ export default {
   text-align: left;
   font-style: normal;
   text-transform: none;
+  margin-top: 0.542vw;
 }
 .title-style {
   font-family: Microsoft YaHei, Microsoft YaHei;