show server info

anjoy8 · anjoy8 · commit 9be67916893b · 2020-05-29T20:25:01.000+08:00
diff --git a/src/api/api.js b/src/api/api.js
@@ -288,6 +288,11 @@ export const getAccessApiByDate = params => {
 export const getAccessApiByHour = params => {
     return axios.get(`${base}/api/Monitor/GetAccessApiByHour`, {params: params});
 };
+export const getServerInfo = params => {
+    return axios.get(`${base}/api/Monitor/Server`, {params: params});
+};
+
+
 // Task管理
 export const getTaskListPage = params => {
     return axios.get(`${base}/api/TasksQz/get`, {params: params});
diff --git a/src/views/Task/QuartzJob.vue b/src/views/Task/QuartzJob.vue
@@ -25,7 +25,7 @@
       </el-table-column>
 
       <el-table-column prop="Cron" label="Cron表达式" width sortable></el-table-column>
-      <el-table-column prop="IntervalSecond" label="循环时间" width sortable></el-table-column>
+      <el-table-column prop="IntervalSecond" label="循环s" width sortable></el-table-column>
       <el-table-column prop="RunTimes" label="运行次数" width sortable></el-table-column>
       <el-table-column prop="AssemblyName" label="程序集" width sortable></el-table-column>
       <el-table-column prop="ClassName" label="执行类" width="150" sortable></el-table-column>
@@ -41,6 +41,20 @@
           >{{scope.row.IsStart ? "运行中":"停止"}}</el-tag>
         </template>
       </el-table-column>
+
+      
+    <el-table-column
+      label="日志" >
+      <template slot-scope="scope">
+        <el-popover trigger="hover" placement="top">
+          <p v-html="scope.row.Remark"></p>
+          <div slot="reference" class="name-wrapper">
+            <el-tag size="medium">Log</el-tag>
+          </div>
+        </el-popover>
+      </template>
+    </el-table-column>
+
     </el-table>
 
     <!--工具条-->
diff --git a/src/views/Welcome.vue b/src/views/Welcome.vue
@@ -12,14 +12,39 @@
   <div class="text item"><i class="el-icon-edit"></i>、更多内容，查看官方文档：<a href="http://vueadmin.neters.club/.doc/" target="_blank">http://vueadmin.neters.club/.doc/</a>。  </div>
 </el-card>
 <el-card class="welcome-card">
-    <el-aside>动态添加一个vue页面：</el-aside>
+   <div slot="header" class="clearfix">
+    <span>服务器：</span>
+   </div>
 
     <br>
+  <div class="text item">环境变量：{{serverInfo.EnvironmentName}}</div>
+  <div class="text item">系统架构：{{serverInfo.OSArchitecture}}</div>
+  <div class="text item">ContentRootPath：{{serverInfo.ContentRootPath}}</div>
+  <div class="text item">WebRootPath：{{serverInfo.WebRootPath}}</div>
+  <div class="text item">.NET Core版本：{{serverInfo.FrameworkDescription}}</div>
+  <div class="text item">内存占用：{{serverInfo.MemoryFootprint}}</div>
+  <div class="text item">启动时间：{{serverInfo.WorkingTime}}</div>
+    
+
     
-    <div class="text item"><i class="el-icon-edit"></i>、更多内容，查看博客园文档：<a href="https://www.cnblogs.com/laozhang-is-phi/p/10643993.html#autoid-2-6-0" target="_blank">https://www.cnblogs.com/laozhang-is-phi/p/10643993.html#autoid-2-6-0</a>。  </div>
 </el-card>
 <el-card class="welcome-card">
-    <el-aside>快速配置接口权限：</el-aside>
+    <div slot="header" class="clearfix">
+        <span>相关配置</span>
+    </div>
+
+
+    <el-aside>1、动态添加一个vue页面：</el-aside>
+
+    <br>
+    
+    <div class="text item"><i class="el-icon-edit"></i>、更多内容，查看博客园文档：<a href="https://www.cnblogs.com/laozhang-is-phi/p/10643993.html#autoid-2-6-0" target="_blank">https://www.cnblogs.com/laozhang-is-phi/p/10643993.html#autoid-2-6-0</a>。  </div>
+
+    <br>
+    <hr>
+    <br>
+
+    <el-aside>2、快速配置接口权限：</el-aside>
 
     <br>
     <div style="height: 300px;overflow-y: auto;">
@@ -44,9 +69,15 @@
 
 <script>
     import applicationUserManager from "../Auth/applicationusermanager";
+    import {getServerInfo} from '../api/api';
   
   export default {
         name: "Welcome",
+         data() {
+            return {
+                serverInfo:{}
+            }
+        },
         mounted() {
             var curTime = new Date()
             if(window.localStorage.TokenExpire){
@@ -66,6 +97,10 @@
                 }
             }
 
+            getServerInfo({}).then((res) => {
+                this.serverInfo = res.data.response;
+            });
+
         },
     }
 </script>
