样式调整

src/views/queueManagement/channelManagement/index.vue

@@ -24,7 +24,7 @@
         </div>
         </div>
         <el-row class="manage-content">
         <el-row class="manage-content">
           <el-col :span="24" class="treeMenu boxShadow">
           <el-col :span="24" class="treeMenu boxShadow">
-            <el-table ref="singleTable" @row-click="setCurrent" @current-change="handleCurrentChange" :data="tableData" :max-height="tableHeight-28" :highlight-current-row='true' style="width: 100%;" v-loading="loading" header-row-class-name="manage-tab-head">
+            <el-table ref="singleTable" @row-click="setCurrent" @current-change="handleCurrentChange" :data="tableData" :max-height="tableHeight-20" :highlight-current-row='true' style="width: 100%;" v-loading="loading" header-row-class-name="manage-tab-head">
               <el-table-column :label="$t('table.laneName')" align="center" prop="name"></el-table-column>
               <el-table-column :label="$t('table.laneName')" align="center" prop="name"></el-table-column>
               <el-table-column width="200" :label="$t('table.counterType')" :formatter="formatCounterType" align="center" prop="counterType"></el-table-column>
               <el-table-column width="200" :label="$t('table.counterType')" :formatter="formatCounterType" align="center" prop="counterType"></el-table-column>
               <el-table-column :label="$t('table.operate')" align="center">
               <el-table-column :label="$t('table.operate')" align="center">
@@ -44,7 +44,7 @@
       </div>
       </div>
       <div class="aiot_right">
       <div class="aiot_right">
         <!-- <el-row v-if="ptype==1" :loading="loading" class="pwraper" :style="{ maxHeight: tableHeight + 'px' }">
         <!-- <el-row v-if="ptype==1" :loading="loading" class="pwraper" :style="{ maxHeight: tableHeight + 'px' }">
-     
+
           </el-row> -->
           </el-row> -->
         <el-col :span="24" class="personInfo">
         <el-col :span="24" class="personInfo">
           <ul class="legends">
           <ul class="legends">
@@ -75,7 +75,7 @@
                 <li class="ditem" style="height:0;margin:0;">
                 <li class="ditem" style="height:0;margin:0;">
                   <div class="dwrap"></div>
                   <div class="dwrap"></div>
                 </li>
                 </li>
-                <li class="ditem" v-for="(item, index) in canvasList" :key="index" style="margin:10px 10px 0 0">
+                <li class="ditem" v-for="(item, index) in canvasList" :key="index" :style="{'margin':index>1?'10px 10px 0 0':'0px 10px 0 0'}">
                   <div class="dwrap">
                   <div class="dwrap">
                     <img class="dimg" :src="item.picUrl" :style="{ maxHeight: tableHeight-60 + 'px' }" />
                     <img class="dimg" :src="item.picUrl" :style="{ maxHeight: tableHeight-60 + 'px' }" />
                     <div class="label-box">
                     <div class="label-box">
@@ -99,7 +99,7 @@
       <ul class="legends">
       <ul class="legends">
                 <el-button size="mini" type="danger" @click="clearDesk">{{$t('button.clear')}}</el-button>
                 <el-button size="mini" type="danger" @click="clearDesk">{{$t('button.clear')}}</el-button>
                 <el-button size="mini" type="primary" @click="saveData">{{$t('button.saveDrawing')}}</el-button>
                 <el-button size="mini" type="primary" @click="saveData">{{$t('button.saveDrawing')}}</el-button>
-            </ul> 
+            </ul>
       <div class="draw_desks boxShadow">
       <div class="draw_desks boxShadow">
         <el-row :loading="loading" class="pwraper" :style="{ maxHeight: tableHeight + 'px' }">
         <el-row :loading="loading" class="pwraper" :style="{ maxHeight: tableHeight + 'px' }">
           <ul class="dlist" ref="dlist">
           <ul class="dlist" ref="dlist">
@@ -547,6 +547,7 @@ export default {
 }
 }
 .manage-content {
 .manage-content {
   //   height: calc(100% - 100px);
   //   height: calc(100% - 100px);
+  padding: 0 12px 10px !important;
 }
 }
 
 
 .bind {
 .bind {
@@ -573,7 +574,7 @@ export default {
 .draw_desks {
 .draw_desks {
   position: relative;
   position: relative;
   width: 100%;
   width: 100%;
-  margin-bottom: 20px;
+  // margin-bottom: 20px;
 }
 }
 
 
 .pwraper {
 .pwraper {
@@ -581,7 +582,7 @@ export default {
   overflow: auto;
   overflow: auto;
   padding-left: 10px;
   padding-left: 10px;
   min-height: 300px;
   min-height: 300px;
-  margin-top: 10px;
+  margin-top: 13px;
 }
 }
 .fwrap {
 .fwrap {
   position: relative;
   position: relative;

src/views/queueManagement/queueLive/index.vue

@@ -569,7 +569,7 @@ export default {
     tableRowClassName: function({ row, rowIndex }) {
     tableRowClassName: function({ row, rowIndex }) {
       if (row.customersInQueue > this.warningNum) {
       if (row.customersInQueue > this.warningNum) {
         return 'danger-row';
         return 'danger-row';
-      }else if(row.warnNum >this.safeingNum && row.warnNum <= this.warningNum){
+      }else if(row.customersInQueue >this.safeingNum && row.customersInQueue <= this.warningNum){
           return 'warn-row';
           return 'warn-row';
       }else{
       }else{
           return 'safe-row';
           return 'safe-row';