Merge branch 'greenUrgent' into allTestUrgent

# Conflicts:
#	package-lock.json
#	src/components/newLayout/modules/header.vue

src/HManagement/serviceDataScreen/components/boxTemplate.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="box-style-border">
-    <div class="content">
+    <div class="content_style">
       <div class="amount">{{tool.formatAmount(data,2)}}</div>
       <div class="justify-style">
         <div class="title">{{$t(title)}}</div>
@@ -27,10 +27,10 @@ export default {
   border: 0.052vw solid #CFDCE5;
   box-sizing: border-box;
 }
-.box-style-border .content {
+.box-style-border .content_style {
   margin: 0.521vw 1.042vw 0.521vw 1.042vw;
 }
-.box-style-border .content .amount {
+.box-style-border .content_style .amount {
   font-family: Microsoft YaHei, Microsoft YaHei;
   font-weight: bold;
   font-size: 1.250vw;

src/HManagement/serviceDataScreen/components/profileTemplate.vue

@@ -75,16 +75,6 @@
             <div class="value-style">{{k.qty}}</div>
             <div class="title-style">{{k.value}}</div>
           </div>
-<!--          <div style="margin-right: 0.252vw;margin-top: 0.1vw" v-if="k.value == '无分类客户'">-->
-<!--            <el-tooltip placement="top" >-->
-<!--              <div slot="content">-->
-<!--                <span v-if="k.value == '无分类客户'">-->
-<!--                  {{$t('无分类客户数：统计没有客户分类信息的客户数量')}}<br/>-->
-<!--                </span>-->
-<!--              </div>-->
-<!--              <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/Tips.svg" >-->
-<!--            </el-tooltip>-->
-<!--          </div>-->
         </div>
       </div>
     </div>
@@ -114,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

@@ -193,6 +193,16 @@ export default {
         this.dialogPaw = true
       }
     },
+    onClose() {
+      this.dialogVisible = false;
+      sessionStorage.setItem("password", "1");
+      sessionStorage.setItem("isPassword", "0");
+    },
+    handleClose() {
+      this.dialogVisible = false;
+      sessionStorage.setItem("password", "1");
+      sessionStorage.setItem("isPassword", "0");
+    },
     goPassword(){
       this.dialogPaw = false
       this.$router.push('/user_center')

src/HManagement/serviceDataScreen/modules/dataProfile.vue

@@ -86,7 +86,7 @@ export default {
         id:20231014114204,
         content:{
           dataid:'',
-          dateType:'全部',
+          dateType:'本年',
           type:'',
           where:{
             isleave:''
@@ -111,8 +111,11 @@ export default {
       }
       const res = await this.$api.requested(this.param)
       this.list = res.data
-      if (this.typeSelect == '客户' || this.typeSelect == '项目'){
+      this.profileType = []
+      if (this.typeSelect == '客户'){
         this.profileType = res.data.data
+      }else if (this.typeSelect == '项目'){
+        this.profileType = res.data.projecttype
       }
       console.log(this.list,this.typeSelect,'数据')
       console.log(this.profileType,this.typeSelect,'this.profileType')
@@ -156,11 +159,6 @@ export default {
             value:this.list.ygq,
             tips:'待分配已过期线索数：所有线索中，待分配已过期的线索数量。'
           },
-          {
-            title:'过期比例',
-            value:Math.round(((this.list.gqbl * 100)*100)/100) + '%',
-            tips:'待分配已过期线索数：所有线索中，待分配已过期的线索数量。'
-          },
           {
             title:'过期比例',
             value:Math.round(((this.list.gqbl * 100)*100)/100) + '%',
@@ -242,11 +240,6 @@ export default {
         ]
       }else if (val == '项目'){
         this.dataProfile = [
-          {
-            title:'项目总数',
-            value:this.list.reportProject,
-            tips:'报备项目数:统计已报备的项目数量'
-          },
           {
             title:'项目总数',
             value:this.list.reportProject,

src/HManagement/serviceDataScreen/modules/marketingExpenseStatistics.vue

@@ -4,8 +4,8 @@
       <template slot="content">
         <div>
           <div style="display: flex;justify-content: right">
-            <el-button  type="text" class="inline-16" @click="onChange">切换{{btnTitle}}</el-button>
-            <el-select v-model="param.content.dateType"  class="inline-16" size="small" @change="onChange" :popper-append-to-body="false">
+            <el-button  type="text" class="inline-16" @click="onChange(true)">切换{{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>
@@ -28,13 +28,13 @@ export default {
   components:{borderTemplate},
   data(){
     return {
-      dateType:'全部',
+      dateType:'本年',
       btnTitle:'项目',
       param:{
         id:2024062615133802,
         content:{
           dataid:'',
-          dateType:'全部',
+          dateType:'本年',
           ownertable:'sa_customers',
           type:'',
           where:{
@@ -86,7 +86,7 @@ export default {
           },
           tooltip:{
             formatter: (datum) => {
-              return { name: datum.key, value: datum.ratio + '%' };
+              return { name: datum.type, value: datum.ratio + '%' };
             },
           },
           statistic: {
@@ -166,7 +166,7 @@ export default {
           },
           tooltip:{
             formatter: (datum) => {
-              return { name: datum.key, value: datum.ratio + '%' };
+              return { name: datum.type, value: datum.ratio + '%' };
             },
           },
           statistic: {
@@ -209,13 +209,21 @@ export default {
         this.proMap.changeData(this.proData)
       }
     },
-    onChange(){
+    onChange(init){
       if (this.btnTitle == '客户'){
-        this.btnTitle = '项目'
-        this.cusInit(false)
+        if (init){
+          this.btnTitle = '项目'
+          this.cusInit(false)
+        }else {
+          this.proInit(false)
+        }
       }else {
-        this.btnTitle = '客户'
-        this.proInit(false)
+        if (init){
+          this.btnTitle = '客户'
+          this.proInit(false)
+        }else {
+          this.cusInit(false)
+        }
       }
     }
   }

src/HManagement/serviceDataScreen/modules/salesPanel.vue

@@ -159,9 +159,10 @@ export default {
       if (init){
         this.renderPie()
       }else {
-        if (time){
-          this.queryModel()
-        }
+        // if (time){
+        //   this.queryModel()
+        // }
+        this.queryModel()
       }
     },
     dateTypeChange(){

src/components/newLayout/modules/header.vue

@@ -47,7 +47,7 @@
           margin-right: 20px;
           color: #ffffff;
         "
-        v-if="(usertype == 1 || usertype == 0) && siteid == 'HY'"
+        v-if="(usertype == 1 || usertype == 0) && (siteid == 'HY' || siteid == 'YOSTEST1')"
         @click="$router.push('/serviceDataScreen')"
         >{{ $t(`业务数据大屏`) }}</el-button
       >
@@ -357,7 +357,7 @@ export default {
   mounted() {
     this.siteInfos();
     this.languagelist();
-    
+
     this.languagename = localStorage.getItem("languagename") ||"简体中文";
 
     try {
@@ -365,7 +365,7 @@ export default {
     } catch (error) {
       this.languagename = "简体中文";
     }
-    
+
     this.accountInfo = JSON.parse(sessionStorage.getItem("active_account"));
     this.accountList = JSON.parse(
       sessionStorage.getItem("account_list")