安全评价接口调用逻辑修正 部分api替换fetch为axios

wj-manage-web/src/dao/efficiency.js

-import fetch from '@/utils/fetch'
+import request from '../utils/request'
 // 路口效率排名
-export const getEfficiencyRank = (data) => fetch('/holo/analysis-cross-efficiency/getRank', data, 'GET')
-
+export const getEfficiencyRank = (data) =>
+    request({
+        url: '/holo/analysis-cross-efficiency/getRank',
+        method: 'get',
+        params: data
+    })
 // 效率指标对比
-export const getEfficiencyContract = (data) => fetch('/holo/analysis-cross-efficiency/getEfficiencyContract', data, 'GET')
-
+export const getEfficiencyContract = (data) =>
+    request({
+        url: '/holo/analysis-cross-efficiency/getEfficiencyContract',
+        method: 'get',
+        params: data
+    })
 // 行人效率
-export const passerbyEfficiency = (data) => fetch('/holo/analysis-cross-pedestrian/list', data, 'GET')
-
+export const passerbyEfficiency = (data) =>
+    request({
+        url: '/holo/analysis-cross-pedestrian/list',
+        method: 'get',
+        params: data
+    })
 // 非机动车效率
-export const noVehicleEfficiency = (data) => fetch('/holo/analysis-cross-non-motor/trend', data, 'GET')
+export const noVehicleEfficiency = (data) =>
+    request({
+        url: '/holo/analysis-cross-non-motor/trend',
+        method: 'get',
+        params: data
+    })
 // 非机动车效率table
-export const noVehicleTable = (data) => fetch('/holo/analysis-cross-non-motor/recently', data, 'GET')
+export const noVehicleTable = (data) =>
+    request({
+        url: '/holo/analysis-cross-non-motor/recently',
+        method: 'get',
+        params: data
+    })
 // 机动车效率
-export const vehicleEfficiency = (data) => fetch('/holo/analysis-cross-motor/trend', data, 'GET')
+export const vehicleEfficiency = (data) =>
+    request({
+        url: '/holo/analysis-cross-motor/trend',
+        method: 'get',
+        params: data
+    })
 

wj-manage-web/src/dao/organization.js

-import fetch from '@/utils/fetch'
+import request from '../utils/request'
 // left 路口排名
-export const orgRank = (data) => fetch('/holo/base-cross-info/org-list', data, 'GET')
-
+export const orgRank = (data) =>
+    request({
+        url: '/holo/base-cross-info/org-list',
+        method: 'get',
+        params: data
+    })
 // 行人
-export const orgPasserby = (data) => fetch('/holo/analysis-cross-pedestrian/list', data, 'GET')
-
+export const orgPasserby = (data) =>
+    request({
+        url: '/holo/analysis-cross-pedestrian/list',
+        method: 'get',
+        params: data
+    })
 // 非机动车
-export const orgNoVehicle = (data) => fetch('/holo/analysis-cross-non-motor/trend', data, 'GET')
-
+export const orgNoVehicle = (data) =>
+    request({
+        url: '/holo/analysis-cross-non-motor/trend',
+        method: 'get',
+        params: data
+    })
 // 右上 冲突点数据
-export const orgConflict = (data) => fetch('/holo/event-cross-conflict/getByCondition', data, 'GET')
-
+export const orgConflict = (data) =>
+    request({
+        url: '/holo/event-cross-conflict/getByCondition',
+        method: 'get',
+        params: data
+    })
 // 获取车道面 polygon
-export const orgCrossPolygon = (data) => fetch('/holo/base-lane-info/lane-area', data, 'GET')
-
+export const orgCrossPolygon = (data) =>
+    request({
+        url: '/holo/base-lane-info/lane-area',
+        method: 'get',
+        params: data
+    })
 // 按车道和路口和时间获取 流量值
-export const orgFlowByLane = (data) => fetch('/holo/analysis-rid-lane-indicators/hour-data', data, 'GET')
-
+export const orgFlowByLane = (data) =>
+    request({
+        url: '/holo/analysis-rid-lane-indicators/hour-data',
+        method: 'get',
+        params: data
+    })
 // 车道转向弧线
-export const orgLaneLine = (data) => fetch('/holo/base-lane-info/lane-turn-arc', data, 'GET')
-
+export const orgLaneLine = (data) =>
+    request({
+        url: '/holo/base-lane-info/lane-turn-arc',
+        method: 'get',
+        params: data
+    })
 // 轨迹点群
-export const trackPoints = (data) => fetch('/holo/histrory-track/density-model', data, 'POST')
+export const trackPoints = (data) =>
+    request({
+        url: '/holo/histrory-track/density-model',
+        method: 'get',
+        params: data
+    })

wj-manage-web/src/dao/safety.js

