diff --git a/src/assets/images/choicepart/Core.png b/src/assets/images/choicepart/Core.png
new file mode 100644
index 00000000..f1d1b73d
Binary files /dev/null and b/src/assets/images/choicepart/Core.png differ
diff --git a/src/assets/images/choicepart/Delivery.png b/src/assets/images/choicepart/Delivery.png
new file mode 100644
index 00000000..b0331ade
Binary files /dev/null and b/src/assets/images/choicepart/Delivery.png differ
diff --git a/src/assets/images/choicepart/Energy.png b/src/assets/images/choicepart/Energy.png
new file mode 100644
index 00000000..a6511565
Binary files /dev/null and b/src/assets/images/choicepart/Energy.png differ
diff --git a/src/assets/images/choicepart/Equipment.png b/src/assets/images/choicepart/Equipment.png
new file mode 100644
index 00000000..763e5396
Binary files /dev/null and b/src/assets/images/choicepart/Equipment.png differ
diff --git a/src/assets/images/choicepart/Extend.png b/src/assets/images/choicepart/Extend.png
new file mode 100644
index 00000000..ae319647
Binary files /dev/null and b/src/assets/images/choicepart/Extend.png differ
diff --git a/src/assets/images/choicepart/Group.png b/src/assets/images/choicepart/Group.png
new file mode 100644
index 00000000..3c16e819
Binary files /dev/null and b/src/assets/images/choicepart/Group.png differ
diff --git a/src/assets/images/choicepart/Material.png b/src/assets/images/choicepart/Material.png
new file mode 100644
index 00000000..b4b1364a
Binary files /dev/null and b/src/assets/images/choicepart/Material.png differ
diff --git a/src/assets/images/choicepart/Order.png b/src/assets/images/choicepart/Order.png
new file mode 100644
index 00000000..7c8a3216
Binary files /dev/null and b/src/assets/images/choicepart/Order.png differ
diff --git a/src/assets/images/choicepart/Packaging.png b/src/assets/images/choicepart/Packaging.png
new file mode 100644
index 00000000..60ccd89e
Binary files /dev/null and b/src/assets/images/choicepart/Packaging.png differ
diff --git a/src/assets/images/choicepart/Quality.png b/src/assets/images/choicepart/Quality.png
new file mode 100644
index 00000000..e6680dfa
Binary files /dev/null and b/src/assets/images/choicepart/Quality.png differ
diff --git a/src/assets/images/choicepart/Report.png b/src/assets/images/choicepart/Report.png
new file mode 100644
index 00000000..a103eede
Binary files /dev/null and b/src/assets/images/choicepart/Report.png differ
diff --git a/src/assets/images/choicepart/System.png b/src/assets/images/choicepart/System.png
new file mode 100644
index 00000000..30a1a7e8
Binary files /dev/null and b/src/assets/images/choicepart/System.png differ
diff --git a/src/assets/images/choicepart/Warehouse.png b/src/assets/images/choicepart/Warehouse.png
new file mode 100644
index 00000000..d808730d
Binary files /dev/null and b/src/assets/images/choicepart/Warehouse.png differ
diff --git a/src/assets/images/choicepart/avatar.png b/src/assets/images/choicepart/avatar.png
new file mode 100644
index 00000000..4b1f623a
Binary files /dev/null and b/src/assets/images/choicepart/avatar.png differ
diff --git a/src/assets/images/choicepart/choice-item-back.png b/src/assets/images/choicepart/choice-item-back.png
new file mode 100644
index 00000000..1cddcef5
Binary files /dev/null and b/src/assets/images/choicepart/choice-item-back.png differ
diff --git a/src/assets/images/choicepart/choicepart-back.png b/src/assets/images/choicepart/choicepart-back.png
new file mode 100644
index 00000000..2f7a3de4
Binary files /dev/null and b/src/assets/images/choicepart/choicepart-back.png differ
diff --git a/src/assets/images/cnbm.png b/src/assets/images/cnbm.png
new file mode 100644
index 00000000..ed7d3fdf
Binary files /dev/null and b/src/assets/images/cnbm.png differ
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 4902d3d8..d7c255e2 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -35,7 +35,7 @@ export default {
const first = matched[0]
if (!this.isDashboard(first)) {
- matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
+ matched = [{ path: '/', meta: { title: '首页' }}].concat(matched)
}
this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
diff --git a/src/layout/components/Sidebar/SidebarItem copy.vue b/src/layout/components/Sidebar/SidebarItem copy.vue
new file mode 100644
index 00000000..7880cbba
--- /dev/null
+++ b/src/layout/components/Sidebar/SidebarItem copy.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/Sidebar/index copy.vue b/src/layout/components/Sidebar/index copy.vue
new file mode 100644
index 00000000..79f2dc38
--- /dev/null
+++ b/src/layout/components/Sidebar/index copy.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 79f2dc38..bac19f28 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -28,7 +28,7 @@
mode="vertical">
@@ -47,7 +47,12 @@ export default {
components: { SidebarItem, Logo },
computed: {
...mapState(['settings']),
- ...mapGetters(['sidebarRouters', 'sidebar']),
+ ...mapGetters(['sidebarRouters', 'sidebar', 'choicepart']),
+ routeList() {
+ // return [this.partList[this.choicepart]]
+ // return [this.sidebarRouters[29]]
+ return [this.sidebarRouters[this.choicepart]]
+ },
activeMenu() {
const route = this.$route;
const { meta, path } = route;
diff --git a/src/router/index.js b/src/router/index.js
index 555a4184..6c36c4b4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -71,17 +71,23 @@ export const constantRoutes = [
},
{
path: '/',
- component: Layout,
- // redirect: 'core/base/factory',
- // children: [{
- // path: 'index',
- // redirect: 'core/base/factory',
- // component: (resolve) => require(['@/views/index'], resolve),
- // name: '首页',
- // meta: { title: '首页', icon: 'dashboard', affix: true }
- // }
- // ]
+ component: () => import('@/views/choicePart'),
+ hidden: true,
+ meta: { requireToken: true }
},
+ // {
+ // path: '/',
+ // component: Layout,
+ // // redirect: 'core/base/factory',
+ // // children: [{
+ // // path: 'index',
+ // // redirect: 'core/base/factory',
+ // // component: (resolve) => require(['@/views/index'], resolve),
+ // // name: '首页',
+ // // meta: { title: '首页', icon: 'dashboard', affix: true }
+ // // }
+ // // ]
+ // },
{
path: '/user',
component: Layout,
diff --git a/src/store/getters.js b/src/store/getters.js
index 79cdf2c3..16103f89 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,6 +17,7 @@ const getters = {
topbarRouters:state => state.permission.topbarRouters,
defaultRoutes:state => state.permission.defaultRoutes,
sidebarRouters:state => state.permission.sidebarRouters,
+ choicepart: state => state.app.choicepart,
// 数据字典
dict_datas: state => state.dict.dictDatas
}
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 623622e1..55fa6c8e 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -8,6 +8,7 @@ const state = {
},
device: "desktop",
size: localStorage.getItem("size") || "medium",
+ choicepart: localStorage.getItem('choicepart') || null
};
const mutations = {
@@ -38,6 +39,10 @@ const mutations = {
SET_SIDEBAR_HIDE: (state, status) => {
state.sidebar.hide = status;
},
+ SET_CHOICEPART: (state, choicepart) => {
+ state.choicepart = choicepart
+ localStorage.setItem('choicepart', choicepart)
+ }
};
const actions = {
@@ -56,6 +61,9 @@ const actions = {
toggleSideBarHide({ commit }, status) {
commit("SET_SIDEBAR_HIDE", status);
},
+ setChoicepart({ commit }, choicepart) {
+ commit('SET_CHOICEPART', choicepart)
+ }
};
export default {
diff --git a/src/views/choicePart/components/Navbar.vue b/src/views/choicePart/components/Navbar.vue
new file mode 100644
index 00000000..7c0a0e03
--- /dev/null
+++ b/src/views/choicePart/components/Navbar.vue
@@ -0,0 +1,87 @@
+
+
+
+
+ MES
+
+
+
+
{{timeZone}} {{topTime}}
+
{{topDate}}
+
+
+
+
+
+
+
{{userName}}
+
角色名11111111111111
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/choicePart/index.vue b/src/views/choicePart/index.vue
new file mode 100644
index 00000000..5ee61349
--- /dev/null
+++ b/src/views/choicePart/index.vue
@@ -0,0 +1,312 @@
+
+
+
+
+
+
+
+
+
+
+
{{item.meta.title}}
+
+
+
+
+
+
+
+
{{item.meta.title}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue
index 37924793..61389315 100644
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -34,7 +34,7 @@
取消
- 班组上下片查询
+
班组能源查询
班组检测查询
@@ -286,22 +286,18 @@ export default {
case '1':
this.$router.push({
path: '/core/enhance/product-line-24h?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
- // name: 'ProductionLineData',
- // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
})
break;
case '2': // 能源
this.$router.push({
path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
- // name: 'EnergyReportSearch',
- // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
})
break;
default:
this.$router.push({
- path: '/quality/monitoring/quality-statistics',
+ path: '/quality/base/quality-inspection-data/detection-information/statistical-data?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
// name: 'QualityStatistics',
- params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
+ // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
})
}
}
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index d20b887a..4da07614 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -332,10 +332,14 @@ export default {
console.log(val)
switch (val.type) {
case 'orderDetail':
-
+ this.$router.push({
+ path: '/base/coreWorkOrder/detail?orderId='+val.data.orderid
+ })
break
case 'qualityDetail':
-
+ this.$router.push({
+ path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString,
+ })
break
default:
this.$router.push({