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

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

@@ -2,7 +2,7 @@
 <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>
+        <n-input v-model:value="optionData.sceneId" ></n-input>
       </setting-item>
     </setting-item-box>
   </collapse-item>
@@ -12,13 +12,9 @@
 import { PropType } from 'vue'
 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

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

@@ -57,6 +57,7 @@ export const seriesItem = {
   }
 }
 export const option = {
+  sceneId: '',
   dateTime: {
       selectValue: 'day',
       dataset: [

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

@@ -1,61 +1,22 @@
 <template>
-  <!-- Echarts 全局设置 -->
+  <collapse-item name="信息" :expanded="true">
-  <global-setting :optionData="optionData"></global-setting>
+    <setting-item-box name="场景ID" :alone="true">
-  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`折线图-${index + 1}`" :expanded="true">
-    <SettingItemBox name="线条">
-      <SettingItem name="宽度">
-        <n-input-number v-model:value="item.lineStyle.width" :min="1" :max="100" size="small"
-          placeholder="自动计算"></n-input-number>
-      </SettingItem>
-      <SettingItem name="类型">
-        <n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
-      </SettingItem>
-    </SettingItemBox>
-    <SettingItemBox name="实心点">
-      <SettingItem name="大小">
-        <n-input-number v-model:value="item.symbolSize" :min="1" :max="100" size="small"
-          placeholder="自动计算"></n-input-number>
-      </SettingItem>
-    </SettingItemBox>
-    <setting-item-box name="标签">
       <setting-item>
-        <n-space>
+        <n-input v-model:value="optionData.sceneId" ></n-input>
-          <n-switch v-model:value="item.label.show" size="small" />
-          <n-text>展示标签</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="大小">
-        <n-input-number v-model:value="item.label.fontSize" size="small" :min="1"></n-input-number>
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="item.label.color"></n-color-picker>
-      </setting-item>
-      <setting-item name="位置">
-        <n-select v-model:value="item.label.position" :options="[
-          { label: 'top', value: 'top' },
-          { label: 'left', value: 'left' },
-          { label: 'right', value: 'right' },
-          { label: 'bottom', value: 'bottom' }
-        ]" />
       </setting-item>
     </setting-item-box>
-  </CollapseItem>
+  </collapse-item>
 </template>
 
 <script setup lang="ts">
-import { PropType, computed } from 'vue'
+import { PropType } from 'vue'
-import { lineConf } from '@/packages/chartConfiguration/echarts/index'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
+import { option } from './config'
-import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 
-const props = defineProps({
+defineProps({
   optionData: {
-    type: Object as PropType<GlobalThemeJsonType>,
+    type: Object as PropType<typeof option>,
     required: true
   }
 })
-
-const seriesList = computed(() => {
-  return props.optionData.series
-})
 </script>

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

@@ -82,7 +82,7 @@ const selectedTimeRange = ref('day')
 // API调用函数
 const fetchChartData = async (option: string) => {
   try {
-    const response:any = await axiosInstance.get(`/awjt/screen/handleByOption/${option}`,{baseURL:''})
+    const response:any = await axiosInstance.get(`/awjt/screen/handleByOption/${option}/${props.chartConfig.option.sceneId}`,{baseURL:''})
     if (response.state === true) {
       return response.value || []
     } else {

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

@@ -3,6 +3,7 @@ import { CreateComponentType } from '@/packages/index.d'
 import { TopAlarmsConfig } from './index'
 import dataJson from './data.json'
 export const option = {
+    sceneId: '',
     dateTime: {
         selectValue: 'day',
         dataset: [

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

@@ -1,26 +1,20 @@
 <template>
-  <div class="go-top-alarms-config">
+  <collapse-item name="信息" :expanded="true">
-    <n-form-item label="标题">
+    <setting-item-box name="场景ID" :alone="true">
-      <n-input v-model:value="option.title" />
+      <setting-item>
-    </n-form-item>
+        <n-input v-model:value="optionData.sceneId" ></n-input>
-    <n-form-item label="标题大小">
+      </setting-item>
-      <n-input-number v-model:value="option.titleSize" />
+    </setting-item-box>
-    </n-form-item>
+  </collapse-item>
-    <n-form-item label="下拉选项">
-      <n-dynamic-input v-model:value="option.dropdownOptions" placeholder="请输入选项" />
-    </n-form-item>
-    <n-form-item label="默认选项">
-      <n-input v-model:value="option.dropdownDefault" />
-    </n-form-item>
-  </div>
 </template>
 
 <script setup lang="ts">
 import { PropType } from 'vue'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { option } from './config'
 
 defineProps({
-  option: {
+  optionData: {
     type: Object as PropType<typeof option>,
     required: true
   }

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

@@ -89,7 +89,7 @@ const calculateWidth = (value: number) => {
 // 新增：API调用函数
 const fetchCorpsData = async (option: string) => {
   try {
-    const response: any = await axiosInstance.get(`/awjt/screen/corpsFive/${option}`, { baseURL: '' })
+    const response: any = await axiosInstance.get(`/awjt/screen/corpsFive/${option}/${props.chartConfig.option.sceneId}`, { baseURL: '' })
     if (response.state === true) {
       displayData.value = response.value || []
     } else {