Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDU

Wenbo/web/src/layout/components/Navbar.vue

@@ -8,6 +8,7 @@
     <lang class="right-menu-item" />
 
     <div class="right-menu">
+      <span style="text-align: center;">{{this.dateTime}}</span>
       <el-badge :value="notReadNum" class="item"  :hidden="notReadNum == 0">
         <i class="el-icon-bell" style="color: #fff; font-size: 21px"></i>
       </el-badge>
@@ -67,7 +68,9 @@ export default {
   },
   created() {
     this.systemConfiguration();
-   this.logoName= this.$store.state.user.logoName;
+    console.log("--->")
+    console.log(this.$store.state.user)
+   this.logoName= this.$store.state.user.name;
   this.dataRefreh();
     this.queryTotal()
   },

Wenbo/web/src/utils/i18n/i18n-en-US.json

@@ -94,9 +94,9 @@
   "zdy":"total voltage",
   "zdl":"total current",
   "zgl":"total power",
-  "pl":"Frequency (communication only, HZ)",
+  "pl":"Frequency ( HZ)",
   "zhdl":"Power Consumption",
-  "glys":"Power factor (AC only)",
+  "glys":"Power factor ",
   "zt":"state",
   "tdmc":"Channel name",
   "tdh":"channel number",
@@ -323,7 +323,9 @@
   "sq":"time zone",
   "bjsj":"(UTC+08:00) Beijing, Chongqing, Hong Kong Special Administrative Region, Urumqi",
   "elssj":"(UTC+03:00) Moscow, St. Petersburg",
-  "sblx":"Device Type"
+  "sblx":"Device Type",
+  "kqys":"Enable delay",
+  "gbys":"Turn off delay"
 
 
 

Wenbo/web/src/utils/i18n/i18n-ru-RU.json

@@ -95,9 +95,9 @@
   "zdy":"Общее напряжение",
   "zdl":"Общий ток",
   "zgl":"Общая мощность",
-  "pl":"Частота (только обмен, HZ)",
+  "pl":"Частота ( HZ)",
   "zhdl":"Общее потребление электроэнергии",
-  "glys":"Коэффициент мощности (только переменный)",
+  "glys":"Коэффициент мощности ",
   "zt":"Статус",
   "tdmc":"Название канала",
   "tdh":"Номер канала",
@@ -326,5 +326,7 @@
   "sq":"Часовой пояс",
   "bjsj":"(UTC + 08: 00) Пекин, Чунцин, Специальный административный район Гонконг, Урумчи",
   "elssj":"(UTC + 03: 00) Москва, Санкт - Петербург",
-  "sblx":"Тип устройства"
+  "sblx":"Тип устройства",
+  "kqys":"Задержка открытия",
+  "gbys":"Задержка закрытия"
 }

Wenbo/web/src/utils/i18n/i18n-zh-CN.json

@@ -95,10 +95,10 @@
   "zdy":"总电压",
   "zdl":"总电流",
   "zgl":"总功率",
-  "pl":"频率(仅交流，HZ)",
+  "pl":"频率(HZ)",
   "pl2":"频率",
   "zhdl":"总耗电量",
-  "glys":"功率因数(仅交流)",
+  "glys":"功率因数",
   "zt":"状态",
   "tdmc":"通道名称",
   "tdh":"通道号",
@@ -331,7 +331,10 @@
   "sq":"时区",
   "bjsj":"(UTC+08:00)北京，重庆，香港特别行政区，乌鲁木齐",
   "elssj":"(UTC+03:00) 莫斯科，圣彼得堡",
-  "sblx":"设备类型"
+  "sblx":"设备类型",
+  "kqys":"开启延时",
+  "gbys":"关闭延时"
+
 
 
 

Wenbo/web/src/views/index.vue

@@ -76,14 +76,16 @@
 
       <el-col :span="12" class="card-box">
         <el-card style="border-radius: 15px; ">
