Bladeren bron

标号功能号总览样式调整

LXXXY 5 jaren geleden
bovenliggende
commit
175042a41c
2 gewijzigde bestanden met toevoegingen van 14 en 14 verwijderingen
  1. 12 12
      src/components/point/report/tabFunNumOverview.vue
  2. 2 2
      src/views/point/report/index.vue

+ 12 - 12
src/components/point/report/tabFunNumOverview.vue

@@ -11,36 +11,36 @@
     <!-- 数据表格 -->
     <div class="table-area">
       <el-table :data="tableData" style="width: 100%" height="calc(100% - 40px)" v-loading="loading" :header-cell-style="headerStyle">
-        <el-table-column prop='' label='' show-overflow-tooltip width="30">
+        <el-table-column prop='' label='' show-overflow-tooltip width="30" header-align='center'>
           <template slot-scope="scope">
             <el-tooltip v-if="scope.row.DataQuality!=0" content="已断数,请检查" placement="bottom" effect="light">
               <i class="el-icon-warning-outline" style="float:left;margin: 0 5px;color: red;"></i>
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop='Data.Data' label='对应值(单位)' show-overflow-tooltip min-width="90">
+        <el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100" header-align='center'></el-table-column>
+        <el-table-column prop='Data.Data' label='对应值(单位)' show-overflow-tooltip min-width="90" header-align='center'>
           <template slot-scope="scope">
             <span>{{ scope.row.Data? scope.row.Data.Data : '' }}</span>
             <i @click="handleDrawer(scope.row, 0)" class="el-icon-s-data"></i>
           </template>
         </el-table-column>
-        <el-table-column prop='Data.Time' label='获取时间' show-overflow-tooltip min-width="130">
+        <el-table-column prop='Data.Time' label='获取时间' show-overflow-tooltip min-width="130" header-align='center'>
           <template slot-scope="scope">
             <span>{{ scope.row.Data? scope.row.Data.Time: '' }}</span>
             <i class="el-icon-refresh" @click="refreshThisRow(scope.row)"></i>
           </template>
         </el-table-column>
-        <el-table-column prop='RelatedPoint' label='涉及子系统点位(数据来源)' show-overflow-tooltip min-width="150">
+        <el-table-column prop='RelatedPoint' label='涉及子系统点位(数据来源)' show-overflow-tooltip min-width="150" align='center'>
           <template slot-scope="scope">
-            <span>{{ scope.row.RelatedPoint }}</span>
-            <i @click="handleDrawer(scope.row, 1)" class="el-icon-coin"></i>
+            <span style="display:inline-block;width:16px;">{{ scope.row.RelatedPoint }}</span>
+            <i @click="handleDrawer(scope.row, 1)" class="el-icon-coin" style="float:none;margin-left:10px;"></i>
           </template>
         </el-table-column>
-        <el-table-column prop='RelatedInstance' label='涉及的对象实例(应用到)' show-overflow-tooltip min-width="150">
+        <el-table-column prop='RelatedInstance' label='涉及的对象实例(应用到)' show-overflow-tooltip min-width="150" align='center'>
           <template slot-scope="scope">
-            <span>{{ scope.row.RelatedInstance }}</span>
-            <i @click="handleDrawer(scope.row, 2)" class="el-icon-coin"></i>
+            <span style="display:inline-block;width:16px;">{{ scope.row.RelatedInstance }}</span>
+            <i @click="handleDrawer(scope.row, 2)" class="el-icon-coin" style="float:none;margin-left:10px;"></i>
           </template>
         </el-table-column>
       </el-table>
@@ -102,9 +102,9 @@ export default {
   methods: {
     //抽屉处理
     handleDrawer(row, index) {
-      if (index == 2) {
+      if (index == 2 || index == 1) {
         //实例数量大于0才能打开
-        if (row.RelatedInstance > 0) {
+        if ((row.RelatedInstance > 0 && index == 2) || (row.RelatedPoint > 0 && index == 1)) {
           this.drawers[index].value = row.Data ? row.Data.Data : '';
           this.drawers[index].objId = row.MeterFunc;
           this.drawers[index].drawer = true;

+ 2 - 2
src/views/point/report/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 系统集成统计页面 -->
-    <div class="contain-block" style="width:calc(40% - 20px);margin-right:20px;">
+    <div class="contain-block" style="width:calc(30% - 20px);margin-right:20px;">
       <span class="contain-title-leftblock">系统集成统计</span>
       <div class="contain-data">
         <integrateStatistics ref="chart" style="height: calc(100% - 15px);" :key="refresh"></integrateStatistics>
@@ -55,7 +55,7 @@ export default {
   float: left;
   height: 100%;
   background: white;
-  width: 60%;
+  width: 70%;
 }
 .contain-title-leftblock {
   height: 30px;