1

src/layout/components/Sidebar/SidebarItem.vue

@@ -2,22 +2,48 @@
   <template v-if="!item.hidden">
     <template v-if="showSidebarItem(item.children, item)">
       <Link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
-      <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
-        <!-- <item :meta="onlyOneChild.meta || item.meta" /> -->
-        <div v-if="onlyOneChild.meta.elSvgIcon || item.meta.elSvgIcon" class="menuIcon" :class="onlyOneChild.path"></div>
-        <template #title>
-          <div :class="onlyOneChild.meta.elSvgIcon || item.meta.elSvgIcon ? 'menuText' : ''">{{ onlyOneChild.meta?.title }}</div>
-        </template>
-      </el-menu-item>
+        <el-menu-item
+          :index="resolvePath(onlyOneChild.path)"
+          :class="{ 'submenu-title-noDropdown': !isNest }"
+        >
+          <!-- <item :meta="onlyOneChild.meta || item.meta" /> -->
+          <div
+            v-if="onlyOneChild.meta.elSvgIcon || item.meta.elSvgIcon"
+            class="menuIcon"
+            :class="onlyOneChild.path"
+          ></div>
+          <template #title>
+            <div
+              :class="
+                onlyOneChild.meta.elSvgIcon || item.meta.elSvgIcon
+                  ? 'menuText'
+                  : ''
+              "
+            >
+              {{ onlyOneChild.meta?.title }}
+            </div>
+          </template>
+        </el-menu-item>
       </Link>
     </template>
-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+    <el-sub-menu
+      v-else
+      ref="subMenu"
+      :index="resolvePath(item.path)"
+      popper-append-to-body
+    >
       <template v-if="item.meta" #title>
-        <div class="menuIcon" :class="item.path.replace('/','')"></div>
+        <div class="menuIcon" :class="item.path.replace('/', '')"></div>
         <!-- <item :meta="item.meta" /> -->
         <span class="menuText">{{ item.meta.title }}</span>
       </template>
-      <SidebarItem v-for="child in item.children" :key="child.path" :is-nest="true" :item="child" :base-path="resolvePath(child.path)" />
+      <SidebarItem
+        v-for="child in item.children"
+        :key="child.path"
+        :is-nest="true"
+        :item="child"
+        :base-path="resolvePath(child.path)"
+      />
     </el-sub-menu>
   </template>
 </template>