-          <div slot="header" style="display: flex;"><span style=" font-size: 20px; font-weight: bold;">{{zxtname}}</span>
-            <div style="margin-left: 45%;display: flex;background-color: #EEEEEE;border-radius: 10px">
+          <div slot="header"  ><span style=" font-size: 20px; font-weight: bold;">{{zxtname}}</span>
+            <span    class="domainSpanCss" :class="{span6:isSpan6}" @click="queryEchart('6')" > {{$t('ljdn')}}</span>
+            <span  class="domainSpanCss" :class="{span4:isSpan4}" @click="queryEchart('4')" > {{$t('edgl')}}</span>
+            <span   class="domainSpanCss" :class="{span3:isSpan3}" @click="queryEchart('3')" > {{$t('dl')}}</span>
               <span   class="domainSpanCss" :class="{span1:isSpan1}" @click="queryEchart('1')" > {{$t('dy')}}</span>
-              <span   class="domainSpanCss" :class="{span3:isSpan3}" @click="queryEchart('3')" > {{$t('dl')}}</span>
-              <span  class="domainSpanCss" :class="{span4:isSpan4}" @click="queryEchart('4')" > {{$t('edgl')}}</span>
-              <span    class="domainSpanCss" :class="{span6:isSpan6}" @click="queryEchart('6')" > {{$t('ljdn')}}</span>
 
-            </div>
+
+
+
+
           </div>
           <div  class="el-table el-table--enable-row-hover el-table--medium">
             <div style="width: 100%">
@@ -1044,13 +1046,12 @@
   }
 
   .domainSpanCss {
+    width: 65px;
     cursor:pointer;
-    width: 70px;
-    height: 25px;
-    display: block;
     margin-right: 10px;
     text-align: center;
-    margin-top: 5px
+    text-decoration: underline;
+    float:right;
   }
   .span1 {
     border-radius: 5px;

Wenbo/web/src/views/login.vue

@@ -331,7 +331,7 @@
     margin-left: 15%;
     border-radius: 6px;
     /*background: #ffffff;*/
-    margin-top: 15%;
+    margin-top: 14%;
     width: 400px;
     padding: 25px 25px 5px 25px;
     .el-input {

Wenbo/web/src/views/power/channelstatus/index.vue

@@ -26,23 +26,25 @@
     <el-card style="min-height: 700px ;border-radius: 15px">
     <el-table min-height="700px"  :data="channelList" style="overflow-y: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
       <!--<el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column :label="this.$t('sbmc')" prop="productName" width="130" />
-      <el-table-column :label="this.$t('sbbh')" v-if="false" prop="productNumber" width="130" />
-      <el-table-column label="设备id" v-if="false" prop="productId" width="130" />
-      <el-table-column :label="this.$t('tdmc')" prop="productChName" width="130" />
-      <el-table-column :label="this.$t('tdh')" prop="productChId" :show-overflow-tooltip="true" width="80" />
-      <el-table-column :label="this.$t('dy')+'（V）'" prop="productChVoltage" :show-overflow-tooltip="true" width="100" />
-      <el-table-column :label="this.$t('dl')+'（A）'" prop="productChCurrent" width="90" />
-      <el-table-column :label="this.$t('gl')+'（W）'" prop="productChPower" align="center" width="90"/>
-      <el-table-column :label="this.$t('pl')"  align="center" prop="productChPowerFreq" width="160"/>
-      <el-table-column :label="this.$t('hdl')+'（Kwh）'" align="center" prop="productChConsumption" />
-      <el-table-column :label="this.$t('glys')" align="center" prop="productChPowerFactor" />
-      <el-table-column :label="this.$t('zt')" align="center" prop="productChStatus" width="80">
+      <el-table-column :label="this.$t('sbmc')" prop="productName"  />
+      <el-table-column :label="this.$t('sbbh')" v-if="false" prop="productNumber"   />
+      <el-table-column label="设备id" v-if="false" prop="productId"   />
+      <el-table-column :label="this.$t('tdmc')" prop="productChName"   />
+      <el-table-column :label="this.$t('tdh')" prop="productChId" :show-overflow-tooltip="true"   />
+      <el-table-column :label="this.$t('dy')+'（V）'" prop="productChVoltage" :show-overflow-tooltip="true"   />
+      <el-table-column :label="this.$t('dl')+'（A）'" prop="productChCurrent" :show-overflow-tooltip="true"  />
+      <el-table-column :label="this.$t('gl')+'（W）'" prop="productChPower"  :show-overflow-tooltip="true" align="center"  />
+      <el-table-column :label="this.$t('pl')" v-if="this.productType!='1'"  align="center" prop="productChPowerFreq"  :show-overflow-tooltip="true"/>
+      <el-table-column :label="this.$t('hdl')+'（Kwh）'" width="120" align="center" prop="productChConsumption" :show-overflow-tooltip="true" />
+      <el-table-column :label="this.$t('glys')"  v-if="this.productType!='1'" align="center" prop="productChPowerFactor" :show-overflow-tooltip="true"/>
+      <el-table-column :label="this.$t('kqys')+'（S）'"  width="140"  sortable  prop="firingInterval" align="center"  :show-overflow-tooltip="true" />
+      <el-table-column :label="this.$t('gbys')+'（S）'"  width="140"   sortable align="center" prop="closeInterval"  :show-overflow-tooltip="true"/>
+      <el-table-column :label="this.$t('zt')" align="center" prop="productChStatus" >
         <template slot-scope="scope">
           <span>{{getDity(scope.row,'productChStatus')}}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="this.$t('cz')" align="center" width="130" class-name="small-padding fixed-width">
+      <el-table-column :label="this.$t('cz')" align="center" width="100" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
           <el-button
             v-if="scope.row.productChStatus == '0'"
@@ -61,7 +63,7 @@
 
         </template>
       </el-table-column>
-      <el-table-column :label="this.$t('pz')" align="center" width="130" class-name="small-padding fixed-width">
+      <el-table-column :label="this.$t('pz')" align="center" width="100" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
           <el-button
             size="mini"
@@ -132,6 +134,7 @@
         usertoken:"",
         // 通道状态
         productChStatuss:[{"id":"0","name":"duank"},{"id":"1","name":"jt"}],
+        productType:""
       };
     },
     mounted() {
@@ -153,6 +156,7 @@
           equipmentMintenance(params).then(response => {
             this.productList = response.data;
         this.queryParams.productId=  this.productList[0].productId;
+            this.productType=this.productList[0].productType
         this.handleQuery();
         }).catch(() => {});
       },
