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

@@ -959,7 +959,8 @@ export default {
       this.reportDownloadConfig.visible = true
       if (this.isNewEntPortrait && this.newTabActive !== 1) {
         try {
-          this.$refs.newEntContent?._setupProxy.getEntChartInfo()
+          console.log(this.$refs.newEntContent)
+          this.$refs.newEntContent?.getEntChartInfo()
         } catch (error) {}
       }
     },

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

@@ -1421,7 +1421,7 @@ export default {
       this.reportDownloadConfig.visible = true
       if (this.isNewEntPortrait && this.newTabActive !== 1) {
         try {
-          this.$refs.newEntContent?._setupProxy.getEntChartInfo()
+          this.$refs.newEntContent?.getEntChartInfo()
         } catch (error) {}
       }
     },

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

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

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

@@ -40,7 +40,7 @@ watch(
     }
   }
 )
-console.log(props.dtParams, 'props.dtParams')
+
 const emit = defineEmits(['onPageChange'])
 
 const onLimitChange = (data) => {
@@ -50,57 +50,57 @@ const onLimitChange = (data) => {
 }
 </script>
 <template>
-<ModuleCard id="bid_dynamics" style="padding-top:0;">
-  <div id="chartInfo" class="tab-content-item bg-white">
-    <div>
-      <!-- 中标动态 -->
-      <div class="bidcomp p-l-r-32">
-        <!-- 筛选部分 -->
-        <BidInfoActive
-          whichPor="entpor"
-          :entId="entId"
-          @onPageChange="onLimitChange"
-          :seachisHide="searchIsHide"
-          :backFilter="backFilter"
-          @searchClick="
-            emptyText =
-              '对不起，没有匹配到相关信息，<br>修改时间范围或换个搜索词试试吧'
-          "
-          :canselect="canSelect"
-          title="中标动态"
-          desc="注：1个项目如同时发布了中标、成交、合同等结果类公告，则有多条数据。"
-        >
-        </BidInfoActive>
-      </div>
-      <div id="project-information" class="p-l-16 p-r-32 p-b-32 p-t-32">
-        <!-- 列表部分 -->
-        <Dynamic-list
-          :key="dynamicKey"
-          :filters="filters"
-          :config="{
-            baseParam: { entId: entId },
-            isWinner: true,
-            hasPower: hasPower
-          }"
-          :emptyText="emptyText"
-          :noStatesbarPower="noStatesBarPower"
-        ></Dynamic-list>
+  <ModuleCard id="bid_dynamics" style="padding-top: 0">
+    <div id="chartInfo" class="tab-content-item bg-white">
+      <div>
+        <!-- 中标动态 -->
+        <div class="bidcomp p-l-r-32">
+          <!-- 筛选部分 -->
+          <BidInfoActive
+            whichPor="entpor"
+            :entId="entId"
+            @onPageChange="onLimitChange"
+            :seachisHide="searchIsHide"
+            :backFilter="backFilter"
+            @searchClick="
+              emptyText =
+                '对不起，没有匹配到相关信息，<br>修改时间范围或换个搜索词试试吧'
+            "
+            :canselect="canSelect"
+            title="中标动态"
+            desc="注：1个项目如同时发布了中标、成交、合同等结果类公告，则有多条数据。"
+          >
+          </BidInfoActive>
+        </div>
+        <div id="project-information" class="p-l-16 p-r-32 p-b-32 p-t-32">
+          <!-- 列表部分 -->
+          <Dynamic-list
+            :key="dynamicKey"
+            :filters="filters"
+            :config="{
+              baseParam: { entId: entId },
+              isWinner: true,
+              hasPower: hasPower
+            }"
+            :emptyText="emptyText"
+            :noStatesbarPower="noStatesBarPower"
+          ></Dynamic-list>
+        </div>
       </div>
     </div>
-  </div>
-</ModuleCard>
+  </ModuleCard>
 </template>
 <style lang="scss" scoped>
-::v-deep{
+::v-deep {
   .bidinfoactive {
     .pro_a_h_left::after {
       display: none;
     }
   }
-  .info-list .article-item{
-    margin-left: 0!important;
+  .info-list .article-item {
+    margin-left: 0 !important;
   }
-  .c-tab-container{
+  .c-tab-container {
     margin: 0 -16px;
   }
 }