Merge branch 'dev/v1.1.10.1_yf' of jianyu/web into hotfix/v1.1.10.1

apps/bigmember_pc/src/views/portrayal/EntPortrayal.vue

@@ -324,7 +324,7 @@
       :page-loading="loading"
       :backFilter="bidInfoParams"
       :canSelect="canSelect"
-      @scrollChange="handleClick('5')"
+      @scrollChange="isNewEntPortrait ? onNewTabClick(1) : handleClick('5')"
     ></report-download-dialog>
     <CheckUserDialog />
     <!-- 分享弹窗 -->
@@ -972,6 +972,13 @@ export default {
     },
     onNewEntTabActive(index) {
       this.newTabActive = index
+    },
+    onNewTabClick() {
+      try {
+        this.$refs.newEntContent?.onTabClick(1)
+      } catch (error) {
+        console.log(error)
+      }
     }
   }
 }

apps/bigmember_pc/src/views/portrayal/EntSearchPortrayal.vue

@@ -444,7 +444,7 @@
       :page-loading="loading"
       :backFilter="bidInfoParams"
       :canSelect="canSelect"
-      @scrollChange="handleClick('5')"
+      @scrollChange="isNewEntPortrait ? onNewTabClick(1) : handleClick('5')"
     ></report-download-dialog>
     <CheckUserDialog />
     <!-- 分享弹窗 -->
@@ -1438,6 +1438,13 @@ export default {
     },
     onNewEntTabActive(index) {
       this.newTabActive = index
+    },
+    onNewTabClick() {
+      try {
+        this.$refs.newEntContent?.onTabClick(1)
+      } catch (error) {
+        console.log(error)
+      }
     }
   }
 }

apps/bigmember_pc/src/views/portrayal/components/BidInfoActive.vue

@@ -447,7 +447,6 @@ export default {
     }
   },
   created() {
-    console.log(this.seachisHide, 'seachisHide')
     this.initData(this.projectData)
   },
   mounted() {
@@ -847,27 +846,27 @@ export default {
       Object.assign(this.ScreenParams, paramData)
     },
     // 回显筛选条件
-    backFilterFun () {
-      if(!this.backFilter) return
+    backFilterFun() {
+      if (!this.backFilter) return
       Object.assign(this.ScreenParams, this.backFilter)
       // 回显地区
-      if(typeof this.backFilter.area === 'string') {
+      if (typeof this.backFilter.area === 'string') {
         const areaObj = {}
         const areaArr = this.backFilter.area.split(',')
-        for(let item of areaArr) {
+        for (let item of areaArr) {
           this.$set(areaObj, item, [])
         }
         this.originalParameter.area = areaObj
-      } else if(typeof this.backFilter.area === 'object') {
+      } else if (typeof this.backFilter.area === 'object') {
         this.originalParameter.area = this.backFilter.area
       }
 
       // 回显搜索范围
-      if(this.backFilter?.matchRange) {
+      if (this.backFilter?.matchRange) {
         const arr = this.backFilter.matchRange.split(',')
         const matchArr = []
-        arr.forEach(item => {
-          if(this.matchRangeObj[item]) {
+        arr.forEach((item) => {
+          if (this.matchRangeObj[item]) {
             matchArr.push(this.matchRangeObj[item])
           }
         })
@@ -875,10 +874,10 @@ export default {
       }
 
       // 回显行业
-      if(this.backFilter.scopeClass) {
+      if (this.backFilter.scopeClass) {
         const scopeArr = this.backFilter.scopeClass.split(',')
         const childrenArr = []
-        for(const item of scopeArr) {
+        for (const item of scopeArr) {
           const temp = item.split('_')
           const value = temp[1]
           childrenArr.push(value)
@@ -887,13 +886,13 @@ export default {
       }
 
       // 采购单位类型
-      if(this.backFilter.buyerClass) {
+      if (this.backFilter.buyerClass) {
         const buyerArr = this.backFilter.buyerClass.split(',')
         this.originalParameter.buyerClass = buyerArr
       }
 
       // 回显成交时间
-      if(this.backFilter.timeRange) {
+      if (this.backFilter.timeRange) {
         const timeArr = this.backFilter.timeRange.split('_')
         this.startyear = timeArr[0] || 2018
         this.endyear = timeArr[1] || new Date().getFullYear()

apps/bigmember_pc/src/views/portrayal/components/EntNewContent.vue

@@ -286,7 +286,7 @@ const getEntChartInfo = async () => {
     }
   }
 }
-defineExpose({ getEntChartInfo })
+defineExpose({ getEntChartInfo, onTabClick })
 /**
  * 经营信息模块
  */

apps/bigmember_pc/src/views/portrayal/components/ent-new/BiddingList.vue

@@ -29,7 +29,6 @@ watch(
   () => props.dtParams,
   (newVal) => {
     if (newVal) {
-      console.log(newVal, 'val')
       hasPower.value = newVal.hasPower
       emptyText.value = newVal.emptyText
       noStatesBarPower.value = newVal.noStatesbarPower