@@ -208,6 +212,11 @@
         this.queryParams.token=this.usertoken;
         this.queryParams.type="listQuery";
         this.loading = true;
+        for(var i=0;i<this.productList.length;i++){
+          if(this.queryParams.productId==this.productList[i].productId){
+          this.productType=this.productList[i].productType
+          }
+        }
         channelStatusMonitoring(this.queryParams).then(response => {
           this.channelList = response.data;
       }).catch(() => {});

Wenbo/web/src/views/power/monitorall/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="overflow-y: hidden">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="88px">
       <el-form-item :label="this.$t('sbmc')" prop="productName">
         <el-select style="width: 100%" v-model="queryParams.productId"    allow-create    filterable>
@@ -16,11 +16,11 @@
 
       <el-col :span="24" class="card-box" >
         <el-card style="border-radius: 15px;height: 50%">
-          <div slot="header" style="display: flex;height: 100px">
+          <div slot="header" style="display: flex;height: 52px">
             <span class="sensorSpamClass" :title="productData.productName"  style="width: 300px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px">{{productData.productNumber}}</a><br>{{productData.productName}}</span>
-            <span  style="margin-top: 15px;" class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/pinl.png"></img>  <span    style="text-align: center;margin-left:10px;width: 150px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px;">{{productData.productPowerFreq}}</a><br>{{$t('pl')}}</span></span>
-            <span style="margin-top: 15px;" class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/hdl.png"></img>  <span     style="text-align: center;width: 120px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px">{{productData.productConsumption}}</a><br>{{$t('zhdl')}}(Kwh)</span></span>
-            <span  style="margin-top: 15px;" class="sensorSpamClass">
+            <span    class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/pinl.png"></img>  <span    style="text-align: center;margin-left:10px;width: 65px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px;">{{productData.productPowerFreq}}</a><br>{{$t('pl')}}</span></span>
+            <span   class="sensorSpamClass" ><img class="imgClass" src="../../../assets/images/hdl.png"></img>  <span     style="text-align: center;width: 120px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block"><a style="color: #0D32FE;font-size: 25px">{{productData.productConsumption}}</a><br>{{$t('zhdl')}}(Kwh)</span></span>
+            <span    class="sensorSpamClass">
               <el-dropdown style="margin-left:10px;" size="mini" @command="(command) => handleCommand(command, productData.productId)" >
               <el-button type='primary' size="mini"  style="margin-left: 10px;margin-top: 10px;width: 80px">{{$t('cz')}}</el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -33,49 +33,49 @@
           </div>
           <div  class="el-table el-table--enable-row-hover el-table--medium">
 
