11

public/config.js

@@ -23,7 +23,7 @@ const DATACONTENT_ID = {
 
   /***-----角色管理------***/
   roleTableId: 41, //角色管理-首页-列表
-  roleDetailsId: 222, //角色管理-根据id查详情
+  roleDetailsId: 48, //角色管理-根据id查详情
   roleAuthId: 42, //角色管理-根据id查权限
 
   /***-----权限管理------***/
@@ -75,6 +75,16 @@ const DATACONTENT_ID = {
   airportTableId: 57, //基础数据-机场信息维护-表格-id
   airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
   bagTableId: 55, //基础数据-特殊行李维护-表格-id
+
+  // 数据统计
+  inOrOutId:246,//获取进离岗下拉ID
+  AirlineId:247,//获取航线下拉ID
+  AreaId:248,//获取大区下拉ID
+  AirportId:249,//获取航站下拉ID
+  TerminalId:250,//获取航站楼下拉ID
+  byAreaId:244,//根据大区统计ID
+  byOtherId:243,//获取大区以外统计ID
+
 };
 
 const SERVICE_ID = {
@@ -93,4 +103,7 @@ const SERVICE_ID = {
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改-id
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交-id
   sysDataTabId: 11, //系统设置-数据结构-数据项-表格-增删改-id
-};
+
+
+
+};

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -136,7 +136,7 @@ export default {
       try {
         this.loading = true;
         const res = await Query({
-          id:48,
+          id:DATACONTENT_ID.roleDetailsId,
           dataContent:[id]
         });
         if (res.code === "0") {

src/views/flightStatistics/components/flightStatisticsHeader.vue

@@ -275,7 +275,7 @@ export default {
     async getInOrOut(data){
       try {
         const res = await Query({
-          id:246,
+          id:DATACONTENT_ID.inOrOutId,
           dataContent:[data]
         });
         if (res.code === "0") {
@@ -297,7 +297,7 @@ export default {
     async getAirline(){
       try {
         const res = await Query({
-          id:247,
+          id:DATACONTENT_ID.AirlineId,
           dataContent:[]
         });
         if (res.code === "0") {
@@ -319,7 +319,7 @@ export default {
     async getArea(){
       try {
         const res = await Query({
-          id:248,
+          id:DATACONTENT_ID.AreaId,
           dataContent:[]
         });
         if (res.code === "0") {
@@ -341,29 +341,7 @@ export default {
     async getAirport(){
       try {
         const res = await Query({
-          id:249,
-          dataContent:[]
-        });
-        if (res.code === "0") {
-          let arr = [];
-          for(let i=0;i< res.returnData.listValues.length;i++){
-            arr.push({
-              label:res.returnData.listValues[i].a2,
-              value:res.returnData.listValues[i].a2
-            })
-          }
-          this.formItems[6].options=arr
-        } else {
-          this.$message.error(res.message);
-        }
-      } catch (error) {
-        console.log("出错了", error);
-      }
-    },
-    async getAirport(){
-      try {
-        const res = await Query({
-          id:249,
+          id:DATACONTENT_ID.AirportId,
           dataContent:[]
         });
         if (res.code === "0") {
@@ -385,7 +363,7 @@ export default {
     async getTerminal(){
       try {
         const res = await Query({
-          id:250,
+          id:DATACONTENT_ID.TerminalId,
           dataContent:[]
         });
         if (res.code === "0") {
@@ -420,7 +398,7 @@ export default {
     // min-width: 176px;
     height: 32px;
     line-height: 32px;
-    font-size: 20px;
+    font-size: 18px;
     font-family: Helvetica, "Microsoft YaHei";
     font-weight: bold;
     position: relative;

src/views/flightStatistics/views/flightStatisticsCharts.vue

@@ -152,27 +152,27 @@ export default {
           //   },
           //   data: []
           // },
-          // {
-          //   name: '航班量环比',
-          //   type: 'line',
-          //   z: 3,
-          //   yAxisIndex: 1,
-          //   symbol: 'circle',
-          //   itemStyle: {
-          //     color: '#E33D3D',
-          //     borderColor: '#ffffff',
-          //     borderWidth: 4
-          //   },
-          //   lineStyle: {
-          //     width: 4,
-          //     color: '#E33D3D'
-          //   },
-          //   symbolSize: 32,
-          //   tooltip: {
-          //     valueFormatter: value => (value * 100).toFixed(2) + '%'
-          //   },
-          //   data: []
-          // }
+          {
+            name: '航班量环比',
+            type: 'line',
+            z: 3,
+            yAxisIndex: 1,
+            symbol: 'circle',
+            itemStyle: {
+              color: '#E33D3D',
+              borderColor: '#ffffff',
+              borderWidth: 4
+            },
+            lineStyle: {
+              width: 4,
+              color: '#E33D3D'
+            },
+            symbolSize: 32,
+            tooltip: {
+              valueFormatter: value => (value * 100).toFixed(2) + '%'
+            },
+            data: []
+          }
         ]
       }
     }
@@ -239,11 +239,11 @@ export default {
         return;
       }
       if(data.range=="大区"){
-        id = 244
+        id = DATACONTENT_ID.byAreaId
         params = [data.interval,data.dateTime[0],data.dateTime[1],data.inOrOut,data.area]
       }
       else if(data.range!="大区"&&data.range!=""){
-        id = 243
+        id = DATACONTENT_ID.byOtherId
         params = [data.interval,data.range,data.dateTime[0],data.dateTime[1],data.inOrOut]
         if(data.airline==""&&data.airport==""&&data.terminal==""){
           params.push("全部")
@@ -267,15 +267,19 @@ export default {
           let max
           let dateArr = []
           let dataArr = []
-          let chainArr = []
+          let chainArr = [0]
           for(let i = 0; i<res.returnData.listValues.length;i++){
             dateArr.push(res.returnData.listValues[i].A)
             dataArr.push(res.returnData.listValues[i].count)
+            if(i>0){
+              chainArr.push((res.returnData.listValues[i].count - res.returnData.listValues[i-1].count)/res.returnData.listValues[i-1].count)
+            }
           }
           max =  Math.max( ...dataArr )+1000
           this.options.yAxis[0].max = max
           this.options.xAxis.data = dateArr;
           this.options.series[0].data = dataArr
+           this.options.series[1].data = chainArr
           this.resizeHandler()
         } else {
           this.$message.error(res.message);