diff --git a/src/resources/api/framework/index.js b/src/resources/api/framework/index.js
index 867bb4256a8ab8f4c20433cee1749e2d97a3cb22..9fb60fdeeb24ef196500937799d347f2c79badeb 100644
--- a/src/resources/api/framework/index.js
+++ b/src/resources/api/framework/index.js
@@ -37,6 +37,7 @@ import extramenu from './extramenu/extramenu'; //附加菜单
 import region from './region/region';//地域管理
 import homepage from './homepage/homepage';//默认首页
 import changelogaudit from './changelogaudit/changelogaudit';//数据库变更记录
+import log from './log/log';// 查看日志
 export default {
   role,
   user,
@@ -75,5 +76,6 @@ export default {
   extramenu,
   region,
   homepage,
-  changelogaudit
+  changelogaudit,
+  log
 };
diff --git a/src/resources/api/framework/log/log.js b/src/resources/api/framework/log/log.js
new file mode 100644
index 0000000000000000000000000000000000000000..37d4b3fc06434f5aeeb3af5ec75d07515d8f5c23
--- /dev/null
+++ b/src/resources/api/framework/log/log.js
@@ -0,0 +1,13 @@
+import axios from '../../http';
+
+const log = {
+  getLogFileNameList(params) {
+    return axios.post('/api/rest/log/filename/list', params);
+  },
+  
+  getLogContent(params) {
+    return axios.post('/api/rest/log/content/get', params);
+  }
+};
+
+export default log;
diff --git a/src/resources/api/framework/server/server.js b/src/resources/api/framework/server/server.js
index 364e199a8b5df5d070bd4a49ab96ef2cd47954c2..a7e25a889db1ab56454d0990687f44b2109ae8e1 100644
--- a/src/resources/api/framework/server/server.js
+++ b/src/resources/api/framework/server/server.js
@@ -1,8 +1,8 @@
 import axios from '../../http';
 
 const server = {
-  getServerList() {
-    return axios.post('api/rest/server/list', {});
+  getServerList(param) {
+    return axios.post('api/rest/server/list', param);
   },
   saveServer(param) {
     return axios.post('api/rest/server/save', param);
diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index e86bb39eaf6685d2f844a083f56bdc208f26be91..685fb7d5d65b52a48915115da096267dc4db7bb0 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -1076,5 +1076,6 @@
   "autoexecbatchround": "in batches",
   "autoexecparall": "Concurrency",
   "autoexecparallel": "Concurrent settings",
-  "paramkeyword": "Participate in search"
+  "paramkeyword": "Participate in search",
+  "loglevel": "log level"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json
index fe13d332d3b55176dbe5a742736691b035b07285..f6ac63567b3ace299180d05414f6f2b0a904136a 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -1078,5 +1078,6 @@
   "autoexecbatchround": "分批",
   "autoexecparall": "并发",
   "autoexecparallel": "并发设置",
-  "paramkeyword": "入参搜索"
+  "paramkeyword": "入参搜索",
+  "loglevel": "日志级别"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/router/en.json b/src/resources/assets/languages/router/en.json
index cc1a64b3e6c1eb0c88356121b1dc06275f4d2da3..22778a4b8228a6d573ee6710c0f950453b350db5 100644
--- a/src/resources/assets/languages/router/en.json
+++ b/src/resources/assets/languages/router/en.json
@@ -170,7 +170,8 @@
     "license": "License Management",
     "extramenu": "Menu management",
     "homepage": "default page ",
-    "changelogaudit": "Database Change Log"
+    "changelogaudit": "Database Change Log",
+    "log": "view log"
   },
   "knowledge": {
     "knowledgedetail": "entry details",
diff --git a/src/resources/assets/languages/router/zh.json b/src/resources/assets/languages/router/zh.json
index 9d4626d540198177c65f3a64000b27728f8bc0b9..0e70111e70dc26e17bacafb9fe3b6ceaab5ea4f3 100644
--- a/src/resources/assets/languages/router/zh.json
+++ b/src/resources/assets/languages/router/zh.json
@@ -170,7 +170,8 @@
     "license": "许可管理",
     "extramenu": "菜单管理",
     "homepage": "默认首页",
-    "changelogaudit": "数据库变更记录"
+    "changelogaudit": "数据库变更记录",
+    "log": "查看日志"
   },
   "knowledge": {
     "knowledgedetail": "词条详情",
diff --git a/src/views/pages/framework/log/log-manage.vue b/src/views/pages/framework/log/log-manage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..78cd102a648b710a4f54d130d53c5cf2ab493bfa
--- /dev/null
+++ b/src/views/pages/framework/log/log-manage.vue
@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <TsContain>
+      <template v-slot:topLeft>
+        <div class="action-group">
+          <div v-if="level != null" class="action-item">
+            <span class="mr-xs text-grey">{{ $t('page.loglevel') }}</span>
+            <span>
+              <b>{{ level }}</b>
+            </span>
+          </div>
+        </div>
+      </template>
+      <template v-slot:topRight>
+        <div>
+          <Row class="action-group" span="24" :gutter="16">
+            <Col span="8">
+              <TsFormSelect
+                v-model="serverSelectSetting.value"
+                v-bind="serverSelectSetting"
+                @change="handleChangeServerId"
+              ></TsFormSelect>
+            </Col>
+            <Col span="12">
+              <TsFormSelect
+                v-model="fileNameSelectSetting.value"
+                v-bind="fileNameSelectSetting"
+                @change="handleChangeFileName"
+              ></TsFormSelect>
+            </Col>
+            <Col span="2">
+              <div v-if="searchParam.fileName != null" class="action-item tsfont-refresh" @click="refreshLog()">{{ $t('page.refresh') }}</div>
+            </Col>
+            <Col span="2">
+              <div v-if="searchParam.fileSize != null" class="action-item tsfont-download" @click="exportLog()">{{ $t('page.export') }}</div>
+            </Col>
+          </Row>
+        </div>
+      </template>
+      <div slot="content">
+        <div ref="textContainer" style="overflow: auto; white-space: pre-wrap">
+          <div 
+            v-for="(line, index) in logLines"
+            :key="index"
+            :class="getLineClass(line)"
+          >
+            {{ line }}
+          </div>
+        </div>
+      </div>
+    </TsContain>
+  </div>
+</template>
+<script>
+import download from '@/resources/mixins/download.js';
+export default {
+  name: '',
+  components: {
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect.vue')
+  },
+  mixins: [download],
+  props: {},
+  data() {
+    return {
+      searchParam: {
+        serverId: null,
+        fileName: null,
+        fileSize: null
+      },
+      serverSelectSetting: {
+        defaultValueIsFirst: false,
+        dataList: [],
+        transfer: true,
+        placeholder: this.$t('page.server'),
+        value: ''
+      },
+      fileNameSelectSetting: {
+        defaultValueIsFirst: false,
+        dataList: [],
+        transfer: true,
+        placeholder: this.$t('page.filename'),
+        value: ''
+      },
+      logLines: [],
+      level: null
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.getServerList();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestory() {},
+  destroyed() {},
+  methods: {
+    getServerList() {
+      let _this = this;
+      let param = {
+        status: 'startup'
+      };
+      this.$api.framework.server.getServerList(param).then(res => {
+        if (res.Status === 'OK') {
+          let tbodyList = res.Return.tbodyList;
+          tbodyList.forEach(item => {
+            _this.serverSelectSetting.dataList.push({
+              value: item.serverId,
+              text: item.serverId + ' (' + item.host + ')'
+            });
+          });
+          _this.serverSelectSetting.value = res.Return.currentServerId;
+          this.handleChangeServerId(res.Return.currentServerId);
+        }
+      });
+    },
+    handleChangeServerId(serverId) {
+      this.searchParam.fileName = null;
+      this.searchParam.fileSize = null;
+      this.logLines = [];
+      if (serverId != null) {
+        this.searchParam.serverId = serverId;
+      } else {
+        this.searchParam.serverId = null;
+        this.level = null;
+      }
+      this.getLogFileNameList();
+    },
+    getLogFileNameList() {
+      let _this = this;
+      _this.fileNameSelectSetting.value = null;
+      _this.fileNameSelectSetting.dataList = [];
+      if (this.searchParam && this.searchParam.serverId != null) {
+        this.$api.framework.log.getLogFileNameList(this.searchParam).then(res => {
+          _this.level = res.Return.level;
+          let tbodyList = res.Return.tbodyList;
+          tbodyList.forEach(item => {
+            _this.fileNameSelectSetting.dataList.push({
+              value: item.fileName,
+              text: item.fileName + ' (' + item.fileSize + ')'
+            });
+          });
+        });
+      }
+    },
+    handleChangeFileName(fileName) {
+      if (fileName != null) {
+        this.searchParam.fileName = fileName;
+        this.getLogContent(false);
+      } else {
+        this.searchParam.fileName = null;
+        this.searchParam.fileSize = null;
+        this.logLines = [];
+      }
+    },
+    getLogContent(isRefresh) {
+      if (this.searchParam && this.searchParam.serverId != null && this.searchParam.fileName != null) {
+        this.$api.framework.log.getLogContent(this.searchParam).then(res => {
+          if (res.Return.isRefresh == 1) {
+            let logData = res.Return.content;
+            this.logLines = logData.split('\n');
+            this.searchParam.fileSize = res.Return.fileSize;
+            if (isRefresh) {
+              this.$Message.success(this.$t('message.refreshsuccess'));
+            }
+          } else {
+            if (isRefresh) {
+              this.$Message.success(this.$t('message.nothingchange'));
+            }
+          }
+        });
+      }
+    },
+    getLineClass(line) {
+      if (line.includes('\tat neatlogic')) {
+        return 'text-error';
+      }
+    },
+    refreshLog() {
+      this.getLogContent(true);
+    },
+    exportLog() {
+      let param = {
+        url: 'api/binary/log/file/export',
+        params: this.searchParam
+      };
+      this.download(param);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less" scoped>
+
+</style>
diff --git a/src/views/pages/framework/router.js b/src/views/pages/framework/router.js
index d751ed90edef816d4f829bb62350a844064562de..6bd822aadc4da99bff3abf275172868b68e988d9 100644
--- a/src/views/pages/framework/router.js
+++ b/src/views/pages/framework/router.js
@@ -61,6 +61,7 @@ const extramenuManage = () => import('./extramenu/extramenu-manage.vue'); //菜
 const regionManage = () => import('./region/region-manage.vue');//地域管理
 const homepageManage = () => import('./homepage/homepage-manage.vue');//首页管理
 const changelogAuditManage = () => import('./changelogaudit/changelogaudit-manage.vue');//数据库变更记录
+const logManage = () => import('./log/log-manage.vue');//查看日志
 
 import { $t } from '@/resources/init.js';
 import { config } from './config.js';
@@ -756,6 +757,18 @@ let routerList = [
       authority: 'ADMIN',
       type: 'others'
     }
+  },
+  {
+    path: '/log-manage',
+    name: 'logManage',
+    component: logManage,
+    meta: {
+      title: $t('router.framework.log'),
+      ismenu: true,
+      icon: 'tsfont-history',
+      authority: 'ADMIN',
+      type: 'others'
+    }
   }
 ];
 export default routerList;
diff --git a/src/views/pages/framework/server/server-manage.vue b/src/views/pages/framework/server/server-manage.vue
index 2c7916484732aba8a5de1ab7b073301b1226f161..6bd92535d699b6f03907cb988bab8edd77f97e38 100644
--- a/src/views/pages/framework/server/server-manage.vue
+++ b/src/views/pages/framework/server/server-manage.vue
@@ -3,7 +3,12 @@
     <TsContain>
       <template v-slot:topLeft>
         <div class="action-group">
-
+          <div v-if="currentServerId != null" class="action-item">
+            <span class="mr-xs text-grey">{{ $t('page.serverid') }}</span>
+            <span>
+              <b>{{ currentServerId }}</b>
+            </span>
+          </div>
         </div>
       </template>
       <template v-slot:topRight>
@@ -64,6 +69,7 @@ export default {
   props: {},
   data() {
     return {
+      currentServerId: null,
       loading: false,
       currentPage: 1,
       pageSize: 20,
@@ -143,9 +149,10 @@ export default {
     },
     getServerList() {
       this.loading = true;
-      this.$api.framework.server.getServerList().then(res => {
+      this.$api.framework.server.getServerList({}).then(res => {
         if (res.Status === 'OK') {
           this.tableData = res.Return;
+          this.currentServerId = res.Return.currentServerId;
         }
       }).finally(() => {
         this.loading = false;