From d9bcec8ea058b30d1412f342cc0eb9d05de0b232 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 9 Sep 2024 11:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=86=80=E5=8C=97=20?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=A0=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tree/pqs/Terminal.vue          | 103 +++++++++++----
 .../components/waveform.vue                   |   2 +-
 .../newEnergyAnalysis/components/detail.vue   |  28 ++--
 .../LN/newEnergy/newEnergyAnalysis/index.vue  | 120 +++++++++---------
 .../evaluationList/components/charge.vue      |   5 +-
 src/views/pqs/database/case/index.vue         |   2 -
 6 files changed, 152 insertions(+), 108 deletions(-)

diff --git a/src/components/tree/pqs/Terminal.vue b/src/components/tree/pqs/Terminal.vue
index 768615ba..4b88a797 100644
--- a/src/components/tree/pqs/Terminal.vue
+++ b/src/components/tree/pqs/Terminal.vue
@@ -8,6 +8,7 @@ import Tree from './index.vue'
 
 import { getTerminalTree } from '@/api/device-boot/Business.ts'
 import { useConfig } from '@/stores/config'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 defineOptions({
     name: 'govern/deviceTree'
 })
@@ -20,32 +21,44 @@ const info = (id: any) => {
     expanded.value = [id]
     getTerminalTree().then(res => {
         // let arr: any[] = []
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-Menu'
-            item.level = 0
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-HomeFilled'
-                item2.level = 100
-                expanded.value.push(item2.id)
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-CollectionTag'
-                    item3.level = 200
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-Flag'
-                        item4.level = 300
-                        // arr.push(item4)
-                        item4.children.forEach((item5: any) => {
-                            item5.icon = 'el-icon-OfficeBuilding'
-                            item5.level = 400
-                            item5.children.forEach((item6: any) => {
-                                item6.icon = 'el-icon-Film'
-                                item6.level = 500
-                                item6.children.forEach((item7: any) => {
-                                    item7.icon = 'el-icon-Share'
-                                    item7.level = 600
-                                    item7.children.forEach((item8: any) => {
-                                        item8.icon = 'el-icon-Location'
-                                        item8.level = 700
+        if (VITE_FLAG) {
+            res.data.forEach((item: any) => {
+                item.icon = 'el-icon-Menu'
+                item.level = 0
+                item.children.forEach((item2: any) => {
+                    item2.icon = 'el-icon-HomeFilled'
+                    item2.level = 100
+                    expanded.value.push(item2.id)
+                    item2.children.forEach((item3: any) => {
+                        item3.icon = 'el-icon-CollectionTag'
+                        item3.level = 200
+                        item3.children.forEach((item4: any) => {
+                            item4.icon = 'el-icon-Flag'
+                            item4.level = 300
+                            // arr.push(item4)
+                            item4.children.forEach((item5: any) => {
+                                item5.icon = 'el-icon-OfficeBuilding'
+                                item5.level = 300
+                                item5.id = item4.id
+                                item5.children.forEach((item6: any) => {
+                                    item6.icon = 'el-icon-HelpFilled'
+                                    item6.level = 300
+                                    item6.id = item4.id
+                                    item6.children.forEach((item7: any) => {
+                                        item7.icon = 'el-icon-Film'
+                                        item7.level = 400
+                                        item7.children.forEach((item8: any) => {
+                                            item8.icon = 'el-icon-Collection'
+                                            item8.level = 500
+                                            item8.children.forEach((item9: any) => {
+                                                item9.icon = 'el-icon-Share'
+                                                item9.level = 600
+                                                item9.children.forEach((item10: any) => {
+                                                    item10.icon = 'el-icon-Location'
+                                                    item10.level = 700
+                                                })
+                                            })
+                                        })
                                     })
                                 })
                             })
@@ -53,7 +66,43 @@ const info = (id: any) => {
                     })
                 })
             })
-        })
+        } else {
+            res.data.forEach((item: any) => {
+                item.icon = 'el-icon-Menu'
+                item.level = 0
+                item.children.forEach((item2: any) => {
+                    item2.icon = 'el-icon-HomeFilled'
+                    item2.level = 100
+                    expanded.value.push(item2.id)
+                    item2.children.forEach((item3: any) => {
+                        item3.icon = 'el-icon-CollectionTag'
+                        item3.level = 200
+                        item3.children.forEach((item4: any) => {
+                            item4.icon = 'el-icon-Flag'
+                            item4.level = 300
+                            // arr.push(item4)
+                            item4.children.forEach((item5: any) => {
+                                item5.icon = 'el-icon-OfficeBuilding'
+                                item5.level = 400
+                                item5.children.forEach((item6: any) => {
+                                    item6.icon = 'el-icon-Film'
+                                    item6.level = 500
+                                    item6.children.forEach((item7: any) => {
+                                        item7.icon = 'el-icon-Share'
+                                        item7.level = 600
+                                        item7.children.forEach((item8: any) => {
+                                            item8.icon = 'el-icon-Location'
+                                            item8.level = 700
+                                        })
+                                    })
+                                })
+                            })
+                        })
+                    })
+                })
+            })
+        }
+
         tree.value = res.data
 
         nextTick(() => {
diff --git a/src/views/LN/newEnergy/highAndLowPressure/components/waveform.vue b/src/views/LN/newEnergy/highAndLowPressure/components/waveform.vue
index 2dc44d7a..deb2ecaa 100644
--- a/src/views/LN/newEnergy/highAndLowPressure/components/waveform.vue
+++ b/src/views/LN/newEnergy/highAndLowPressure/components/waveform.vue
@@ -7,7 +7,7 @@
             <vxe-column field="num3" title="最大值" />
             <vxe-column field="num3" title="平均值" />
             <vxe-column field="num3" title="cp95值" />
-            <vxe-column field="num3" title="国际限值" />
+            <vxe-column field="num3" title="国标限值" />
         </vxe-table>
     </el-dialog>
 </template>
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue
index c574597d..0a2e7871 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-model="dialogVisible" :title="title" width="50%" draggable>
+    <el-dialog v-model="dialogVisible" :title="title" width="1200" draggable>
         <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="500px" :data="tableData">
             <vxe-colgroup field="anotherName" title="指标" width="180" />
             <!-- <vxe-colgroup field="unit" title="单位" /> -->
@@ -7,21 +7,21 @@
                 <vxe-column field="minphaseA" title="A">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.minphaseA ? 'red' : '' }">
-                            {{ row.minphaseA }}
+                            {{ row.minphaseA || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="minphaseB" title="B">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.minphaseB ? 'red' : '' }">
-                            {{ row.minphaseB }}
+                            {{ row.minphaseB || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="minphaseC" title="C">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.minphaseC ? 'red' : '' }">
-                            {{ row.minphaseC }}
+                            {{ row.minphaseC || '/' }}
                         </span>
                     </template>
                 </vxe-column>
@@ -30,21 +30,21 @@
                 <vxe-column field="maxphaseA" title="A">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.maxphaseA ? 'red' : '' }">
-                            {{ row.maxphaseA }}
+                            {{ row.maxphaseA || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="maxphaseB" title="B">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.maxphaseB ? 'red' : '' }">
-                            {{ row.maxphaseB }}
+                            {{ row.maxphaseB || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="maxphaseC" title="C">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.maxphaseC ? 'red' : '' }">
-                            {{ row.maxphaseC }}
+                            {{ row.maxphaseC || '/' }}
                         </span>
                     </template>
                 </vxe-column>
@@ -53,21 +53,21 @@
                 <vxe-column field="avgphaseA" title="A">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.avgphaseA ? 'red' : '' }">
-                            {{ row.avgphaseA }}
+                            {{ row.avgphaseA || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="avgphaseB" title="B">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.avgphaseB ? 'red' : '' }">
-                            {{ row.avgphaseB }}
+                            {{ row.avgphaseB || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="avgphaseC" title="C">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.avgphaseC ? 'red' : '' }">
-                            {{ row.avgphaseC }}
+                            {{ row.avgphaseC || '/' }}
                         </span>
                     </template>
                 </vxe-column>
@@ -76,27 +76,27 @@
                 <vxe-column field="cp95PhaseA" title="A">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.cp95PhaseA ? 'red' : '' }">
-                            {{ row.cp95PhaseA }}
+                            {{ row.cp95PhaseA || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="cp95PhaseB" title="B">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.cp95PhaseB ? 'red' : '' }">
-                            {{ row.cp95PhaseB }}
+                            {{ row.cp95PhaseB || '/' }}
                         </span>
                     </template>
                 </vxe-column>
                 <vxe-column field="cp95PhaseC" title="C">
                     <template #default="{ row }">
                         <span :style="{ color: row.limit < row.cp95PhaseC ? 'red' : '' }">
-                            {{ row.cp95PhaseC }}
+                            {{ row.cp95PhaseC || '/' }}
                         </span>
                     </template>
                 </vxe-column>
             </vxe-colgroup>
 
-            <vxe-column field="limit" title="国际限值" />
+            <vxe-column field="limit" title="国标限值" />
         </vxe-table>
     </el-dialog>
 </template>
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
index 59402b86..1cd159b6 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
@@ -16,63 +16,61 @@
                 </TableHeader>
 
                 <div class="container pd10">
-                    <div>
-                        <el-card class="cardBox">
-                            <div class="mb5" style="display: flex; justify-content: space-between">
-                                <h3>功率区间</h3>
+                    <el-card class="cardBox">
+                        <div class="mb5" style="display: flex; justify-content: space-between">
+                            <h3>功率区间</h3>
+                            <div>
+                                <span>稳态越限图例:　</span>
+                                <span style="color: red">越限　</span>
+                                <span style="color: green">合格</span>
+                            </div>
+                        </div>
+                        <el-card class="card-top">
+                            <div
+                                v-for="(item, index) in powerList1"
+                                class="pd10"
+                                style="cursor: pointer"
+                                :class="flag == item.label ? 'hoverBox' : ''"
+                                @click="analyseList(item.label, index)"
+                            >
+                                <div style="font-size: 24px; font-weight: 700">
+                                    <span :style="{ color: item.crossTheLine > 0 ? 'red' : 'green' }">
+                                        {{ item.quantity }}
+                                    </span>
+                                    <span style="font-size: 14px; font-weight: 500">个</span>
+                                </div>
                                 <div>
-                                    <span>稳态越限图例:　</span>
-                                    <span style="color: red">越限　</span>
-                                    <span style="color: green">合格</span>
+                                    {{ item.label }}
                                 </div>
                             </div>
-                            <el-card class="card-top">
-                                <div
-                                    v-for="(item, index) in powerList1"
-                                    class="pd10"
-                                    style="cursor: pointer"
-                                    :class="flag == item.label ? 'hoverBox' : ''"
-                                    @click="analyseList(item.label, index)"
-                                >
-                                    <div style="font-size: 24px; font-weight: 700">
-                                        <span :style="{ color: item.crossTheLine > 0 ? 'red' : 'green' }">
-                                            {{ item.quantity }}
-                                        </span>
-                                        <span style="font-size: 14px; font-weight: 500">个</span>
-                                    </div>
-                                    <div>
-                                        {{ item.label }}
-                                    </div>
-                                </div>
-                            </el-card>
-
-                            <el-card class="card-top mt15">
-                                <div
-                                    v-for="(item, index) in powerList2"
-                                    class="pd10"
-                                    style="cursor: pointer"
-                                    :class="flag == item.label ? 'hoverBox' : ''"
-                                    @click="analyseList(item.label, index + 5)"
-                                >
-                                    <div style="font-size: 24px; font-weight: 700">
-                                        <span :style="{ color: item.crossTheLine > 0 ? 'red' : 'green' }">
-                                            {{ item.quantity }}
-                                        </span>
-                                        <span style="font-size: 14px; font-weight: 500">个</span>
-                                    </div>
-                                    <div>
-                                        {{ item.label }}
-                                    </div>
-                                </div>
-                            </el-card>
                         </el-card>
-                    </div>
+
+                        <el-card class="card-top mt15">
+                            <div
+                                v-for="(item, index) in powerList2"
+                                class="pd10"
+                                style="cursor: pointer"
+                                :class="flag == item.label ? 'hoverBox' : ''"
+                                @click="analyseList(item.label, index + 5)"
+                            >
+                                <div style="font-size: 24px; font-weight: 700">
+                                    <span :style="{ color: item.crossTheLine > 0 ? 'red' : 'green' }">
+                                        {{ item.quantity }}
+                                    </span>
+                                    <span style="font-size: 14px; font-weight: 500">个</span>
+                                </div>
+                                <div>
+                                    {{ item.label }}
+                                </div>
+                            </div>
+                        </el-card>
+                    </el-card>
                     <el-card class="echart">
                         <h3>有功率区间占比</h3>
                         <my-echart :options="options" style="height: 208px" />
                     </el-card>
                 </div>
-                <div class="container mt10 ml10">
+                <div class="container" style="padding: 0px 10px 10px">
                     <el-card class="box">
                         <h3>功率区间稳态越限详情</h3>
                         <div :style="`height:calc(${heightB.height} - 25px)`" style="overflow-y: auto">
@@ -100,7 +98,7 @@
                                         <el-link
                                             :type="row.voltageOffset == '1' ? 'danger' : 'success'"
                                             class="percentage"
-                                            @click="detailClick(row, '电压偏差', 'voltageOffsetList')"
+                                            @click="detailClick(row, '电压偏差(%)', 'voltageOffsetList')"
                                         >
                                             {{ row.voltageOffset == '1' ? '越限' : '合格' }}
                                         </el-link>
@@ -111,18 +109,18 @@
                                         <el-link
                                             :type="row.vtimes == '1' ? 'danger' : 'success'"
                                             class="percentage"
-                                            @click="detailClick(row, '谐波电压', 'vtimesList')"
+                                            @click="detailClick(row, '谐波电压(%)', 'vtimesList')"
                                         >
                                             {{ row.vtimes == '1' ? '越限' : '合格' }}
                                         </el-link>
                                     </template>
                                 </vxe-column>
-                                <vxe-column field="itimes" title="谐波电流(%)">
+                                <vxe-column field="itimes" title="谐波电流(A)">
                                     <template #default="{ row }">
                                         <el-link
                                             :type="row.itimes == '1' ? 'danger' : 'success'"
                                             class="percentage"
-                                            @click="detailClick(row, '谐波电流', 'itimesList')"
+                                            @click="detailClick(row, '谐波电流(A)', 'itimesList')"
                                         >
                                             {{ row.itimes == '1' ? '越限' : '合格' }}
                                         </el-link>
@@ -133,7 +131,7 @@
                                         <el-link
                                             :type="row.ubalance == '1' ? 'danger' : 'success'"
                                             class="percentage"
-                                            @click="detailClick(row, '三相电压不平衡度', 'ubalanceList')"
+                                            @click="detailClick(row, '三相电压不平衡度(%)', 'ubalanceList')"
                                         >
                                             {{ row.ubalance == '1' ? '越限' : '合格' }}
                                         </el-link>
@@ -144,13 +142,13 @@
                                         <el-link
                                             :type="row.voltageFluctuation == '1' ? 'danger' : 'success'"
                                             class="percentage"
-                                            @click="detailClick(row, '电压波动', 'voltageFluctuationList')"
+                                            @click="detailClick(row, '电压波动(%)', 'voltageFluctuationList')"
                                         >
                                             {{ row.voltageFluctuation == '1' ? '越限' : '合格' }}
                                         </el-link>
                                     </template>
                                 </vxe-column>
-                                <vxe-column field="flicker" title="闪变(%)">
+                                <vxe-column field="flicker" title="闪变">
                                     <template #default="{ row }">
                                         <el-link
                                             :type="row.flicker == '1' ? 'danger' : 'success'"
@@ -166,18 +164,18 @@
                                         <el-link
                                             :type="row.interHarmonic == '1' ? 'danger' : 'success'"
                                             class="percentage"
-                                            @click="detailClick(row, '间谐波电压含有率', 'interHarmonicList')"
+                                            @click="detailClick(row, '间谐波电压含有率(%)', 'interHarmonicList')"
                                         >
                                             {{ row.interHarmonic == '1' ? '越限' : '合格' }}
                                         </el-link>
                                     </template>
                                 </vxe-column>
-                                <vxe-column field="sequenceCurrentUnbalance" title="电流不平衡度">
+                                <vxe-column field="sequenceCurrentUnbalance" title="电流不平衡度(%)">
                                     <template #default="{ row }">
                                         <el-link
                                             :type="row.sequenceCurrentUnbalance == '1' ? 'danger' : 'success'"
                                             class="percentage"
-                                            @click="detailClick(row, '电流不平衡度', 'sequenceCurrentUnbalanceList')"
+                                            @click="detailClick(row, '电流不平衡度(%)', 'sequenceCurrentUnbalanceList')"
                                         >
                                             {{ row.sequenceCurrentUnbalance == '1' ? '越限' : '合格' }}
                                         </el-link>
@@ -193,7 +191,7 @@
                         </div>
                     </el-card>
 
-                    <el-card class="box mr10">
+                    <el-card class="box">
                         <div :style="heightB" style="overflow-y: auto">
                             <div style="display: flex; justify-content: space-between">
                                 <span style="font-size: 16px; font-weight: 700">报告参数</span>
@@ -262,7 +260,7 @@ const timePopUpBox = ref<anyObj | null>(null)
 const flag = ref('0%~10%')
 
 const height = mainHeight(20)
-const heightB = mainHeight(395)
+const heightB = mainHeight(385)
 const size = ref(0)
 const TableHeaderRef = ref()
 const detailRef = ref()
@@ -768,7 +766,7 @@ const handleNodeClick = (data: any, node: any) => {
 .container {
     display: grid;
     grid-template-columns: 5fr 2.5fr;
-    gap: 20px;
+    gap: 10px;
     .card-top {
         background-color: var(--el-color-primary-light-9);
         // color: #fff;
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
index e6cb73d7..a8279940 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
@@ -132,7 +132,6 @@
         <div class="bottomBox">
             <div v-if="showFlag">
                 <div style="height: 70px">
-                   
                     一级评估：{{ outcome.firstResult }}%
                     {{ outcome.firstResult > 0.1 ? '>' : (outcome.firstResult = 0.1 ? '=' : '<') }} 0.1%
                     <!-- <span>{{ 0.02 < outcome.firstResult && outcome.firstResult < 0.1 ? '满足' : '不满足' }}</span> -->
@@ -211,7 +210,7 @@ const factor = [
         name: 0.95,
         id: 0.95
     },
-    
+
     {
         name: 0.96,
         id: 0.96
@@ -243,7 +242,7 @@ const level2Data = ref([
         name: '谐波电流幅值(A)'
     },
     {
-        name: '国际限值(A)'
+        name: '国标限值(A)'
     },
     {
         name: '是否允许值'
diff --git a/src/views/pqs/database/case/index.vue b/src/views/pqs/database/case/index.vue
index c29ff43e..65b5945f 100644
--- a/src/views/pqs/database/case/index.vue
+++ b/src/views/pqs/database/case/index.vue
@@ -13,10 +13,8 @@
 </template>
 <script setup lang="ts">
 import { onMounted, ref, provide } from 'vue'
-
 import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
-
 import Table from '@/components/table/index.vue'
 import PopupEdit from './components/form.vue'
 defineOptions({