@@ -114,4 +140,7 @@ const resolvePath = (routePath: string) => {
 .systemSettings {
   background-image: url("@/assets/menus/ic_system_setting_nav.png");
 }
+.statisticalanalysis {
+  background-image: url("@/assets/menus/ic_statistics_nav.png");
+}
 </style>

src/router/routes/routes-file-seven.ts

@@ -8,8 +8,7 @@ const HomeRoutes = {
   //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
   meta: {
     title: "统计分析",
-    elSvgIcon: "Operation",
-    roles: ["basic_data_menu"],
+    elSvgIcon: "analyseIcon",
   },
   children: [
     {
@@ -22,32 +21,6 @@ const HomeRoutes = {
       component: () =>
         import("@/views/statisticalanalysis/specialgoods/index.vue"),
     },
-    // {
-    //   path: "/BasicsData/deployNode",
-    //   name: "DeployNode",
-    //   meta: {
-    //     title: "节点信息维护",
-    //     roles: ["node_information_maintenance_page"],
-    //   },
-    //   component: () => import("@/views/BasicsData/deployNode/index.vue"),
-    // },
-    // {
-    //   path: "/BasicsData/specialCargoMaintenance",
-    //   name: "SpecialCargoMaintenance",
-    //   meta: {
-    //     title: "特殊货物类型维护",
-    //     roles: ["special_cargo_type_maintenance_page"],
-    //   },
-    //   component: () =>
-    //     import("@/views/BasicsData/specialCargoMaintenance/index.vue"),
-    // },
-    // {
-    //   path: "/BasicsData/equipmentMaintenance",
-    //   name: "EquipmentMaintenance",
-    //   meta: { title: "设备维护", roles: ["equipment_maintenance_page"] },
-    //   component: () =>
-    //     import("@/views/BasicsData/equipmentMaintenance/index.vue"),
-    // },
   ],
 };
 

src/views/statisticalanalysis/components/echart/echarts.js

@@ -511,13 +511,20 @@ export const collectionStatistics = {
     },
   },
   // legend: {
-  //   data: ["环比", "主营业务"],
+  //   data: ["环比", ""],
   //   top: "0%",
   //   right: "10%",
+  //   icon: "rect",
   //   textStyle: {
   //     color: "#ffffff",
   //   },
   // },
+  // tooltip: {
+  //   trigger: "axis",
+  //   axisPointer: {
+  //     type: "shadow",
+  //   },
+  // },
   xAxis: {
     data: [],
     axisLine: {

src/views/statisticalanalysis/components/echart/index.vue

@@ -13,7 +13,6 @@ import * as _ from "lodash";
 import { collectionStatistics } from "./echarts.js";
 // 柱状图初始数据
 export default {
-  name: "ChartsBar",
   props: {
     // 柱状图生成所需id
     id: {
@@ -28,22 +27,7 @@ export default {
   },
   data() {
     return {
-      levelList: [
-        {
-          name: "加货重量统计",
-        },
-        {
-          name: "航班量统计",
-        },
-        {
-          name: "特货统计",
-        },
-        {
-          name: "货量统计",
-        },
-      ],
       myChart: null, //柱状图实例
-      desc: 300, // 防抖时间
     };
   },
   mounted() {
@@ -54,8 +38,9 @@ export default {
     collectionStatistics.xAxis.data = this.option.time;
     collectionStatistics.series[0].data = this.option.data1;
     collectionStatistics.series[1].data = this.option.data2;
-    collectionStatistics.series[1].name = this.option.kg;
-    collectionStatistics.yAxis[0].name = this.option.kg;
+    // collectionStatistics.series[1].name = this.option.kg;
+    // collectionStatistics.legend.data[1] = this.option.kg;
+    // collectionStatistics.yAxis[0].name = this.option.kg;
     // 生成柱状图
     this.myChart.setOption(collectionStatistics);
     // 监听页面缩放 防止dom重复渲染
@@ -74,8 +59,9 @@ export default {
         collectionStatistics.xAxis.data = newVal.time;
         collectionStatistics.series[0].data = newVal.data1;
         collectionStatistics.series[1].data = newVal.data2;
-        collectionStatistics.series[1].name = this.option.kg;
-        collectionStatistics.yAxis[0].name = this.option.kg;
+        // collectionStatistics.series[1].name = newVal.kg;
+        // collectionStatistics.legend.data[1] = newVal.kg;
+        // collectionStatistics.yAxis[0].name = newVal.kg;
         this.myChart.setOption(collectionStatistics);
       },
     },

src/views/statisticalanalysis/specialgoods/index.vue

@@ -26,11 +26,6 @@
       <Echarts :id="dataid" :option="tableData" />
     </div>
   </div>
-  <!-- <div
-    style="height: 100%; width: 100%; position: absolute; left: 0; top: 0"
-    class="ChartsBar"
-    :id="id"
-  ></div> -->
 </template>
 
 <script>
@@ -136,8 +131,8 @@ export default {
           prop: "spe",
           inputType: "select",
           placeholder: "特货类型",
-          requiredWarning: "请先选择特货类型",
-          clearable: false,
+          requiredWarning: "",
+          clearable: true,
           disabled: true,
           options: [
             {
@@ -171,7 +166,7 @@ export default {
           inputType: "select",
           placeholder: "统计运单",
           requiredWarning: "",
-          clearable: false,
+          clearable: true,
           disabled: true,
           options: [
             {