前端：新首页

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -4337,7 +4337,7 @@ func (this *OilSupplierController) StatisticalNum() {
 
 	var supplierBas []suppliercert.OilSupplierCert
 	certService.GetEntitysByWhere(OilSupplierCertName, "SupplierTypeCode = '02'", &supplierBas)
-	statisticalNum.BasNum = len(supplierBas)
+	statisticalNum.BaseNum = len(supplierBas)
 
 	var supplierTec []suppliercert.OilSupplierCert
 	certService.GetEntitysByWhere(OilSupplierCertName, "SupplierTypeCode = '03'", &supplierTec)

src/dashoo.cn/frontend_web/src/pages/indexNew.vue

@@ -11,30 +11,30 @@
     <div class="chart-box">
       <div class="chart-box-row">
         <div class="chart-box-row-item">
-          <div class="item-more-button"><span>更多类型</span></div>
+          <div class="item-more-button"><span>更多</span></div>
           <div class="item-chart-body">
             <!--<highcharts class="item-high-chart" :options="supplierTypeChartOptions"></highcharts>-->
             <div id="supplier-type" class="item-high-chart" :option="supplierTypeOptions"></div>
           </div>
         </div>
         <div class="chart-box-row-item">
-          <div class="item-more-button"><span>更多等级</span></div>
+          <div class="item-more-button"><span>更多</span></div>
           <div class="item-chart-body">
             <!--<highcharts class="item-high-chart" :options="chartOptions"></highcharts>-->
-            <div id="supplier-level" class="item-high-chart" :option="supplierLevelOptions"></div>
+            <div id="supplier-level" class="item-high-chart" style="margin-left: -4%" :option="supplierLevelOptions"></div>
           </div>
         </div>
       </div>
       <div class="chart-box-row">
         <div class="chart-box-row-item">
-          <div class="item-more-button"><span>更多准入方式</span></div>
+          <div class="item-more-button"><span>更多</span></div>
           <div class="item-chart-body">
             <!--<highcharts class="item-high-chart" :options="chartOptions"></highcharts>-->
             <div id="access-type" class="item-high-chart" :option="accessTypeOptions"></div>
           </div>
         </div>
         <div class="chart-box-row-item">
-          <div class="item-more-button"><span>更多规模</span></div>
+          <div class="item-more-button"><span>更多</span></div>
           <div class="item-chart-body">
             <!--<highcharts class="item-high-chart" :options="chartOptions"></highcharts>-->
             <div id="supplier-scale" class="item-high-chart" style="width: 80%" :option="supplierScaleOption"></div>
@@ -79,6 +79,7 @@
           this.supplierTypeOptions = Highcharts.chart('supplier-type', {
             chart: {
               type: 'pie',
+              backgroundColor: 'rgba(0,0,0,0)',
               marginLeft: 1, // 饼图距左距离
               options3d: {
                 enabled: true,
@@ -117,19 +118,19 @@
               // #6c757d #007fbb  #c7000a
               data: [
                 {
-                  name: '供应商  30 家',
+                  name: '供应商  ' + res.data.GoodsNum + ' 家',
                   color: '#60C0DD',
                   y: 30,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '服务商 12 家',
+                  name: '服务商  ' + res.data.TecNum + ' 家',
                   color: '#E87C25',
                   y: 12,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '承包商 42 家',
+                  name: '承包商  ' + res.data.BaseNum + ' 家',
                   color: '#007fbb',
                   y: 42,
                   sliced: false, // 是否默认突出
@@ -141,10 +142,11 @@
               enabled: false // 不显示LOGO
             },
             legend: {
+              x: -10,
               enabled: true,
               layout: 'vertical',
               align: 'right',
-              verticalAlign: 'bottom',
+              verticalAlign: 'bottom', // middle bottom
               borderWidth: 0,
               borderRadius: 0,
               itemMarginTop: 10, // 图例每行举上高度
@@ -201,19 +203,19 @@
               // #6c757d #007fbb  #c7000a
               data: [
                 {
-                  name: '评审准入 30 家',
+                  name: '评审准入  ' + res.data.ReviewNum + ' 家',
                   color: '#60C0DD',
                   y: 30,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '招标准入 12 家           ',
+                  name: '招标准入  ' + res.data.TenderNum + ' 家',
                   color: '#E87C25',
                   y: 12,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '战略准入 42 家           ',
+                  name: '战略准入  ' + res.data.StrategicNum + ' 家',
                   color: '#007fbb',
                   y: 42,
                   sliced: false, // 是否默认突出
@@ -285,19 +287,19 @@
               // #6c757d #007fbb  #c7000a
               data: [
                 {
-                  name: '一级供应商 30 家          ',
+                  name: '一级供应商  ' + res.data.OneLevelGoodsNum + ' 家',
                   color: '#60C0DD',
                   y: 30,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '二级制造商 12 家          ',
+                  name: '二级制造商  ' + res.data.TwoLevelMakeNum + ' 家',
                   color: '#E87C25',
                   y: 12,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '二级贸易/代理商 42 家       ',
+                  name: '二级贸易/代理商  ' + res.data.TwoLevelNotMakeNum + ' 家',
                   color: '#007fbb',
                   y: 42,
                   sliced: false, // 是否默认突出
@@ -369,25 +371,25 @@
               // #6c757d #007fbb  #c7000a
               data: [
                 {
-                  name: '注册资金500万以下 30 家',
+                  name: '注册资金500万以下  ' + res.data.RegCapitalSmall + ' 家',
                   color: '#FE8463',
                   y: 30,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '注册资金500万-1000万 12 家',
+                  name: '注册资金500万-1000万  ' + res.data.RegCapital2 + ' 家',
                   color: '#60C0DD',
                   y: 12,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '注册资金1000万-2000万 42 家',
+                  name: '注册资金1000万-2000万  ' + res.data.RegCapital3 + ' 家',
                   color: '#E87C25',
                   y: 42,
                   sliced: false, // 是否默认突出
                   selected: false
                 }, {
-                  name: '注册资金2000万-5000万 42 家',
+                  name: '注册资金2000万-5000万  ' + res.data.RegCapital4 + ' 家',
                   color: '#007fbb',
                   y: 42,
                   sliced: false, // 是否默认突出