Merge branch 'blueBranch' into allTestUrgent

src/views/mediaStatistics/modules/boxBorder.vue

@@ -2,7 +2,26 @@
   <div class="box-border-style" :style="{height:height}">
     <div :style="{padding:class1}">
       <div style="display: flex;justify-content: space-between">
-        <div class="font-color-style-black font-class-bold mt-5">{{$t(title)}}</div>
+        <div style="display: flex;justify-content: left">
+          <div class="font-color-style-black font-class-bold mt-5">{{$t(title)}}</div>
+          <div style="margin-left: 5px;margin-top: 2px">
+            <el-tooltip v-if="titleTip" effect="dark" placement="top-start" >
+              <div slot="content">
+                {{
+                  $t(
+                      '预计成交金额 = 预计签约金额 × 项目成交率'
+                  )
+                }}
+              </div>
+              <!--        <i class="el-icon-question" style="color: #afb0be;float: right"></i>-->
+              <img
+                  width="14px"
+                  height="14px"
+                  src="../../../assets/icons/prompt_icon.svg"
+              />
+            </el-tooltip>
+          </div>
+        </div>
         <slot name="select"></slot>
       </div>
       <slot name="content"></slot>
@@ -17,7 +36,8 @@ export default {
   props:{
     title:String,
     class1:String,
-    height:String
+    height:String,
+    titleTip:Boolean
   }
 }
 </script>

src/views/mediaStatistics/modules/futureTwelveMonths.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <boxBorder title="未来12月项目预计签约金额/预计成交金额分析" class1="20px 20px" height="282px">
+    <boxBorder title="未来12月项目预计签约金额/预计成交金额分析" class1="20px 20px" height="282px" :titleTip="true">
       <template slot="select">
         <div>
           <label class="search__label">{{$t(`项目阶段`)}}：</label>
-          <el-select v-model="stagename" multiple placeholder="请选择" size="small" @focus="getStage" @change="selectStage" filterable style="width: 370px">
+          <el-select v-model="stagename" multiple :placeholder="$t(`请选择`)" size="small" @focus="getStage" @change="selectStage" filterable style="width: 370px">
             <el-option
                 v-for="item in stagenameList"
                 :key="item.stagename"
@@ -15,22 +15,7 @@
         </div>
       </template>
       <template slot="charts">
-        <el-tooltip effect="dark" placement="top-start" style="margin-top: 3px;margin-left:275px;position: relative;z-index: 50">
-          <div slot="content">
-            {{
-              $t(
-                  '预计成交金额 = 预计签约金额 × 项目成交率'
-              )
-            }}
-          </div>
-          <!--        <i class="el-icon-question" style="color: #afb0be;float: right"></i>-->
-          <img
-              width="14px"
-              height="14px"
-              src="../../../assets/icons/prompt_icon.svg"
-          />
-        </el-tooltip>
-        <div ref="chartRef" style="height: 220px;margin-top: -25px;position: relative;z-index: 20">
+        <div ref="chartRef" style="height: 220px;">
         </div>
       </template>
     </boxBorder>
@@ -62,13 +47,13 @@ export default {
           this.chartMapData[indexNew] = {
             "signdate_due":item.signdate_due,
             "value":Math.round(this.tool.unitConversion(item.signamount_due,10000) * 100)/100,
-            "name":this.$t('预计签约金额(万)')
+            "name":this.$t('预计签约金额')+ this.$t('(万)')
           }
           indexNew = indexNew + 1
           this.chartMapData[indexNew] = {
             "signdate_due":item.signdate_due,
             "value":Math.round(this.tool.unitConversion(item.dealamount_due,10000) * 100)/100,
-            "name":this.$t('预计成交金额(万)')
+            "name":this.$t('预计成交金额') + this.$t('(万)')
           }
           indexNew = indexNew + 1
           index = index + 1

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -868,7 +868,7 @@ export default {
             title2:'金额',
             value2:this.tool.formatAmount(this.tool.unitConversion(res.data.positiveOffsetAmount,10000),2),
             unit2:'万元',
-            description:'依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额' + '\n' + ' ①项目：合计偏差金额为正数的项目数量' + '\n' + ' ②金额：合计每个项目的正数偏差金额',
+            description:this.$t('依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额') + '\n ①' + this.$t('项目：合计偏差金额为正数的项目数量') + '\n ②' + this.$t('金额：合计每个项目的正数偏差金额'),
             color:'#E6A23C'
           },
           {
@@ -893,7 +893,7 @@ export default {
             title2:'金额',
             value2:this.tool.formatAmount(this.tool.unitConversion(res.data.negativeOffsetAmount,10000),2),
             unit2:'万元',
-            description:'依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额' + '\n' + ' ①项目：合计偏差金额为负数的项目数量' + '\n' + ' ②金额：合计每个项目的负数偏差金额',
+            description:this.$t('依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额') + '\n ①' + this.$t('项目：合计偏差金额为负数的项目数量') + '\n ②' + this.$t('金额：合计每个项目的负数偏差金额'),
             color:'#E6A23C'
           },
           {
@@ -914,7 +914,7 @@ export default {
             title:'预计成交准确率',
             value:Math.round((res.data.rightRate * 100)*100)/100,
             unit:'%',
-            description:'依据：偏差率 = |（项目成交金额 - 预计签约金额）| ÷ 预计签约金额 × 100%' + '\n' + ' 预计成交准确率 = 偏差率≤15%的项目数 ÷ 成交项目数 × 100%',
+            description:this.$t('依据：偏差率 = |（项目成交金额 - 预计签约金额）| ÷ 预计签约金额 × 100%') + '\n ' + this.$t('预计成交准确率 = 偏差率≤15%的项目数 ÷ 成交项目数 × 100%'),
             color:'#E6A23C'
           },
         ]