diff --git a/__unconfig_vite.config.js b/__unconfig_vite.config.js deleted file mode 100644 index ce4eb14..0000000 --- a/__unconfig_vite.config.js +++ /dev/null @@ -1,58 +0,0 @@ - -let __unconfig_data; -let __unconfig_stub = function (data = {}) { __unconfig_data = data }; -__unconfig_stub.default = (data = {}) => { __unconfig_data = data }; -import { fileURLToPath, URL } from 'node:url' - -import { defineConfig } from 'vite' -import vue from '@vitejs/plugin-vue' -import vueJsx from '@vitejs/plugin-vue-jsx' -import AutoImport from 'unplugin-auto-import/vite' -import Components from 'unplugin-vue-components/vite' -import { ElementPlusResolver } from 'unplugin-vue-components/resolvers' -// import vueDevTools from 'vite-plugin-vue-devtools' - -// https://vite.dev/config/ -const __unconfig_default = defineConfig({ - plugins: [ - vue(), - vueJsx(), - AutoImport({ - imports: ['vue'], - dts: 'src/auto-import.d.ts', - resolvers: [ElementPlusResolver()] - }), - Components({ - resolvers: [ElementPlusResolver()] - }) - // vueDevTools(), - ], - base: '/largeScreen/', - server: { - hmr: true, - host: '0.0.0.0' - // proxy: { - // '/': { - // // 目标服务器的地址 - // target: 'http://36.138.38.16:8001', - // changeOrigin: true - // } - // } - }, - resolve: { - alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) - }, - extensions: ['.js', '.vue'] - }, - css: { - preprocessorOptions: { - scss: { - additionalData: '@use "@/styles/screen.scss" as *;', - javascriptEnabled: true - } - } - } -}) - -if (typeof __unconfig_default === "function") __unconfig_default(...[{"command":"serve","mode":"development"}]);export default __unconfig_data; \ No newline at end of file diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 5f81f0f..33c63da 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -266,13 +266,13 @@ isSkip.value = false current.vlaue = '' isBack.value = true - let res1 = await getSpotListApi() + let spotRes = await getSpotListApi() navLeft.value = [ { name: '奉节县', scenicSpotId: '' }, - ...res1.data + ...spotRes.data ] break case '/sceneTesting': diff --git a/src/views/home/components/box-2.vue b/src/views/home/components/box-2.vue index e0b493d..246d266 100644 --- a/src/views/home/components/box-2.vue +++ b/src/views/home/components/box-2.vue @@ -22,7 +22,7 @@
{{ item.name }}
-
{{ +
{{ item.value }}
diff --git a/src/views/monitor/components/box-1.vue b/src/views/monitor/components/box-1.vue index fb4201c..f26d634 100644 --- a/src/views/monitor/components/box-1.vue +++ b/src/views/monitor/components/box-1.vue @@ -60,13 +60,24 @@
-
- {{ item.name }} - +
+ 核心路段分析点位 + +
+
+ 拥堵点位 + +
+
+ 拥堵告警 + +
+
+ 已处理 +
@@ -205,10 +216,12 @@ abnormalAlarmPercent: [] }) // 交通告警信息 - let trafficAbnormalityData = ref({ - dataList: [], - dataLists: [], - headList: [] + let trafficAiAnalyzeData = ref({ + abnormalWarnings: 0, + abnormalPoints: 0, + coreMonitoringPoints: 0, + handled: 0, + abnormalAlarm: [] }) // 监控点位异常告警统计 let pointAlarmData = ref({ @@ -230,10 +243,10 @@ // 拥堵告警 let jamlData = computed(() => { - return [{ data: trafficAbnormalityData.value.dataList.map((item) => item.value) }] + return [{ data: trafficAiAnalyzeData.value.abnormalAlarm.map((item) => item.value) }] }) let jamXAxisData = computed(() => { - return trafficAbnormalityData.value.dataList.map((item) => item.name) + return trafficAiAnalyzeData.value.abnormalAlarm.map((item) => item.name) }) watch( @@ -268,9 +281,8 @@ case '监控点位统计和异常告警统计': pointAlarmData.value = val.data break - case 'trafficAbnormalityData': - trafficAbnormalityData.value = val - break + case '交通智能AI分析': + trafficAiAnalyzeData.value = val.data } } } diff --git a/src/views/monitor/components/box-2.vue b/src/views/monitor/components/box-2.vue index 2d46286..427456c 100644 --- a/src/views/monitor/components/box-2.vue +++ b/src/views/monitor/components/box-2.vue @@ -375,24 +375,11 @@ } } const getVideoRegions = async () => { - if (params.businessScenicArea == '三峡之巅') { - regionList.value = [ - { - regions: '调试中', - videoResources: [] - }, - { - regions: '调试中', - videoResources: [] - } - ] - } else { - let res = await getVideoRegionsApi({ - cameraName: cameraName.value, - businessScenicArea: params.businessScenicArea - }) - regionList.value = res.data - } + let res = await getVideoRegionsApi({ + cameraName: cameraName.value, + businessScenicArea: params.businessScenicArea + }) + regionList.value = res.data } const onMonitorChange = () => { monitorChange = pubSub.subscribe('monitorChange', (res, data) => {