Merge branch 'mergeBranch' into allTestUrgent

src/Form/accountclass/edit.vue

@@ -26,12 +26,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isorder" checked="checked">允许订货</el-checkbox>
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isorder" >允许订货</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isused" checked="checked">是否启用</el-checkbox>
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isused" >是否启用</el-checkbox>
             </el-form-item>
           </el-col>
         </el-form>
@@ -98,4 +98,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/servePeople/components/edit.vue

@@ -90,4 +90,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/views/clueData/modules/clueAdd.vue

@@ -103,7 +103,7 @@ export default {
         return {
           date: item.date,
           type:"同比增长率",
-          value: item.value
+          value: Math.round((item.value * 100)*100)/100
         }
       })
       this.newHistogram = lastYear.concat(nowYear)

src/views/clueData/modules/clueChange.vue

@@ -86,7 +86,7 @@ export default {
         return {
           date: item.date,
           key:"总次数同比增长率",
-          value: item.value
+          value: Math.round((item.value * 100)*100)/100
         }
       })
       this.chartDualAxes.changeData([this.histogram,this.lineChart])

src/views/clueData/modules/clueFollow.vue

@@ -105,7 +105,7 @@ export default {
         return {
           date: item.date,
           key:"同比增长率",
-          value: item.value
+          value: Math.round((item.value * 100)*100)/100
         }
       })
       this.newHistogram = lastYear.concat(nowYear)

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -290,15 +290,20 @@ export default {
       this.personnelList = res.data.hr
     },
     leaveChange(){
+      this.person = ''
       if (this.isleave){
         this.dataParam.content.where.isleave = this.isleave
+        this.dataParam.content.dataid = -1
         this.projectParam.content.where.isleave = this.isleave
+        this.projectParam.content.dataid = -1
         this.depmentParam.content.isleave = this.isleave
         this.personData()
         this.getProportionOfFileModel()
       }else {
         this.dataParam.content.where.isleave = 0
+        this.dataParam.content.dataid = -1
         this.projectParam.content.where.isleave = 0
+        this.projectParam.content.dataid = -1
         this.depmentParam.content.isleave = 0
         this.personData()
         this.getProportionOfFileModel()