diff --git a/.env b/.env index d1b3d4e2..682ae1b9 100644 --- a/.env +++ b/.env @@ -3,9 +3,9 @@ VITE_DEV_PORT = '8080' # development path # VITE_DEV_PATH = 'http://192.168.0.34:11887' -VITE_DEV_PATH = 'http://114.115.222.135:9008/' +VITE_DEV_PATH = 'http://114.115.222.135:9015/' # VITE_DEV_PATH = 'http://192.168.0.120:3001' -VITE_DEV_TOKEN = 'e5982f26-54bb-45d8-827a-02bbb42a2eae' +VITE_DEV_TOKEN = '2a6c435a-1b8f-43b6-938c-ab6b73f96801' # production path VITE_PRO_PATH = 'http://192.168.0.235:8177' diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/VCircle.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/VCircle.vue index f30aeab8..83c2ef33 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/VCircle.vue +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/VCircle.vue @@ -253,17 +253,17 @@
{{value[1].label}}
-
{{value[1].value}}
+
{{value[1].value}}
{{value[2].label}}
-
{{value[2].value}}
+
{{value[2].value}}
{{value[3].label}}
-
{{value[3].value}}
+
{{value[3].value}}
@@ -277,6 +277,18 @@ type ItemType = { label: string, value: number } type ValueType = ItemType[] const { value } = defineProps(['value']) as { value: ValueType } +const getColor = (pue: number) => { + let color = '#4dca59' + if (pue >= 0 && pue < 1.7) { + color = '#4dca59' + } else if (pue >= 1.7 && pue < 2.2) { + color = '#e3bb26' + } else if (pue >= 2.2) { + color = '#d73f40' + } + return color +} + const color = ref('#4dca59') const getRotate = (horizontal:string, data:number) => { // 传入指针水平位置,计算指针角度,水平位置即为指针角度为0时,两端点的纵坐标 diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts index 850023e1..fbf8eba6 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts @@ -15,6 +15,7 @@ export const option = { export const customData = { title: '综合PUE', enable: false, + demonstration: false, id: null, circle: { title: '昨日PUE', diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue index a865b5c4..1bed15dd 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue @@ -7,6 +7,11 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue index 87a0be26..ffb63040 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue @@ -397,7 +397,7 @@ const option3 = ref({ }) const getLeftData = async () => { - dataArr.value[0] = 1 + // dataArr.value[0] = 1 if(customData.value.id) { const params = { duration: 3, // 2,查询日报;3,查询月报;4,年报 @@ -429,8 +429,8 @@ const getLeftData = async () => { } const getCenterData = async () => { - dataArr.value[2] = 0 - dataArr.value[3] = 0 + // dataArr.value[2] = 0 + // dataArr.value[3] = 0 if(customData.value.id) { const params = { strategy_ids: [Number(customData.value.id)] @@ -445,14 +445,14 @@ const getCenterData = async () => { const getRightData = async () => { // 设置默认值 - dataArr.value[1] = 0 - dataArr.value[4] = 0 - dataArr.value[5] = 0 - dataArr.value[6] = 0 - option2.value.series[0].data[0].value = 0 - option2.value.title[0].text = '0' - option3.value.series[0].data[0].value = 0 - option3.value.title[0].text = '0' + // dataArr.value[1] = 0 + // dataArr.value[4] = 0 + // dataArr.value[5] = 0 + // dataArr.value[6] = 0 + // option2.value.series[0].data[0].value = 0 + // option2.value.title[0].text = '0' + // option3.value.series[0].data[0].value = 0 + // option3.value.title[0].text = '0' let item = { time_out: 60, @@ -484,8 +484,31 @@ const getRightData = async () => { } } +const toTwoDecimalPlaces = (num:number) => { + return parseFloat(num.toFixed(2)); +} + +const resetData = () => { + let a = toTwoDecimalPlaces(1 + Math.random() * 0.6) + let b = toTwoDecimalPlaces(1 + Math.random() * 0.6) + let c = toTwoDecimalPlaces(1 + Math.random() * 0.6) + let d = toTwoDecimalPlaces(1 + Math.random() * 0.6) + let e = toTwoDecimalPlaces(Math.random() * 5000) + let f = toTwoDecimalPlaces(e * (0.8 + Math.random() * 0.1)) + let g = e - f + + dataArr.value = [a, b, c, d, e, f, g] + option2.value.series[0].data[0].value = toTwoDecimalPlaces(f * 100 / e) + option2.value.title[0].text = toTwoDecimalPlaces(f * 100 / e) + '' + option3.value.series[0].data[0].value = toTwoDecimalPlaces(g * 100/ e) + option3.value.title[0].text = toTwoDecimalPlaces(g * 100 / e) + '' +} const getData = async () => { + if(customData.value.demonstration) { + resetData() + return + } if(!customData.value.enable) { dataArr.value = [1, 0, 0, 0, 0, 0, 0] option2.value.series[0].data[0].value = 0 @@ -503,6 +526,10 @@ watch(() => customData.value.enable, () => { getData() }) +watch(() => customData.value.demonstration, () => { + getData() +}) + let timer: unknown watch(() => [props.chartConfig.request.requestInterval, props.chartConfig.request.requestIntervalUnit].join('&&'), v => { if(!isPreview()) return diff --git a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/config.ts b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/config.ts index 93b303d5..1f0526be 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/config.ts +++ b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/config.ts @@ -10,6 +10,7 @@ export const customData = { title1: '当月用电量', title2: '年用电量', enable: false, + demonstration: false, arr: [ {id: null, name: '1号楼'}, {id: null, name: '2号楼'}, diff --git a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue index f4464542..189c3520 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue +++ b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/configData.vue @@ -10,7 +10,12 @@ - + + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue index a143fe78..6357727b 100644 --- a/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/ElectricityConsumption/index.vue @@ -298,8 +298,49 @@ const handleChart = () => { } } +const toTwoDecimalPlaces = (num: number) => { + return parseFloat(num.toFixed(2)); +} + const getData = () => { let v = radio.value.value + if(customData.value.demonstration) { + if(v === '周') { + customData.value.arr.forEach((_, i) => { + let base = Math.random() * 14000 + weekData.value[i] = Array(7).fill('').map(() => { + return toTwoDecimalPlaces(base + Math.random() * 2000) + }) + }) + handleChart() + } + else if(v === '月') { + monthData.value = customData.value.arr.map(_ => { + let base = Math.random() * 14000 + return { + name: _.name, + value: Array((moment().daysInMonth() as any) * 1).fill('').map(() => { + return toTwoDecimalPlaces(base + Math.random() * 2000) + }) + } + }) + handleChart() + } + else if(v === '年') { + monthData.value = customData.value.arr.map(_ => { + let base = Math.random() * 14000 + return { + name: _.name, + value: Array(12).fill('').map(() => { + return toTwoDecimalPlaces(base + Math.random() * 2000) + }) + } + }) + handleChart() + handleChart() + } + return + } if(customData.value.enable) { if(v === '周') { customData.value.arr.forEach((item, i) => { @@ -315,6 +356,7 @@ const getData = () => { } } +watch(() => customData.value.demonstration, getData) watch(() => radio.value.value, getData) watch([() => customData.value.enable, () => customData.value.arr.map(_ => _.id)], getData, { deep: true }) watch(() => customData.value.arr.map(_ => _.name), handleChart, { deep: true }) diff --git a/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/config.ts b/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/config.ts index 27197444..1ee60608 100644 --- a/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/config.ts +++ b/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/config.ts @@ -8,6 +8,7 @@ export const option = {} export const customData = { title: '区域温度TOP10', ids: '', + demonstration: false, showInterval: true, } diff --git a/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/configData.vue b/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/configData.vue index dd4ac527..f04c14c9 100644 --- a/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/configData.vue +++ b/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/configData.vue @@ -2,6 +2,11 @@ + + + + + diff --git a/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/index.vue b/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/index.vue index 2ca5efbb..6feb26ae 100644 --- a/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/TemperatureTop10/index.vue @@ -73,6 +73,10 @@ const jumpToMachineRoom = (row: any) => { } } +const toTwoDecimalPlaces = (num: number) => { + return parseFloat(num.toFixed(2)); +} + const getData = () => { const params = { signal_ids: customData.value.ids.split(',') @@ -80,10 +84,21 @@ const getData = () => { publicInterface('/dcim/dems/device_point', 'temp_list_dashboard', params).then((res: any) => { if (res.data && res.data.length) { data.value = res.data.slice(0, 10) + if(customData.value.demonstration) { + data.value = data.value.map((item: any) => { + if(!item?.dems_device_point?.node_value) { + if(!item.dems_device_point) item.dems_device_point = {} + item.dems_device_point.node_value = toTwoDecimalPlaces(25 + Math.random() * 10) + } + return item + }) + } } }) } +watch(() => customData.value.demonstration, getData) + let timer:unknown watch(() => [props.chartConfig.request.requestInterval, props.chartConfig.request.requestIntervalUnit].join('&&'), v => { if(!isPreview()) return