Skip to content

M
mes-ui
Commit 3f9ec4fa authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents d12e1e5a 2104c971
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 27 deletions
pages/produce/execute/ProcessCheck/components/guidance.vue 0 → 100644
View file @ 3f9ec4fa
<template>
<div class="p20">
<div class="">
工艺提醒
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCheck/components/remind.vue 0 → 100644
View file @ 3f9ec4fa
<template>
<div class="p20">
<div class="">
作业指导书
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCheck/components/workSteps.vue 0 → 100644
View file @ 3f9ec4fa
<template>
<div class="p20">
<div class="">
工步导航
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCheck/index.vue
View file @ 3f9ec4fa
......@@ -2,21 +2,23 @@
<template>
<div class="wu_bg">
<!-- <div class="wu_top">
工艺查看 /technology/details/setup/setupDetails
工艺查看 /technology/details/setup/setupDetails
to="/produce/execute/ProcessCheck/setupDetails"
</div> -->
<Layout class="tech_box">
<Header>
<div class="tech_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/produce/execute/ProcessCheck/setupDetails">工艺规程</MenuItem>
<MenuItem name="2" to="/produce/execute/ProcessCheck/setupDetails">作业指导书</MenuItem>
<MenuItem name="3" to="/produce/execute/ProcessCheck/setupDetails">工步导航</MenuItem>
<MenuItem name="4" to="/produce/execute/ProcessCheck/setupDetails">工艺提醒</MenuItem>
<Menu mode="horizontal" theme="light" active-name="1" @on-select="openSaveTip">
<MenuItem name="1" >工艺规程</MenuItem>
<MenuItem name="2" >作业指导书</MenuItem>
<MenuItem name="3" >工步导航</MenuItem>
<MenuItem name="4" >工艺提醒</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box" >
<nuxt-child keep-alive></nuxt-child>
<!-- <nuxt-child keep-alive></nuxt-child> -->
<component :is="detail" :eid="id" />
</Layout>
</Layout>
</div>
......@@ -26,26 +28,26 @@ export default {
name:'starOrder',
data(){
return{
starmodal: false,
id: "1",
detail: null,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
this.detail = () => import("./components/setupDetails");
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
// this.detail = () => import("./components/setupDetails");
},
methods: {
starFun(){
this.$Message.success("开工...")
openSaveTip(key){
this.id = key
if(this.id == "1"){ this.detail = () => import("./components/setupDetails");}
if(this.id == "2"){ this.detail = () => import("./components/remind");}
if(this.id == "3"){ this.detail = () => import("./components/workSteps");}
if(this.id == "4"){ this.detail = () => import("./components/guidance");}
},
},
}
......
pages/produce/execute/execute.less
View file @ 3f9ec4fa
......@@ -336,22 +336,20 @@
}
.tech_box{
height: calc(100vh - 165px);
.ivu-layout-header{
height: 50px;
}
.tech_body{
// padding: 0 20px;
.ivu-layout-header{
height: 0;
}
.ivu-menu-horizontal{
height: 40px;
line-height: 40px;
height: 50px;
line-height: 50px;
.ivu-menu-item{
width: 115px;
text-align: center;
}
a.ivu-menu-item-active::before{
li.ivu-menu-item-active::before{
content: "";
display: block;
border-width: 5px 6px 0;
border-style: solid;
border-color: #2d8cf0 transparent transparent;
......@@ -361,7 +359,7 @@
bottom: -6px;
left: 43%;
}
a.ivu-menu-item-active::after{
li.ivu-menu-item-active::after{
content: "";
display: block;
border-width: 4px 4px 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment