Merge branch 'master' of http://120.26.64.82:10880/BFFE/SMAirports

public/staticConfig.js

@@ -76,6 +76,15 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+  case '192.168.243.11':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://192.168.243.11:8043',
+      baseURLCA: 'http://192.168.243.11:8043',
+      fileUrl: 'http://192.168.243.11:8043',
+      hasStaticRoutes: true,
+    }
+    break
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,

src/components/generateEcharts/index.vue

@@ -460,6 +460,24 @@ const hisOption = {
           ],
         },
       }
+    },
+    {
+      name: 'Email',
+      type: 'line',
+      stack: 'Total',
+      symbol: 'circle',
+      itemStyle: {
+        normal: {
+          color: "#1F824E", //改变折线点的颜色
+          lineStyle: {
+            color: "#1F824E", //改变折线颜色
+          },
+        },
+      },
+      // emphasis: {
+      //   focus: 'series'
+      // },
+      data: [120, 132, 101, 134, 90, 230, 210]
     }
   ]
 };

src/config/staticConfig.js

@@ -76,6 +76,15 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+    case '192.168.243.11':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://192.168.243.11:8043',
+      baseURLCA: 'http://192.168.243.11:8043',
+      fileUrl: 'http://192.168.243.11:8043',
+      hasStaticRoutes: true,
+    }
+    break
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,

src/views/monitoringlarge/components/echart/statisticsHeader.vue

@@ -24,7 +24,7 @@
           </el-select>
         </template>
         <template v-if="item.inputType === 'datePicker'">
-          <el-date-picker  v-model="formData[item.prop]" :size="item.size || 'small'" type="daterange" value-format="yyyy-MM-dd"  range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+          <el-date-picker @change="changes()" v-model="formData[item.prop]" :size="item.size || 'small'" type="daterange" value-format="yyyy-MM-dd"  range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         </template>
         <template v-if="item.inputType === 'datetimerange'">
           <el-date-picker v-model="formData[item.prop]" type="datetimerange" range-separator="至" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
@@ -121,7 +121,7 @@ export default {
         area: "",
         airport: [],
         terminal: "",
-        dateTime: [],
+        dateTime: [ new Date(), new Date()],
         flightType: "",
         baggageType: "",
         passengerType: [],
@@ -297,7 +297,7 @@ export default {
     items: {
       handler (val) {
         val && (this.formItems = val);
-        this.formData.dateTime = [Format("yyyy-MM-dd", new Date()),Format("yyyy-MM-dd", new Date())]
+        // this.formData.dateTime = [Format("yyyy-MM-dd", new Date()),Format("yyyy-MM-dd", new Date())]
         // this.formData[val[0].prop] ? this.formData[val[0].prop] : val[0].placeholder
         // console.log(this.formData,val)
         // if (!this.formData[val[0].prop]) {
@@ -310,15 +310,6 @@ export default {
     },
     formData: {
       handler (val) {
-        if (this.action === 14 || this.action === 2 || this.action === 19) {
-          this.$emit("fore", val);
-        }
-        if (!this.formData.aircompany.length === 0) {
-          this.formData.aircompany = 'CZ'
-        }
-        if (!this.formData.airport === 0) {
-          this.formData.airport = 'CAN'
-        }
       },
       deep: true,
       immediate: true,
@@ -326,6 +317,7 @@ export default {
     data: {
       handler (val) {
         val && (this.formData = val);
+        // this.$set(this.formData,'dateTime',[val.dateTime[0],val.dateTime[1]])
       },
       deep: true,
       immediate: true,
@@ -339,6 +331,7 @@ export default {
     },
   },
   created () {
+    this.$set(this.formData,'dateTime',[Format("yyyy-MM-dd", new Date()),Format("yyyy-MM-dd", new Date())])
     this.customItems.forEach((item) => {
       if (typeof item.itemIndex === "number") {
         if (item.prop) {
@@ -362,6 +355,9 @@ export default {
   mounted () {
   },
   methods: {
+    changes (event) {
+      console.log(event)
+    },
     picup () {
       this.picShow = false;
       this.$emit("upset", this.picShow);

src/views/monitoringlarge/views/singleairline/singleairline.vue

@@ -5,7 +5,6 @@
         :title="titleTop"
         :items="formItems"
         :data="formData"
-        :eledata="eledata"
         with-setting
         :withSetting="false"
         :withExport="false"
@@ -316,11 +315,12 @@ export default {
           inputType: "datePicker",
           requiredWarning: "请先选择统计时间范围",
           width: "240px",
+          dateTime:[Format("yyyy-MM-dd", new Date()),Format("yyyy-MM-dd", new Date())]
         },
       ],
       formData: {
-        aircompany: "",
-        dateTime: "",
+        aircompany: "CZ",
+        dateTime:[Format("yyyy-MM-dd", new Date()),Format("yyyy-MM-dd", new Date())],
       },
       eledata: null,
       inHourDataOption: this._.cloneDeep(barOption),