+
+ 异常警告
+
+
+
+
+ )
+ vnodes.push()
+ } else {
+ vnodes.push()
}
if (title) {
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 1e58cd7f..420f3d76 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -4,7 +4,7 @@
:class="{ collapse: collapse }"
:style="{
backgroundColor:
- sideTheme === 'theme-dark' ? '#1f2d3d' : variables.menuLightBackground,
+ sideTheme === 'theme-dark' ? '#1E1651' : variables.menuLightBackground,
}">
-
-
-
-
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index bac19f28..ead3a7bc 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,6 +1,7 @@
+
+
+
-
\ No newline at end of file
+
diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue
index be3285df..30873bd5 100644
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -17,7 +17,9 @@ export default {
const vnodes = []
if (icon) {
- vnodes.push(
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ {{ nickname }}
+ {{ dept }}
+
+.left-menu-box {
+ .el-menu-item.is-active {
+ background-color: #0b58ff !important;
+ }
+}
+
diff --git a/src/mixins/tableHeightMixin.js b/src/mixins/tableHeightMixin.js
index ad23d16e..ad2716fc 100644
--- a/src/mixins/tableHeightMixin.js
+++ b/src/mixins/tableHeightMixin.js
@@ -1,11 +1,11 @@
export default {
data() {
return {
- tableH: this.tableHeight(260),
+ tableH: this.tableHeight(296),
};
},
created() {
- this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+ this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(296);
window.addEventListener('resize', this._setTableHeight);
},
destroyed() {
@@ -13,7 +13,7 @@ export default {
},
methods: {
_setTableHeight() {
- this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+ this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(296);
// this.tableH = this.tableHeight(260);
},
},
diff --git a/src/router/index.js b/src/router/index.js
index 40189532..305eff0b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -71,7 +71,8 @@ export const constantRoutes = [
},
{
path: '/',
- component: () => import('@/views/choicePart'),
+ // component: () => import('@/views/choicePart'),
+ component: () => import('@/views/home'),
hidden: true,
meta: { requireToken: true }
},
diff --git a/src/settings.js b/src/settings.js
index 045f5eb3..17ef259c 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -13,7 +13,7 @@ module.exports = {
/**
* 是否显示顶部导航
*/
- topNav: false,
+ topNav: true,
/**
* 是否显示 tagsView
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 2da339e2..62a875b6 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -23,10 +23,15 @@ const permission = {
state.topbarRouters = routes
},
SET_SIDEBAR_ROUTERS: (state, routes) => {
+ console.log('==SET_SIDEBAR_ROUTERS==:',routes)
state.sidebarRouters = routes
},
},
actions: {
+
+
+
+
// 生成路由
GenerateRoutes({commit}) {
return new Promise(resolve => {
diff --git a/src/views/abnormalWarning/components/Navbar.vue b/src/views/abnormalWarning/components/Navbar.vue
new file mode 100644
index 00000000..cf022a9b
--- /dev/null
+++ b/src/views/abnormalWarning/components/Navbar.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+
+
+ 更多菜单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/abnormalWarning/index.vue b/src/views/abnormalWarning/index.vue
new file mode 100644
index 00000000..302512e0
--- /dev/null
+++ b/src/views/abnormalWarning/index.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
+ 更多菜单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
new file mode 100644
index 00000000..af987e32
--- /dev/null
+++ b/src/views/home/index.vue
@@ -0,0 +1,444 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/abnormalWarning/components/NavbarRight.vue b/src/views/abnormalWarning/components/NavbarRight.vue
new file mode 100644
index 00000000..8ccd6110
--- /dev/null
+++ b/src/views/abnormalWarning/components/NavbarRight.vue
@@ -0,0 +1,138 @@
+
+
+ 
+ MES产品化重构
+
+
+
+ MES产品化重构
+
+
+
+
+
+
+
+
+
diff --git a/src/views/abnormalWarning/components/TopNav.vue b/src/views/abnormalWarning/components/TopNav.vue
new file mode 100644
index 00000000..ddc4e661
--- /dev/null
+++ b/src/views/abnormalWarning/components/TopNav.vue
@@ -0,0 +1,273 @@
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ {{ nickname }}
+ {{ dept }}
+
+
+
+
+
diff --git a/src/views/home/components/Navbar.vue b/src/views/home/components/Navbar.vue
new file mode 100644
index 00000000..677378e6
--- /dev/null
+++ b/src/views/home/components/Navbar.vue
@@ -0,0 +1,167 @@
+
+
+
+
+ 
+
+
+ © 中建材智能自动化研究院有限公司
+
+
+
+
+
+
+
diff --git a/src/views/home/components/NavbarRight.vue b/src/views/home/components/NavbarRight.vue
new file mode 100644
index 00000000..9118446a
--- /dev/null
+++ b/src/views/home/components/NavbarRight.vue
@@ -0,0 +1,143 @@
+
+
+
+ MES产品化重构
+
+
+
+ MES产品化重构
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/components/TopNav.vue b/src/views/home/components/TopNav.vue
new file mode 100644
index 00000000..f41b7777
--- /dev/null
+++ b/src/views/home/components/TopNav.vue
@@ -0,0 +1,273 @@
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ {{ nickname }}
+ {{ dept }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality/currentData/currentTest.vue b/src/views/quality/currentData/currentTest.vue
index f00ada1b..96b753bb 100644
--- a/src/views/quality/currentData/currentTest.vue
+++ b/src/views/quality/currentData/currentTest.vue
@@ -70,7 +70,7 @@ export default {
};
},
mounted() {
- this.getList();
+ // this.getList();
},
methods: {
/** 查询列表 */
diff --git a/src/views/quality/currentData/hourData.vue b/src/views/quality/currentData/hourData.vue
index 5199b1e6..69827e64 100644
--- a/src/views/quality/currentData/hourData.vue
+++ b/src/views/quality/currentData/hourData.vue
@@ -24,7 +24,7 @@ export default {
},
data() {
return {
- heightNum: 200,
+ heightNum: 236,
nameData: [],
list: [],
};
diff --git a/src/views/quality/currentData/index.vue b/src/views/quality/currentData/index.vue
index c461d5df..4fef6125 100644
--- a/src/views/quality/currentData/index.vue
+++ b/src/views/quality/currentData/index.vue
@@ -45,7 +45,7 @@ export default {
diff --git a/src/views/quality/monitoring/deviceParameters/index.vue b/src/views/quality/monitoring/deviceParameters/index.vue
index 70ad1556..e8646e55 100644
--- a/src/views/quality/monitoring/deviceParameters/index.vue
+++ b/src/views/quality/monitoring/deviceParameters/index.vue
@@ -48,7 +48,7 @@
+
+
+
+
+
+ (6.13-6.20)
+
+
+ {{ topTime + timeZone }}
+
+ {{ topDate }}
+
+
+
+ 9,301.01
+ 产量/千片
+ 94.34
+ 良品率/%
+ 29,301.01
+ 完成工单数量/千片
+ 1,340
+ 完成订单数量/个
+
+
+ 2,931
+ 设备总数/台
+ 931
+ 在线设备总数/台
+ 7
+ 故障设备总数/台
+ 0
+ 停机设备总数/台
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.value }}%
+
+
+
+
+
+