xiufu

src/vab/plugins/permissions.js

@@ -18,6 +18,8 @@ router.beforeEach(async(to, from, next) => {
     let hasToken = store.getters['user/accessToken']
 
     if (!loginInterception) hasToken = true
+    console.log(11111111111111111)
+    console.log(localStorage.getItem('accessToken'))
     if (hasToken) {
         if (to.path === '/login') {
             next({ path: '/' })

src/views/dataManage/sameAnalysis/ehcarts/index.vue

@@ -52,7 +52,7 @@ import * as echarts from 'echarts'
 //   },
 // ]
 
-const yName = 'kV'
+const yName = ''
 
 export default defineComponent({
   name: 'CurveCom',

src/views/deviceManage/powerEquip/deviceDetails.vue

@@ -63,7 +63,7 @@
       :header-cell-style="headClass"
       :height="Height"
     >
-      <el-table-column prop="status" align="center" label="状态" width="50">
+      <!-- <el-table-column prop="status" align="center" label="状态" width="50">
         <template #default="scope">
           <el-avatar
             class="status"
@@ -74,7 +74,7 @@
             "
           ></el-avatar>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="monitorDeviceName"
         label="监控设备名称"

src/views/powerQuality/asseReport/loopReport.vue

@@ -12,7 +12,7 @@
               style="width: 220px"
               clearable
               filterable
-               @change="linkDevice()"
+              @change="linkDevice()"
             >
               <el-option
                 v-for="site in store.state.siteList"
@@ -48,35 +48,43 @@
             ></el-date-picker> -->
 
             <el-date-picker
-            v-model="dateTime"
-            placeholder="请选择"
-            style="width: 150px;margin-left:20px"
-            :clearable="false"
-            :editable="false"
-          ></el-date-picker>
-
+              v-model="dateTime"
+              placeholder="请选择"
+              style="width: 150px; margin-left: 20px"
+              :clearable="false"
+              :editable="false"
+            ></el-date-picker>
           </div>
 
-          <el-button type="primary" class="search-button"  @click="SingleLoopReportData()">搜索</el-button>
+          <el-button
+            type="primary"
+            class="search-button"
+            @click="SingleLoopReportData()"
+          >
+            搜索
+          </el-button>
         </div>
       </div>
-       <div class="right descIcon" @click="descripDialog()">
+      <div class="right descIcon" @click="descripDialog()">
         <img src="@/assets/images/descIcon.png" alt="" />
         指标说明
       </div>
     </div>
     <!-- 筛选end -->
 
-    <el-row :gutter="20" >
+    <el-row :gutter="20">
       <el-col :md="24" :lg="14">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>电压质量</span>
-            <span class="subs">标称电压： {{getData.voltageLevel?getData.voltageLevel:'-'}}V</span>
+            <span class="subs">
+              标称电压：
+              {{ getData.voltageLevel ? getData.voltageLevel : '-' }}V
+            </span>
           </div>
 
           <el-row :gutter="20" style="padding: 20px">
-            <el-col  :md="24" :lg="8">
+            <el-col :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -85,37 +93,81 @@
                 <el-row :gutter="20" style="padding: 0 20px">
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum">{{getData.proportionUa?getData.proportionUa:'-'}}</div>
+                      <div class="assNum">
+                        {{ getData.proportionUa ? getData.proportionUa : '-' }}
+                      </div>
                       <div class="assTxt">超限数/测点数</div>
                     </div>
                   </el-col>
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum greenRate">{{getData.qrUa?getData.qrUa:'-'}}%</div>
+                      <div class="assNum greenRate">
+                        {{ getData.qrUa ? getData.qrUa : '-' }}%
+                      </div>
                       <div class="assTxt">合格率</div>
                     </div>
                   </el-col>
                 </el-row>
-                <el-button class="banlanceBtn" round :type="getData.uaStatus==true?'primary':getData.uaStatus==false?'danger':'warning'">
-                  {{getData.uaStatus==true?'合格':getData.uaStatus==false?'不合格':'暂无结论'}}
+                <el-button
+                  class="banlanceBtn"
+                  round
+                  :type="
+                    getData.uaStatus == true
+                      ? 'primary'
+                      : getData.uaStatus == false
+                      ? 'danger'
+                      : 'warning'
+                  "
+                >
+                  {{
+                    getData.uaStatus == true
+                      ? '合格'
+                      : getData.uaStatus == false
+                      ? '不合格'
+                      : '暂无结论'
+                  }}
                 </el-button>
                 <ul>
                   <li>
-                    <div>最大值：{{getData.maxUa?getData.maxUa:'-'}}</div>  
-                    <span :class="getData.maxUaStatus?'':'overLimit'">{{getData.maxUaStatus==true?'未超限':getData.maxUaStatus==false?'超限':'-'}}</span>
+                    <div>最大值：{{ getData.maxUa ? getData.maxUa : '-' }}</div>
+                    <span :class="getData.maxUaStatus ? '' : 'overLimit'">
+                      {{
+                        getData.maxUaStatus == true
+                          ? '未超限'
+                          : getData.maxUaStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>最小值：{{getData.minUa?getData.minUa:'-'}}</div>
-                    <span  :class="getData.minUaStatus?'':'overLimit'">{{getData.minUaStatus==true?'未超限':getData.minUaStatus==false?'超限':'-'}}</span>
+                    <div>最小值：{{ getData.minUa ? getData.minUa : '-' }}</div>
+                    <span :class="getData.minUaStatus ? '' : 'overLimit'">
+                      {{
+                        getData.minUaStatus == true
+                          ? '未超限'
+                          : getData.minUaStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>平均值：{{getData.avgUa?getData.avgUa:'-'}}</div>
-                    <span :class="getData.avgUaStatus?'':'overLimit'">{{getData.avgUaStatus==true?'未超限':getData.avgUaStatus==false?'超限':'-'}}</span>
+                    <div>平均值：{{ getData.avgUa ? getData.avgUa : '-' }}</div>
+                    <span :class="getData.avgUaStatus ? '' : 'overLimit'">
+                      {{
+                        getData.avgUaStatus == true
+                          ? '未超限'
+                          : getData.avgUaStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                 </ul>
               </div>
             </el-col>
-            <el-col  :md="24" :lg="8">
+            <el-col :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -124,71 +176,159 @@
                 <el-row :gutter="20" style="padding: 0 20px">
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum">{{getData.proportionUb?getData.proportionUb:'-'}}</div>
+                      <div class="assNum">
+                        {{ getData.proportionUb ? getData.proportionUb : '-' }}
+                      </div>
                       <div class="assTxt">超限数/测点数</div>
                     </div>
                   </el-col>
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum greenRate">{{getData.qrUb?getData.qrUb:'-'}}%</div>
+                      <div class="assNum greenRate">
+                        {{ getData.qrUb ? getData.qrUb : '-' }}%
+                      </div>
                       <div class="assTxt">合格率</div>
                     </div>
                   </el-col>
                 </el-row>
-                <el-button class="banlanceBtn" round :type="getData.ubStatus==true?'primary':getData.ubStatus==false?'danger':'warning'">
-                  {{getData.ubStatus==true?'合格':getData.ubStatus==false?'不合格':'暂无结论'}}
+                <el-button
+                  class="banlanceBtn"
+                  round
+                  :type="
+                    getData.ubStatus == true
+                      ? 'primary'
+                      : getData.ubStatus == false
+                      ? 'danger'
+                      : 'warning'
+                  "
+                >
+                  {{
+                    getData.ubStatus == true
+                      ? '合格'
+                      : getData.ubStatus == false
+                      ? '不合格'
+                      : '暂无结论'
+                  }}
                 </el-button>
                 <ul>
                   <li>
-                    <div>最大值：{{getData.maxUb?getData.maxUb:'-'}}</div>  
-                    <span :class="getData.maxUbStatus?'':'overLimit'">{{getData.maxUbStatus==true?'未超限':getData.maxUbStatus==false?'超限':'-'}}</span>
+                    <div>最大值：{{ getData.maxUb ? getData.maxUb : '-' }}</div>
+                    <span :class="getData.maxUbStatus ? '' : 'overLimit'">
+                      {{
+                        getData.maxUbStatus == true
+                          ? '未超限'
+                          : getData.maxUbStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>最小值：{{getData.minUb?getData.minUb:'-'}}</div>
-                    <span  :class="getData.minUbStatus?'':'overLimit'">{{getData.minUbStatus==true?'未超限':getData.minUbStatus==false?'超限':'-'}}</span>
+                    <div>最小值：{{ getData.minUb ? getData.minUb : '-' }}</div>
+                    <span :class="getData.minUbStatus ? '' : 'overLimit'">
+                      {{
+                        getData.minUbStatus == true
+                          ? '未超限'
+                          : getData.minUbStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>平均值：{{getData.avgUb?getData.avgUb:'-'}}</div>
-                    <span :class="getData.avgUbStatus?'':'overLimit'">{{getData.avgUbStatus==true?'未超限':getData.avgUbStatus==false?'超限':'-'}}</span>
+                    <div>平均值：{{ getData.avgUb ? getData.avgUb : '-' }}</div>
+                    <span :class="getData.avgUbStatus ? '' : 'overLimit'">
+                      {{
+                        getData.avgUbStatus == true
+                          ? '未超限'
+                          : getData.avgUbStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                 </ul>
               </div>
             </el-col>
-            <el-col  :md="24" :lg="8">
+            <el-col :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
               >
                 <div class="subTits">C相电压</div>
-                 <el-row :gutter="20" style="padding: 0 20px">
+                <el-row :gutter="20" style="padding: 0 20px">
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum">{{getData.proportionUc?getData.proportionUc:'-'}}</div>
+                      <div class="assNum">
+                        {{ getData.proportionUc ? getData.proportionUc : '-' }}
+                      </div>
                       <div class="assTxt">超限数/测点数</div>
                     </div>
                   </el-col>
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum greenRate">{{getData.qrUc?getData.qrUc:'-'}}%</div>
+                      <div class="assNum greenRate">
+                        {{ getData.qrUc ? getData.qrUc : '-' }}%
+                      </div>
                       <div class="assTxt">合格率</div>
                     </div>
                   </el-col>
                 </el-row>
-                <el-button class="banlanceBtn" round :type="getData.ucStatus==true?'primary':getData.ucStatus==false?'danger':'warning'">
-                  {{getData.ucStatus==true?'合格':getData.ucStatus==false?'不合格':'暂无结论'}}
+                <el-button
+                  class="banlanceBtn"
+                  round
+                  :type="
+                    getData.ucStatus == true
+                      ? 'primary'
+                      : getData.ucStatus == false
+                      ? 'danger'
+                      : 'warning'
+                  "
+                >
+                  {{
+                    getData.ucStatus == true
+                      ? '合格'
+                      : getData.ucStatus == false
+                      ? '不合格'
+                      : '暂无结论'
+                  }}
                 </el-button>
                 <ul>
                   <li>
-                    <div>最大值：{{getData.maxUc?getData.maxUc:'-'}}</div>  
-                    <span :class="getData.maxUcStatus?'':'overLimit'">{{getData.maxUcStatus==true?'未超限':getData.maxUcStatus==false?'超限':'-'}}</span>
+                    <div>最大值：{{ getData.maxUc ? getData.maxUc : '-' }}</div>
+                    <span :class="getData.maxUcStatus ? '' : 'overLimit'">
+                      {{
+                        getData.maxUcStatus == true
+                          ? '未超限'
+                          : getData.maxUcStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>最小值：{{getData.minUc?getData.minUc:'-'}}</div>
-                    <span  :class="getData.minUcStatus?'':'overLimit'">{{getData.minUcStatus==true?'未超限':getData.minUcStatus==false?'超限':'-'}}</span>
+                    <div>最小值：{{ getData.minUc ? getData.minUc : '-' }}</div>
+                    <span :class="getData.minUcStatus ? '' : 'overLimit'">
+                      {{
+                        getData.minUcStatus == true
+                          ? '未超限'
+                          : getData.minUcStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>平均值：{{getData.avgUc?getData.avgUc:'-'}}</div>
-                    <span :class="getData.avgUcStatus?'':'overLimit'">{{getData.avgUcStatus==true?'未超限':getData.avgUcStatus==false?'超限':'-'}}</span>
+                    <div>平均值：{{ getData.avgUc ? getData.avgUc : '-' }}</div>
+                    <span :class="getData.avgUcStatus ? '' : 'overLimit'">
+                      {{
+                        getData.avgUcStatus == true
+                          ? '未超限'
+                          : getData.avgUcStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                 </ul>
               </div>
@@ -196,11 +336,13 @@
           </el-row>
         </div>
       </el-col>
-      <el-col  :md="12" :lg="5">
+      <el-col :md="12" :lg="5">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>频率质量</span>
-            <span class="subs">标称频率：{{getData.mhz?getData.mhz:0}}Hz</span>
+            <span class="subs">
+              标称频率：{{ getData.mhz ? getData.mhz : 0 }}Hz
+            </span>
           </div>
           <el-row :gutter="20" style="padding: 20px">
             <el-col :span="24">
@@ -212,32 +354,76 @@
                 <el-row :gutter="20" style="padding: 0 20px">
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum">{{getData.proportionF?getData.proportionF:'-'}}</div>
+                      <div class="assNum">
+                        {{ getData.proportionF ? getData.proportionF : '-' }}
+                      </div>
                       <div class="assTxt">超限数/测点数</div>
                     </div>
                   </el-col>
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum greenRate">{{getData.qrF?getData.qrF:'-'}}%</div>
+                      <div class="assNum greenRate">
+                        {{ getData.qrF ? getData.qrF : '-' }}%
+                      </div>
                       <div class="assTxt">合格率</div>
                     </div>
                   </el-col>
                 </el-row>
-                <el-button class="banlanceBtn" round :type="getData.fstatus==true?'primary':getData.fstatus==false?'danger':'warning'">
-                  {{getData.fstatus==true?'合格':getData.fstatus==false?'不合格':'暂无结论'}}
+                <el-button
+                  class="banlanceBtn"
+                  round
+                  :type="
+                    getData.fstatus == true
+                      ? 'primary'
+                      : getData.fstatus == false
+                      ? 'danger'
+                      : 'warning'
+                  "
+                >
+                  {{
+                    getData.fstatus == true
+                      ? '合格'
+                      : getData.fstatus == false
+                      ? '不合格'
+                      : '暂无结论'
+                  }}
                 </el-button>
                 <ul>
                   <li>
-                    <div>最大值：{{getData.maxF?getData.maxF:'-'}}</div>  
-                    <span :class="getData.maxFStatus?'':'overLimit'">{{getData.maxFStatus==true?'未超限':getData.maxFStatus==false?'超限':'-'}}</span>
+                    <div>最大值：{{ getData.maxF ? getData.maxF : '-' }}</div>
+                    <span :class="getData.maxFStatus ? '' : 'overLimit'">
+                      {{
+                        getData.maxFStatus == true
+                          ? '未超限'
+                          : getData.maxFStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>最小值：{{getData.minF?getData.minF:'-'}}</div>
-                    <span  :class="getData.minFStatus?'':'overLimit'">{{getData.minFStatus==true?'未超限':getData.minFStatus==false?'超限':'-'}}</span>
+                    <div>最小值：{{ getData.minF ? getData.minF : '-' }}</div>
+                    <span :class="getData.minFStatus ? '' : 'overLimit'">
+                      {{
+                        getData.minFStatus == true
+                          ? '未超限'
+                          : getData.minFStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>平均值：{{getData.avgF?getData.avgF:'-'}}</div>
-                    <span :class="getData.avgFStatus?'':'overLimit'">{{getData.avgFStatus==true?'未超限':getData.avgFStatus==false?'超限':'-'}}</span>
+                    <div>平均值：{{ getData.avgF ? getData.avgF : '-' }}</div>
+                    <span :class="getData.avgFStatus ? '' : 'overLimit'">
+                      {{
+                        getData.avgFStatus == true
+                          ? '未超限'
+                          : getData.avgFStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                 </ul>
               </div>
@@ -245,7 +431,7 @@
           </el-row>
         </div>
       </el-col>
-      <el-col  :md="12" :lg="5">
+      <el-col :md="12" :lg="5">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">功率因数分析</div>
           <el-row :gutter="20" style="padding: 20px">
@@ -258,19 +444,39 @@
                 <el-row :gutter="20" style="padding: 0 20px">
                   <el-col :span="24" style="margin-bottom: 20px">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum"> {{getData.appraise?getData.appraise:'-'}}</div>
+                      <div class="assNum">
+                        {{ getData.appraise ? getData.appraise : '-' }}
+                      </div>
                       <div class="assTxt">考核限值</div>
                     </div>
                   </el-col>
                   <el-col :span="24" style="margin-bottom: 20px">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum greenRate">{{getData.cos?getData.cos:'-'}}</div>
+                      <div class="assNum greenRate">
+                        {{ getData.cos ? getData.cos : '-' }}
+                      </div>
                       <div class="assTxt">数值</div>
                     </div>
                   </el-col>
                 </el-row>
-                <el-button class="banlanceBtn" round :type="getData.fstatus?'primary':'danger'">
-                  {{getData.cosStatus==true?'合格':getData.cosStatus==false?'不合格':'暂无数据'}}
+                <el-button
+                  class="banlanceBtn"
+                  round
+                  :type="
+                    getData.cosStatus == true
+                      ? 'primary'
+                      : getData.cosStatus == false
+                      ? 'danger'
+                      : 'warning'
+                  "
+                >
+                  {{
+                    getData.cosStatus == true
+                      ? '合格'
+                      : getData.cosStatus == false
+                      ? '不合格'
+                      : '暂无数据'
+                  }}
                 </el-button>
               </div>
             </el-col>
@@ -280,7 +486,7 @@
     </el-row>
 
     <el-row :gutter="20" class="mt-20">
-      <el-col   :md="24" :lg="14">
+      <el-col :md="24" :lg="14">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>谐波畸变率</span>
@@ -392,7 +598,7 @@
           </el-row>
         </div>
       </el-col>
-      <el-col  :md="24" :lg="10">
+      <el-col :md="24" :lg="10">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>不平衡度</span>
@@ -408,32 +614,92 @@
                 <el-row :gutter="20" style="padding: 0 20px">
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum">{{getData.proportionElBalun?getData.proportionElBalun:'-'}}</div>
+                      <div class="assNum">
+                        {{
+                          getData.proportionElBalun
+                            ? getData.proportionElBalun
+                            : '-'
+                        }}
+                      </div>
                       <div class="assTxt">超限数/测点数</div>
                     </div>
                   </el-col>
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum greenRate">{{getData.qrElBalun?getData.qrElBalun:'-'}}%</div>
+                      <div class="assNum greenRate">
+                        {{ getData.qrElBalun ? getData.qrElBalun : '-' }}%
+                      </div>
                       <div class="assTxt">合格率</div>
                     </div>
                   </el-col>
                 </el-row>
-                <el-button class="banlanceBtn" round :type="getData.elBalunStatus==true?'primary':getData.elBalunStatus==false?'danger':'warning'">
-                  {{getData.elBalunStatus==true?'合格':getData.elBalunStatus==false?'不合格':'暂无结论'}}
+                <el-button
+                  class="banlanceBtn"
+                  round
+                  :type="
+                    getData.elBalunStatus == true
+                      ? 'primary'
+                      : getData.elBalunStatus == false
+                      ? 'danger'
+                      : 'warning'
+                  "
+                >
+                  {{
+                    getData.elBalunStatus == true
+                      ? '合格'
+                      : getData.elBalunStatus == false
+                      ? '不合格'
+                      : '暂无结论'
+                  }}
                 </el-button>
                 <ul>
                   <li>
-                    <div>最大值：{{getData.maxElBalun?getData.maxElBalun:'-'}}</div>  
-                    <span :class="getData.maxElBalunStatus?'':'overLimit'">{{getData.maxElBalunStatus==true?'未超限':getData.maxElBalunStatus==false?'超限':'-'}}</span>
+                    <div>
+                      最大值：{{
+                        getData.maxElBalun ? getData.maxElBalun : '-'
+                      }}
+                    </div>
+                    <span :class="getData.maxElBalunStatus ? '' : 'overLimit'">
+                      {{
+                        getData.maxElBalunStatus == true
+                          ? '未超限'
+                          : getData.maxElBalunStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>最小值：{{getData.minElBalun?getData.minElBalun:'-'}}</div>
-                    <span  :class="getData.minElBalunStatus?'':'overLimit'">{{getData.minElBalunStatus==true?'未超限':getData.minElBalunStatus==false?'超限':'-'}}</span>
+                    <div>
+                      最小值：{{
+                        getData.minElBalun ? getData.minElBalun : '-'
+                      }}
+                    </div>
+                    <span :class="getData.minElBalunStatus ? '' : 'overLimit'">
+                      {{
+                        getData.minElBalunStatus == true
+                          ? '未超限'
+                          : getData.minElBalunStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>平均值：{{getData.avgElBalun?getData.avgElBalun:'-'}}</div>
-                    <span :class="getData.avgElBalunStatus?'':'overLimit'">{{getData.avgElBalunStatus==true?'未超限':getData.avgElBalunStatus==false?'超限':'-'}}</span>
+                    <div>
+                      平均值：{{
+                        getData.avgElBalun ? getData.avgElBalun : '-'
+                      }}
+                    </div>
+                    <span :class="getData.avgElBalunStatus ? '' : 'overLimit'">
+                      {{
+                        getData.avgElBalunStatus == true
+                          ? '未超限'
+                          : getData.avgElBalunStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                 </ul>
               </div>
@@ -448,33 +714,93 @@
                 <el-row :gutter="20" style="padding: 0 20px">
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum">{{getData.proportionVtBalun?getData.proportionVtBalun:'-'}}</div>
+                      <div class="assNum">
+                        {{
+                          getData.proportionVtBalun
+                            ? getData.proportionVtBalun
+                            : '-'
+                        }}
+                      </div>
                       <div class="assTxt">超限数/测点数</div>
                     </div>
                   </el-col>
                   <el-col :span="12">
                     <div class="grid-content bg-purple assSmallbox">
-                      <div class="assNum greenRate">{{getData.qrVtBalun?getData.qrVtBalun:'-'}}%</div>
+                      <div class="assNum greenRate">
+                        {{ getData.qrVtBalun ? getData.qrVtBalun : '-' }}%
+                      </div>
                       <div class="assTxt">合格率</div>
                     </div>
                   </el-col>
                 </el-row>
-                <el-button class="banlanceBtn" round :type="getData.vtBalunStatus==true?'primary':getData.vtBalunStatus==false?'danger':'warning'">
-                  {{getData.vtBalunStatus==true?'合格':getData.vtBalunStatus==false?'不合格':'暂无结论'}}
+                <el-button
+                  class="banlanceBtn"
+                  round
+                  :type="
+                    getData.vtBalunStatus == true
+                      ? 'primary'
+                      : getData.vtBalunStatus == false
+                      ? 'danger'
+                      : 'warning'
+                  "
+                >
+                  {{
+                    getData.vtBalunStatus == true
+                      ? '合格'
+                      : getData.vtBalunStatus == false
+                      ? '不合格'
+                      : '暂无结论'
+                  }}
                 </el-button>
-                
+
                 <ul>
                   <li>
-                    <div>最大值：{{getData.maxVtBalun?getData.maxVtBalun:'-'}}</div>  
-                    <span :class="getData.maxVtBalunStatus?'':'overLimit'">{{getData.maxVtBalunStatus==true?'未超限':getData.maxVtBalunStatus==false?'超限':'-'}}</span>
+                    <div>
+                      最大值：{{
+                        getData.maxVtBalun ? getData.maxVtBalun : '-'
+                      }}
+                    </div>
+                    <span :class="getData.maxVtBalunStatus ? '' : 'overLimit'">
+                      {{
+                        getData.maxVtBalunStatus == true
+                          ? '未超限'
+                          : getData.maxVtBalunStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>最小值：{{getData.minVtBalun?getData.minVtBalun:'-'}}</div>
-                    <span  :class="getData.minVtBalunStatus?'':'overLimit'">{{getData.minVtBalunStatus==true?'未超限':getData.minVtBalunStatus==false?'超限':'-'}}</span>
+                    <div>
+                      最小值：{{
+                        getData.minVtBalun ? getData.minVtBalun : '-'
+                      }}
+                    </div>
+                    <span :class="getData.minVtBalunStatus ? '' : 'overLimit'">
+                      {{
+                        getData.minVtBalunStatus == true
+                          ? '未超限'
+                          : getData.minVtBalunStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                   <li>
-                    <div>平均值：{{getData.avgVtBalun?getData.avgVtBalun:'-'}}</div>
-                    <span :class="getData.avgVtBalunStatus?'':'overLimit'">{{getData.avgVtBalunStatus==true?'未超限':getData.avgVtBalunStatus==false?'超限':'-'}}</span>
+                    <div>
+                      平均值：{{
+                        getData.avgVtBalun ? getData.avgVtBalun : '-'
+                      }}
+                    </div>
+                    <span :class="getData.avgVtBalunStatus ? '' : 'overLimit'">
+                      {{
+                        getData.avgVtBalunStatus == true
+                          ? '未超限'
+                          : getData.avgVtBalunStatus == false
+                          ? '超限'
+                          : '-'
+                      }}
+                    </span>
                   </li>
                 </ul>
               </div>
@@ -484,9 +810,8 @@
       </el-col>
     </el-row>
 
-     <!--指标说明弹框组件开始-----------------------start-->
+    <!--指标说明弹框组件开始-----------------------start-->
     <descrip-dialog
-
       @closeDialog="closeDialog"
       :flag="showDialog2"
       class="descripDialog"
@@ -497,13 +822,13 @@
 
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, onMounted,ref ,watch} from 'vue'
+import { defineComponent, onMounted, ref, watch } from 'vue'
 import * as api from '@/api/powerQuality/loopReport.js'
 import descripDialog from './scoreReportComponent/descripDialog'
 import { ElMessage } from 'element-plus'
 export default defineComponent({
   name: 'LoopReport',
-   components: {
+  components: {
     descripDialog,
   },
   props: {
@@ -511,15 +836,15 @@ export default defineComponent({
   },
   setup(props) {
     const store = useStore()
-     const getData = ref({})
-     const showDialog2 = ref(false)
-    
+    const getData = ref({})
+    const showDialog2 = ref(false)
+
     const deviceList = ref([])
     const deviceCode = ref('')
-    const dateTime=ref(new Date())
-     const dialogTitle = ref('')
+    const dateTime = ref(new Date())
+    const dialogTitle = ref('')
 
-    function linkDevice(){
+    function linkDevice() {
       deviceSelect()
     }
 
@@ -537,25 +862,31 @@ export default defineComponent({
 
     //单回路主页面请求
     function SingleLoopReportData() {
-       store.commit('getNowFormatDate', dateTime.value)
+      store.commit('getNowFormatDate', dateTime.value)
       //  time:store.state.dateList,
       // time:'2021-11-01'
-      api.SingleLoopReportData({ deviceCode: deviceCode.value,time:store.state.dateList,type:1 }).then((requset) => {
-        if (requset.status === 'SUCCESS') {
-           console.log('requset.data.uaStatus')
-          console.log(requset.data.uaStatus)
-          getData.value=requset.data
-        } else {
-          ElMessage.error(requset.msg)
-        }
-      })
+      api
+        .SingleLoopReportData({
+          deviceCode: deviceCode.value,
+          time: store.state.dateList,
+          type: 1,
+        })
+        .then((requset) => {
+          if (requset.status === 'SUCCESS') {
+            console.log('requset.data.uaStatus')
+            console.log(requset.data.uaStatus)
+            getData.value = requset.data
+          } else {
+            ElMessage.error(requset.msg)
+          }
+        })
     }
     // 查看指标说明
     const descripDialog = () => {
       dialogTitle.value = '指标说明'
       showDialog2.value = true
     }
-     // 关闭操作
+    // 关闭操作
     const closeDialog = () => {
       showDialog2.value = false
     }
@@ -563,14 +894,16 @@ export default defineComponent({
     watch(
       () => props.activeName,
       (newVal) => {
-        if (newVal =='second') {
-         setTimeout(function(){
-        SingleLoopReportData()
-      },1000)
+        if (newVal == 'second') {
+          // getData.value={}
+          deviceSelect()
+          setTimeout(function () {
+            SingleLoopReportData()
+          }, 1000)
         }
       }
     )
-   
+
     onMounted(() => {
       deviceSelect()
     })
@@ -587,19 +920,15 @@ export default defineComponent({
       closeDialog,
       showDialog2,
       descripDialog,
-      dialogTitle
-     
+      dialogTitle,
     }
   },
 })
-
-
-
 </script>
  
 <style scoped lang="scss">
-.el-button{
-  cursor:default!important
+.el-button {
+  cursor: default !important;
 }
 .el-row {
   margin-bottom: 20px;

src/views/powerQuality/harmonicReport/curveCom.vue

@@ -108,7 +108,7 @@ export default defineComponent({
         series: [
           {
             name: props.curveComList.icontitle,
-            type: 'bar',
+            type: 'line',
             data: props.curveComList.data,
             barWidth: 10, //柱子宽度
             barGap: '1', //柱子之间间距