From d6d626a5c4c0b6e4574e5e9bb3f6b5fd73797169 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Fri, 16 Aug 2024 15:02:41 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomComponents/CustomComponents/VideoList/index.vue   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/packages/components/CustomComponents/CustomComponents/VideoList/index.vue b/src/packages/components/CustomComponents/CustomComponents/VideoList/index.vue
index b50c422c..4c791cfc 100644
--- a/src/packages/components/CustomComponents/CustomComponents/VideoList/index.vue
+++ b/src/packages/components/CustomComponents/CustomComponents/VideoList/index.vue
@@ -121,9 +121,9 @@ onUnmounted(() => {
 
 
 // 预览更新
-useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
-  option.dataset = newData
-})
+// useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => {
+//   option.dataset = newData
+// })
 </script>
 
 <style lang="scss" scoped>

From 60befc3362db1b5b3094ec77c2ff4af35d951665 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Sat, 17 Aug 2024 11:07:50 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=AF=B9?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                                       | 4 ++--
 src/store/modules/chartEditStore/chartEditStore.d.ts       | 2 +-
 .../ContentConfigurations/components/ChartEvent/index.vue  | 7 +++++--
 src/views/preview/hooks/useCustomEvent.hook.ts             | 5 ++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index cad75cf2..49ac8784 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://192.168.0.34:8102/'
+VITE_DEV_PATH = 'http://114.115.222.135:9015/'
 # VITE_DEV_PATH = 'http://192.168.0.120:3001'
-VITE_DEV_TOKEN = '09c7cb6a-ab85-4c92-ad0f-5a25d72d71f7'
+VITE_DEV_TOKEN = 'a170d26c-477f-4b17-a344-997a20d3bab0'
 
 # production path
 VITE_PRO_PATH = 'http://192.168.0.235:8177'
