Merge remote-tracking branch 'origin/dev' into dev

src/components/price-Library/configuration/mainList.json

@@ -1,6 +1,6 @@
 {
   "border": true,
-  "searchMenuSpan": 16,
+  "searchMenuSpan": 8,
   "searchIcon": true,
   "searchIndex": 2,
   "index": true,
@@ -75,6 +75,8 @@
       "prop": "corpCode",
       "index": 7,
       "width": 100,
+      "searchSpan": 8,
+      "search": true,
       "overHidden": true
     },
     {

src/components/price-Library/main.vue

@@ -43,6 +43,13 @@
                   :configuration="goodsConfiguration"
                 />
               </template>
+              <template slot="corpCodeSearch">
+                <crop-select
+                  v-model="search.corpId"
+                  gysType="CK"
+                  corpType="GYS"
+                ></crop-select>
+              </template>
             </avue-crud>
           </el-col>
         </el-row>
@@ -148,7 +155,7 @@ export default {
       return "padding:0;height:40px;";
     },
     nodeClick(data) {
-      console.log(data)
+      console.log(data);
       this.search.goodTypeId = data.value;
       this.getList(this.page, this.search);
     },
@@ -178,8 +185,8 @@ export default {
       this.getList(this.page, params);
       done();
     },
-    refreshChange(){
-      this.getList(this.page,this.search);
+    refreshChange() {
+      this.getList(this.page, this.search);
     },
     getList(page, params) {
       let data = {

src/views/wel/components/charge-today.vue

@@ -63,6 +63,12 @@ export default {
         document.getElementById("chargeData")
       );
       chargeData.setOption({
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "line"
+          }
+        },
         xAxis: {
           type: "category",
           data: []
@@ -99,7 +105,7 @@ export default {
   .title {
     display: flex;
     justify-content: space-between;
-        margin-bottom: 5px;
+    margin-bottom: 5px;
   }
 }
 .content {

src/views/wel/components/pay-today.vue

@@ -61,6 +61,12 @@ export default {
     payData() {
       let payData = this.$echarts.init(document.getElementById("payData"));
       payData.setOption({
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "line"
+          }
+        },
         xAxis: {
           type: "category",
           data: []

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

@@ -296,7 +296,7 @@ export default {
     align-items: center;
     margin: 1.5vh 1vw 0vh 1vw;
     span {
-      margin-top: 1vh;
+      margin-top: 0.2vh;
     }
   }
 }

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

@@ -71,13 +71,13 @@ export default {
   data() {
     return {
       loading: false,
-      annual:"",
+      annual: "",
       tradeType: null,
       moneyList: []
     };
   },
   created() {
-    this.annual=getYearDate().toString()
+    this.annual = getYearDate().toString();
     this.getSysType();
   },
   mounted() {
@@ -131,6 +131,12 @@ export default {
         document.getElementById("polylineData")
       );
       polylineData.setOption({
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "line"
+          }
+        },
         xAxis: {
           type: "category",
           data: [

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

@@ -202,9 +202,8 @@ export default {
 };
 </script>
 
-<style scoped xml:lang="less">
+<style scoped Lang="less">
 @import url('https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css');
-
 #container {
   height: 93vh;
   width: 100%;

src/views/wel/home/tongjiSchool.vue

@@ -197,8 +197,12 @@ export default {
       moonList: [],
       fsalaryList2: [],
       studentNumberList2: [],
+      fsalaryContrastList2: [],
+      studentNumberContrastList2: [],
       fsalaryList: [],
       studentNumberList: [],
+      fsalaryContrastList: [],
+      studentNumberContrastList: [],
       activeNames: ["1", "2", "3", "5"],
       logActiveNames: ["24"],
       annual: "",
@@ -381,6 +385,8 @@ export default {
     getsalaryStatistics() {
       this.fsalaryList = [];
       this.studentNumberList = [];
+      this.fsalaryContrastList = [];
+      this.studentNumberContrastList = [];
       salaryStatistics({
         annual: this.annual,
         salaryType: this.salaryType
@@ -389,6 +395,10 @@ export default {
           res.data.data.forEach(e => {
             this.fsalaryList.push(Number(e.fsalary).toFixed(6));
             this.studentNumberList.push(Number(e.studentNumber).toFixed(2));
+            this.fsalaryContrastList.push(Number(e.fsalaryContrast).toFixed(2));
+            this.studentNumberContrastList.push(
+              Number(e.studentNumberContrast).toFixed(2)
+            );
           });
         })
         .finally(() => {
@@ -407,6 +417,8 @@ export default {
       this.yearList = [];
       this.fsalaryList2 = [];
       this.studentNumberList2 = [];
+      this.fsalaryContrastList2 = [];
+      this.studentNumberContrastList2 = [];
       salaryDataChain({
         annual: this.annual3,
         moon: this.moon,
@@ -440,6 +452,42 @@ export default {
           this.studentNumberList2.push(
             Number(data.studentNumberFive).toFixed(2)
           );
+          this.fsalaryContrastList2.push(
+            Number(data.fsalaryContrast).toFixed(2)
+          );
+          this.fsalaryContrastList2.push(
+            Number(data.fsalaryOneContrast).toFixed(2)
+          );
+          this.fsalaryContrastList2.push(
+            Number(data.fsalaryTwoContrast).toFixed(2)
+          );
+          this.fsalaryContrastList2.push(
+            Number(data.fsalaryThreeContrast).toFixed(2)
+          );
+          this.fsalaryContrastList2.push(
+            Number(data.fsalaryFourContrast).toFixed(2)
+          );
+          this.fsalaryContrastList2.push(
+            Number(data.fsalaryFiveContrast).toFixed(2)
+          );
+          this.studentNumberContrastList2.push(
+            Number(data.studentNumberContrast).toFixed(2)
+          );
+          this.studentNumberContrastList2.push(
+            Number(data.studentNumberOneContrast).toFixed(2)
+          );
+          this.studentNumberContrastList2.push(
+            Number(data.studentNumberTwoContrast).toFixed(2)
+          );
+          this.studentNumberContrastList2.push(
+            Number(data.studentNumberThreeContrast).toFixed(2)
+          );
+          this.studentNumberContrastList2.push(
+            Number(data.studentNumberFourContrast).toFixed(2)
+          );
+          this.studentNumberContrastList2.push(
+            Number(data.studentNumberFiveContrast).toFixed(2)
+          );
         })
         .finally(() => {
           this.commoDity2();
@@ -478,6 +526,7 @@ export default {
     commoDity() {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
       let myChart = this.$echarts.init(document.getElementById("commoDity"));
+      const colors = ["#5470C6", "#91CC75", "#EE6666", "#00008b"];
       // 绘制图表
       myChart.setOption({
         tooltip: {
@@ -487,7 +536,7 @@ export default {
           }
         },
         legend: {
-          data: ["工资", "人数"]
+          data: ["工资", "人数", "工资比", "人数比"]
         },
         xAxis: {
           type: "category",
@@ -517,12 +566,14 @@ export default {
             type: "value",
             name: "人民币",
             position: "left",
+            offset: 80,
             alignTicks: true,
             axisLine: {
               show: true,
               lineStyle: {
-                color: "#5470C6"
-              }
+                color: colors[0]
+              },
+              onZero: false
             },
             axisLabel: {
               formatter: "{value} 元"
@@ -536,12 +587,46 @@ export default {
             axisLine: {
               show: true,
               lineStyle: {
-                color: "#91CC75"
-              }
+                color: colors[1]
+              },
+              onZero: false
             },
             axisLabel: {
               formatter: "{value} 人"
             }
+          },
+          {
+            type: "value",
+            name: "工资比",
+            position: "left",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: colors[2]
+              },
+              onZero: false
+            },
+            axisLabel: {
+              formatter: "{value} %"
+            }
+          },
+          {
+            type: "value",
+            name: "工资比",
+            position: "right",
+            alignTicks: true,
+            offset: 80,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: colors[3]
+              },
+              onZero: false
+            },
+            axisLabel: {
+              formatter: "{value} %"
+            }
           }
         ],
         series: [
@@ -555,6 +640,18 @@ export default {
             name: "人数",
             yAxisIndex: 1,
             type: "bar"
+          },
+          {
+            data: this.fsalaryContrastList,
+            name: "工资比",
+            yAxisIndex: 2,
+            type: "line"
+          },
+          {
+            data: this.studentNumberContrastList,
+            name: "人数比",
+            yAxisIndex: 3,
+            type: "line"
           }
         ]
       });
@@ -562,7 +659,7 @@ export default {
     commoDity2() {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
       let myChart = this.$echarts.init(document.getElementById("commoDity2"));
-
+      const colors = ["#5470C6", "#91CC75", "#EE6666", "#00008b"];
       // 绘制图表
       myChart.setOption({
         tooltip: {
@@ -572,7 +669,7 @@ export default {
           }
         },
         legend: {
-          data: ["工资", "人数"]
+          data: ["工资", "人数", "工资比", "人数比"]
         },
         xAxis: {
           type: "category",
@@ -589,12 +686,14 @@ export default {
             type: "value",
             name: "人民币",
             position: "left",
+            offset: 80,
             alignTicks: true,
             axisLine: {
               show: true,
               lineStyle: {
-                color: "#5470C6"
-              }
+                color: colors[0]
+              },
+              onZero: false
             },
             axisLabel: {
               formatter: "{value} 元"
@@ -608,12 +707,46 @@ export default {
             axisLine: {
               show: true,
               lineStyle: {
-                color: "#91CC75"
-              }
+                color: colors[1]
+              },
+              onZero: false
             },
             axisLabel: {
               formatter: "{value} 人"
             }
+          },
+          {
+            type: "value",
+            name: "工资比",
+            position: "left",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: colors[2]
+              },
+              onZero: false
+            },
+            axisLabel: {
+              formatter: "{value} %"
+            }
+          },
+          {
+            type: "value",
+            name: "工资比",
+            position: "right",
+            alignTicks: true,
+            offset: 80,
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: colors[3]
+              },
+              onZero: false
+            },
+            axisLabel: {
+              formatter: "{value} %"
+            }
           }
         ],
         series: [
@@ -627,6 +760,18 @@ export default {
             name: "人数",
             yAxisIndex: 1,
             type: "bar"
+          },
+          {
+            data: this.fsalaryContrastList2,
+            name: "工资比",
+            yAxisIndex: 2,
+            type: "line"
+          },
+          {
+            data: this.studentNumberContrastList2,
+            name: "人数比",
+            yAxisIndex: 3,
+            type: "line"
           }
         ]
       });