-              <div style="height: 380px; width: 100%;min-width: 300px;display: flex">
-                <span  style="margin-top: 15px;  flex: 1.5;" >
+              <div style="height: 290px; width: 100%;min-width: 300px;display: flex">
+                <span  style="   flex: 1.5;" >
                   <div style="width: 100%">
-                    <div ref="sbDyRef" style="height: 380px; width: 100%;min-width: 300px"></div>
+                    <div ref="sbDyRef" style="height: 280px; width: 100%;min-width: 280px"></div>
                   </div>
                 </span>
-                <span  style="margin-top: 15px;  flex: 1.5;" >
+                <span  style="  flex: 1.5;" >
                    <div style="width: 100%">
-                    <div ref="sbDlRef" style="height: 380px; width: 100%;min-width: 300px"></div>
+                    <div ref="sbDlRef" style="height: 280px; width: 100%;min-width: 280px"></div>
                   </div>
                 </span>
-                <span style="margin-top: 15px;  flex: 1.5;"  >
+                <span style="  flex: 1.5;"  >
                  <div style="width: 100%">
-                    <div ref="sbGlRef" style="height: 380px; width: 100%;min-width: 300px"></div>
+                    <div ref="sbGlRef" style="height: 280px; width: 100%;min-width: 280px"></div>
                   </div></span>
-                <span  style="margin-top: 15px;  flex: 1.5;"  >
-                 <div style="width: 100%">
-                    <div ref="sbGlysRef" style="height: 380px; width: 100%;min-width: 300px"></div>
-                  </div>
-                </span>
+                <!--<span  style="   flex: 1.5;"  >-->
+                 <!--<div style="width: 100%">-->
+                    <!--<div ref="sbGlysRef" style="height: 280px; width: 100%;min-width: 280px"></div>-->
+                  <!--</div>-->
+                <!--</span>-->
               </div>
 
           </div>
         </el-card>
       </el-col>
-      <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
-        <el-card style="border-radius: 15px;max-height: 400px">
+      <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 315px" >
+        <el-card style="border-radius: 15px;max-height: 315px">
           <div slot="header"><span style=" font-size: 20px; font-weight: bold;">24H{{$t('zhdl')}}</span> </div>
             <div style="width: 100%">
-              <div ref="sbHdlRef" style="height: 310px; width: 100%;min-width: 600px"></div>
+              <div ref="sbHdlRef" style="height: 300px; width: 100%;min-width: 600px"></div>
             </div>
 
         </el-card>
 
       </el-col>
 
-      <el-col   style="overflow-y: auto;max-height: 500px"  :span="12" class="card-box"  >
+      <el-col   style="overflow-y: auto;max-height: 315px"  :span="12" class="card-box"  >
 
-        <el-card style="border-radius: 15px;max-height: 500px">
+        <el-card style="border-radius: 15px;max-height: 315px">
           <div slot="header" style="display: flex;"><span style=" font-size: 20px; font-weight: bold;">{{$t('gl')}}</span></div>
 
             <div style="width: 100%">
-              <div ref="sbHdlRefGl" style="height: 310px; width: 100%;min-width: 600px"></div>
+              <div ref="sbHdlRefGl" style="height: 300px; width: 100%;min-width: 600px"></div>
             </div>
 
 
@@ -91,7 +91,7 @@
 </template>
 
 <script>