-import fetch from '../utils/fetch'
-export const safetyRank = (data) => fetch('/holo/analysis-cross-safe-evaluate/getRank', data, 'GET')
-
-export const safetyCompare = (data) => fetch('/holo/analysis-cross-safe-evaluate/getContractData', data, 'GET')
-
-export const safetySeveralCycle = (data) => fetch('/holo/analysis-cross-safe-evaluate/event-trend', data, 'POST')
-
-export const safetyEventList = (data) => fetch('/holo/analysis-cross-safe-evaluate/event-detail', data, 'POST')
-
-export const safetyPieData = (data) => fetch('/holo/analysis-cross-safe-evaluate/sub-event-statistic', data, 'POST')
\ No newline at end of file
+import request from '../utils/request'
+// left 路口排名
+export const safetyRank = (data) =>
+    request({
+        url: '/holo/analysis-cross-safe-evaluate/getRank',
+        method: 'get',
+        params: data
+    })
+export const safetyCompare = (data) =>
+    request({
+        url: '/holo/analysis-cross-safe-evaluate/getContractData',
+        method: 'get',
+        params: data
+    })
+export const safetySeveralCycle = (data) =>
+    request({
+        url: '/holo/analysis-cross-safe-evaluate/event-trend',
+        method: 'post',
+        data: data
+    })
+export const safetyEventList = (data) =>
+    request({
+        url: '/holo/analysis-cross-safe-evaluate/event-detail',
+        method: 'post',
+        data: data
+    })
+export const safetyPieData = (data) =>
+    request({
+        url: '/holo/analysis-cross-safe-evaluate/sub-event-statistic',
+        method: 'post',
+        data: data
+    })
\ No newline at end of file

wj-manage-web/src/utils/request.js

@@ -78,14 +78,12 @@ service.interceptors.response.use(res => {
     }
     if (code !== 200) {
         ELEMENT.Message.error(res.data.message || res.data.status)
-    }
-    if (res.config.showMsg) {
-        if (code !== 200) {
-            // ELEMENT.Message.error(res.data.message || res.data.status)
     } else {
+        if (res.config.showMsg) {
             ELEMENT.Message.success(res.data.message || res.data.status)
         }
     }
+
     return res.data
 })
 

wj-manage-web/src/views/safety/analysisTypes.vue

@@ -124,7 +124,36 @@ export default {
     computedId() {
       return `barChart${this.compId}`;
     },
-    barChartOption() {
+    barChartOption() {},
+  },
+  watch: {},
+  data() {
+    return {
+      pathApiName: "",
+      pathParam: {},
+      pieChartData: [],
+      barChart: null,
+      xAxisData: [],
+      series1: [],
+      trackDetail: [],
+      tableData: [],
+      tableLoading: false,
+      init: true,
+      barChartLoading: false,
+      pieChartLoading: false,
+    };
+  },
+  mounted() {},
+  methods: {
+    dictFormat(value, type) {
+      for (let item of this.$store.state.dicts[type]) {
+        if (item.code == value) {
+          return item.name;
+        }
+      }
+      return "未定义";
+    },
+    setBarOption(){
         let colors = [
             "rgba(65, 130, 242,1)",
             "rgba(255, 166, 0,1)",
@@ -169,7 +198,9 @@ export default {
               },
             };
           }
-      return {
+          console.log("x", this.xAxisData);
+this.barChart.setOption(
+            {
               title: chartTitle,
               tooltip: {
                 trigger: "axis",
@@ -321,40 +352,16 @@ export default {
                 data: this.series1,
                 event: "click",
               },
-      };
-    },
-  },
-  watch: {},
-  data() {
-    return {
-      pathApiName: "",
-      pathParam: {},
-      pieChartData: [],
-      barChart: null,
-      xAxisData: [],
-      series1: [],
-      trackDetail: [],
-      tableData: [],
-      tableLoading: false,
-      init: true,
-      barChartLoading: false,
-      pieChartLoading: false,
-    };
             },
-  mounted() {},
-  methods: {
-    dictFormat(value, type) {
-      for (let item of this.$store.state.dicts[type]) {
-        if (item.code == value) {
-          return item.name;
-        }
-      }
-      return "未定义";
+            true
+          );
     },
     // 路口 || 时间粒度 || 类型 变化时 触发图表更新
     refreshBarChart() {
       this.xAxisData = [];
       this.series1 = [];
+      console.log('cross',this.crossData);
+    //   debugger
       if (this.crossData && this.crossData.crossId) {
         this.barChartLoading = true;
         safetySeveralCycle({
@@ -386,8 +393,7 @@ export default {
               this.refreshPieChart(params.dataIndex);
             });
           }
-
-          this.barChart.setOption(this.barChartOption, true);
+          this.setBarOption()
           // 模拟点击最后一根柱子 即获取最新一条数据详情
           if (res.content.length) {
             this.refreshBarColor(res.content.length - 1);
@@ -440,7 +446,7 @@ export default {
           }
         }
       }
-      this.barChart.setOption(this.barChartOption, true);
+      this.setBarOption()
     },
     refreshTableByTime(index) {
       console.log(this.barChartDataSource);

wj-manage-web/src/views/safety/index.vue

@@ -212,7 +212,7 @@ export default {
     // 选择不同路口 => 更新右侧所有数据
     crossChange(row) {
       this.currentCrossData = row;
-      this.$refs[`comp${this.tabsActiveName}`].refreshBarChart();
+      this.$refs[`comp${this.tabsActiveName}`].initData();
       if (Array.isArray(row.cameraList)) {
         this.cameraList = row.cameraList;
       } else {