Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
40d2ae4046
@ -16,7 +16,7 @@ export const styleConfig = {
|
||||
}
|
||||
}
|
||||
export const option = {
|
||||
secneID: '01',
|
||||
sceneCode: 'T01',
|
||||
dataset: dataJson,
|
||||
rowNum: 4,
|
||||
waitTime: 0.5,
|
||||
|
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -273,7 +273,7 @@ const formatAlarmItem = (item) => {
|
||||
const fetchRecentAlarms = async () => {
|
||||
try {
|
||||
isLoading.value = true
|
||||
const res = await axiosInstance.get(`/awjt/space/getRecentAlarms/${props.chartConfig.option.secneID}`, { responseType: 'json', baseURL: '' });
|
||||
const res = await axiosInstance.get(`/awjt/space/getRecentAlarms/${props.chartConfig.option.sceneCode}`, { responseType: 'json', baseURL: '' });
|
||||
|
||||
if (res.state === true) {
|
||||
let rawData = [];
|
||||
|
@ -9,7 +9,7 @@ export const includes = ['legend']
|
||||
|
||||
// 其它配置
|
||||
const otherConfig = {
|
||||
secneID: '01',
|
||||
sceneCode: 'T01',
|
||||
dateTime: {
|
||||
selectValue: 'day',
|
||||
dataset: [
|
||||
|
@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<div>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -133,7 +133,7 @@ export class BarOption {
|
||||
}
|
||||
}
|
||||
export const option = {
|
||||
secneID:"01",
|
||||
sceneCode:"T01",
|
||||
dataset: { ...dataJson }
|
||||
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<div>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -14,7 +14,7 @@ export const selectStyleOption = {
|
||||
borderRadius: '2px',
|
||||
}
|
||||
const otherConfig = {
|
||||
secneID: '01',
|
||||
sceneCode: 'T01',
|
||||
// 轮播动画
|
||||
isCarousel: false,
|
||||
color: ['#3B72E8', '#45B5E3', '#50D4A8', '#F8B55B'],
|
||||
|
@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<div>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -190,7 +190,7 @@ const fetchAlarmData = async ({ startTime, endTime }: { startTime: string; endTi
|
||||
};
|
||||
try {
|
||||
const res: any = await axiosInstance.get(
|
||||
`/awjt/space/getNumberByAlarmLevel/${props.chartConfig.option.secneID}`,
|
||||
`/awjt/space/getNumberByAlarmLevel/${props.chartConfig.option.sceneCode}`,
|
||||
{
|
||||
params: { startTime, endTime },
|
||||
responseType: 'json',
|
||||
|
@ -5,7 +5,7 @@ import cloneDeep from 'lodash/cloneDeep'
|
||||
import dataJson from './cameratree.json'
|
||||
import { chartInitConfig } from '@/settings/designSetting'
|
||||
export const option = {
|
||||
secneID: '01',
|
||||
sceneCode: 'T01',
|
||||
// 摄像头id
|
||||
dataset: {
|
||||
defaultValue: '中国中车集团有限公司',
|
||||
|
@ -2,9 +2,9 @@
|
||||
<!-- eslint-disable vue/no-mutating-props -->
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -528,7 +528,7 @@ const getDataSource = (newData: any) => {
|
||||
const fetchCameraTree = async () => {
|
||||
console.log('fetchCameraTree: 正在获取摄像头树数据...');
|
||||
try {
|
||||
const res = await axiosInstance.get(`/awjt/api/camera/tree/${option.secneID}`, { baseURL: '', responseType: 'json' });
|
||||
const res = await axiosInstance.get(`/awjt/api/camera/tree/${option.sceneCode}`, { baseURL: '', responseType: 'json' });
|
||||
console.log("API 响应数据 (Camera Tree):", res);
|
||||
if (res && res.state === true) {
|
||||
console.log("API 响应数据 (Camera Tree):", res.value);
|
||||
|
@ -22,7 +22,7 @@ export const FontStyleObject = {
|
||||
[FontStyleEnum.ITALIC]: 'italic',
|
||||
}
|
||||
export const option = {
|
||||
secneID: '04',
|
||||
sceneCode: 'T04',
|
||||
dataset: dataJson,
|
||||
header: ['报警事件', '时间', '所属企业', '状态'],
|
||||
headerTextColor: '#B4B4B4',
|
||||
|
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
<setting-item-box name="标题" :alone="true">
|
||||
|
@ -89,7 +89,7 @@ const convertTimestampToDateTime = (timestamp: number | string) => {
|
||||
const fetchRecentAlarms = async () => {
|
||||
try {
|
||||
const res: any = await axiosInstance.get(
|
||||
`/awjt/space/getRecentAlarms/${option.value.secneID}`,
|
||||
`/awjt/space/getRecentAlarms/${option.value.sceneCode}`,
|
||||
{
|
||||
responseType: 'json',
|
||||
baseURL: ''
|
||||
|
@ -33,7 +33,7 @@ const otherConfig = {
|
||||
}
|
||||
]
|
||||
},
|
||||
sceneId: '',
|
||||
sceneCode: '',
|
||||
}
|
||||
|
||||
export const option = {
|
||||
|
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.sceneId" ></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" ></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -75,7 +75,7 @@ use([DatasetComponent, CanvasRenderer, LineChart, GridComponent, TooltipComponen
|
||||
const fetchChartData = async (timeType: string, riskLevel: number) => {
|
||||
try {
|
||||
console.log('props.chartConfig.option',props.chartConfig.option)
|
||||
const response:any = await axiosInstance.get(`/awjt/screen/alarmByOption/${timeType}/${riskLevel}/${props.chartConfig.option.sceneId}`,
|
||||
const response:any = await axiosInstance.get(`/awjt/screen/alarmByOption/${timeType}/${riskLevel}/${props.chartConfig.option.sceneCode}`,
|
||||
{baseURL:''})
|
||||
if (response.state === true) {
|
||||
return response.value || []
|
||||
|
@ -57,7 +57,7 @@ export const seriesItem = {
|
||||
}
|
||||
}
|
||||
export const option = {
|
||||
sceneId: '04',
|
||||
sceneCode: 'T04',
|
||||
dateTime: {
|
||||
selectValue: 'day',
|
||||
dataset: [
|
||||
|
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.sceneId" ></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" ></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -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}/${props.chartConfig.option.sceneId}`,{baseURL:''})
|
||||
const response:any = await axiosInstance.get(`/awjt/screen/handleByOption/${option}/${props.chartConfig.option.sceneCode}`,{baseURL:''})
|
||||
if (response.state === true) {
|
||||
return response.value || []
|
||||
} else {
|
||||
|
@ -8,7 +8,7 @@ export const includes = ['legend']
|
||||
|
||||
// 其它配置
|
||||
const otherConfig = {
|
||||
secneID:'04',
|
||||
sceneCode:'T04',
|
||||
dateTime: {
|
||||
selectValue: 'day',
|
||||
dataset: [
|
||||
|
@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<div>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -239,7 +239,7 @@ function generateTimeRange(period: string): { startTime: string; endTime: string
|
||||
async function fetchAlarmData({ startTime, endTime }: { startTime: string; endTime: string }) {
|
||||
try {
|
||||
const res: any = await axiosInstance.get(
|
||||
`/awjt/space/getNumberByAlarmLevel/${props.chartConfig.option.sceneID}`,
|
||||
`/awjt/space/getNumberByAlarmLevel/${props.chartConfig.option.sceneCode}`,
|
||||
{
|
||||
params: { startTime, endTime }, // 请求参数
|
||||
responseType: 'json',
|
||||
|
@ -3,7 +3,7 @@ import { CreateComponentType } from '@/packages/index.d'
|
||||
import { TopAlarmsConfig } from './index'
|
||||
import dataJson from './data.json'
|
||||
export const option = {
|
||||
sceneId: '04',
|
||||
sceneCode: 'T04',
|
||||
dateTime: {
|
||||
selectValue: 'day',
|
||||
dataset: [
|
||||
|
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.sceneId" ></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" ></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -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}/${props.chartConfig.option.sceneId}`, { baseURL: '' })
|
||||
const response: any = await axiosInstance.get(`/awjt/screen/corpsFive/${option}/${props.chartConfig.option.sceneCode}`, { baseURL: '' })
|
||||
if (response.state === true) {
|
||||
displayData.value = response.value || []
|
||||
} else {
|
||||
|
@ -4,7 +4,7 @@ import { yushiVideoConfig } from './index'
|
||||
import cloneDeep from 'lodash/cloneDeep'
|
||||
|
||||
export const option = {
|
||||
secneID: '04',
|
||||
sceneCode: 'T04',
|
||||
// 摄像头id
|
||||
dataset: {
|
||||
defaultValue: '',
|
||||
|
@ -2,9 +2,9 @@
|
||||
<!-- eslint-disable vue/no-mutating-props -->
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
</collapse-item>
|
||||
|
@ -7,7 +7,7 @@ import * as echarts from 'echarts'
|
||||
|
||||
export const includes = []
|
||||
const otherOption = {
|
||||
secneID: '',
|
||||
sceneCode: '',
|
||||
unit: dataJson.unit,
|
||||
}
|
||||
export const option = {
|
||||
|
@ -7,7 +7,7 @@ import * as echarts from 'echarts'
|
||||
|
||||
export const includes = []
|
||||
const otherOption = {
|
||||
secneID: '',
|
||||
sceneCode: '',
|
||||
titleText:'能源趋势',
|
||||
unit: dataJson.unit,
|
||||
}
|
||||
|
@ -8,7 +8,7 @@ import { chartInitConfig } from '@/settings/designSetting'
|
||||
import costIcon from './assets/cost.svg'
|
||||
import dataJson from './data.json'
|
||||
const otherOption = {
|
||||
secneID: '',
|
||||
sceneCode: '',
|
||||
titleText: '能源总览',
|
||||
gridItems: [
|
||||
{
|
||||
|
@ -7,7 +7,7 @@ import dataJson from './data.json'
|
||||
|
||||
export const includes = []
|
||||
const otherOption = {
|
||||
secneID: '',
|
||||
sceneCode: '',
|
||||
titleText: '燃气系统',
|
||||
unit: dataJson.unit,
|
||||
}
|
||||
|
@ -7,7 +7,7 @@ import * as echarts from 'echarts'
|
||||
|
||||
export const includes = []
|
||||
const otherOption = {
|
||||
secneID: '',
|
||||
sceneCode: '',
|
||||
unit: dataJson.unit,
|
||||
}
|
||||
|
||||
|
@ -13,7 +13,7 @@ const snapHeight = wid / 2;
|
||||
const otherOption = {
|
||||
wid, w1, w2, snapHeight,
|
||||
unit: dataJson.unit,
|
||||
secneID:''
|
||||
sceneCode:''
|
||||
}
|
||||
export const option = {
|
||||
...otherOption,
|
||||
|
@ -22,7 +22,7 @@ export const FontStyleObject = {
|
||||
[FontStyleEnum.ITALIC]: 'italic',
|
||||
}
|
||||
export const option = {
|
||||
secneID:"",
|
||||
sceneCode:"",
|
||||
dataset: dataJson,
|
||||
header: ['报警事件', '时间', '所属企业', '状态'],
|
||||
headerTextColor: '#B4B4B4',
|
||||
|
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<collapse-item name="信息" :expanded="true">
|
||||
<setting-item-box name="场景ID" :alone="true">
|
||||
<setting-item-box name="场景 Code " :alone="true">
|
||||
<setting-item>
|
||||
<n-input v-model:value="optionData.secneID" type="textarea" size="small"></n-input>
|
||||
<n-input v-model:value="optionData.sceneCode" type="textarea" size="small"></n-input>
|
||||
</setting-item>
|
||||
</setting-item-box>
|
||||
<setting-item-box name="标题" :alone="true">
|
||||
|
@ -91,7 +91,7 @@ const fetchRecentAlarms = async () => {
|
||||
|
||||
const res: any = await axiosInstance({
|
||||
method: 'GET',
|
||||
url: `/awjt/space/getRecentAlarms/${props.chartConfig.option.secneID}`,
|
||||
url: `/awjt/space/getRecentAlarms/${props.chartConfig.option.sceneCode}`,
|
||||
responseType: 'json'
|
||||
});
|
||||
|
||||
|
@ -4,7 +4,7 @@ import { ParkingSceneConfig } from './index'
|
||||
import dataJson from './data.json'
|
||||
|
||||
export const option = {
|
||||
secneID: "",
|
||||
sceneCode: "",
|
||||
dataset: dataJson.source,
|
||||
title: '场景分布概况',
|
||||
titleColor: '#eee',
|
||||
|
Loading…
Reference in New Issue
Block a user