-  import {  overallStatusMonitoring } from "@/api/pdu/pduServer";
+  import {  overallStatusMonitoring ,equipmentMintenance} from "@/api/pdu/pduServer";
   import * as echarts from 'echarts';
   export default {
     name: "Server",
@@ -222,16 +222,16 @@
               axisLabel: {
                 color: 'inherit',
                 distance: -40,
-                fontSize: 20
+                fontSize: 15
               },
               detail: {
                 valueAnimation: true,
-                fontSize: 18,
-                lineHeight: 18,
+                fontSize: 15,
+                lineHeight: 15,
                 borderRadius: 8,
                 formatter: '{value} V\n电压',
                 color: 'inherit',
-                offsetCenter: [0, '60%']
+                offsetCenter: [0, '50%']
               },
               data: [
                 {
@@ -320,7 +320,7 @@
               axisLabel: {
                 color: 'inherit',
                 distance: -40,
-                fontSize: 20
+                fontSize: 15
               },
               detail: {
                 valueAnimation: true,
@@ -415,15 +415,15 @@
               },
               axisLabel: {
                 color: 'inherit',
-                distance: -40,
-                fontSize: 20
+                distance: -30,
+                fontSize: 15
               },
               detail: {
                 valueAnimation: true,
-                fontSize: 20,
-                lineHeight: 20,
+                fontSize: 15,
+                lineHeight: 15,
                 borderRadius: 8,
-                formatter: '{value} W\n功率',
+                formatter: '{value} KW\n功率',
                 color: 'inherit',
                 offsetCenter: [0, '60%']
               },
@@ -512,14 +512,14 @@
               axisLabel: {
                 color: 'inherit',
                 distance: -40,
-                fontSize: 20
+                fontSize: 15
               },
               detail: {
                 valueAnimation: true,
                 fontSize: 20,
                 lineHeight: 20,
                 borderRadius: 8,
-                formatter: '{value} \n功率因素',
+                formatter: '{value} Hz\n频率',
                 color: 'inherit',
                 offsetCenter: [0, '60%']
               },
@@ -868,7 +868,6 @@
   .sensorSpamClass{
     margin-left: 35px;
     flex: 2;
-    margin-top: 15px;
     text-align: center
   }
   .imgClass{

Wenbo/web/src/views/power/monitorhistory/index.vue

@@ -40,10 +40,9 @@
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header" ><span style=" font-size: 20px; font-weight: bold;">{{$t('zdy')}}</span>
-                    <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:isSpan1}" @click="queryEchart('1','zdy','L1')" >L1</span>
-                    <span  class="domainSpanCss" :class="{span2:isSpan2}" @click="queryEchart('2','zdy','L2')" >L2</span>
-                    <span  class="domainSpanCss" :class="{span3:isSpan3}" @click="queryEchart('3','zdy','L3')" > L3</span>
-
+                  <span  class="domainSpanCss" :class="{span3:isSpan3}" @click="queryEchart('3','zdy','L3')" > L3</span>
+                  <span  class="domainSpanCss" :class="{span2:isSpan2}" @click="queryEchart('2','zdy','L2')" >L2</span>
+                    <span   class="domainSpanCss" :class="{span1:isSpan1}" @click="queryEchart('1','zdy','L1')" >L1</span>
                 </div>
                 <div style="width: 100%">
                   <div ref="sbzdyRef" style="height: 310px; width: 100%;min-width: 600px"></div>
@@ -55,9 +54,11 @@
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('zdl')}}</span>
-                  <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:zdlisSpan1}" @click="queryEchart('1','zdl','L1')" >L1</span>
-                  <span  class="domainSpanCss" :class="{span2:zdlisSpan2}" @click="queryEchart('2','zdl','L2')" >L2</span>
-                  <span  class="domainSpanCss" :class="{span3:zdlisSpan3}" @click="queryEchart('3','zdl','L3')" > L3</span>
+                  <span   class="domainSpanCss" :class="{span3:zdlisSpan3}" @click="queryEchart('3','zdl','L3')" > L3</span>
+                  <span   class="domainSpanCss" :class="{span2:zdlisSpan2}" @click="queryEchart('2','zdl','L2')" >L2</span>
+                  <span   class="domainSpanCss" :class="{span1:zdlisSpan1}" @click="queryEchart('1','zdl','L1')" >L1</span>
+
+
                 </div>
                 <div style="width: 100%">
                   <div ref="sbzdlRef" style="height: 310px; width: 100%;min-width: 600px"></div>
