修改bug

src/api/wel.js

@@ -20,3 +20,52 @@ export const salaryDataChain = (query) => {
     params: query
   })
 }
+export const checkDate = (query) => {
+  return request({
+    url: '/api/blade-purchase-sales/exportOrder/checkDate',
+    method: 'get',
+    params: query
+  })
+}
+export const realTimeData = (query) => {
+  return request({
+    url: '/api/blade-purchase-sales/exportOrder/realTimeData',
+    method: 'get',
+    params: query
+  })
+}
+export const shipCheckDate = (query) => {
+  return request({
+    url: '/api/blade-deliver-goods/exportDelivery/checkDate',
+    method: 'get',
+    params: query
+  })
+}
+export const shipRealTimeData = (query) => {
+  return request({
+    url: '/api/blade-deliver-goods/exportDelivery/realTimeData',
+    method: 'get',
+    params: query
+  })
+}
+export const monthSales = (query) => {
+  return request({
+    url: '/api/blade-purchase-sales/exportEnquiry/monthSales',
+    method: 'get',
+    params: query
+  })
+}
+export const salesTrend = (query) => {
+  return request({
+    url: '/api/blade-purchase-sales/exportOrder/salesTrend',
+    method: 'get',
+    params: query
+  })
+}
+export const financeCheck = (query) => {
+  return request({
+    url: '/api/trade-finance/settlement/financeCheck',
+    method: 'get',
+    params: query
+  })
+}

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -1238,6 +1238,13 @@ export default {
           {
             label: "学生人数",
             prop: "studentNumber",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 4
           },
           {

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -1238,6 +1238,13 @@ export default {
           {
             label: "学生人数",
             prop: "studentNumber",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 4
           },
           {

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -1238,6 +1238,13 @@ export default {
           {
             label: "学生人数",
             prop: "studentNumber",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 4
           },
           {
@@ -2369,7 +2376,7 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
-                      case "33":
+          case "33":
             this.exportUrl =
               "/api/blade-school/salaryitem/export/teamLeaderAssessExcel";
             this.findObject(this.excelOption.column, "excelFile").action =

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1241,6 +1241,13 @@ export default {
           {
             label: "学生人数",
             prop: "studentNumber",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             span: 4
           },
           {
@@ -1364,7 +1371,7 @@ export default {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
-    console.log(this.detailData)
+    console.log(this.detailData);
     if (this.detailData.status == 1) {
       this.$set(this.option, "disabled", true);
     }

src/views/wel/components/audit-data.vue

@@ -29,6 +29,11 @@
 </template>
 
 <script>
+import {
+  checkDate,
+  shipCheckDate,
+  financeCheck
+} from "@/api/wel";
 export default {
   name: "basicContainer",
   props: {
@@ -38,33 +43,107 @@ export default {
     return {
       loading: false,
       list: [
-        { icon: "el-icon-s-order", qty: "1", text: "销售订单/待审核" },
-        { icon: "el-icon-s-goods", qty: "1", text: "采购订单/待审核" },
-        { icon: "el-icon-s-home", qty: "1", text: "发货/待审核" },
-        { icon: "el-icon-s-home", qty: "1", text: "收货/待审核" },
-        { icon: "el-icon-s-finance", qty: "1", text: "申请付款/待审核" }
-      ]
+        { icon: "el-icon-s-order", qty: "0", text: "报价订单/待审核" },
+        { icon: "el-icon-s-order", qty: "0", text: "销售订单/待审核" },
+        { icon: "el-icon-s-goods", qty: "0", text: "采购订单/待审核" },
+        { icon: "el-icon-s-home", qty: "0", text: "发货/待审核" },
+        { icon: "el-icon-s-home", qty: "0", text: "收货/待审核" },
+        { icon: "el-icon-s-finance", qty: "0", text: "申请付款/待审核" }
+      ],
+      tradeType: null
     };
   },
+  created() {
+    this.getSysType();
+  },
   mounted() {
-    this.init()
+    this.init();
   },
   methods: {
-    init(){
-      if(this.sysType === 3){
+    init() {
+      // if(this.sysType === 3){
 
-      }
-      if(this.sysType === 5){
+      // }
+      if (this.sysType === 5) {
         this.list = [
-          { icon: "el-icon-s-order", qty: "0", text: "主营业务/待审核" },
-        ]
+          { icon: "el-icon-s-order", qty: "0", text: "主营业务/待审核" }
+        ];
       }
+      this.getCheckDate();
+      this.getshipCheckDate();
+      this.getfinanceCheck()
     },
-    refresh() {
+    getSysType() {
+      const sysType = localStorage.getItem("sysitemType");
+      if (sysType == 6) {
+        this.tradeType = "JXS";
+      } else if (sysType == 5) {
+        this.tradeType = "SW";
+      } else if (sysType == 4) {
+        this.tradeType = "CK";
+      } else if (sysType == 3) {
+        this.tradeType = "JK";
+      } else if (sysType == 2) {
+        this.tradeType = "GN";
+      } else if (sysType == 1) {
+        this.tradeType = "XX";
+      }
+    },
+    getCheckDate() {
       this.loading = true;
-      setTimeout(() => {
-        this.loading = false;
-      }, 1000);
+      checkDate({ tradeType: this.tradeType })
+        .then(res => {
+          this.list.forEach(e => {
+            if (e.text == "报价订单/待审核") {
+              e.qty = res.data.data.offerNumber;
+            }
+            if (e.text == "销售订单/待审核") {
+              e.qty = res.data.data.sellNumber;
+            }
+            if (e.text == "采购订单/待审核") {
+              e.qty = res.data.data.purchaseNumber;
+            }
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    getshipCheckDate() {
+      this.loading = true;
+      shipCheckDate({ tradeType: this.tradeType })
+        .then(res => {
+          this.list.forEach(e => {
+            if (e.text == "发货/待审核") {
+              e.qty = res.data.data.sellNumber;
+            }
+            if (e.text == "收货/待审核") {
+              e.qty = res.data.data.purchaseNumber;
+            }
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    getfinanceCheck(){
+      this.loading = true;
+      financeCheck({ tradeType: this.tradeType })
+        .then(res => {
+          this.list.forEach(e => {
+            if (e.text == "申请付款/待审核") {
+              e.qty = res.data.data;
+            }
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    refresh() {
+      this.getCheckDate();
+      this.getshipCheckDate();
+      this.getfinanceCheck()
     }
   }
 };

src/views/wel/components/quick-launch.vue

@@ -63,6 +63,10 @@
         </div>
       </div>
       <div class="content" v-if="sysType == 4 || sysType == 2">
+        <div class="content-icon" @click="inPage('bj')">
+          <i class="tradingIcon icon-sales" style="color:#606266"></i>
+          <span>报价</span>
+        </div>
         <div class="content-icon" @click="inPage('xs')">
           <i class="tradingIcon icon-sales" style="color:#409EFF"></i>
           <span>销售</span>
@@ -122,6 +126,9 @@ export default {
       //出口
       if (this.sysType == 4) {
         switch (type) {
+          case "bj":
+            this.$router.push("/exportTrade/customerInquiry/index");
+            break;
           case "xs":
             this.$router.push("/exportTrade/salesContract/index");
             break;

src/views/wel/components/realtime-data.vue

@@ -35,11 +35,25 @@
             <div class="card">
               <div class="card-title card-title1">
                 <span>
+                  报
+                </span>
+              </div>
+              <div class="card-content">
+                <span class="card-content-num">{{ data1.offerNumber }}</span>
+                <span class="card-content-text">报价订单</span>
+              </div>
+            </div>
+          </div>
+          <div class="divider" />
+          <div class="content-item">
+            <div class="card">
+              <div class="card-title card-title1">
+                <span>
                   销
                 </span>
               </div>
               <div class="card-content">
-                <span class="card-content-num">1</span>
+                <span class="card-content-num">{{ data1.sellNumber }}</span>
                 <span class="card-content-text">销售订单</span>
               </div>
             </div>
@@ -53,7 +67,7 @@
                 </span>
               </div>
               <div class="card-content">
-                <span class="card-content-num">1</span>
+                <span class="card-content-num">{{ data1.purchaseNumber }}</span>
                 <span class="card-content-text">采购订单</span>
               </div>
             </div>
@@ -67,8 +81,8 @@
                 </span>
               </div>
               <div class="card-content">
-                <span class="card-content-num">1</span>
-                <span class="card-content-text">发货数量</span>
+                <span class="card-content-num">{{ data2.sellNumber }}</span>
+                <span class="card-content-text">发货重量</span>
               </div>
             </div>
           </div>
@@ -81,8 +95,8 @@
                 </span>
               </div>
               <div class="card-content">
-                <span class="card-content-num">1</span>
-                <span class="card-content-text">收货数量</span>
+                <span class="card-content-num">{{ data2.purchaseNumber }}</span>
+                <span class="card-content-text">收货重量</span>
               </div>
             </div>
           </div>
@@ -136,6 +150,7 @@
 </template>
 
 <script>
+import { realTimeData, shipRealTimeData } from "@/api/wel";
 export default {
   name: "basicContainer",
   props: {
@@ -144,15 +159,61 @@ export default {
   data() {
     return {
       isActive: true,
-      loading: false
+      loading: false,
+      data1: {},
+      data2: {},
+      tradeType: null
     };
   },
+  created() {
+    this.getSysType();
+  },
+  mounted() {
+    this.init();
+  },
   methods: {
+    init() {
+      this.getrealTimeData();
+      this.getshipRealTimeData();
+    },
     refresh() {
+      this.init();
+    },
+    getSysType() {
+      const sysType = localStorage.getItem("sysitemType");
+      if (sysType == 6) {
+        this.tradeType = "JXS";
+      } else if (sysType == 5) {
+        this.tradeType = "SW";
+      } else if (sysType == 4) {
+        this.tradeType = "CK";
+      } else if (sysType == 3) {
+        this.tradeType = "JK";
+      } else if (sysType == 2) {
+        this.tradeType = "GN";
+      } else if (sysType == 1) {
+        this.tradeType = "XX";
+      }
+    },
+    getrealTimeData() {
       this.loading = true;
-      setTimeout(() => {
-        this.loading = false;
-      }, 1000);
+      realTimeData({ tradeType: this.tradeType })
+        .then(res => {
+          this.data1 = res.data.data;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    getshipRealTimeData() {
+      this.loading = true;
+      shipRealTimeData({ tradeType: this.tradeType})
+        .then(res => {
+          this.data2 = res.data.data;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     inDay() {
       this.isActive = true;

src/views/wel/components/sales-reached.vue

@@ -3,7 +3,7 @@
     <el-card class="home-container__card">
       <div class="title">
         <span>
-          当月销售
+          当月报价
         </span>
         <span>
           <i
@@ -18,19 +18,19 @@
           <div id="ringData" ref="ringData" style="width:20vw;height:33vh" />
           <div>
             <div class="content_item">
-              <div class="content_item_num">100,000</div>
-              <div class="content_item_text">目标金额</div>
+              <div class="content_item_num">{{ data.grossAmount }}</div>
+              <div class="content_item_text">订单总金额</div>
             </div>
             <div class="content_item">
-              <div class="content_item_num">20</div>
-              <div class="content_item_text">达成金额</div>
+              <div class="content_item_num">{{ data.reachAmount }}</div>
+              <div class="content_item_text">达成</div>
             </div>
             <div class="content_item">
               <div class="divider" />
             </div>
             <div class="content_item">
-              <div class="content_item_num">20</div>
-              <div class="content_item_text">达成金额</div>
+              <div class="content_item_num">{{ data.notReachAmount }}</div>
+              <div class="content_item_text">未达成</div>
             </div>
           </div>
         </div>
@@ -40,22 +40,55 @@
 </template>
 
 <script>
+import { monthSales } from "@/api/wel";
 export default {
   name: "basicContainer",
   data() {
     return {
-      loading: false
+      loading: false,
+      tradeType: null,
+      data: {}
     };
   },
+  created() {
+    this.getSysType();
+  },
   mounted() {
-    this.ringData();
+    this.init();
   },
   methods: {
-    refresh() {
+    init() {
+      this.getmonthSales();
+    },
+    getSysType() {
+      const sysType = localStorage.getItem("sysitemType");
+      if (sysType == 6) {
+        this.tradeType = "JXS";
+      } else if (sysType == 5) {
+        this.tradeType = "SW";
+      } else if (sysType == 4) {
+        this.tradeType = "CK";
+      } else if (sysType == 3) {
+        this.tradeType = "JK";
+      } else if (sysType == 2) {
+        this.tradeType = "GN";
+      } else if (sysType == 1) {
+        this.tradeType = "XX";
+      }
+    },
+    getmonthSales() {
       this.loading = true;
-      setTimeout(() => {
-        this.loading = false;
-      }, 1000);
+      monthSales({ tradeType: this.tradeType, billType: "BJ" })
+        .then(res => {
+          this.data = res.data.data;
+        })
+        .finally(() => {
+          this.loading = false;
+          this.ringData();
+        });
+    },
+    refresh() {
+      this.init();
     },
     ringData() {
       let ringData = this.$echarts.init(document.getElementById("ringData"));
@@ -73,7 +106,7 @@ export default {
             left: "center",
             top: "43%",
             style: {
-              text: "5%",
+              text: this.data.yieldRate + "%",
               textAlign: "center",
               fill: "#000",
               fontSize: 24
@@ -84,7 +117,7 @@ export default {
             left: "center",
             top: "53%",
             style: {
-              text: "销售达成率",
+              text: "报价达成率",
               textAlign: "center",
               fill: "#999999",
               fontSize: 16
@@ -94,7 +127,7 @@ export default {
         color: ["#F6695E", "#E3E3E3"],
         series: [
           {
-            name: "当月销售",
+            name: "当月报价",
             type: "pie",
             radius: ["55%", "70%"],
             avoidLabelOverlap: false,
@@ -106,8 +139,8 @@ export default {
               show: false
             },
             data: [
-              { value: 5, name: "已销售数量" },
-              { value: 95, name: "未销售数量" }
+              { value: Number(this.data.reachAmount), name: "已报价数量" },
+              { value: Number(this.data.notReachAmount), name: "未报价数量" }
             ]
           }
         ]

src/views/wel/components/sales-trend.vue

@@ -1,39 +1,52 @@
 <template>
   <div class="home-container">
-    <el-card  class="home-container__card">
+    <el-card class="home-container__card">
       <div v-if="sysType !== 5">
         <div class="title">
-        <span>
-          销售趋势
-        </span>
           <span>
-          <i
-            class="el-icon-refresh-right"
-            style="cursor: pointer;font-size:20px"
-            @click="refresh"
-          ></i>
-        </span>
+            销售趋势
+          </span>
+          <span>
+            <i
+              class="el-icon-refresh-right"
+              style="cursor: pointer;font-size:20px"
+              @click="refresh"
+            ></i>
+          </span>
         </div>
+
         <div class="content" v-loading="loading">
+          <div class="content-year">
+            <el-date-picker
+              v-model="annual"
+              type="year"
+              size="mini"
+              placeholder="选择年"
+              value-format="yyyy"
+              style="margin-right:10px"
+              @change="getsalesTrend"
+            />
+          </div>
+
           <div
             id="polylineData"
             ref="polylineData"
-            style="width:60vw;height:33vh"
+            style="width:55vw;height:33vh"
           />
         </div>
       </div>
       <div v-if="sysType === 5">
         <div class="title">
-        <span>
-          业绩趋势
-        </span>
           <span>
-          <i
-            class="el-icon-refresh-right"
-            style="cursor: pointer;font-size:20px"
-            @click="refresh"
-          ></i>
-        </span>
+            业绩趋势
+          </span>
+          <span>
+            <i
+              class="el-icon-refresh-right"
+              style="cursor: pointer;font-size:20px"
+              @click="refresh"
+            ></i>
+          </span>
         </div>
         <div class="content" v-loading="loading">
           <div
@@ -48,6 +61,7 @@
 </template>
 
 <script>
+import { salesTrend } from "@/api/wel";
 export default {
   name: "basicContainer",
   props: {
@@ -55,35 +69,79 @@ export default {
   },
   data() {
     return {
-      loading: false
+      loading: false,
+      annual: "2022",
+      tradeType: null,
+      moneyList: []
     };
   },
+  created() {
+    this.getSysType();
+  },
   mounted() {
-    this.polylineData();
+    this.init();
   },
   methods: {
-    refresh() {
+    init() {
+      this.getsalesTrend();
+    },
+    getSysType() {
+      const sysType = localStorage.getItem("sysitemType");
+      if (sysType == 6) {
+        this.tradeType = "JXS";
+      } else if (sysType == 5) {
+        this.tradeType = "SW";
+      } else if (sysType == 4) {
+        this.tradeType = "CK";
+      } else if (sysType == 3) {
+        this.tradeType = "JK";
+      } else if (sysType == 2) {
+        this.tradeType = "GN";
+      } else if (sysType == 1) {
+        this.tradeType = "XX";
+      }
+    },
+    getsalesTrend() {
       this.loading = true;
-      setTimeout(() => {
-        this.loading = false;
-      }, 1000);
+      this.moneyList=[]
+      salesTrend({
+        tradeType: this.tradeType,
+        billType: "XS",
+        annual: this.annual
+      })
+        .then(res => {
+          res.data.data.forEach(e => {
+            this.moneyList.push(Number(e.money));
+          });
+        })
+        .finally(() => {
+          this.loading = false;
+          this.polylineData();
+        });
+    },
+    refresh() {
+      this.init()
     },
     polylineData() {
       let polylineData = this.$echarts.init(
         document.getElementById("polylineData")
       );
-      // document.getElementById("polylineDatas")
       polylineData.setOption({
         xAxis: {
           type: "category",
           data: [
-            "2022-01-01",
-            "2022-01-01",
-            "2022-01-05",
-            "2022-01-09",
-            "2022-01-13",
-            "2022-01-17",
-            "2022-01-21"
+            "一月",
+            "二月",
+            "三月",
+            "四月",
+            "五月",
+            "六月",
+            "七月",
+            "八月",
+            "九月",
+            "十月",
+            "十一月",
+            "十二月"
           ]
         },
         yAxis: {
@@ -91,7 +149,7 @@ export default {
         },
         series: [
           {
-            data: [1, 4, 6, 7, 8, 10, 20],
+            data: this.moneyList,
             type: "line",
             smooth: true
           }
@@ -122,5 +180,10 @@ export default {
 }
 .content {
   display: flex;
+  flex-direction: column;
+  &-year {
+    display: flex;
+    justify-content: right;
+  }
 }
 </style>

src/views/wel/home/tongjiSchool.vue

@@ -46,7 +46,7 @@
     </basic-container>
     <basic-container>
       <index-card
-        title="工资同比走势图"
+        title="工资环比走势图"
         iconName="el-icon-s-fold"
         style="height:500px;margin-bottom: 30px"
       >
@@ -84,7 +84,7 @@
     </basic-container>
     <basic-container>
       <index-card
-        title="工资环比走势图"
+        title="工资同比走势图"
         iconName="el-icon-s-fold"
         style="height:500px;margin-bottom: 30px"
       >
@@ -132,6 +132,21 @@
             >
             </el-option>
           </el-select>
+           <el-select
+            slot="content"
+            size="mini"
+            v-model="salaryType3"
+            placeholder="请选择"
+            @change="getsalaryDataChain"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </div>
 
         <div slot="content" style="height:450px" id="commoDity2"></div>
@@ -142,7 +157,11 @@
 </template>
 
 <script>
-import { salaryStatistics, salaryData, salaryDataChain } from "@/api/wel";
+import {
+  salaryStatistics,
+  salaryData,
+  salaryDataChain
+} from "@/api/wel";
 import { mapGetters } from "vuex";
 import indexCard from "../components/card.vue";
 import butCard from "../components/butCard.vue";
@@ -150,6 +169,7 @@ export default {
   name: "wel",
   data() {
     return {
+      tradeType: null,
       moon: null,
       semester: null,
       moonList: [],
@@ -164,6 +184,7 @@ export default {
       annual3: "2022",
       salaryType: "",
       salaryType2: "",
+      salaryType3:"",
       isHeight: {},
       options: [
         {
@@ -319,8 +340,8 @@ export default {
       })
         .then(res => {
           res.data.data.forEach(e => {
-            this.fsalaryList.push(Number(e.fsalary));
-            this.studentNumberList.push(Number(e.studentNumber));
+            this.fsalaryList.push(Number(e.fsalary).toFixed(6));
+            this.studentNumberList.push(Number(e.studentNumber).toFixed(2));
           });
         })
         .finally(() => {
@@ -342,7 +363,8 @@ export default {
       salaryDataChain({
         annual: this.annual3,
         moon: this.moon,
-        semester: this.semester
+        semester: this.semester,
+        salaryType:this.salaryType3
       })
         .then(res => {
           let data = res.data.data;
@@ -350,17 +372,27 @@ export default {
             this.yearList.push(Number(this.annual3) - i + "年");
           }
           this.fsalaryList2.push(Number(data.fsalary));
-          this.fsalaryList2.push(Number(data.fsalaryOne));
-          this.fsalaryList2.push(Number(data.fsalaryTwo));
-          this.fsalaryList2.push(Number(data.fsalaryThree));
-          this.fsalaryList2.push(Number(data.fsalaryFour));
-          this.fsalaryList2.push(Number(data.fsalaryFive));
-          this.studentNumberList2.push(Number(data.studentNumber));
-          this.studentNumberList2.push(Number(data.studentNumberOne));
-          this.studentNumberList2.push(Number(data.studentNumberTwo));
-          this.studentNumberList2.push(Number(data.studentNumberThree));
-          this.studentNumberList2.push(Number(data.studentNumberFour));
-          this.studentNumberList2.push(Number(data.studentNumberFive));
+          this.fsalaryList2.push(Number(data.fsalaryOne).toFixed(2));
+          this.fsalaryList2.push(Number(data.fsalaryTwo).toFixed(2));
+          this.fsalaryList2.push(Number(data.fsalaryThree).toFixed(2));
+          this.fsalaryList2.push(Number(data.fsalaryFour).toFixed(2));
+          this.fsalaryList2.push(Number(data.fsalaryFive).toFixed(2));
+          this.studentNumberList2.push(Number(data.studentNumber).toFixed(2));
+          this.studentNumberList2.push(
+            Number(data.studentNumberOne).toFixed(2)
+          );
+          this.studentNumberList2.push(
+            Number(data.studentNumberTwo).toFixed(2)
+          );
+          this.studentNumberList2.push(
+            Number(data.studentNumberThree).toFixed(2)
+          );
+          this.studentNumberList2.push(
+            Number(data.studentNumberFour).toFixed(2)
+          );
+          this.studentNumberList2.push(
+            Number(data.studentNumberFive).toFixed(2)
+          );
         })
         .finally(() => {
           this.commoDity2();
@@ -399,7 +431,6 @@ export default {
     commoDity() {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
       let myChart = this.$echarts.init(document.getElementById("commoDity"));
-
       // 绘制图表
       myChart.setOption({
         tooltip: {
@@ -434,12 +465,38 @@ export default {
           bottom: "3%",
           containLabel: true
         },
-        yAxis: {
-          type: "value",
-          axisLabel: {
-            formatter: "{value} 元"
+        yAxis: [
+          {
+            type: "value",
+            name: "人民币",
+            position: "left",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#5470C6"
+              }
+            },
+            axisLabel: {
+              formatter: "{value} 元"
+            }
+          },
+          {
+            type: "value",
+            name: "人数",
+            position: "right",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#91CC75"
+              }
+            },
+            axisLabel: {
+              formatter: "{value} 人"
+            }
           }
-        },
+        ],
         series: [
           {
             data: this.fsalaryList,
@@ -449,6 +506,7 @@ export default {
           {
             data: this.studentNumberList,
             name: "人数",
+            yAxisIndex: 1,
             type: "bar"
           }
         ]
@@ -471,7 +529,7 @@ export default {
         },
         xAxis: {
           type: "category",
-          data: this.yearList,
+          data: this.yearList
         },
         grid: {
           left: "3%",
@@ -479,12 +537,38 @@ export default {
           bottom: "3%",
           containLabel: true
         },
-        yAxis: {
-          type: "value",
-          axisLabel: {
-            formatter: "{value} 元"
+        yAxis: [
+          {
+            type: "value",
+            name: "人民币",
+            position: "left",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#5470C6"
+              }
+            },
+            axisLabel: {
+              formatter: "{value} 元"
+            }
+          },
+          {
+            type: "value",
+            name: "人数",
+            position: "right",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#91CC75"
+              }
+            },
+            axisLabel: {
+              formatter: "{value} 人"
+            }
           }
-        },
+        ],
         series: [
           {
             data: this.fsalaryList2,
@@ -494,6 +578,7 @@ export default {
           {
             data: this.studentNumberList2,
             name: "人数",
+            yAxisIndex: 1,
             type: "bar"
           }
         ]