更改bug

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue

@@ -56,7 +56,7 @@ export default {
     return {
       formData: {
         type: "day",
-        warningTime: "",
+        warningTime: moment().format("YYYY-MM-DD") + " 00:00:01",
       },
       trafficIncidents: null,
       trafficIncidentsPie: null,
@@ -89,6 +89,7 @@ export default {
           key: "warningTime",
           required: true,
           type: "datePicker",
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           options: {
             valueFormat: "yyyy-MM-dd",
           },
@@ -107,6 +108,7 @@ export default {
             type: "month",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "month") {
               return true;
@@ -122,6 +124,7 @@ export default {
             type: "year",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "year") {
               return true;
@@ -134,9 +137,9 @@ export default {
   async mounted() {
     setTimeout(() => {
       this.$nextTick(async () => {
-        (this.formData.warningTime =
+        // (this.formData.warningTime =
-          moment(new Date()).format("YYYY-MM-DD") + " 00:00:01"),
+        //   moment().format("YYYY-MM-DD") + " 00:00:01"),
-          (this.trafficIncidents = echarts.init(this.$refs.trafficIncidents));
+        this.trafficIncidents = echarts.init(this.$refs.trafficIncidents);
         this.trafficIncidents.setOption(trafficIncidentsCharts);
         this.trafficIncidentsPie = echarts.init(this.$refs.trafficIncidentsPie);
         this.trafficIncidentsPie.setOption(trafficIncidentsChartsPie);
@@ -166,6 +169,7 @@ export default {
         drawRoundRect(context, 410, 406, 320, 24, 10, gr);
         drawRoundRect(context, 410, 440, 320, 24, 10, gr);
         drawRoundRect(context, 410, 474, 320, 24, 10, gr);
+        console.log("this.formData", this.formData);
         await this.getNonAutomaticWarningType(this.formData);
         // drawRoundRect(context, 410, 508, 320, 24, 10, gr);
       });
@@ -174,6 +178,7 @@ export default {
   methods: {
     getNonAutomaticWarningType(data) {
       let that = this;
+      console.log("data", data);
       return nonAutomaticWarningType(data).then((res) => {
         let newData = res.data;
         let seriesData = [];

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue

@@ -64,7 +64,7 @@ export default {
       trafficIncidentsPie: null,
       formData: {
         type: "day",
-        warningTime: "",
+        warningTime: moment().format("YYYY-MM-DD") + " 00:00:01",
       },
       searchFormList: [
         {
@@ -98,6 +98,7 @@ export default {
           options: {
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "day") {
               return true;
@@ -113,6 +114,7 @@ export default {
             type: "month",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "month") {
               return true;
@@ -128,6 +130,7 @@ export default {
             type: "year",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "year") {
               return true;
@@ -155,9 +158,9 @@ export default {
     getWarningCharts() {
       setTimeout(() => {
         this.$nextTick(async () => {
-          (this.formData.warningTime =
+          // (this.formData.warningTime =
-            moment(new Date()).format("YYYY-MM-DD") + " 00:00:01"),
+          //   moment(new Date()).format("YYYY-MM-DD") + " 00:00:01"),
-            (this.trafficIncidents = echarts.init(this.$refs.trafficIncidents));
+          this.trafficIncidents = echarts.init(this.$refs.trafficIncidents);
           this.trafficIncidents.setOption(trafficIncidentsCharts1);
           this.trafficIncidentsPie = echarts.init(
             this.$refs.trafficIncidentsPie

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue

@@ -33,7 +33,7 @@ export default {
       trafficIncidents: null,
       formData: {
         type: "day",
-        warningTime: "",
+        warningTime: moment().format("YYYY-MM-DD") + " 00:00:01",
       },
       searchFormList: [
         {
@@ -67,6 +67,7 @@ export default {
           options: {
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "day") {
               return true;
@@ -82,6 +83,7 @@ export default {
             type: "month",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "month") {
               return true;
@@ -97,6 +99,7 @@ export default {
             type: "year",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "year") {
               return true;

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue

@@ -128,7 +128,25 @@ export default {
   watch: {},
   created() {},
   methods: {
-    ____onDragend() {},
+    ____onDragend(event) {
+      console.log("____onDragend", event);
+      let oldIndex = event.oldIndex; //移动初始位置
+      let newIndex = event.newIndex; //运动终止位置
+      let diff = Math.abs(newIndex - oldIndex); //插值绝对值
+      let index = this.dataList[oldIndex];
+      if (eval(oldIndex) > eval(newIndex)) {
+        for (let i = 0; i < diff; i++) {
+          this.dataList[oldIndex - i] = this.dataList[oldIndex - i - 1];
+        }
+        this.dataList[newIndex] = index;
+      } else {
+        for (let i = 0; i < diff; i++) {
+          this.dataList[oldIndex + i] = this.dataList[oldIndex + i + 1];
+        }
+        this.dataList[newIndex] = index;
+      }
+      console.log(789, this.dataList);
+    },
   },
   mounted() {},
 };