@@ -69,9 +70,11 @@
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('zgl')}}</span>
-                  <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:zglisSpan1}" @click="queryEchart('1','zgl','L1')" >L1</span>
-                  <span  class="domainSpanCss" :class="{span2:zglisSpan2}" @click="queryEchart('2','zgl','L2')" >L2</span>
                   <span  class="domainSpanCss" :class="{span3:zglisSpan3}" @click="queryEchart('3','zgl','L3')" > L3</span>
+                  <span  class="domainSpanCss" :class="{span2:zglisSpan2}" @click="queryEchart('2','zgl','L2')" >L2</span>
+                  <span   class="domainSpanCss" :class="{span1:zglisSpan1}" @click="queryEchart('1','zgl','L1')" >L1</span>
+
+
                 </div>
                 <div style="width: 100%">
                   <div ref="sbzglRef" style="height: 310px; width: 100%;min-width: 600px"></div>
@@ -81,25 +84,20 @@
 
             </el-col>
 
-            <el-col   style="overflow-y: auto;max-height: 500px"  :span="12" class="card-box"  >
+            <el-col   style="overflow-y: auto;max-height:400px"  :span="12" class="card-box"  >
 
-              <el-card style="border-radius: 15px;max-height: 500px">
-                <div slot="header" style="display: flex;"><span style=" font-size: 20px; font-weight: bold;">{{$t('zhdl')}}</span>
-                  <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:zhdlisSpan1}" @click="queryEchart('1','zhdl','L1')" >L1</span>
-                  <span  class="domainSpanCss" :class="{span2:zhdlisSpan2}" @click="queryEchart('2','zhdl','L2')" >L2</span>
+              <el-card style="border-radius: 15px;max-height: 400px;">
+                <div slot="header"  ><span style=" font-size: 20px; font-weight: bold;">{{$t('zhdl')}}</span>
                   <span  class="domainSpanCss" :class="{span3:zhdlisSpan3}" @click="queryEchart('3','zhdl','L3')" > L3</span>
+                  <span  class="domainSpanCss" :class="{span2:zhdlisSpan2}" @click="queryEchart('2','zhdl','L2')" >L2</span>
+                  <span    class="domainSpanCss" :class="{span1:zhdlisSpan1}" @click="queryEchart('1','zhdl','L1')" >L1</span>
                 </div>
 
                 <div style="width: 100%">
                   <div ref="sbzhdlRefGl" style="height: 310px; width: 100%;min-width: 600px"></div>
                 </div>
-
-
               </el-card>
             </el-col>
-
-
-
           </el-row>
 
         </el-tab-pane>
@@ -110,9 +108,11 @@
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('dy')}}</span>
-                  <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:dyisSpan1}" @click="queryEchart('1','dy','L1')" >L1</span>
-                  <span  class="domainSpanCss" :class="{span2:dyisSpan2}" @click="queryEchart('2','dy','L2')" >L2</span>
                   <span  class="domainSpanCss" :class="{span3:dyisSpan3}" @click="queryEchart('3','dy','L3')" > L3</span>
+                  <span  class="domainSpanCss" :class="{span2:dyisSpan2}" @click="queryEchart('2','dy','L2')" >L2</span>
+                  <span class="domainSpanCss" :class="{span1:dyisSpan1}" @click="queryEchart('1','dy','L1')" >L1</span>
+
+
                 </div>
                 <div style="width: 100%">
                   <div ref="sbdyRef" style="height: 310px; width: 100%;min-width: 600px"></div>
