Merge branch 'greenUrgent' into allTestUrgent

# Conflicts:
#	src/views/mediaStatistics/modules/salesfunnel.vue

src/views/mediaStatistics/modules/futureTwelveMonths.vue

@@ -2,7 +2,7 @@
   <div>
     <boxBorder title="未来12月项目预计签约金额/预计成交金额分析" class1="20px 20px" height="282px">
       <template slot="charts">
-        <el-tooltip effect="dark" placement="top-start" style="margin-top: 3px;margin-left:240px;position: relative;z-index: 50">
+        <el-tooltip effect="dark" placement="top-start" style="margin-top: 3px;margin-left:275px;position: relative;z-index: 50">
           <div slot="content">
             {{
               $t(
@@ -47,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('预计签约金额(万)')
           }
           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('预计成交金额(万)')
           }
           indexNew = indexNew + 1
           index = index + 1

src/views/mediaStatistics/modules/previousTwelveMonths.vue

@@ -33,7 +33,7 @@
                 <span class="font-color-style-green previous-style-font4 font-class-bold">{{$t(item.unit2)}}</span>
               </div>
               <div v-else>
-                <span class="font-color-style-green previous-style-font3 font-class-bold">{{$t(item.value)}}</span>
+                <span class="font-color-style-green previous-style-font3 font-class-bold">{{item.value}}</span>
                 <span class="font-color-style-green previous-style-font4 font-class-bold">{{$t(item.unit)}}</span>
               </div>
             </div>

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -98,11 +98,7 @@
       <tableTemp :layout="tablecols" :data="projectList" :opwidth="200" :custom="true" :height="tableHieght">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'status'">
-            <span style="color:#3874F6" v-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#67C23A" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#f56c6c" v-else-if="scope.column.data[[scope.column.columnname]] == '已失败'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#cccccc" v-else-if="scope.column.data[[scope.column.columnname]] == '已结案'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span v-else>{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+            <span :style="{color:scope.column.data[[scope.column.columnname]] == '跟进中'?'#52c41a':tool.getStatusColor(scope.column.data[[scope.column.columnname]],true)}" >{{$t(scope.column.data[[scope.column.columnname]])}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'tag_sys'">
             <div v-for="item in scope.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">