fix: b2 市场 优化

src/views/hui-jia/b1-screen/index.vue

@@ -11,7 +11,7 @@
         <div style="color: #fff" class="item-4">4</div>
       </div>
       <div class="right-wrap">
-        <Market />
+        <Market :data="state.market_vs_month" />
         <implementationTotal />
       </div>
       <div class="bottom-wrap">
@@ -38,8 +38,11 @@
       implementationNowYear,
       Market,
     },
-    data () {
+    data() {
       return {
+        state: {
+          market_vs_month: {}, // 市场拓展数据
+        },
         implementationData: {
           ing: {},
           nowYear: {},
@@ -50,9 +53,18 @@
     mounted() {
       huiJiaApi.getImplementaryData().then((res) => {
         this.implementationData = res.data.data
-        console.log('123----', this.implementationData)
+        console.log("123----", this.implementationData)
       })
     },
+    methods: {
+      getData() {
+        huiJiaApi.getScreenData().then((res) => {
+          if (res && res.data) {
+            console.log("大屏数据----", res)
+          }
+        })
+      },
+    },
   }
 </script>
 

src/views/hui-jia/components/implementary/now-year.vue

@@ -20,11 +20,11 @@
         chartInstance: null,
         chartData: {
           categories: [
-            "履约城市",
-            "服务企业",
-            "服务项目",
-            "合同数",
             "签约户数",
+            "合同份数",
+            "服务项目",
+            "服务企业",
+            "履约城市",
           ],
           ongoing: [88888, 88888, 88888, 88888, 88888], // 进行中
           lastMonthCompleted: [88888, 88888, 88888, 88888, 88888], // 上月完成

src/views/hui-jia/components/market.vue

@@ -9,6 +9,7 @@
       <div class="legend-item">本月</div>
     </div>
     <div id="marketChart" class="chart"></div>
+    <div id="marketChart2" class="chart2"></div>
   </div>
 </template>
 
@@ -19,6 +20,12 @@
 
   export default {
     name: "MarketExpansion",
+    props: {
+      data: {
+        type: Object,
+        default: () => ({}),
+      },
+    },
     data() {
       return {
         chartInstance: null,
@@ -91,7 +98,7 @@
             left: "10%",
             right: "10%",
             bottom: "5%",
-            top: '5%',
+            top: "5%",
             containLabel: true,
           },
           xAxis: {
@@ -138,11 +145,8 @@
             {
               name: "上月",
               type: "bar",
-              //   stack: "sameStack",
-              stack: "Total",
-              emphasis: {
-                focus: "series",
-              },
+                stack: "sameStack",
+              // stack: "Total",
               barMinHeight: 4,
               data: this.chartData.lastMonthData,
               barWidth: 16,
@@ -168,11 +172,8 @@
             {
               name: "本月",
               type: "bar",
-              //   stack: "sameStack",
-              stack: "Total",
-              emphasis: {
-                focus: "series",
-              },
+                stack: "sameStack",
+              // stack: "Total",
               barMinHeight: 4,
               data: this.chartData.thisMonthData,
               barWidth: 16,