@@ -124,9 +124,11 @@
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('dl')}}</span>
-                  <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:dlisSpan1}" @click="queryEchart('1','dl','L1')" >L1</span>
-                  <span  class="domainSpanCss" :class="{span2:dlisSpan2}" @click="queryEchart('2','dl','L2')" >L2</span>
                   <span  class="domainSpanCss" :class="{span3:dlisSpan3}" @click="queryEchart('3','dl','L3')" > L3</span>
+                  <span  class="domainSpanCss" :class="{span2:dlisSpan2}" @click="queryEchart('2','dl','L2')" >L2</span>
+                  <span   class="domainSpanCss" :class="{span1:dlisSpan1}" @click="queryEchart('1','dl','L1')" >L1</span>
+
+
                 </div>
                 <div style="width: 100%">
                   <div ref="sbdlRef" style="height: 310px; width: 100%;min-width: 600px"></div>
@@ -138,9 +140,11 @@
             <el-col :span="12" class="card-box"   style="overflow-y: auto;max-height: 400px" >
               <el-card style="border-radius: 15px;max-height: 400px">
                 <div slot="header"><span style=" font-size: 20px; font-weight: bold;">{{$t('gl')}}</span>
-                  <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:glisSpan1}" @click="queryEchart('1','gl','L1')" >L1</span>
-                  <span  class="domainSpanCss" :class="{span2:glisSpan2}" @click="queryEchart('2','gl','L2')" >L2</span>
                   <span  class="domainSpanCss" :class="{span3:glisSpan3}" @click="queryEchart('3','gl','L3')" > L3</span>
+                  <span  class="domainSpanCss" :class="{span2:glisSpan2}" @click="queryEchart('2','gl','L2')" >L2</span>
+                  <span class="domainSpanCss" :class="{span1:glisSpan1}" @click="queryEchart('1','gl','L1')" >L1</span>
+
+
                 </div>
                 <div style="width: 100%">
                   <div ref="sbglRef" style="height: 310px; width: 100%;min-width: 600px"></div>
@@ -153,22 +157,20 @@
             <el-col   style="overflow-y: auto;max-height: 500px"  :span="12" class="card-box"  >
 
               <el-card style="border-radius: 15px;max-height: 500px">
-                <div slot="header" style="display: flex;"><span style=" font-size: 20px; font-weight: bold;">{{$t('hdl')}}</span>
-                  <span style="margin-left: 78%;"  class="domainSpanCss" :class="{span1:hdlisSpan1}" @click="queryEchart('1','hdl','L1')" >L1</span>
-                  <span  class="domainSpanCss" :class="{span2:hdlisSpan2}" @click="queryEchart('2','hdl','L2')" >L2</span>
+                <div slot="header"  ><span style=" font-size: 20px; font-weight: bold;">{{$t('hdl')}}</span>
                   <span  class="domainSpanCss" :class="{span3:hdlisSpan3}" @click="queryEchart('3','hdl','L3')" > L3</span>
+                  <span  class="domainSpanCss" :class="{span2:hdlisSpan2}" @click="queryEchart('2','hdl','L2')" >L2</span>
+                  <span class="domainSpanCss" :class="{span1:hdlisSpan1}" @click="queryEchart('1','hdl','L1')" >L1</span>
+
+
                 </div>
 
                 <div style="width: 100%">
                   <div ref="sbhdlRefGl" style="height: 310px; width: 100%;min-width: 600px"></div>
                 </div>
-
-
               </el-card>
             </el-col>
 
-
-
           </el-row>
 
         </el-tab-pane>
@@ -742,6 +744,7 @@
     margin-right: 10px;
     text-align: center;
     text-decoration: underline;
