diff --git a/hw-ui/src/layout/index2.vue b/hw-ui/src/layout/index2.vue
index 71192199..1b451512 100644
--- a/hw-ui/src/layout/index2.vue
+++ b/hw-ui/src/layout/index2.vue
@@ -8,21 +8,12 @@
- 切换看板
+ {{ (menuData.find(v=>v.path === $route.fullPath)||{}).name }}
后台系统
- 一楼生产
- 一楼能源
- 二楼生产
- 二楼仓储
- 三楼生产
- 三楼仓储
- 四楼生产
- 四楼仓储
- 五楼生产
- 五楼仓储
+ {{ i.name }}
@@ -41,7 +32,45 @@
data: '',
time: '',
date: '',
- value: ''
+ value: '',
+ menuData:[
+ {
+ name:'一楼生产',
+ path:'/board/firstFloorProduction'
+ },
+ {
+ name:'一楼能源',
+ path:'/board/firstFloorWarehouse'
+ },
+ {
+ name:'二楼生产',
+ path:'/board/secondFloorProduction'
+ },
+ {
+ name:'二楼仓储',
+ path:'/board/secondFloorWarehouse'
+ },
+ {
+ name:'三楼生产',
+ path:'/board/thirdFloorProduction'
+ },
+ {
+ name:'三楼仓储',
+ path:'/board/thirdFloorWarehouse'
+ },
+ {
+ name:'四楼生产',
+ path:'/board/fourthFloorProduction'
+ },
+ {
+ name:'四楼仓储',
+ path:'/board/fourthFloorWarehouse'
+ },
+ {
+ name:'五楼生产',
+ path:'/board/fifthFloorProduction'
+ },
+ ]
}
},
created() {
@@ -61,6 +90,9 @@
getDate()
getDateIntervalFun = setInterval(getDate, 1000)
},
+ mounted(){
+ console.log(this.$route.fullPath)
+ },
methods: {
handleCommand(e) {
this.$router.push(e)
diff --git a/hw-ui/src/views/mes/productplan/editProductPlan.vue b/hw-ui/src/views/mes/productplan/editProductPlan.vue
index d6a3826d..b336bf01 100644
--- a/hw-ui/src/views/mes/productplan/editProductPlan.vue
+++ b/hw-ui/src/views/mes/productplan/editProductPlan.vue
@@ -186,7 +186,7 @@
size="mini"
type="primary"
@click="handleDrawing(scope.row)"
- v-if="scope.row.processType !== PROCESS_TYPE.AUTO && scope.row.children != null && scope.row.children !== undefined"
+
>图纸
-
+
@@ -300,12 +301,6 @@
@@ -482,6 +477,7 @@ export default {
},
data() {
return {
+ nowRow:{},
blueprintModel: false,
sopViewModel: false,
pictureDetailModel: false,
@@ -1298,6 +1294,7 @@ export default {
/** 查看sop */
handleSop(row) {
+ this.nowRow = row
this.fileList = [];
if (row.oldRowFlag && (!this.previewSopFlag[row.dispatchCode + "-" + row.processId]
|| this.previewSopFlag[row.dispatchCode + "-" + row.processId] !== "1")) {
@@ -1561,4 +1558,7 @@ export default {