Merge branch 'master' of http://119.45.132.149:3000/security/go-view-fetch

src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/config.ts

@@ -33,10 +33,10 @@ const otherConfig = {
             }
         ]
     },
-
+    sceneId: '',
 }
 
-const option = {
+export const option = {
   ...otherConfig,
   backgroundColor: 'rgba(13, 16, 22, 1)',
   grid: {

src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/config.vue

@@ -1,16 +1,27 @@
 <template>
-
+<collapse-item name="信息" :expanded="true">
+    <setting-item-box name="场景ID" :alone="true">
+      <setting-item>
+        <n-input v-model:value="optionData.sceneId" type="textarea" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { NSpace, NCard, NFormItem, NInput } from 'naive-ui'
+import { option } from './config'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import config from './config'
 
 defineProps({
   chartConfig: {
     type: Object as PropType<config>,
     required: true
+  },
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
   }
 })
 </script>

src/packages/components/Charts/HazardousChemicalsSpace/LineDropdownHaz/index.vue

@@ -74,7 +74,8 @@ use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponen
 // API调用函数
 const fetchChartData = async (timeType: string, riskLevel: number) => {
   try {
-    const response:any = await axiosInstance.get(`/awjt/screen/alarmByOption/${timeType}/${riskLevel}`,
+    console.log('props.chartConfig.option',props.chartConfig.option)
+    const response:any = await axiosInstance.get(`/awjt/screen/alarmByOption/${timeType}/${riskLevel}/${props.chartConfig.option.sceneId}`,
     {baseURL:''})
     if (response.state === true) {
       return response.value || []

vite.config.ts

@@ -66,9 +66,15 @@ export default ({ mode }) =>
           rewrite: (path) => path.replace(/^\/aw/, '')
         },
         '/awjt/': {
-          target: 'http://127.0.0.1:8921/',
+          target: 'http://127.0.0.1:8080/',
-          changeOrigin: true
+          changeOrigin: true,
-        }, '/dev': {
+          rewrite: (path) => path.replace(/^\/awjt/, '')
+        },
+        // '/awjt/': {
+        //   target: 'http://127.0.0.1:8921/',
+        //   changeOrigin: true
+        // }, 
+        '/dev': {
           target: 'http://127.0.0.1:8080',
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/dev/, '')