Merge pull request #206 from BeyondWUXF/feature/BeyondWUXF/add_report…

…ed_status Feature/beyond wuxf/add reported status
TarsCloud · Aug 25, 2023 · 2399efe · 2399efe
2 parents 7dfae93 + 072ffd4
commit 2399efe
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/client/src/pages/server/manage.vue b/client/src/pages/server/manage.vue
@@ -147,6 +147,22 @@
         </template>
       </let-table-column>
 
+      <let-table-column
+          :title="$t('serverList.table.th.reportedStatus')"
+          width="90px"
+      >
+        <template slot-scope="scope">
+          <span
+              v-if="scope.row.present_state !== 'Active'"
+              style="color: #FF0000"
+          >{{ scope.row.present_state }}</span
+          >
+          <span v-else style="color: #49CC8F">{{
+              scope.row.present_state
+            }}</span>
+        </template>
+      </let-table-column>
+
       <let-table-column
         :title="$t('serverList.table.th.flowStatus')"
         width="90px"
@@ -1240,6 +1256,9 @@ export default {
               item.setting_state =
                 item.setting_state.charAt(0).toUpperCase() +
                 item.setting_state.slice(1);
+              item.present_state =
+                item.present_state.charAt(0).toUpperCase() +
+                item.present_state.slice(1);
             });
             this.serverPageNum = server_curr_page;
             this.serverTotal = Math.ceil(data.count / this.serverPageSize);
@@ -1255,6 +1274,9 @@ export default {
               item.setting_state =
                 item.setting_state.charAt(0).toUpperCase() +
                 item.setting_state.slice(1);
+              item.present_state =
+                  item.present_state.charAt(0).toUpperCase() +
+                  item.present_state.slice(1);
             });
             this.serverList = data;
           }

diff --git a/index/json/cn.json b/index/json/cn.json
@@ -380,6 +380,7 @@
                 "enableSet": "启用Set",
                 "configStatus": "设置状态",
                 "currStatus": "当前状态",
+                "reportedStatus": "上报状态",
                 "currMessage": "当前消息",
                 "flowStatus": "流量状态",
                 "processID": "进程ID",
@@ -1658,4 +1659,4 @@
         "errorInfo": "加载服务市场错误, 请检查网络连接是否正常",
         "reload": "重新加载"
     }
-}
+}
diff --git a/index/json/en.json b/index/json/en.json
@@ -379,6 +379,7 @@
                 "enableSet": "SET",
                 "configStatus": "Configuration Status",
                 "currStatus": "Current Status",
+                "reportedStatus": "Reported Status",
                 "currMessage": "Current Message",
                 "flowStatus": "Flow Status",
                 "processID": "Process ID",
@@ -1666,4 +1667,4 @@
         "errorInfo": "Error loading service market, please check whether the network connection is normal",
         "reload": "Reload"
     }
-}
+}