diff --git a/public/static/config.js b/public/static/config.js index dfad4ff..46644e6 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -1,7 +1,8 @@ window.g = { AXIOS_TIMEOUT: 10000, - // ApiUrl: 'http://27.16.212.58:11100', // 配置服务器地址, - ApiUrl: 'http://192.168.99.71:11110', + ApiUrl: 'http://27.19.50.212:11100', + // ApiUrl: 'http://27.16.212.58:11100', + // ApiUrl: 'http://192.168.99.71:11110', // ApiUrl: 'http://192.168.99.107:11100', AIDeepSeekUrl:'http://192.168.99.86:12123', ProcessModelUrl:'http://192.168.99.72:11200', diff --git a/src/api/ai/ai.js b/src/api/ai/ai.js index ccc5b72..8ff712e 100644 --- a/src/api/ai/ai.js +++ b/src/api/ai/ai.js @@ -68,4 +68,36 @@ export function FetchDelResearchAI(data) { }) } -export default { FetchInitAssistEnter, FetchDoHandleEnterAnalysis, FetchInitAssistEnterTemp, FetchDelAssistEnter, FetchHandleEnterAnalysis, FetchInitShowByCategory, FetchEditResearchAI, FetchDelResearchAI } +// AI处理终端 初始化 +export function FetchInitSetting(params) { + return request({ + url: 'api/ai/initSetting' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export function FetchEditSetting(data) { + return request({ + url: 'api/ai/editSetting', + method: 'post', + data + }) +} + +// AI处理终端状态查询 +export function FetchAITerminalStatusQuery(params) { + return request({ + url: 'api/ai/AITerminalStatusQuery' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 运行/停止图书AI识别程序 +export function FetchStartStopBookAIService(params) { + return request({ + url: 'api/ai/startStopBookAIService' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export default { FetchInitAssistEnter, FetchDoHandleEnterAnalysis, FetchInitAssistEnterTemp, FetchDelAssistEnter, FetchHandleEnterAnalysis, FetchInitShowByCategory, FetchEditResearchAI, FetchDelResearchAI, FetchInitSetting, FetchEditSetting, FetchAITerminalStatusQuery, FetchStartStopBookAIService } diff --git a/src/assets/images/serve1-1.png b/src/assets/images/serve1-1.png new file mode 100644 index 0000000..7b65d0e Binary files /dev/null and b/src/assets/images/serve1-1.png differ diff --git a/src/assets/images/serve1-2.png b/src/assets/images/serve1-2.png new file mode 100644 index 0000000..5ca5a78 Binary files /dev/null and b/src/assets/images/serve1-2.png differ diff --git a/src/assets/images/serve1-3.png b/src/assets/images/serve1-3.png new file mode 100644 index 0000000..756eae2 Binary files /dev/null and b/src/assets/images/serve1-3.png differ diff --git a/src/assets/images/serve1.png b/src/assets/images/serve1.png new file mode 100644 index 0000000..6e1dd64 Binary files /dev/null and b/src/assets/images/serve1.png differ diff --git a/src/assets/images/ter1-1.png b/src/assets/images/ter1-1.png new file mode 100644 index 0000000..b83c731 Binary files /dev/null and b/src/assets/images/ter1-1.png differ diff --git a/src/assets/images/ter1.png b/src/assets/images/ter1.png new file mode 100644 index 0000000..4039b93 Binary files /dev/null and b/src/assets/images/ter1.png differ diff --git a/src/assets/images/ter2-1.png b/src/assets/images/ter2-1.png new file mode 100644 index 0000000..883c64e Binary files /dev/null and b/src/assets/images/ter2-1.png differ diff --git a/src/assets/images/ter2.png b/src/assets/images/ter2.png new file mode 100644 index 0000000..8632e5c Binary files /dev/null and b/src/assets/images/ter2.png differ diff --git a/src/assets/images/ter3-1.png b/src/assets/images/ter3-1.png new file mode 100644 index 0000000..c9ea68f Binary files /dev/null and b/src/assets/images/ter3-1.png differ diff --git a/src/assets/images/ter3.png b/src/assets/images/ter3.png new file mode 100644 index 0000000..ef6ea1b Binary files /dev/null and b/src/assets/images/ter3.png differ diff --git a/src/assets/images/ter4-1.png b/src/assets/images/ter4-1.png new file mode 100644 index 0000000..8b8e889 Binary files /dev/null and b/src/assets/images/ter4-1.png differ diff --git a/src/assets/images/ter4.png b/src/assets/images/ter4.png new file mode 100644 index 0000000..87e50cc Binary files /dev/null and b/src/assets/images/ter4.png differ diff --git a/src/assets/images/ter5-1.png b/src/assets/images/ter5-1.png new file mode 100644 index 0000000..c8ff5b5 Binary files /dev/null and b/src/assets/images/ter5-1.png differ diff --git a/src/assets/images/ter5.png b/src/assets/images/ter5.png new file mode 100644 index 0000000..03fce7c Binary files /dev/null and b/src/assets/images/ter5.png differ diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 0f5cf2d..f6964fb 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -576,6 +576,7 @@ } // 20230712 抽屉 + .el-drawer__wrapper { position: absolute; top: -22px; @@ -603,6 +604,36 @@ height: calc(100vh - 173px); } +.mask-modal{ + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + opacity: 0.3; + background: #000; + width: 100%; + height: 100%; + overflow: hidden; +} +.level1-modal{ + z-index: 2001; +} +.level2-modal{ + z-index: 2003; +} +.level3-modal{ + z-index: 2005; +} +.drawer1-modal{ + z-index: 2002 !important; +} +.drawer2-modal{ + z-index: 2004 !important; +} +.drawer3-modal{ + z-index: 2008 !important; +} .el-drawer{ overflow: visible; } diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 8f181de..4a8b386 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -133,6 +133,7 @@ ul{ //main-container全局样式 .app-wrapper{ background-color: $main-bg-light; + overflow: hidden; } .app-container { diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 0c784c1..a0cd3a7 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -4,8 +4,10 @@ transition: margin-left .28s; margin-left: $sideBarWidth; position: relative; - padding-top: $headerHeight; + // padding-top: $headerHeight; + margin-top: 118px; background-color: $main-bg-light; + z-index: 999; } .sidebar-container { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index bc73137..7243d83 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -218,7 +218,16 @@ export default { logout() { this.$store.dispatch('LogOut').then(() => { location.reload() - localStorage.clear() + // localStorage.clear() + this.clearLocalStorageExceptStatusBar() + }) + }, + clearLocalStorageExceptStatusBar() { + const keys = Object.keys(localStorage) + keys.forEach(key => { + if (key !== 'statusBarManagement') { + localStorage.removeItem(key) + } }) }, handleClose(done) { diff --git a/src/views/archivesManage/managementLibrary/anjuan/index.vue b/src/views/archivesManage/managementLibrary/anjuan/index.vue index d3b1821..a80eecb 100644 --- a/src/views/archivesManage/managementLibrary/anjuan/index.vue +++ b/src/views/archivesManage/managementLibrary/anjuan/index.vue @@ -1,5 +1,6 @@ - - - - diff --git a/src/views/components/serveTerminal.vue b/src/views/components/serveTerminal.vue new file mode 100644 index 0000000..6e89197 --- /dev/null +++ b/src/views/components/serveTerminal.vue @@ -0,0 +1,314 @@ + + + + + diff --git a/src/views/home.vue b/src/views/home.vue index ddeaa67..a60e971 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -39,10 +39,35 @@

服务器监控 +

- - - + + + + + + + + +
+ + +
+
{{ GPUName }}
+
+ + + +
+
@@ -105,9 +130,15 @@ import lendAcross from '@/views/components/echarts/lendAcross.vue' import catePie from '@/views/components/echarts/catePie.vue' import typePie from '@/views/components/echarts/typePie.vue' import serverProgress from '@/views/components/echarts/serverProgress.vue' +import serverGpu from '@/views/components/echarts/serverGpu.vue' +import serverGpuUse from '@/views/components/echarts/serverGpuUse.vue' +import serverGpuOther from '@/views/components/echarts/serverGpuOther.vue' +import serveTerminal from '@/views/components/serveTerminal.vue' import { FetchMainData } from '@/api/archivesManage/library' import { FetchSystemInfo } from '@/api/home/cpu/index' import { mapGetters } from 'vuex' +import { swiper, swiperSlide } from 'vue-awesome-swiper' +import 'swiper/css/swiper.css' export default { name: 'Dashboard', @@ -116,7 +147,13 @@ export default { lendAcross, catePie, typePie, - serverProgress + serverProgress, + serveTerminal, + serverGpu, + serverGpuUse, + serverGpuOther, + swiper, + swiperSlide }, data() { return { @@ -148,7 +185,20 @@ export default { cpuPercentage: 0, memPercentage: 0, sysFilesPercentage: 0 - } + }, + swiperOptionServer: { + autoplay: false, + slidesPerView: 'auto', + pagination: { + el: '.swiper-pagination', + clickable: true + } + }, + memoryFree: 0, + memoryTotal: 0, + GPUName: '', + temperature: 0, + utilization: 0 } }, computed: { @@ -159,7 +209,9 @@ export default { created() { this.handleMainData() this.getSystemInfo() - // this.get() + this.$nextTick(() => { + this.$refs.serveTerminalRefs.initData() + }) }, mounted() { // const _this = this @@ -191,6 +243,21 @@ export default { // }, 3000) }, methods: { + refreshSystemData() { + this.systemData = { + cpuPercentage: 0, + memPercentage: 0, + sysFilesPercentage: 0 + } + this.memoryFree = 0 + this.memoryTotal = 0 + this.GPUName = '' + this.temperature = 0 + this.utilization = 0 + + this.getSystemInfo() + this.$refs.serveTerminalRefs.initData() + }, getSystemInfo() { FetchSystemInfo().then(res => { // cpu 占有率 (总的cpuTotal-空闲的cpuFree)/总的cpuTotal @@ -207,6 +274,12 @@ export default { sysFilesTotal += parseFloat(item.total) }) this.systemData.sysFilesPercentage = Math.round((sysFilesTotalUsed / sysFilesTotal) * 100) + + this.memoryFree = res.memoryFree + this.memoryTotal = res.memoryTotal + this.GPUName = res.GPUName + this.temperature = res.temperature + this.utilization = res.utilization }) }, toMoreProcess() { @@ -312,7 +385,7 @@ export default { position: relative; .chart-wrapper { - height: calc(100% - 55px); + height: calc(100% - 92px); } } @media (max-width: 1024px) { @@ -386,4 +459,28 @@ export default { ::v-deep .home-flowable-list .el-table__body-wrapper::-webkit-scrollbar-corner { background-color: #DDE8FB !important; } + +.swiper-server{ + position: relative; + height: 300px; + ::v-deep .swiper-wrapper{ + height: 344px; + } + .swiper-pagination{ + bottom: 80px; + } +} + +.cpu-echarts{ + position: relative; + display: flex; + justify-content: flex-start; + align-items: center; + .cpu-right{ + flex: 1; + height: 100%; + display: flex; + justify-content: flex-start; + } +} diff --git a/src/views/login.vue b/src/views/login.vue index 454cb8e..339b2e0 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -124,7 +124,9 @@ export default { } }, created() { - localStorage.clear() + // localStorage.clear() + // 调用函数清除缓存 + this.clearLocalStorageExceptStatusBar() // 获取验证码 this.getCode() // 获取用户名密码等Cookie @@ -133,6 +135,14 @@ export default { this.point() }, methods: { + clearLocalStorageExceptStatusBar() { + const keys = Object.keys(localStorage) + keys.forEach(key => { + if (key !== 'statusBarManagement') { + localStorage.removeItem(key) + } + }) + }, getCode() { getCodeImg().then((res) => { this.codeUrl = res.img diff --git a/src/views/system/paramSetting/index.vue b/src/views/system/paramSetting/index.vue new file mode 100644 index 0000000..3a52210 --- /dev/null +++ b/src/views/system/paramSetting/index.vue @@ -0,0 +1,492 @@ + + + + +