Browse Source

Merge branch 'dktest' into device

haojianlong 5 years ago
parent
commit
d73e8ff7b4

+ 0 - 1
src/components/point/report/integrateStatistics.vue

@@ -9,7 +9,6 @@
     <!-- 图形图 -->
     <div class="statistics-chart" style="border-top:5px solid #eee;min-height: calc(65% - 3px);">
       <div class="chart-title">共包含原始点位:{{ originalPoint }} 个</div>
-      <hr style="width:90%" />
       <div style="padding:15px 10%;line-height:2;">
         1点位对多表号功能号:{{ pointData.oneToM }}
         <br />

+ 9 - 5
src/components/point/report/tabFunNumOverview.vue

@@ -19,17 +19,21 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100" header-align='center'></el-table-column>
+        <el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100" header-align='left'></el-table-column>
         <el-table-column prop='Data.Data' label='查看分精度' show-overflow-tooltip min-width="90" header-align='center' align='center'>
           <template slot-scope="scope">
             <el-button style="padding:7px 15px;" @click="handleDrawer(scope.row, 0)"><i class="el-icon-s-data" style="font-size:15px;"></i></el-button>
           </template>
         </el-table-column>
-        <el-table-column prop='Data.Time' label='对应值 - 获取时间' show-overflow-tooltip min-width="230" header-align='center'>
+        <el-table-column prop='Data.Time' label='对应值 - 获取时间' show-overflow-tooltip min-width="270" header-align='center' align='center' style="position:relative;">
           <template slot-scope="scope">
-            <span style="line-height:29px;">{{ scope.row.Data? scope.row.Data.Data : '' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-            <span style="line-height:29px;">{{ scope.row.Data? scope.row.Data.Time: '' }}</span>
-            <el-button class="dialog-btn" style="float:right;" @click="refreshThisRow(scope.row)"><i class="el-icon-refresh"></i></el-button>
+            <div style="width:175px;display:inline-block;">
+              <span style="line-height:29px;">{{ scope.row.Data? (scope.row.Data.Data  || '--'): '--' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+              <span style="line-height:29px;">{{ scope.row.Data? scope.row.Data.Time : '' }}</span>
+            </div>
+            <span style="width:55.33px;display:inline-block;padding-left:10px;">
+            <el-button class="dialog-btn" @click="refreshThisRow(scope.row)"><i class="el-icon-refresh"></i></el-button>
+            </span>
           </template>
         </el-table-column>
         <el-table-column prop='RelatedPoint' label='涉及子系统点位(数据来源)' show-overflow-tooltip min-width="150" align='center'>