Merge remote-tracking branch 'origin/dev' into dev

src/layout/header/index.vue

@@ -4,7 +4,7 @@
       <div class="logo" />
       <div class="menu">
         <ul>
-          <li @click="router.push({ path: '/large_screen_data_display' })">
+          <li @click="fnNavigationBI">
             <div class="title">BI</div>
           </li>
           <template v-for="(item, index) in MENU" :key="index">
@@ -79,6 +79,7 @@ defineOptions({
   name: "LayoutHeader",
 });
 const FILE_URL = import.meta.env.VITE_FILE_URL;
+let notify;
 const router = useRouter();
 const menuStore = useMenuStore();
 const userStore = useUserStore();
@@ -156,7 +157,7 @@ const fnSignOut = async () => {
 const fnSpecialOperationsWarnAmount = async () => {
   const resData = await getSpecialOperationsWarnAmount();
   if (resData.message) {
-    ElNotification({
+    notify = ElNotification({
       title: "温馨提示",
       dangerouslyUseHTMLString: true,
       message: resData.message,
@@ -166,6 +167,10 @@ const fnSpecialOperationsWarnAmount = async () => {
   }
 };
 fnSpecialOperationsWarnAmount();
+const fnNavigationBI = () => {
+  notify && notify.close();
+  router.push({ path: "/large_screen_data_display" });
+};
 </script>
 
 <style lang="scss" scoped>

src/views/BI/components/personnel.vue

@@ -76,44 +76,7 @@ const data = reactive({
     },
   ],
   eleType: 0,
-  block2OptionsList: [
+  block2OptionsList: [],
-    {
-      label: "滞留报警",
-      count: 0,
-    },
-    {
-      label: "越界报警",
-      count: 235,
-    },
-    {
-      label: "超员报警",
-      count: 569,
-    },
-    {
-      label: "缺员报警",
-      count: 569,
-    },
-    {
-      label: "静止报警",
-      count: 423,
-    },
-    {
-      label: "串岗报警",
-      count: 789,
-    },
-    {
-      label: "一键告警",
-      count: 236,
-    },
-    {
-      label: "聚集告警",
-      count: 214,
-    },
-    {
-      label: "作业告警",
-      count: 852,
-    },
-  ],
   block3List: [
     {
       name: "赵一诺",

src/views/BI/js/echarts1.js

@@ -57,10 +57,8 @@ function echarts1(id, legend, echartCount) {
         type: "shadow",
       },
       axisLabel: {
-        textStyle: {
+        color: "#B3CFFF", // x轴文本颜色
-          color: "#B3CFFF", // x轴文本颜色
+        fontSize: 10,
-          fontSize: 10,
-        },
         formatter(params) {
           // const res = xWrapText(params, 6);
           xWrapText(params, 6);
@@ -84,10 +82,8 @@ function echarts1(id, legend, echartCount) {
       },
       axisLabel: {
         formatter: "{value}%",
-        textStyle: {
+        color: "#B3CFFF", // x轴文本颜色
-          color: "#B3CFFF", // x轴文本颜色
+        fontSize: 12,
-          fontSize: 12,
-        },
       },
       name: "",
       nameTextStyle: {
@@ -119,7 +115,7 @@ function echarts1(id, legend, echartCount) {
               opacity: 1,
             },
           ]),
-          barBorderRadius: [0, 0, 0, 0],
+          borderRadius: [0, 0, 0, 0],
         },
         data: echartCount,
       },
@@ -148,7 +144,7 @@ function echarts1(id, legend, echartCount) {
               opacity: 1,
             },
           ]),
-          barBorderRadius: [0, 0, 0, 0],
+          borderRadius: [0, 0, 0, 0],
         },
         data: echartCount,
         barGap: 0,

src/views/BI/js/echarts2.js

@@ -34,10 +34,8 @@ function echarts2(id, month, accumulated, currentMonth) {
         },
         axisLabel: {
           // 坐标轴刻度标签的相关设置
-          textStyle: {
+          color: "#d1e6eb",
-            color: "#d1e6eb",
+          margin: 15,
-            margin: 15,
-          },
           interval: 0,
           rotate: 30,
         },
@@ -64,9 +62,7 @@ function echarts2(id, month, accumulated, currentMonth) {
         },
         axisLabel: {
           margin: 20,
-          textStyle: {
+          color: "#d1e6eb",
-            color: "#d1e6eb",
-          },
         },
         axisTick: {
           show: false,

src/views/BI/js/echarts4.js

@@ -52,12 +52,8 @@ function echarts4(id) {
       axisLabel: {
         show: true,
         // rotate: -1,
-        textStyle: {
+        fontSize: 14,
-          fontSize: 14,
+        color: "#fff",
-          // fontFamily: PangMenZhengDao,
-
-          color: "#fff",
-        },
       },
       axisTick: {
         show: false,
@@ -93,11 +89,8 @@ function echarts4(id) {
         },
         axisLabel: {
           show: true,
-          textStyle: {
+          fontSize: 12,
-            fontSize: 12,
+          color: "#ffffff",
-            // fontFamily: PangMenZhengDao,
-            color: "#ffffff",
-          },
         },
         splitArea: {
           areaStyle: {
@@ -187,8 +180,9 @@ function echarts4(id) {
             return colorList[params.dataIndex];
           },
           opacity: 0.7,
-          // 鼠标移入柱子上 透明度变为 1
+        },
-          emphasis: {
+        emphasis: {
+          itemStyle: {
             opacity: 1,
           },
         },

src/views/BI/js/echarts5.js

@@ -41,10 +41,8 @@ function echarts2(id, data) {
         },
         axisLabel: {
           // 坐标轴刻度标签的相关设置
-          textStyle: {
+          color: "#d1e6eb",
-            color: "#d1e6eb",
+          margin: 15,
-            margin: 15,
-          },
         },
         axisTick: {
           show: false,
@@ -69,9 +67,7 @@ function echarts2(id, data) {
         },
         axisLabel: {
           margin: 20,
-          textStyle: {
+          color: "#d1e6eb",
-            color: "#d1e6eb",
-          },
         },
         axisTick: {
           show: false,

src/views/large_screen_data_display/components/full_staff_training.vue

@@ -32,14 +32,6 @@ const fnInitEcharts = (data) => {
         type: "shadow",
       },
     },
-    legend: {
-      data: ["各培训类型学习人数"],
-      top: "15",
-      textStyle: {
-        color: "#2aaef2",
-      },
-      orient: "horizontal",
-    },
     grid: {
       top: "25%",
       right: "3%",

src/views/large_screen_data_display/components/hidden_danger_situation.vue

@@ -65,9 +65,7 @@ const fnInitEcharts = (data) => {
         },
         axisLabel: {
           interval: 0,
-          textStyle: {
+          color: "#fff",
-            color: "#fff",
-          },
           fontSize: 12,
           margin: 15,
         },
@@ -87,9 +85,7 @@ const fnInitEcharts = (data) => {
           },
         },
         axisLabel: {
-          textStyle: {
+          color: "#fff",
-            color: "#fff",
-          },
         },
         splitLine: {
           show: false,