From 8cf78ec3f53b70177faad16aa4d96f07b8134127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 10 Feb 2023 09:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=93=E6=9E=84=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  16 +--
 pages/device/{aboutAPF.vue => APF/about.vue}  |   0
 pages/device/APF/{ => comp}/IO.vue            |   0
 pages/device/APF/{ => comp}/basic.vue         |   0
 pages/device/APF/{ => comp}/oscillogram.vue   |   0
 pages/device/APF/{ => comp}/power.vue         |   0
 pages/device/APF/{ => comp}/xieBo.vue         |   0
 .../device/{detailAPF.vue => APF/detail.vue}  |  16 +--
 .../device/{recordAPF.vue => APF/record.vue}  |   0
 .../device/{reportAPF.vue => APF/report.vue}  |   0
 pages/device/{aboutDVR.vue => DVR/about.vue}  |   0
 pages/device/DVR/comp/dianWang.vue            |  67 ++++++++++
 pages/device/DVR/{ => comp}/ganjiedian.vue    |   0
 pages/device/DVR/comp/nibian.vue              |  69 ++++++++++
 pages/device/DVR/{ => comp}/qita.vue          |   0
 pages/device/DVR/{ => comp}/shuchu.vue        |   0
 pages/device/DVR/{ => comp}/zhuantailiang.vue |   0
 .../device/{detailDVR.vue => DVR/detail.vue}  |   8 +-
 pages/device/DVR/dianWang.vue                 | 124 ------------------
 pages/device/DVR/nibian.vue                   |   0
 .../device/{recordDVR.vue => DVR/record.vue}  |   0
 .../device/{reportDVR.vue => DVR/report.vue}  |   0
 pages/index/comp/indexGongCheng.vue           |   6 +-
 pages/index/comp/indexYunWei.vue              |   6 +-
 pages/index/comp/indexZhuYongHu.vue           |   6 +-
 pages/index/comp/indexZhuanZhi.vue            |   6 +-
 pages/index/comp/indexZiYongHu.vue            |   6 +-
 27 files changed, 171 insertions(+), 159 deletions(-)
 rename pages/device/{aboutAPF.vue => APF/about.vue} (100%)
 rename pages/device/APF/{ => comp}/IO.vue (100%)
 rename pages/device/APF/{ => comp}/basic.vue (100%)
 rename pages/device/APF/{ => comp}/oscillogram.vue (100%)
 rename pages/device/APF/{ => comp}/power.vue (100%)
 rename pages/device/APF/{ => comp}/xieBo.vue (100%)
 rename pages/device/{detailAPF.vue => APF/detail.vue} (94%)
 rename pages/device/{recordAPF.vue => APF/record.vue} (100%)
 rename pages/device/{reportAPF.vue => APF/report.vue} (100%)
 rename pages/device/{aboutDVR.vue => DVR/about.vue} (100%)
 create mode 100644 pages/device/DVR/comp/dianWang.vue
 rename pages/device/DVR/{ => comp}/ganjiedian.vue (100%)
 create mode 100644 pages/device/DVR/comp/nibian.vue
 rename pages/device/DVR/{ => comp}/qita.vue (100%)
 rename pages/device/DVR/{ => comp}/shuchu.vue (100%)
 rename pages/device/DVR/{ => comp}/zhuantailiang.vue (100%)
 rename pages/device/{detailDVR.vue => DVR/detail.vue} (96%)
 delete mode 100644 pages/device/DVR/dianWang.vue
 delete mode 100644 pages/device/DVR/nibian.vue
 rename pages/device/{recordDVR.vue => DVR/record.vue} (100%)
 rename pages/device/{reportDVR.vue => DVR/report.vue} (100%)

