1

supervise-report-ui/src/main.js

@@ -49,9 +49,9 @@ VueAMap.initAMapApiLoader({
 
 Vue.config.productionTip = false
 
-// let token = null
-let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDAyMTA3MjF9.wq9OgbpBnuvHdJsVzaVA1FM4pdhY-dJM9GUGSkp5mPk'
-// token = GetQueryString('token')
+let token = null
+// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDAyOTk0NTN9.oZoMaHdDSGNsNf-3jd22RgvBYQkSemneihmQ4P12HCo'
+token = GetQueryString('token')
 if (token) {
   setStorage(token)
   const href = window.location.href

supervise-report-ui/src/views/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <div class="mains">
 
     <div class="index">
 
@@ -135,19 +136,26 @@
           <div class="centre-title-view"></div>
         </div>
 
-      <div id="main" style="width: 100%;height: 20px;margin-top: 20px;"></div>
+        <div id="main" style="width: 100%;height: 250px;margin-top: 20px;"></div>
 
       </div>
 
 
       <div class="bom">
 
+        <el-table v-loading="tableLoading" :data="listSalesChannelData" border style="width: 100%;">
+          <el-table-column width="200" label="销售渠道类别" prop="salesChannelCategory" align="center" />
+          <el-table-column label="总额" prop="totalAmount" align="center" />
+          <el-table-column label="应收帐款" prop="accountsReceivable" align="center" />
+          <el-table-column label="扣除应收" prop="deductionAccountsReceivable" align="center" />
+        </el-table>
 
 
       </div>
 
     </div>
 
+  </div>
 </template>
 
 </div>
@@ -176,11 +184,72 @@
             label: "333333",
             value: "项目3"
           }
-        ]
+        ],
+        listSalesChannelData: [{
+            salesChannelCategory: '连网连锁店',
+            totalAmount: '2000000',
+            accountsReceivable: '31,914',
+            deductionAccountsReceivable: '35,793'
+          },
+          {
+            salesChannelCategory: '连锁内加盟',
+            totalAmount: '28,700',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '配送中心',
+            totalAmount: '-1241.81',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '连锁外加盟',
+            totalAmount: '29822.44',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '配送中心',
+            totalAmount: '-1241.81',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '连锁外加盟',
+            totalAmount: '29822.44',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '配送中心',
+            totalAmount: '-1241.81',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '连锁外加盟',
+            totalAmount: '29822.44',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '配送中心',
+            totalAmount: '-1241.81',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          },
+          {
+            salesChannelCategory: '连锁外加盟',
+            totalAmount: '29822.44',
+            accountsReceivable: '28,749',
+            deductionAccountsReceivable: '58,339'
+          }
+        ],
 
       }
     },
-    created() {
+    mounted() {
       this.drawLine()
     },
 
@@ -197,10 +266,9 @@
         // 基于准备好的dom，初始化echarts实例
         var myChart = echarts.init(document.getElementById('main'));
         // 绘制图表
-        console.log('option', obj)
         myChart.setOption({
           title: {
-            text: 'Stacked Line'
+            text: ''
           },
           tooltip: {
             trigger: 'axis'
@@ -215,8 +283,24 @@
             containLabel: true
           },
           toolbox: {
+            show: true,
             feature: {
-              saveAsImage: {}
+              mark: {
+                show: true
+              },
+              // 数据图标
+              dataView: {
+                show: false,
+                readOnly: false
+              },
+              // 刷新图标
+              restore: {
+                show: false
+              },
+              // 下载图标
+              saveAsImage: {
+                show: false
+              }
             }
           },
           xAxis: {
@@ -275,6 +359,11 @@
     text-align: right;
     padding-right: 40px;
   }
+  .mains{
+    overflow-x: hidden;
+        overflow-y: auto;
+        height: 100%;
+  }
 
   .index {
     width: 100%;
@@ -449,5 +538,10 @@
         }
       }
     }
+
+    .bom {
+      margin-top: 36px;
+      padding-bottom: 50px;
+    }
   }
 </style>