diff --git a/portal-manager-ui/admin/src/main.js b/portal-manager-ui/admin/src/main.js
index 5aa31adaf2954ed5cb1a966d2dabffe81759d48c..77019728a54f007590d76bf0815a7e3b4973d9fb 100644
--- a/portal-manager-ui/admin/src/main.js
+++ b/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, {
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/module.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/module.vue
index e54ec00310cc55e8dc76514f05fe0c124ac1cb1e..afaafe52a95d3884d6458fa185de723d99ed6c60 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/module.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/module.vue
@@ -1,7 +1,7 @@
<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">
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/IOT/module.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/IOT/module.vue
index c1c5232eb22aff8ef298713bf18b4e4457612a72..747cdacd79d07c613cac599e0a1dee5307a7ead1 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/IOT/module.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/IOT/module.vue
@@ -1,7 +1,7 @@
<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">
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/module.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/module.vue
index 1dec273e193d1bf5b43bb3298fee05ba1d705daa..00ca3fcbe3e12b03d88f268926d52e9e1588c6f7 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/module.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/module.vue
@@ -1,7 +1,7 @@
<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>
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/module.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/module.vue
index b9a251ed574b5e3114b24a5e752efb252cd87903..7208e011bcea1b7d1e325f0b5360412ce79019ab 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/module.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/module.vue
@@ -2,7 +2,10 @@
<div class="h-full w-full flex flex-col">
<div class="total-info">
<span
- v-if="$route.path == '/home/dataManagement/queueCall/queueRecord'"
+ v-if="
+ $route.path == '/home/dataManagement/queueCall/queueRecord' ||
+ $route.path == '/home/dataManagement/queueCall/numAcquisition'
+ "
class="mr-[30px]"
>鍙栧彿娆℃暟锛歿{ total ?? 0 }}娆�</span
>
@@ -74,6 +77,4 @@ export default {
};
</script>
-<style lang="less" scoped>
-</style>
-
+<style lang="less" scoped></style>
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue
index 80c8bdce031ddde420570e78ce28220a006daebb..acfa1f45e107f384a8c95a54eb3db22b8fe850ce 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue
@@ -12,8 +12,8 @@
>
</a-range-picker>
<a-select v-model="day">
- <a-select-option value="0"> 浠婂ぉ </a-select-option>
<a-select-option value="1"> 杩�7澶� </a-select-option>
+ <a-select-option value="0"> 浠婂ぉ </a-select-option>
<a-select-option value="2"> 杩�30澶� </a-select-option>
<a-select-option value="3"> 杩�3鏈� </a-select-option>
<a-select-option value="4"> 鏈勾搴� </a-select-option>
@@ -90,7 +90,7 @@ export default {
area: [],
sign: [],
chart: null,
- dayValue: "",
+ dayValue: "0",
};
},
components: {
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/module.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/module.vue
index 3171ab8f475983bcf40daba663eee5a09e9f4b71..5f44b6e9943706c9e18eb89a620b782c6ffd21d8 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/module.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/module.vue
@@ -1,41 +1,39 @@
<template>
<div id="dataAnalyse-Container">
<a-layout>
- <a-layout>
- <a-layout-sider width="200" style="background: #fff">
- <a-menu
- mode="inline"
- :defaultOpenKeys="['sub1']"
- :selectedKeys="selectedKeys"
- @select="menuSelect"
- :style="{ height: '100%', borderRight: 0 }"
- >
- <template v-for="item of menuList">
- <a-sub-menu
- :key="item.key"
- v-if="item.children && item.children.length"
- >
- <template slot="title">{{ item.name }}</template>
- <a-menu-item :key="ite.key" v-for="ite of item.children">
- {{ ite.name }}
- </a-menu-item>
- </a-sub-menu>
- <a-menu-item :key="item.key" v-else>
- {{ item.name }}
+ <a-layout-sider width="200" style="background: #fff">
+ <a-menu
+ mode="inline"
+ :defaultOpenKeys="['sub1']"
+ :selectedKeys="selectedKeys"
+ @select="menuSelect"
+ :style="{ height: '100%', borderRight: 0 }"
+ >
+ <template v-for="item of menuList">
+ <a-sub-menu
+ :key="item.key"
+ v-if="item.children && item.children.length"
+ >
+ <template slot="title">{{ item.name }}</template>
+ <a-menu-item :key="ite.key" v-for="ite of item.children">
+ {{ ite.name }}
</a-menu-item>
- </template>
- </a-menu>
- </a-layout-sider>
- <a-layout style="padding: 0 24px 24px" class="layout_main">
- <a-breadcrumb style="margin: 16px 0">
- <a-breadcrumb-item>褰撳墠浣嶇疆:鏀垮姟涓€浣撳寲骞冲彴></a-breadcrumb-item>
- <a-breadcrumb-item>鏁版嵁绠＄悊></a-breadcrumb-item>
- <a-breadcrumb-item>{{ sleectedName }}</a-breadcrumb-item>
- </a-breadcrumb>
- <a-layout-content>
- <component ref="viewComponet" :is="viewComponet" />
- </a-layout-content>
- </a-layout>
+ </a-sub-menu>
+ <a-menu-item :key="item.key" v-else>
+ {{ item.name }}
+ </a-menu-item>
+ </template>
+ </a-menu>
+ </a-layout-sider>
+ <a-layout style="padding: 0 24px 24px" class="layout_main">
+ <a-breadcrumb style="margin: 16px 0">
+ <a-breadcrumb-item>褰撳墠浣嶇疆:鏀垮姟涓€浣撳寲骞冲彴></a-breadcrumb-item>
+ <a-breadcrumb-item>鏁版嵁绠＄悊></a-breadcrumb-item>
+ <a-breadcrumb-item>{{ sleectedName }}</a-breadcrumb-item>
+ </a-breadcrumb>
+ <a-layout-content>
+ <component ref="viewComponet" :is="viewComponet" />
+ </a-layout-content>
</a-layout>
</a-layout>
</div>
@@ -123,8 +121,7 @@ export default {
.ant-layout-content {
background: #fff;
flex: 1;
- overflow-y: auto;
- overflow-x: hidden;
+ // overflow: auto;
}
}
&::before {
@@ -152,4 +149,3 @@ export default {
}
}
</style>
-