diff --git a/pages.json b/pages.json
index 338f3e1..3a1e494 100644
--- a/pages.json
+++ b/pages.json
@@ -116,49 +116,49 @@
       }
     },
     {
-      "path": "pages/device/detailAPF",
+      "path": "pages/device/APF/detail",
       "style": {
         "navigationBarTitleText": "APF设备详情"
       }
     },
     {
-      "path": "pages/device/detailDVR",
+      "path": "pages/device/DVR/detail",
       "style": {
         "navigationBarTitleText": "DVR设备详情"
       }
     },
     {
-      "path": "pages/device/recordAPF",
+      "path": "pages/device/APF/record",
       "style": {
         "navigationBarTitleText": "操作记录"
       }
     },
     {
-        "path": "pages/device/recordDVR",
+        "path": "pages/device/DVR/record",
         "style": {
           "navigationBarTitleText": "操作记录"
         }
       },
     {
-      "path": "pages/device/reportAPF",
+      "path": "pages/device/APF/report",
       "style": {
         "navigationBarTitleText": "告警情况"
       }
     },
     {
-        "path": "pages/device/reportDVR",
+        "path": "pages/device/DVR/report",
         "style": {
           "navigationBarTitleText": "告警情况"
         }
       },
     {
-      "path": "pages/device/aboutAPF",
+      "path": "pages/device/APF/about",
       "style": {
         "navigationBarTitleText": "关于"
       }
     },
     {
-        "path": "pages/device/aboutDVR",
+        "path": "pages/device/DVR/about",
         "style": {
           "navigationBarTitleText": "关于"
         }
diff --git a/pages/device/aboutAPF.vue b/pages/device/APF/about.vue
similarity index 100%
rename from pages/device/aboutAPF.vue
rename to pages/device/APF/about.vue
diff --git a/pages/device/APF/IO.vue b/pages/device/APF/comp/IO.vue
similarity index 100%
rename from pages/device/APF/IO.vue
rename to pages/device/APF/comp/IO.vue
diff --git a/pages/device/APF/basic.vue b/pages/device/APF/comp/basic.vue
similarity index 100%
rename from pages/device/APF/basic.vue
rename to pages/device/APF/comp/basic.vue
diff --git a/pages/device/APF/oscillogram.vue b/pages/device/APF/comp/oscillogram.vue
similarity index 100%
rename from pages/device/APF/oscillogram.vue
rename to pages/device/APF/comp/oscillogram.vue
diff --git a/pages/device/APF/power.vue b/pages/device/APF/comp/power.vue
similarity index 100%
rename from pages/device/APF/power.vue
rename to pages/device/APF/comp/power.vue
diff --git a/pages/device/APF/xieBo.vue b/pages/device/APF/comp/xieBo.vue
similarity index 100%
rename from pages/device/APF/xieBo.vue
rename to pages/device/APF/comp/xieBo.vue
diff --git a/pages/device/detailAPF.vue b/pages/device/APF/detail.vue
similarity index 94%
rename from pages/device/detailAPF.vue
rename to pages/device/APF/detail.vue
index c1cbc3d..eb038df 100644
--- a/pages/device/detailAPF.vue
+++ b/pages/device/APF/detail.vue
@@ -42,11 +42,11 @@
     </Cn-page>
 </template>
 <script>
-import basic from "./APF/basic.vue";
-import xieBo from "./APF/xieBo.vue";
-import power from "./APF/power.vue";
-import oscillogram from "./APF/oscillogram.vue";
-import IO from "./APF/IO.vue";
+import basic from "./comp/basic.vue";
+import xieBo from "./comp/xieBo.vue";
+import power from "./comp/power.vue";
+import oscillogram from "./comp/oscillogram.vue";
+import IO from "./comp/IO.vue";
 
 export default {
     components: {
@@ -105,11 +105,11 @@ export default {
             } else if (e.item.text === '下载') {
                 this.$util.toast('下载成功')
             } else if (e.item.text === '记录') {
-                uni.navigateTo({ url: '/pages/device/recordAPF' })
+                uni.navigateTo({ url: '/pages/device/APF/record' })
             } else if (e.item.text === '告警') {
-                uni.navigateTo({ url: '/pages/device/reportAPF' })
+                uni.navigateTo({ url: '/pages/device/APF/report' })
             } else if (e.item.text === '关于') {
-                uni.navigateTo({ url: '/pages/device/aboutAPF' })
+                uni.navigateTo({ url: '/pages/device/APF/about' })
             } else if (e.item.text === '移交') {
                 uni.navigateTo({ url: '/pages/device/transfer' })
             } else if (e.item.text === '反馈') {
diff --git a/pages/device/recordAPF.vue b/pages/device/APF/record.vue
similarity index 100%
rename from pages/device/recordAPF.vue
rename to pages/device/APF/record.vue
diff --git a/pages/device/reportAPF.vue b/pages/device/APF/report.vue
similarity index 100%
rename from pages/device/reportAPF.vue
rename to pages/device/APF/report.vue
diff --git a/pages/device/aboutDVR.vue b/pages/device/DVR/about.vue
similarity index 100%
rename from pages/device/aboutDVR.vue
rename to pages/device/DVR/about.vue
diff --git a/pages/device/DVR/comp/dianWang.vue b/pages/device/DVR/comp/dianWang.vue
new file mode 100644
index 0000000..7f43f11
--- /dev/null
+++ b/pages/device/DVR/comp/dianWang.vue
@@ -0,0 +1,67 @@
+<template>
+    <view class='basic'>
+        <view style="font-size:24rpx;color:#111" class="ml4 mb20">电网电压频率:49.974Hz</view>
+        <view class="grid-card">
+            <view class="grid-card-content-5">
+                <view class="item">相数</view>
+                <view class="item">电流(A)</view>
+                <view class="item">毘流峰值比</view>
+                <view class="item">相电压(V)</view>
+                <view class="item">线电压(V)</view>
+                <view class="item">A</view>
+                <view class="item">20.339</view>
+                <view class="item">2.447</view>
+                <view class="item">226.192</view>
+                <view class="item">391.934</view>
+                <view class="item">B</view>
+                <view class="item">20.339</view>
+                <view class="item">2.447</view>
+                <view class="item">226.192</view>
+                <view class="item">391.934</view>
+                <view class="item">C</view>
+                <view class="item">20.339</view>
+                <view class="item">2.447</view>
+                <view class="item">226.192</view>
+                <view class="item">391.934</view>
+                <view class="item">N</view>
+                <view class="item">14.078</view>
+                <view class="item"></view>
+            </view>
+        </view>
+        <view class="grid-card">
+            <view class="grid-card-content-5">
+                <view class="item">相数</view>
+                <view class="item">视在功要(kVA)</view>
+                <view class="item">有功功类(kW)</view>
+                <view class="item">无功功率(kVar)</view>
+                <view class="item">功率園益</view>
+                <view class="item">226.8</view>
+                <view class="item">50.0</view>
+                <view class="item">4.6</view>
+                <view class="item">L2</view>
+                <view class="item">226.8</view>
+                <view class="item">50.0</view>
+                <view class="item">4.6</view>
+                <view class="item">L3</view>
+                <view class="item">226.8</view>
+                <view class="item">50.0</view>
+                <view class="item">4.6</view>
+                <view class="item">N</view>
+                <view class="item">3.9</view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    data () {
+        return {
+        }
+    },
+    methods: {
+    }
+}
+</script>
+<style lang='scss'>
+.basic {}
+</style>
\ No newline at end of file
diff --git a/pages/device/DVR/ganjiedian.vue b/pages/device/DVR/comp/ganjiedian.vue
similarity index 100%
rename from pages/device/DVR/ganjiedian.vue
rename to pages/device/DVR/comp/ganjiedian.vue
diff --git a/pages/device/DVR/comp/nibian.vue b/pages/device/DVR/comp/nibian.vue
new file mode 100644
index 0000000..fb3b93e
--- /dev/null
+++ b/pages/device/DVR/comp/nibian.vue
@@ -0,0 +1,69 @@
+<template>
+    <view class='basic'>
+        <view style="font-size:24rpx;color:#111" class="ml4 mb20">工直流母线电压:458.007V</view>
+        <view style="font-size:24rpx;color:#111" class="ml4 mb20">充放电电流:0.409 A</view>
+        <view style="font-size:24rpx;color:#111" class="ml4 mb20">逆安电压牌率:50.037Hz</view>
+        <view class="grid-card">
+            <view class="grid-card-content-5">
+                <view class="item">相数</view>
+                <view class="item">电流(A)</view>
+                <view class="item">毘流峰值比</view>
+                <view class="item">相电压(V)</view>
+                <view class="item">线电压(V)</view>
+                <view class="item">A</view>
+                <view class="item">20.339</view>
+                <view class="item">2.447</view>
+                <view class="item">226.192</view>
+                <view class="item">391.934</view>
+                <view class="item">B</view>
+                <view class="item">20.339</view>
+                <view class="item">2.447</view>
+                <view class="item">226.192</view>
+                <view class="item">391.934</view>
+                <view class="item">C</view>
+                <view class="item">20.339</view>
+                <view class="item">2.447</view>
+                <view class="item">226.192</view>
+                <view class="item">391.934</view>
+                <view class="item">N</view>
+                <view class="item">14.078</view>
+                <view class="item"></view>
+            </view>
+        </view>
+        <view class="grid-card">
+            <view class="grid-card-content-5">
+                <view class="item">相数</view>
+                <view class="item">视在功要(kVA)</view>
+                <view class="item">有功功类(kW)</view>
+                <view class="item">无功功率(kVar)</view>
+                <view class="item">功率園益</view>
+                <view class="item">226.8</view>
+                <view class="item">50.0</view>
+                <view class="item">4.6</view>
+                <view class="item">L2</view>
+                <view class="item">226.8</view>
+                <view class="item">50.0</view>
+                <view class="item">4.6</view>
+                <view class="item">L3</view>
+                <view class="item">226.8</view>
+                <view class="item">50.0</view>
+                <view class="item">4.6</view>
+                <view class="item">N</view>
+                <view class="item">3.9</view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    data () {
+        return {
+        }
+    },
+    methods: {
+    }
+}
+</script>
+<style lang='scss'>
+.basic {}
+</style>
\ No newline at end of file
diff --git a/pages/device/DVR/qita.vue b/pages/device/DVR/comp/qita.vue
similarity index 100%
rename from pages/device/DVR/qita.vue
rename to pages/device/DVR/comp/qita.vue
diff --git a/pages/device/DVR/shuchu.vue b/pages/device/DVR/comp/shuchu.vue
similarity index 100%
rename from pages/device/DVR/shuchu.vue
rename to pages/device/DVR/comp/shuchu.vue
diff --git a/pages/device/DVR/zhuantailiang.vue b/pages/device/DVR/comp/zhuantailiang.vue
similarity index 100%
rename from pages/device/DVR/zhuantailiang.vue
rename to pages/device/DVR/comp/zhuantailiang.vue
diff --git a/pages/device/detailDVR.vue b/pages/device/DVR/detail.vue
similarity index 96%
rename from pages/device/detailDVR.vue
rename to pages/device/DVR/detail.vue
index 331bdf3..70ac0ad 100644
--- a/pages/device/detailDVR.vue
+++ b/pages/device/DVR/detail.vue
@@ -38,7 +38,7 @@
     </Cn-page>
 </template>
 <script>
-import DianWang from "./DVR/dianWang.vue";
+import DianWang from "./comp/dianWang.vue";
 export default {
     components: {
         DianWang
@@ -96,11 +96,11 @@ export default {
             } else if (e.item.text === '下载') {
                 this.$util.toast('下载成功')
             } else if (e.item.text === '记录') {
-                uni.navigateTo({ url: '/pages/device/recordDVR' })
+                uni.navigateTo({ url: '/pages/device/DVR/record' })
             } else if (e.item.text === '告警') {
-                uni.navigateTo({ url: '/pages/device/reportDVR' })
+                uni.navigateTo({ url: '/pages/device/DVR/report' })
             } else if (e.item.text === '关于') {
-                uni.navigateTo({ url: '/pages/device/aboutDVR' })
+                uni.navigateTo({ url: '/pages/device/DVR/about' })
             } else if (e.item.text === '移交') {
                 uni.navigateTo({ url: '/pages/device/transfer' })
             } else if (e.item.text === '反馈') {
diff --git a/pages/device/DVR/dianWang.vue b/pages/device/DVR/dianWang.vue
deleted file mode 100644
index 8b69a40..0000000
--- a/pages/device/DVR/dianWang.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-    <view class='basic'>
-        <view style="font-size:24rpx;color:#111" class="ml4 mb20">电网电压频率:49.974Hz</view>
-        <view class="grid-card">
-            <view class="grid-card-content-5">
-                <view class="item">相数</view>
-                <view class="item">电流(A)</view>
-                <view class="item">毘流峰值比</view>
-                <view class="item">相电压(V)</view>
-                <view class="item">线电压(V)</view>
-                <view class="item">A</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L2</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L3</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">N</view>
-                <view class="item">3.9</view>
-            </view>
-        </view>
-        <view class="grid-card">
-            <view class="grid-card-content-5">
-                <view class="item">相数</view>
-                <view class="item">视在功要(kVA)</view>
-                <view class="item">有功功类(kW)</view>
-                <view class="item">无功功率(kVar)</view>
-                <view class="item">功率園益</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L2</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L3</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">N</view>
-                <view class="item">3.9</view>
-            </view>
-        </view>
-        <view class="grid-card">
-            <view class="grid-card-content-4">
-                <view class="item">名称</view>
-                <view class="item">电压(V)</view>
-                <view class="item">频率(Hz)</view>
-                <view class="item">THDU(%)</view>
-                <view class="item">L1</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L2</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L3</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-            </view>
-        </view>
-        <view class="grid-card">
-            <view class="grid-card-title">负载电流</view>
-            <view class="grid-card-content-4">
-                <view class="item">名称</view>
-                <view class="item">有效值(A)</view>
-                <view class="item">cosp</view>
-                <view class="item">THDI(%)</view>
-                <view class="item">L1</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L2</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-                <view class="item">L3</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item">4.6</view>
-            </view>
-        </view>
-        <view class="grid-card">
-            <view class="grid-card-title">补偿电流</view>
-            <view class="grid-card-content-4">
-                <view class="item">名称</view>
-                <view class="item">有效值(A)</view>
-                <view class="item">负载率(%)</view>
-                <view class="item"></view>
-                <view class="item">L1</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item"></view>
-                <view class="item">L2</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item"></view>
-                <view class="item">L3</view>
-                <view class="item">226.8</view>
-                <view class="item">50.0</view>
-                <view class="item"></view>
-            </view>
-        </view>
-    </view>
-</template>
-<script>
-export default {
-    data () {
-        return {
-        }
-    },
-    methods: {
-    }
-}
-</script>
-<style lang='scss'>
-.basic {}
-</style>
\ No newline at end of file
diff --git a/pages/device/DVR/nibian.vue b/pages/device/DVR/nibian.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/pages/device/recordDVR.vue b/pages/device/DVR/record.vue
similarity index 100%
rename from pages/device/recordDVR.vue
rename to pages/device/DVR/record.vue
diff --git a/pages/device/reportDVR.vue b/pages/device/DVR/report.vue
similarity index 100%
rename from pages/device/reportDVR.vue
rename to pages/device/DVR/report.vue
diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue
index f4797f3..ec33c16 100644
--- a/pages/index/comp/indexGongCheng.vue
+++ b/pages/index/comp/indexGongCheng.vue
@@ -31,12 +31,12 @@ export default {
     methods: {
         jump (item) {
             if (item % 2) {
-                uni.navigateTo({
-                    url: '/pages/device/detailAPF'
+               uni.navigateTo({
+                    url: '/pages/device/APF/detail'
                 })
             } else {
                 uni.navigateTo({
-                    url: '/pages/device/detailDVR'
+                    url: '/pages/device/DVR/detail'
                 })
             }
         },
diff --git a/pages/index/comp/indexYunWei.vue b/pages/index/comp/indexYunWei.vue
index fb5ca2e..76e3a5c 100644
--- a/pages/index/comp/indexYunWei.vue
+++ b/pages/index/comp/indexYunWei.vue
@@ -31,12 +31,12 @@ export default {
     methods: {
         jump (item) {
             if (item % 2) {
-                uni.navigateTo({
-                    url: '/pages/device/detailAPF'
+               uni.navigateTo({
+                    url: '/pages/device/APF/detail'
                 })
             } else {
                 uni.navigateTo({
-                    url: '/pages/device/detailDVR'
+                    url: '/pages/device/DVR/detail'
                 })
             }
         },
diff --git a/pages/index/comp/indexZhuYongHu.vue b/pages/index/comp/indexZhuYongHu.vue
index a82fff6..6ffeec9 100644
--- a/pages/index/comp/indexZhuYongHu.vue
+++ b/pages/index/comp/indexZhuYongHu.vue
@@ -31,12 +31,12 @@ export default {
     methods: {
         jump (item) {
             if (item % 2) {
-                uni.navigateTo({
-                    url: '/pages/device/detailAPF'
+               uni.navigateTo({
+                    url: '/pages/device/APF/detail'
                 })
             } else {
                 uni.navigateTo({
-                    url: '/pages/device/detailDVR'
+                    url: '/pages/device/DVR/detail'
                 })
             }
         },
diff --git a/pages/index/comp/indexZhuanZhi.vue b/pages/index/comp/indexZhuanZhi.vue
index 1faa500..c8da8af 100644
--- a/pages/index/comp/indexZhuanZhi.vue
+++ b/pages/index/comp/indexZhuanZhi.vue
@@ -42,12 +42,12 @@ export default {
     methods: {
         jump (item) {
             if (item % 2) {
-                uni.navigateTo({
-                    url: '/pages/device/detailAPF'
+               uni.navigateTo({
+                    url: '/pages/device/APF/detail'
                 })
             } else {
                 uni.navigateTo({
-                    url: '/pages/device/detailDVR'
+                    url: '/pages/device/DVR/detail'
                 })
             }
         },
diff --git a/pages/index/comp/indexZiYongHu.vue b/pages/index/comp/indexZiYongHu.vue
index 40fb84f..6d6c6e4 100644
--- a/pages/index/comp/indexZiYongHu.vue
+++ b/pages/index/comp/indexZiYongHu.vue
@@ -31,12 +31,12 @@ export default {
     methods: {
         jump (item) {
             if (item % 2) {
-                uni.navigateTo({
-                    url: '/pages/device/detailAPF'
+               uni.navigateTo({
+                    url: '/pages/device/APF/detail'
                 })
             } else {
                 uni.navigateTo({
-                    url: '/pages/device/detailDVR'
+                    url: '/pages/device/DVR/detail'
                 })
             }
         },