Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZHY2.0

# Conflicts:
#	src/views/securityCheck/views/cargoCharts.vue
#	src/views/securityCheck/views/cargoRelevanceTable.vue

src/views/securityCheck/components/securityCheckHeader.vue

@@ -342,8 +342,8 @@ export default {
       // this.formData.selection = this.$route.query.levelId
       //   ? this.$route.query.levelId
       //   : this.$route.query.agentLevel;
-      this.formData.selection = this.$route.query.destination
-        ? this.$route.query.destination
+      this.formData.selection = this.$route.query.place
+        ? this.$route.query.place
         : this.$route.query.levelId
         ? this.$route.query.levelId
         : this.$route.query.agentLevel;

src/views/securityCheck/views/cargoCharts.vue

@@ -213,8 +213,10 @@ export default {
     //点击跳转
     echar(data) {
       if (data) {
-        this.queryData.riskRating = data.namefa;
-        this.queryData.openResult = data.namech;
+        // this.queryData.riskRating = data.namefa;
+        if (data.namech !== "总数") {
+          this.queryData.openResult = data.namech;
+        }
       }
       this.$router.push({
         path: "/waybillTable",