From 5fe329e576318f8d61c9e476b50f3e329dac4b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Thu, 16 Apr 2020 18:49:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmodel=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAassetstat=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/App.vue                     |  1 -
 nezha-fronted/src/assets/stylus/main.scss     | 35 +++++++++++++++++++
 .../src/components/page/config/dc.vue         | 35 ++++---------------
 .../src/components/page/config/model.vue      |  9 ++++-
 4 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/nezha-fronted/src/App.vue b/nezha-fronted/src/App.vue
index 6d59edb89..d7335f6aa 100644
--- a/nezha-fronted/src/App.vue
+++ b/nezha-fronted/src/App.vue
@@ -24,7 +24,6 @@ export default {
 #app{
   height: 100%;
   width: 100%;
-  min-width: 1300px;
 }
 </style>
 <style>
diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 65e970f54..a151e00a8 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -1010,6 +1010,41 @@ li{
 .dc-dropdown {
   z-index: 2952 !important;
 }
+.asset-state .cell {
+  height: 38px;
+}
+.asset-state .cell>span {
+  display: block;
+  height: 100%;
+}
+.dc-asset-states {
+  display: flex;
+  align-items: center;
+  height: 100%;
+}
+.dc-asset-state {
+  display: inline-block;
+  min-width: 25px;
+  height: 20px;
+  color: white;
+  text-align: center;
+  line-height: 20px;
+  margin-right: 6px;
+  border-radius: 3px;
+}
+.dc-asset-state-total {
+  background-color: #1166bb;
+  margin-right: 15px
+}
+.dc-asset-state-in {
+  background-color: #90ee90;
+}
+.dc-asset-state-out {
+  background-color: orange;
+}
+.dc-asset-state-high {
+  background-color: rgba(255, 0, 0, 0.6);
+}
 .chart-box-dropdown {
   width: 519px;
 }
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 4938208fd..7afa15df7 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -2,34 +2,6 @@
   .dc {
     height: 100%;
   }
-  .dc-asset-states {
-    display: flex;
-    align-items: center;
-    height: 100%;
-  }
-  .dc-asset-state {
-    display: inline-block;
-    min-width: 25px;
-    height: 20px;
-    color: white;
-    text-align: center;
-    line-height: 20px;
-    margin-right: 6px;
-    border-radius: 3px;
-  }
-  .dc-asset-state.dc-asset-state-total {
-    background-color: #1166bb;
-    margin-right: 15px
-  }
-  .dc-asset-state-in {
-    background-color: #90ee90;
-  }
-  .dc-asset-state-out {
-    background-color: orange;
-  }
-  .dc-asset-state-high {
-    background-color: rgba(255, 0, 0, 0.6);
-  }
 </style>
 <template>
     <div class="dc" >
@@ -87,6 +59,7 @@
             v-scrollBar:el-table
             :height="mainTableHeight"
             ref="dcTable"
+            :cell-class-name="assetStatClassName"
             style="width: 100%;">
             <el-table-column
               :resizable="false"
@@ -290,6 +263,12 @@
         //悬浮点击空白隐藏
         this.$refs.elementset.elementsetHide();
       },
+      assetStatClassName(param) {
+        if (param.column.label == this.$t("config.dc.assets")) {
+          return "asset-state";
+        }
+        return "";
+      },
       tablelabelEmit(data) {
         //获取子组件传过来的参数
         this.$store.commit('setHeaderTable', data);
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index 780f007c4..f3630e0fb 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -45,7 +45,7 @@
           </button>
         </div>
       </div>
-      <el-table :data="tableData" border :height="$tableHeight.normal" style="width: 100%;" ref="modelTable" class="nz-table" v-scrollBar:el-table>
+      <el-table :data="tableData" border :height="$tableHeight.normal" style="width: 100%;" ref="modelTable" class="nz-table" v-scrollBar:el-table :cell-class-name="assetStatClassName">
         <el-table-column :resizable="false" v-for="(item, index) in tablelable" v-if="item.show" :width="item.width"
                          :key="`col-${index}`" :label="item.label">
           <template slot-scope="scope" :column="item">
@@ -196,6 +196,12 @@
         //悬浮点击空白隐藏
         this.$refs.elementset.elementsetHide();
       },
+      assetStatClassName(param) {
+        if (param.column.label == this.$t("config.model.assets")) {
+          return "asset-state";
+        }
+        return "";
+      },
       tablelabelEmit(data) {
         //获取子组件传过来的参数
         this.$store.commit('setHeaderTable', data);
@@ -249,6 +255,7 @@
         this.tableData = [];
         this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo);
         this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize);
+        this.$set(this.searchLabel, "stat", 1);
         this.$get('model', this.searchLabel).then(response => {
           if (response.code === 200) {
             this.tableData = response.data.list;