diff --git a/src/store/modules/chartEditStore/chartEditStore.d.ts b/src/store/modules/chartEditStore/chartEditStore.d.ts
index 51144f33..b3e9e5df 100644
--- a/src/store/modules/chartEditStore/chartEditStore.d.ts
+++ b/src/store/modules/chartEditStore/chartEditStore.d.ts
@@ -395,7 +395,7 @@ export interface commonDataType {
 // customEvent事件
 export interface CustomEventType {
   click: {
-    linkHead: 'http://' | 'https://'
+    linkHead: 'http://' | 'https://' | '/'
     link: string
     isBlank: boolean
   }
diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue
index d437f042..18bb0c2c 100644
--- a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue
@@ -69,21 +69,24 @@ const showModal = ref(false)
 //   init()
 // })
 
-const linkHeadOptions = ['http://', 'https://'].map(_ => ({label: _, value: _}))
+const linkHeadOptions = ['http://', 'https://', '/'].map(_ => ({label: _, value: _}))
 
 const finallyLink = computed(() => {
   return targetData.value.customEvent.click.linkHead + (targetData.value as any).customEvent.click.link
 })
 const handleClick = () => {
   if(!finallyLink.value) return
+  let isRelativePath = targetData.value.customEvent.click.linkHead === '/'
   if(targetData.value.customEvent.click.isBlank) postMessageToParent({
     type: 'windowOpen',
     url: finallyLink.value,
-    openNew: true
+    openNew: true,
+    isRelativePath
   })
   else postMessageToParent({
     type: 'windowOpen',
     url: finallyLink.value,
+    isRelativePath
   })
 }
 </script>
diff --git a/src/views/preview/hooks/useCustomEvent.hook.ts b/src/views/preview/hooks/useCustomEvent.hook.ts
index b31e38b2..4f8edcee 100644
--- a/src/views/preview/hooks/useCustomEvent.hook.ts
+++ b/src/views/preview/hooks/useCustomEvent.hook.ts
@@ -7,14 +7,17 @@ const bindEvent = (item:any) => {
         obj = {
             click: () => {
                 if(!link) return
+                let isRelativePath = linkHead === '/'
                 if(isBlank) postMessageToParent({
                     type: 'windowOpen',
                     url: `${linkHead}${link}`,
-                    openNew: true
+                    openNew: true,
+                    isRelativePath
                 })
                 else postMessageToParent({
                     type: 'windowOpen',
                     url: `${linkHead}${link}`,
+                    isRelativePath
                 })
             }
         }

From d5336bb9093c5ff6e9eaf65cd08da99626cc1756 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Sat, 17 Aug 2024 17:10:35 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8A=9F=E7=8E=87?=
 =?UTF-8?q?=E5=AE=B9=E9=87=8F=E6=A5=BC=E5=B1=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomComponents/PowerCapacity/config.ts                | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/packages/components/CustomComponents/CustomComponents/PowerCapacity/config.ts b/src/packages/components/CustomComponents/CustomComponents/PowerCapacity/config.ts
index 9cfbed61..4038010b 100644
--- a/src/packages/components/CustomComponents/CustomComponents/PowerCapacity/config.ts
+++ b/src/packages/components/CustomComponents/CustomComponents/PowerCapacity/config.ts
@@ -12,17 +12,11 @@ export const customData = {
     {
       name: '一号楼', show: true, label: '设计容量', value: 20000, label1: '已使用', calculation: '', floor: [
         { label: '1F', calculation: '' },
-        { label: '2F', calculation: '' },
-        { label: '3F', calculation: '' },
-        { label: '4F', calculation: '' },
       ]
     },
     {
       name: '二号楼', show: true, label: '设计容量', value: 20000, label1: '已使用', calculation: '', floor: [
         { label: '1F', calculation: '' },
-        { label: '2F', calculation: '' },
-        { label: '3F', calculation: '' },
-        { label: '4F', calculation: '' },
       ]
     }
   ],

From 117fa5d72f90f0d8936e8b983faea26a4fbd55a8 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Tue, 20 Aug 2024 17:05:35 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E7=BB=BC=E5=90=88PUE=E9=80=9A?=
 =?UTF-8?q?=E7=94=A81=E6=96=B0=E5=A2=9E=E6=89=8B=E5=8A=A8=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ComprehensivePUEV4/config.ts              |   8 +
 .../ComprehensivePUEV4/configData.vue         | 152 +++++++++++++-----
 .../ComprehensivePUEV4/index.vue              |  35 ++++
 3 files changed, 154 insertions(+), 41 deletions(-)

diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts
index fbf8eba6..2cc6c3a0 100644
--- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts
+++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/config.ts
@@ -16,21 +16,29 @@ export const customData = {
   title: '综合PUE',
   enable: false,
   demonstration: false,
+  manual: false,
   id: null,
   circle: {
     title: '昨日PUE',
+    value: 0,
   },
   center: {
     title1: '实时PUE',
+    value1: 0,
     title2: '上周PUE',
+    value2: 0,
     title3: '上月PUE',
+    value3: 0,
   },
   right: {
     title1: '总功率(kWh)',
+    value1: 0,
     calculation1: '',
     title2: 'IT功率(kW)',
+    value2: 0,
     calculation2: '',
     title3: '其他功率(kW)',
+    value3: 0,
   },
   showInterval: true,
 }
diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue
index 1bed15dd..2216ed06 100644
--- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue
+++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/configData.vue
@@ -7,55 +7,125 @@
       <n-switch v-model:value="props.customData.enable" size="small"/>
     </n-space>
   </setting-item-box>
-  <setting-item-box name="开启演示模式">
-    <n-space>
-      <n-switch v-model:value="props.customData.demonstration" size="small"/>
+  <setting-item-box name="模式" alone>
+    <n-space >
+      <n-radio
+        :checked="checkedValue === 'normal'"
+        value="normal"
+        name="mode"
+        @change="handleChange"
+      >普通模式</n-radio>
+      <n-radio
+        :checked="checkedValue === 'demonstration'"
+        value="demonstration"
+        name="mode"
+        @change="handleChange"
+      >演示模式</n-radio>
+      <n-radio
+        :checked="checkedValue === 'manual'"
+        value="manual"
+        name="mode"
+        @change="handleChange"
+      >手动模式</n-radio>
     </n-space>
   </setting-item-box>
-  <setting-item-box name="报表ID" alone>
-    <setting-item name="控制左边和中间的ID">
-      <n-input v-model:value="props.customData.id" size="small" placeholder="请输入"/>
-    </setting-item>
-  </setting-item-box>
-  <setting-item-box name="仪表盘">
-    <setting-item name="标题">
-      <n-input v-model:value="props.customData.circle.title" size="small" placeholder="请输入"/>
-    </setting-item>
-  </setting-item-box>
-  <setting-item-box name="中间">
-    <setting-item name="标题1">
-      <n-input v-model:value="props.customData.center.title1" size="small" placeholder="请输入"/>
-    </setting-item>
-    <setting-item name="标题2">
-      <n-input v-model:value="props.customData.center.title2" size="small" placeholder="请输入"/>
-    </setting-item>
-    <setting-item name="标题3">
-      <n-input v-model:value="props.customData.center.title3" size="small" placeholder="请输入"/>
-    </setting-item>
-  </setting-item-box>
-  <setting-item-box name="右边">
-    <setting-item name="标题1">
-      <n-input v-model:value="props.customData.right.title1" size="small" placeholder="请输入"/>
-    </setting-item>
-    <setting-item name="测点计算公式1">
-      <n-input v-model:value="props.customData.right.calculation1" size="small" placeholder="请输入"/>
-    </setting-item>
-    <setting-item name="标题2">
-      <n-input v-model:value="props.customData.right.title2" size="small" placeholder="请输入"/>
-    </setting-item>
-    <setting-item name="测点计算公式2">
-      <n-input v-model:value="props.customData.right.calculation2" size="small" placeholder="请输入"/>
-    </setting-item>
-    <setting-item name="标题3">
-      <n-input v-model:value="props.customData.right.title3" size="small" placeholder="请输入"/>
-    </setting-item>
-  </setting-item-box>
+  <template v-if="checkedValue === 'normal'">
+    <setting-item-box name="报表ID" alone>
+      <setting-item name="控制左边和中间的ID">
+        <n-input v-model:value="props.customData.id" size="small" placeholder="请输入"/>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="仪表盘">
+      <setting-item name="标题">
+        <n-input v-model:value="props.customData.circle.title" size="small" placeholder="请输入"/>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="中间">
+      <setting-item name="标题1">
+        <n-input v-model:value="props.customData.center.title1" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item name="标题2">
+        <n-input v-model:value="props.customData.center.title2" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item name="标题3">
+        <n-input v-model:value="props.customData.center.title3" size="small" placeholder="请输入"/>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="右边">
+      <setting-item name="标题1">
+        <n-input v-model:value="props.customData.right.title1" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item name="测点计算公式1">
+        <n-input v-model:value="props.customData.right.calculation1" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item name="标题2">
+        <n-input v-model:value="props.customData.right.title2" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item name="测点计算公式2">
+        <n-input v-model:value="props.customData.right.calculation2" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item name="标题3">
+        <n-input v-model:value="props.customData.right.title3" size="small" placeholder="请输入"/>
+      </setting-item>
+    </setting-item-box>
+  </template>
+  <template v-else-if="checkedValue === 'manual'">
+    <setting-item-box name="仪表盘">
+      <setting-item :name="props.customData.circle.title">
+        <n-input-number v-model:value="props.customData.circle.value" step="0.001" size="small" placeholder="请输入"/>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="中间">
+      <setting-item :name="props.customData.center.title1">
+        <n-input-number v-model:value="props.customData.center.value1" step="0.001" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item :name="props.customData.center.title2">
+        <n-input-number v-model:value="props.customData.center.value2" step="0.001" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item :name="props.customData.center.title3">
+        <n-input-number v-model:value="props.customData.center.value3" step="0.001" size="small" placeholder="请输入"/>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="右边">
+      <setting-item :name="props.customData.right.title1">
+        <n-input-number v-model:value="props.customData.right.value1" step="0.001" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item :name="props.customData.right.title2">
+        <n-input-number v-model:value="props.customData.right.value2" step="0.001" size="small" placeholder="请输入"/>
+      </setting-item>
+      <setting-item :name="props.customData.right.title3">
+        <n-input-number v-model:value="props.customData.right.value3" step="0.001" size="small" placeholder="请输入"/>
+      </setting-item>
+    </setting-item-box>
+  </template>
 </template>
 
 <script lang="ts" setup>
+import { watch, ref } from 'vue'
 import { SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 
 const props = defineProps(['customData', 'request'])
+
+const checkedValue = ref('normal')
+
+if(props.customData.demonstration) checkedValue.value = 'demonstration'
+if(props.customData.manual) checkedValue.value = 'manual'
+
+const handleChange = (e: Event) => {
+  checkedValue.value = (e.target as HTMLInputElement).value
+  if(checkedValue.value === 'normal') {
+    props.customData.demonstration = false
+    props.customData.manual = false
+  }
+  else if(checkedValue.value === 'demonstration') {
+    props.customData.demonstration = true
+    props.customData.manual = false
+  }
+  else if(checkedValue.value === 'manual') {
+    props.customData.demonstration = false
+    props.customData.manual = true
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue
index ffb63040..66b63e8c 100644
--- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue
+++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue
@@ -504,11 +504,31 @@ const resetData = () => {
   option3.value.title[0].text = toTwoDecimalPlaces(g * 100 / e) + ''
 }
 
+const resetData1 = () => {
+  let a = customData.value.circle.value
+  let b = customData.value.center.value1
+  let c = customData.value.center.value2
+  let d = customData.value.center.value3
+  let e = customData.value.right.value1
+  let f = customData.value.right.value2
+  let g = customData.value.right.value3
+
+  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.manual) {
+    resetData1()
+    return
+  }
   if(!customData.value.enable) {
     dataArr.value = [1, 0, 0, 0, 0, 0, 0]
     option2.value.series[0].data[0].value = 0
@@ -530,6 +550,21 @@ watch(() => customData.value.demonstration, () => {
   getData()
 })
 
+watch([
+  () => customData.value.manual,
+  () => customData.value.circle.value,
+  () => customData.value.center.value1,
+  () => customData.value.center.value2,
+  () => customData.value.center.value3,
+  () => customData.value.right.value1,
+  () => customData.value.right.value2,
+  () => customData.value.right.value3,
+], () => {
+  getData()
+}, {
+  deep: true
+})
+
 let timer: unknown
 watch(() => [props.chartConfig.request.requestInterval, props.chartConfig.request.requestIntervalUnit].join('&&'), v => {
   if(!isPreview()) return

From ce86b24b46a0ba70384e753c22f9ed7985e0b30c Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Tue, 20 Aug 2024 17:40:01 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E7=BB=BC=E5=90=88PUE=E9=80=9A?=
 =?UTF-8?q?=E7=94=A81=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ComprehensivePUEV4/index.vue              | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue
index 66b63e8c..2215452f 100644
--- a/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue
+++ b/src/packages/components/CustomComponents/CustomComponents/ComprehensivePUEV4/index.vue
@@ -488,14 +488,31 @@ 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 resetData = () => {
+  let random = 0.8 + Math.random() * 0.2
+
   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
+  let f = 1152 * 4 * random
+  let g = 277 * 4 * random
+  let e = f + g
+  let b = e / f
 
   dataArr.value = [a, b, c, d, e, f, g]
   option2.value.series[0].data[0].value = toTwoDecimalPlaces(f * 100 / e)