diff --git a/hb_client/.env.development b/hb_client/.env.development index 003a43c..ef83e12 100644 --- a/hb_client/.env.development +++ b/hb_client/.env.development @@ -2,8 +2,8 @@ ENV = 'development' # base api -#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' -VUE_APP_BASE_API = 'http://47.95.0.242:2222/api' +VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' +#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/hb_client/src/layout/index.vue b/hb_client/src/layout/index.vue index 2993021..a0d3695 100644 --- a/hb_client/src/layout/index.vue +++ b/hb_client/src/layout/index.vue @@ -67,13 +67,13 @@ export default { if (hasToken) { this.$store.dispatch("user/getCount", {}); } - this.timer = window.setInterval(() => { + /*this.timer = window.setInterval(() => { setTimeout(() => { if (hasToken) { this.$store.dispatch("user/getCount", {}); } },0) - },5000) + },5000)*/ }, methods: { handleClickOutside() { diff --git a/hb_client/src/styles/index.scss b/hb_client/src/styles/index.scss index 13042e0..73e86dd 100644 --- a/hb_client/src/styles/index.scss +++ b/hb_client/src/styles/index.scss @@ -62,7 +62,7 @@ div:focus { // main-container global css .app-container { - padding: 10px; + padding: 2px; } .el-table--medium td,   .el-table--medium th { diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue index 89d54b0..4238688 100644 --- a/hb_client/src/views/em/detection.vue +++ b/hb_client/src/views/em/detection.vue @@ -24,13 +24,13 @@ >重置 -
+
新增设备
- + 重置
-
+
新增设备
- + 重置
-
+
新增校准或检定
- +
- -
+ +
新增物料 @@ -153,7 +153,7 @@
- + + diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue index 3f1a7aa..ba70e95 100644 --- a/hb_client/src/views/inm/fifodetail.vue +++ b/hb_client/src/views/inm/fifodetail.vue @@ -25,7 +25,7 @@ >
- +
- + - + 重置 -
+
新增仓库
- +
+ + + +
+ CPU +
+ + + + {{ cpuData.count }} + + + + {{ cpuData.lcount }} + + + + {{ cpuData.percent }}% + + + + + + +
+ 内存 +
+ + + + {{ memoryData.total }}GB + + + + {{ memoryData.used }}GB + + + + {{ memoryData.percent }}% + + + + + + +
+ 硬盘 +
+ + + + {{ diskData.total }}GB + + + + {{ diskData.used }}GB + + + + {{ diskData.percent }}% + + + + + -
- - - - -
- CPU -
- - - 属性 - - - 值 - - - - - 逻辑核心数 - - - {{cpuData.count}} - - - - - 物理核心数 - - - {{cpuData.lcount}} - - - - - 当前使用率 - - - {{cpuData.percent}}% - - - - - - -
- 内存 -
- - - 属性 - - - 值 - - - - - 使用率 - - - {{memoryData.percent}}% - - - - - 总内存 - - - {{memoryData.total}} - - - - - 已用内存 - - - {{memoryData.used}} - - - - - - -
- 硬盘 -
- - - 属性 - - - 值 - - - - - 已用百分比 - - - {{diskData.percent}}% - - - - - 总大小 - - - {{diskData.total}} - - - - - 已用大小 - - - {{diskData.used}} - - - - - -
- - +
日志列表
@@ -141,45 +83,33 @@ type="primary" icon="el-icon-search" @click="handleFilter" - >搜索 + >搜索 重置 + >重置
- - - - - + + + - +
@@ -188,121 +118,60 @@ - + getServerList() { + getServerList().then((response) => { + if (response.data) { + this.cpuData = response.data.cpu; + this.diskData = response.data.disk; + this.memoryData = response.data.memory; + } + }); + }, + handleClick(row) { + this.dialogVisible = true; + getLog(row.name).then((response) => { + if (response.data) { + this.logdec = response.data.replace(/\n/gm, "
"); + } + }); + }, + }, +}; + \ No newline at end of file diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue index 9eb99f4..b781fc5 100644 --- a/hb_client/src/views/mtm/material.vue +++ b/hb_client/src/views/mtm/material.vue @@ -24,13 +24,13 @@ >重置
-
+
新增物料
- + -
+
新增工序
- + - + 新增 重置
-
+
新增供应商
- + 重置
-
+
新增标准
- + 重置
-
+
新增项目
- + 重置
-
+
新增客户
- + 重置
-
+
新增客户
- + 重置
-
+
新增订单
- + 重置
-
+
新增客户
- + @@ -52,7 +52,7 @@ v-show="listQuery.type" v-loading="listLoading" :data="dictList" - style="width: 100%;margin-top:10px;" + style="width: 100%;margin-top: 2px;" highlight-current-row row-key="id" height="100" diff --git a/hb_client/src/views/system/file.vue b/hb_client/src/views/system/file.vue index b9c70a8..02307b3 100644 --- a/hb_client/src/views/system/file.vue +++ b/hb_client/src/views/system/file.vue @@ -41,7 +41,7 @@ -
+
新增
- + 重置
-
+
新增
- +
-
+
新增
- + 添加修改 - + 搜索
-
+
新增
diff --git a/hb_client/src/views/workflow/transitions.vue b/hb_client/src/views/workflow/transitions.vue index 341fa2b..d0827f6 100644 --- a/hb_client/src/views/workflow/transitions.vue +++ b/hb_client/src/views/workflow/transitions.vue @@ -2,13 +2,13 @@
-
+
新增
- + 重置
-
+
新增项目
- +