+    float:right;
   }
   .span1 {
     border-radius: 5px;

Wenbo/web/src/views/sensor/sensorStatus/index.vue

@@ -19,22 +19,22 @@
     <el-tabs value="0" @tab-click="handleClick">
       <el-tab-pane v-for="tab in sensorStatusTabs" :label="$t(tab.name)" :key="tab.id" :name="tab.id">
         <el-card style="height: 600px ;border-radius: 15px">
-        <el-table max-height="600"  :data="sensorStatusList" style="overflow-y: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
+        <el-table height="550"  :data="sensorStatusList" style="overflow: auto"  :header-cell-style="{ background:'#FFFFFF',color:'#000000'}">
           <!--<el-table-column type="selection" width="55" align="center" />-->
-          <el-table-column :label="$t('sbmc')" prop="productName" width="130" />
-          <el-table-column   v-if="false" :label="$t('sbbh')" prop="productNumber" width="130" />
-          <el-table-column label="设备id" v-if="false" prop="productId" width="130" />
-          <el-table-column :label="$t('cgqxh')" prop="sensorId" :show-overflow-tooltip="true"   />
-          <el-table-column :label="$t('cgqmc')" prop="sensorName" :show-overflow-tooltip="true"   />
-          <el-table-column :label="$t('lx')" prop="sensorType" width="140" >
+          <el-table-column :label="$t('sbmc')" v-if="false" prop="productName" />
+          <el-table-column   v-if="false" :label="$t('sbbh')" prop="productNumber"  />
+          <el-table-column label="设备id" v-if="false" prop="productId"  />
+          <el-table-column :label="$t('cgqxh')" prop="sensorId" v-if="false" :show-overflow-tooltip="true"   />
+          <el-table-column :label="$t('cgqmc')" prop="sensorName"  width="170"   :show-overflow-tooltip="true"   />
+          <el-table-column :label="$t('lx')" prop="sensorType" width="170"  >
             <template slot-scope="scope">
               <span>{{getDity(scope.row,'sensorType')}}</span>
             </template>
 
           </el-table-column>
-          <el-table-column :label="'COM'+$t('kh')" prop="comSlogan" width="100" />
-          <el-table-column :label="$t('cgqsjtd')" prop="cgqtd" width="130" />
-          <el-table-column :label="'MOSBUS'+$t('dz')" prop="sensorAddr" align="center"  />
+          <el-table-column :label="'COM'+$t('kh')" prop="comSlogan"  width="120" />
+          <el-table-column :label="$t('cgqsjtd')" width="170"  prop="cgqtd" />
+          <el-table-column :label="'MOSBUS'+$t('dz')" prop="sensorAddr" width="150"  align="center"  />
           <el-table-column :label="$t('btl')"  align="center" prop="sensorBaud" width="100"/>
           <el-table-column :label="$t('jdh')" align="center" prop="jdh" width="130"/>
           <el-table-column :label="$t('ljzt')" align="center" prop="connectionStatus" width="130">
@@ -60,10 +60,10 @@
               <span>{{getDity(scope.row,'accessControlStatus')}}</span>
             </template>
           </el-table-column>
-          <el-table-column v-if="tab.id==='4'" :label="$t('qtld')" align="center" prop="gasConcentration" width="100"/>
-          <el-table-column v-if="tab.id==='5'" :label="$t('qlz')+'（m/s）'" align="center" prop="airflowValue" width="100"/>
-          <el-table-column v-if="tab.id==='5'" :label="$t('qyz')+'（MPa）'" align="center" prop="airPressureValue" width="100"/>
-          <el-table-column :label="$t('cz')" align="center"  class-name="small-padding fixed-width" width="180">
+          <el-table-column v-if="tab.id==='4'" :label="$t('qtld')" align="center" prop="gasConcentration" width="180"/>
+          <el-table-column v-if="tab.id==='5'" :label="$t('qlz')+'（m/s）'" align="center" prop="airflowValue" width="130"/>
+          <el-table-column v-if="tab.id==='5'" :label="$t('qyz')+'（MPa）'" align="center" prop="airPressureValue" width="130"/>
+          <el-table-column :label="$t('cz')" align="center"  class-name="small-padding fixed-width" width="170">
             <template slot-scope="scope" >
               <el-button
                 size="mini"
@@ -651,6 +651,9 @@
     color: white;
     border-radius: 20px;
   }
+  .el-tabs--top .el-tabs__item.is-top:nth-child(2), .el-tabs--top .el-tabs__item.is-bottom:nth-child(2), .el-tabs--bottom .el-tabs__item.is-top:nth-child(2), .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2){
+    padding-left:20px;
+  }
 </style>
 <style scoped>
   .row-item {