Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/main.js

@@ -73,6 +73,11 @@ Vue.config.productionTip = false;
 import Viewer from "v-viewer";
 import "viewerjs/dist/viewer.css";
 Vue.use(Viewer);
+
+// echarts
+import * as echarts from "echarts";
+Vue.prototype.$echarts = echarts; 
+
 // 图片懒加载插件
 import VueLazyload from "vue-lazyload";
 Vue.use(VueLazyload, {

portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/module.vue

 <template>
   <div class="h-full w-full flex flex-col">
     <div class="total-info">
-      <span class="mr-[30px]">总次数：{{ total ?? 0 }}次</span>
+      <span class="mr-[30px]">异常次数：{{ total ?? 0 }}次</span>
       <span>统计时间段：{{ time[0] }} - {{ time[1] }}</span>
     </div>
     <div class="reportforms-out-box">
@@ -56,6 +56,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
-
+<style lang="less" scoped></style>

portal-manager-ui/admin/src/views/dataAdmin/components/IOT/module.vue

 <template>
   <div class="h-full w-full flex flex-col">
     <div class="total-info">
-      <span class="mr-[30px]">总次数：{{ total ?? 0 }}次</span>
+      <span class="mr-[30px]">异常次数：{{ total ?? 0 }}次</span>
       <span>统计时间段：{{ time[0] }} - {{ time[1] }}</span>
     </div>
     <div class="reportforms-out-box">
@@ -56,6 +56,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
-
+<style lang="less" scoped></style>

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/module.vue

 <template>
   <div class="h-full w-full flex flex-col">
     <div class="total-info">
-      <span class="mr-[30px]">次数：{{ total ?? 0 }}次</span>
+      <span class="mr-[30px]">{{ title }}：{{ total ?? 0 }}次</span>
       <span>统计时间段：{{ time[0] }} - {{ time[1] }}</span>
     </div>
     <div class="reportforms-out-box">
@@ -38,6 +38,17 @@ export default {
     };
   },
   computed: {
+    title() {
+      if (this.$route.path === "/home/dataManagement/pickUp/pickUpRecord") {
+        return "取件记录";
+      } else if (
+        this.$route.path === "/home/dataManagement/pickUp/depositRecord"
+      ) {
+        return "存件记录";
+      } else {
+        return "其他记录";
+      }
+    },
     tabsList() {
       return getItemData(this.$router.options.routes, "name", "pickUp");
     },
@@ -56,6 +67,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
-
+<style lang="less" scoped></style>

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/module.vue

@@ -2,12 +2,10 @@
   <div class="h-full w-full flex flex-col">
     <div class="total-info">
       <span
-        v-if="$route.path == '/home/dataManagement/queueCall/queueRecord'"
-        class="mr-[30px]"
-        >取号次数：{{ total ?? 0 }}次</span
-      >
-      <span
-        v-if="$route.path == '/home/dataManagement/queueCall/numAcquisition'"
+        v-if="
+          $route.path == '/home/dataManagement/queueCall/queueRecord' ||
+          $route.path == '/home/dataManagement/queueCall/numAcquisition'
+        "
         class="mr-[30px]"
         >取号次数：{{ total ?? 0 }}次</span
       >
@@ -79,6 +77,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
-
+<style lang="less" scoped></style>

portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue

@@ -90,7 +90,7 @@ export default {
       area: [],
       sign: [],
       chart: null,
-      dayValue: "",
+      dayValue: "0",
     };
   },
   components: {

portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/module.vue

@@ -123,8 +123,6 @@ export default {
     .ant-layout-content {
       background: #fff;
       flex: 1;
-      overflow-y: auto;
-      overflow-x: hidden;
     }
   }
   &::before {
@@ -152,4 +150,3 @@ export default {
   }
 }
 </style>
-