Merge branch 'master' of http://47.111.81.118:3000/xf15575941817/admin-fiveFollowing

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 dist
+.history
 package-lock.json
 *.zip
 

src/assets/css/index.scss

@@ -151,6 +151,7 @@ ul li {
     .filter-item {
         margin-right: 30px;
         display: inline-block;
+        margin-bottom: 10px
     }
 }
 
@@ -599,7 +600,7 @@ ul li {
     li {
         display: flex;
         >div {
-            margin: 7px 20px;
+            margin: 2px 4px;
             line-height: 14px;
         }
         >div:first-child {
@@ -608,6 +609,23 @@ ul li {
     }
 }
 
+@media(min-width:1500px) {
+    .loopUnbanlanceCard {
+        li {
+            >div {
+                margin: 7px 20px;
+                line-height: 14px;
+            }
+        }
+    }
+}
+
+@media(max-width:1200px) {
+    .bg-purple {
+        margin-bottom: 20px
+    }
+}
+
 .voltagePanel {
     .el-table--small th,
     .el-table--small td {
@@ -945,6 +963,9 @@ ul li {
                 height: 110px;
                 .imgBlock {
                     text-align: right;
+                    img {
+                        // max-width: 90%
+                    }
                 }
                 .staticBlock {
                     // text-align: center

src/views/alarmManage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container alarmingManage" v-if="this.pageShow">
     <!-- 筛选start -->
-    <div class="filter-container mb-20">
+    <div class="filter-container mb-10">
       <div class="left">
         <div>
           <div class="filter-item">
@@ -147,6 +147,34 @@ export default {
       input: '',
       region: '',
       tableData: [
+        {
+          other: '10',
+          siteName: '测试站点1',
+          totalNum: '626',
+          oneAlarming: '10',
+          twoAlarming: '10',
+        },
+        {
+          other: '10',
+          siteName: '测试站点1',
+          totalNum: '626',
+          oneAlarming: '10',
+          twoAlarming: '10',
+        },
+        {
+          other: '10',
+          siteName: '测试站点1',
+          totalNum: '626',
+          oneAlarming: '10',
+          twoAlarming: '10',
+        },
+        {
+          other: '10',
+          siteName: '测试站点1',
+          totalNum: '626',
+          oneAlarming: '10',
+          twoAlarming: '10',
+        },
         {
           other: '10',
           siteName: '测试站点1',

src/views/operManage/defectManage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 筛选start -->
-    <div class="filter-container mb-20">
+    <div class="filter-container mb-10">
       <div class="left">
         <div>
           <a class="" style="margin-right: 30px">缺陷管理</a>

src/views/operManage/operStatistics/components/opeWorkChart.vue

@@ -118,10 +118,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/operManage/operStatistics/components/pieChart.vue

@@ -4,12 +4,7 @@
   </div>
 </template>
 <script>
-import {
-  computed,
-  defineComponent,
-  onMounted,
-  ref,
-} from 'vue'
+import { computed, defineComponent, onMounted, ref } from 'vue'
 import { useStore } from 'vuex'
 import * as echarts from 'echarts'
 
@@ -46,7 +41,6 @@ var echartData = [
   },
 ]
 
-
 export default defineComponent({
   name: 'PieChart',
   setup() {
@@ -119,10 +113,14 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      // window.onresize = function () {
+      //   // 自适应大小
+      //   myChart.resize()
+      // }
+
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/operManage/operStatistics/components/siteWorkChart.vue

@@ -32,11 +32,11 @@ export default defineComponent({
       let myChart = echarts.init(siteWorkChart.value)
 
       // 指定图表的配置项和数据
-      var data1 = [2]
-      var data2 = [6]
-      var data3 = [3]
-      var data4 = [5]
-      var datacity = ['万众实业变电站']
+      var data1 = [2,3]
+      var data2 = [6,1]
+      var data3 = [3,4]
+      var data4 = [5,2]
+      var datacity = ['万众实业变电站','其他']
 
       // 绘制图表
       myChart.setOption({
@@ -100,13 +100,13 @@ export default defineComponent({
         {
             name: '巡检',
             type: 'bar',
-            label: {
-              show: true,
-              position: 'inside',
-              textStyle: {
-                color: '#555',
-              },
-            },
+            // label: {
+            //   show: true,
+            //   position: 'inside',
+            //   textStyle: {
+            //     color: '#555',
+            //   },
+            // },
             stack: 'sum1',
             barWidth: '30px',
             barGap: '-100%',
@@ -118,25 +118,25 @@ export default defineComponent({
             barWidth: '30px',
             barGap: '-100%',
             stack: 'sum1',
-            label: {
-              show: true,
-              position: 'inside',
-              textStyle: {
-                color: '#555',
-              },
-            },
+            // label: {
+            //   show: true,
+            //   position: 'inside',
+            //   textStyle: {
+            //     color: '#555',
+            //   },
+            // },
             data: data2,
           },
           {
             name: '抢修',
             type: 'bar',
-            label: {
-              show: true,
-              position: 'inside',
-              textStyle: {
-                color: '#555',
-              },
-            },
+            // label: {
+            //   show: true,
+            //   position: 'inside',
+            //   textStyle: {
+            //     color: '#555',
+            //   },
+            // },
             stack: 'sum1',
             barWidth: '30px',
             barGap: '-100%',
@@ -145,13 +145,13 @@ export default defineComponent({
           {
             name: '运维服务',
             type: 'bar',
-            label: {
-              show: true,
-              position: 'inside',
-              textStyle: {
-                color: '#555',
-              },
-            },
+            // label: {
+            //   show: true,
+            //   position: 'inside',
+            //   textStyle: {
+            //     color: '#555',
+            //   },
+            // },
             stack: 'sum1',
             barWidth: '30px',
             barGap: '-100%',
@@ -159,10 +159,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/operManage/operStatistics/components/workPanelChart.vue

@@ -128,10 +128,9 @@ export default defineComponent({
           // },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/operManage/operStatistics/index.vue

@@ -34,8 +34,10 @@
     <!-- 主题部分 -->
     <div class="operStatisticsInner">
       <el-row :gutter="20">
+
+
         <!-- 左边start -->
-        <el-col :span="18" style="">
+        <el-col   :md="24" :lg="18"  style="">
           <!-- 上边统计区块 -->
           <el-row :gutter="40" class="staitcDataSec">
             <el-col :span="6">
@@ -108,7 +110,7 @@
 
           <!-- 左中区块 -->
           <el-row :gutter="20" class="mt-20">
-            <el-col :span="16">
+            <el-col :md="24" :lg="16">
               <!-- 工单数趋势 -->
               <div class="grid-content bg-purple workPanel">
                 <div class="panelTit">工单数趋势</div>
@@ -116,7 +118,7 @@
               </div>
               <!-- 工单数趋势 end -->
             </el-col>
-            <el-col :span="8">
+            <el-col :md="24" :lg="8">
               <div class="grid-content bg-purple siteWorkPanel">
                 <div class="panelTit">站点工单</div>
                 <site-work-chart></site-work-chart>
@@ -141,7 +143,7 @@
         <!-- 左边end -->
 
         <!-- 右边 -->
-        <el-col :span="6" style="">
+        <el-col :md="24" :lg="6"  style="">
           <!-- 右上区块 -->
           <el-row :gutter="20">
             <el-col :span="24">

src/views/operManage/siteAchives/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 筛选start -->
-    <div class="filter-container mb-20">
+    <div class="filter-container mb-10">
       <div class="left">
         <div>
           <span class="" style="margin-right: 30px">现场档案列表</span>

src/views/operManage/workManage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container workManage" v-if="this.pageShow">
     <!-- 筛选start -->
-    <div class="filter-container mb-20">
+    <div class="filter-container mb-10">
       <div>
         <div class="filter-item">
           站点:

src/views/operManage/workStatistics/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 筛选start -->
-    <div class="filter-container mb-20">
+    <div class="filter-container mb-10">
       <div class="left">
        <div class="filter-item">
             时间：

src/views/planOutage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 筛选start -->
-    <div class="filter-container mb-20">
+    <div class="filter-container mb-10">
       <div class="left">
         <div>
           <a class="" style="margin-right: 30px">计划停电列表</a>

src/views/powerQuality/asseReport/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container assePage" style="padding-top: 0;min-width: 1500px;">
+  <div class="app-container assePage" style="padding-top: 0">
     <!-- tab切换 start -->
 
     <el-tabs 

src/views/powerQuality/asseReport/loopReport.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 筛选start -->
-    <div class="filter-container">
+    <div class="filter-container mb-10">
       <div class="left">
         <div>
           <div class="filter-item">
@@ -32,8 +32,8 @@
     </div>
     <!-- 筛选end -->
 
-    <el-row :gutter="20" class="mt-20">
-      <el-col :span="14">
+    <el-row :gutter="20" >
+      <el-col :md="24" :lg="14">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>电压质量</span>
@@ -41,7 +41,7 @@
           </div>
 
           <el-row :gutter="20" style="padding: 20px">
-            <el-col :span="8">
+            <el-col  :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -80,7 +80,7 @@
                 </ul>
               </div>
             </el-col>
-            <el-col :span="8">
+            <el-col  :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -119,7 +119,7 @@
                 </ul>
               </div>
             </el-col>
-            <el-col :span="8">
+            <el-col  :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -161,7 +161,7 @@
           </el-row>
         </div>
       </el-col>
-      <el-col :span="5">
+      <el-col  :md="12" :lg="5">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>频率质量</span>
@@ -210,7 +210,7 @@
           </el-row>
         </div>
       </el-col>
-      <el-col :span="5">
+      <el-col  :md="12" :lg="5">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">功率因数分析</div>
           <el-row :gutter="20" style="padding: 20px">
@@ -245,7 +245,7 @@
     </el-row>
 
     <el-row :gutter="20" class="mt-20">
-      <el-col :span="14">
+      <el-col   :md="24" :lg="14">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>谐波畸变率</span>
@@ -253,7 +253,7 @@
           </div>
 
           <el-row :gutter="20" style="padding: 20px">
-            <el-col :span="8">
+            <el-col :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -266,7 +266,7 @@
                 />
               </div>
             </el-col>
-            <el-col :span="8">
+            <el-col :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -305,7 +305,7 @@
                 </ul>
               </div>
             </el-col>
-            <el-col :span="8">
+            <el-col :md="24" :lg="8">
               <div
                 class="grid-content bg-purple assCard"
                 style="text-align: center"
@@ -347,7 +347,7 @@
           </el-row>
         </div>
       </el-col>
-      <el-col :span="10">
+      <el-col  :md="24" :lg="10">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>不平衡度</span>

src/views/powerQuality/asseReport/scoreReport.vue

@@ -35,8 +35,8 @@
     </div>
     <!-- 筛选end -->
 
-    <el-row :gutter="20" class="mt-20">
-      <el-col :span="6">
+    <el-row :gutter="20" >
+      <el-col :md="24" :lg="7">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
             <span>评分</span>
@@ -58,7 +58,7 @@
           </div>
         </div>
       </el-col>
-      <el-col :span="18">
+      <el-col :md="24" :lg="14">
         <!-- 表格start -->
         <el-table
           :data="tableData"

src/views/powerQuality/asseReport/scoreReportComponent/pieChart.vue

@@ -125,10 +125,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/asseReport/scoreReportComponent/radarChart.vue

@@ -117,10 +117,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/harmonicReport/index.vue

@@ -56,17 +56,20 @@
             时间：
             <el-date-picker
               v-model="value4"
-            :type="this.num==0?'dates':'month'"
+             :type="dateType"
               placeholder="请选择"
               style="width: 150px"
             ></el-date-picker>
 
-            <!-- <el-radio-group v-model="listTabPosition">
-              <el-radio-button label="byDay">按日</el-radio-button>
-              <el-radio-button label="byMonth">按月</el-radio-button>
-            </el-radio-group> -->
+            <el-radio-group v-model="listTabPosition"  @change="listTabsChange(listTabPosition)" style="    display: inline-block;
+    position: relative;
+    top: -3px;
+}">
+              <el-radio-button label="dayValue">按日</el-radio-button>
+              <el-radio-button label="monthValue">按月</el-radio-button>
+            </el-radio-group>
 
-            <el-button
+            <!-- <el-button
               class="search-button timeTab"
               @click="num = 0"
               :type="num == 0 ? 'primary' : ''"
@@ -80,7 +83,7 @@
               style="margin-left: 0 !important"
             >
               按月
-            </el-button>
+            </el-button> -->
           </div>
 
           <el-button type="primary" class="search-button">搜索</el-button>
@@ -125,10 +128,11 @@ export default {
 
   data() {
     return {
-      listTabPosition: 'byDay',
+      dateType:'date',
+      listTabPosition: 'dayValue',
       num: 0,
       num2: 0,
-      value4: '请选择',
+      value4: '2021-10-21',
       number: 1,
       measurType: 1,
       select: 1,
@@ -140,7 +144,11 @@ export default {
     }
   },
   methods: {
-    
+    listTabsChange(value){
+      value == 'dayValue'? (this.dateType = 'date'): (this.dateType = 'month')
+
+    }
+
   },
 }
 </script>

src/views/powerQuality/realTimeMonitoring/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container assePage" style="padding-top: 0;min-width: 1500px;">
+  <div class="app-container assePage" style="padding-top: 0">
     <!-- tab切换 start -->
 
     <el-tabs 

src/views/powerQuality/realTimeMonitoring/loopMonitor.vue

@@ -30,13 +30,13 @@
     <el-row :gutter="20" class="mt-20">
 
       <!-- 三项不平衡度 -->
-      <el-col :span="8">
+      <el-col   :md="24" :lg="8" >
         <div class="grid-content bg-purple loopUnbanlancePanel">
           <div class="blanceChartTit">
             <span>三项不平衡度</span>
           </div>
           <el-row :gutter="20" style="padding: 20px; border-bottom: 1px solid #d3dce6;" >
-            <el-col :span="12" class="loopUnbanlanceCard">
+            <el-col :span="12"  class="loopUnbanlanceCard">
               <div
                 class="grid-content "
                 style="text-align: center" >
@@ -119,7 +119,7 @@
        <!-- 三项不平衡度 end -->
 
       <!-- 谐波 -->
-      <el-col :span="16">
+      <el-col  :md="24" :lg="16">
         <harmonic-panel></harmonic-panel>
       </el-col>
        <!-- 谐波 end -->
@@ -129,19 +129,19 @@
     <el-row :gutter="20" class="mt-20">
 
      <!-- 电压start -->
-      <el-col :span="8">
+      <el-col :md="24" :lg="8" class="mb-20">
          <voltage-panel></voltage-panel>
       </el-col>
       <!-- 电压end -->
 
       <!-- 频率 start-->
-      <el-col :span="8">
+      <el-col :md="24" :lg="8" class="mb-20">
         <frequency-panel></frequency-panel>   
       </el-col>
       <!-- 频率 end -->
 
       <!-- 有功功率 -->
-      <el-col :span="8">
+      <el-col :md="24" :lg="8">
         <power-panel></power-panel>
       </el-col>
        <!-- 有功功率 end -->

src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/loopLineChart.vue

@@ -138,10 +138,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/loopRadarChart.vue

@@ -107,10 +107,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/voltagePanel.vue

@@ -22,7 +22,7 @@
             border
             style="width: 100%"
           >
-            <el-table-column prop="name" label="进度条" width="300px">
+            <el-table-column prop="name" label="进度条">
               <template #default="scope">
                 <div class="demo-progress" style="width: 100%">
                   <el-tooltip
@@ -42,7 +42,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="date" label="日期"> </el-table-column>
+            <el-table-column prop="date" label="日期" width="100px"> </el-table-column>
           </el-table>
         </div>
       </div>

src/views/powerQuality/realTimeMonitoring/realScore.vue

@@ -23,7 +23,7 @@
     <!-- 筛选end -->
 
     <el-row :gutter="20" class="mt-20">
-      <el-col :span="6">
+      <el-col  :md="24" :lg="7" >
         <!-- 评分 -->
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">
@@ -51,7 +51,7 @@
         <!-- 回路统计 end -->
       </el-col>
 
-      <el-col :span="18">
+      <el-col :md="24" :lg="17">
         <!-- 表格start -->
         <el-table
           :data="tableData"

src/views/powerQuality/realTimeMonitoring/realScoreComponent/pieChart.vue

@@ -115,7 +115,7 @@ export default defineComponent({
             name: '标题',
             type: 'pie',
             center: ['50%', '50%'],
-            radius: ['40%', '60%'],
+            radius: ['37%', '55%'],
 
             clockwise: false, //饼图的扇区是否是顺时针排布
             avoidLabelOverlap: false,
@@ -129,10 +129,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/realTimeMonitoring/realScoreComponent/radarChart.vue

@@ -41,7 +41,7 @@ export default defineComponent({
           containLabel: true,
         },
         radar: {
-          radius: '70%',
+          radius: '60%',
           center: ['50%', '55%'],
           splitNumber: 5,
           nameGap: '15',
@@ -116,10 +116,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+     window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/unbalanceAnalysis/electricChart.vue

@@ -136,10 +136,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/unbalanceAnalysis/electricChart2.vue

@@ -138,10 +138,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/unbalanceAnalysis/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container harmonicReport">
     <!-- 筛选start -->
-    <div class="filter-container">
+    <div class="filter-container mb-10">
       <div class="left">
         <div>
           <div class="filter-item">
@@ -32,8 +32,8 @@
       </div>
     </div>
     <!-- 筛选end -->
-    <el-row :gutter="20" class="mt-20">
-      <el-col :span="12">
+    <el-row :gutter="20" >
+      <el-col :md="24" :lg="12">
         <div class="grid-content bg-purple">
           <div class="blanceChartTit">电压不平衡度</div>
           <voltage-chart></voltage-chart>
@@ -41,7 +41,7 @@
           <voltage-chart2></voltage-chart2>
         </div>
       </el-col>
-      <el-col :span="12">
+      <el-col :md="24" :lg="12">
         <div class="grid-content bg-purple">
            <div class="blanceChartTit">电流不平衡度</div>
           <electric-chart></electric-chart>

src/views/powerQuality/unbalanceAnalysis/voltageChart.vue

@@ -136,10 +136,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/powerQuality/unbalanceAnalysis/voltageChart2.vue

@@ -139,10 +139,9 @@ export default defineComponent({
           },
         ],
       })
-      window.onresize = function () {
-        // 自适应大小
+      window.addEventListener('resize', () => {
         myChart.resize()
-      }
+      })
     })
 
     return {

src/views/siteManage/index.vue

@@ -143,7 +143,7 @@ export default {
       deleteShow: false,
       showDialog: false,
       treeLevel: 0,
-      activeName: 'first',
+      activeName: 'second',
       filterText: '',
       data: [
         {

src/views/siteManage/watchDog/index.vue

@@ -151,6 +151,42 @@ export default {
           powerAnalysis: "开启",
           watchAddress: "1",
         },
+        {
+          ratedVoltage: "10KV",
+          watchName: "测试设备1",
+          watchCode: "cssb1",
+          ratedCurrent: "58A",
+          fzlMx: "80%",
+          powerAnalysis: "开启",
+          watchAddress: "1",
+        },  
+        {
+          ratedVoltage: "10KV",
+          watchName: "测试设备1",
+          watchCode: "cssb1",
+          ratedCurrent: "58A",
+          fzlMx: "80%",
+          powerAnalysis: "开启",
+          watchAddress: "1",
+        },
+        {
+          ratedVoltage: "10KV",
+          watchName: "测试设备1",
+          watchCode: "cssb1",
+          ratedCurrent: "58A",
+          fzlMx: "80%",
+          powerAnalysis: "开启",
+          watchAddress: "1",
+        },
+        {
+          ratedVoltage: "10KV",
+          watchName: "测试设备1",
+          watchCode: "cssb1",
+          ratedCurrent: "58A",
+          fzlMx: "80%",
+          powerAnalysis: "开启",
+          watchAddress: "1",
+        },
       ],
     };
   },

src/views/stationManage/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-if="this.pageShow">
     <!-- 筛选start -->
     <div class="mb-20">所有台区</div>
-    <div class="filter-container mb-20">
+    <div class="filter-container mb-10">
       <div>
         <div class="filter-item">
         台区：
@@ -41,9 +41,10 @@
       </el-table-column>
       <el-table-column prop="pointNum" label="点位数量" width="">
          <template #default="scope">  
-            <router-link style="margin-right:15px;" :to="{ path:'siteList',query:{id:scope.row.stationName}}">
+           <span @click="goSiteList">  {{ scope.row.pointNum }}</span>
+            <!-- <router-link style="margin-right:15px;" :to="{ path:'siteList',query:{id:scope.row.stationName}}">
               {{ scope.row.pointNum }}
-            </router-link>
+            </router-link> -->
           </template>
 
       </el-table-column>
@@ -79,10 +80,12 @@
     ></dialog-component>
     <!--弹框组件开始-----------------------end-->
   </div>
+  <site-list v-else :pageShow="pageShow" @func="getMsgFormSon"></site-list>
 </template>
 
 <script>
 import DialogComponent from "./dialogComponent";
+import siteList from './siteList'
 // import { mapGetters } from "vuex";
 
 export default {
@@ -91,10 +94,11 @@ export default {
   //   ...mapGetters(["name"]),
   // },
 
-  components: { DialogComponent },
+  components: { DialogComponent,siteList },
 
   data() {
     return {
+      pageShow: true,
       showDialog: false,
 
       input: "请输入台区名称",
@@ -132,6 +136,13 @@ export default {
     };
   },
   methods: {
+    goSiteList() {
+      this.pageShow = !this.pageShow
+    },
+     getMsgFormSon() {
+      this.pageShow = !this.pageShow
+    },
+
     // 表头样式设置
     headClass() {
       return "background:#FAFAFA;";
@@ -141,7 +152,7 @@ export default {
     cellStyle({ row, column, rowIndex, columnIndex }) {
       row, column, rowIndex
       if (columnIndex === 3) {
-        return `color:#0284E8;`;
+        return `color:#0284E8;cursor:pointer`;
       } else {
         return "";
       }

src/views/stationManage/siteList.vue

@@ -41,10 +41,11 @@
 
 <script>
 export default {
-  // name: 'Dashboard',
+  name: 'SiteList',
   // computed: {
   //   ...mapGetters(['name']),
   // },
+  props: ['pageShow'],
 
   data() {
     return {
@@ -93,7 +94,8 @@ export default {
   },
   methods: {
     goBack() {
-      this.$router.replace('/stationManage/index');
+      this.$emit('func')
+      // this.$router.replace('/stationManage/index');
     },
     // 表头样式设置
     headClass() {