Skip to content

M
mes-ui
Commit e0eceacd authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents ba2f8b55 178cbf15
Hide whitespace changes
Inline Side-by-side
Showing with 338 additions and 63 deletions
assets/css/iview-reset.less
View file @ e0eceacd
......@@ -339,7 +339,9 @@
color: #fff;
}
}
.ivu-select-dropdown{
z-index: 910!important;
}
.manyTabs {
.ivu-tabs-bar {
position: absolute;
......
pages/aps/aps/duration.vue
View file @ e0eceacd
......@@ -38,6 +38,7 @@ export default {
return {
editDuration: null,
tempModal: false,
setTimeModal:false,
columnsDuration: [
{
key: "projectNo",
......
pages/resourceManagement/EquipmentCalendar/index.vue
View file @ e0eceacd
......@@ -5,7 +5,7 @@
<h3 class="zh-title">组织架构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" />
<Tree :data="searchList" class="tree-content" @on-select-change="selectTreeNode"></Tree>
<Tree :data="searchList" class="tree-content" :style="{height:treeHeight-104 +'px'}" @on-select-change="selectTreeNode"></Tree>
</div>
</div>
<!-- 右侧内容 -->
......@@ -1058,6 +1058,10 @@ export default {
.table {
margin-top: 15px;
}
.tree-content{
overflow-y: auto;
// height: 692px;
}
</style>
<style>
.single-page-con {
......
pages/technology/details.vue 0 → 100644
View file @ e0eceacd
<style lang="less">
@import './technolog.less';
</style>
<template>
<Layout class="details_box">
<Header>
<h4 class="details_top tc">
<a class="back_href" @click="back"> <Icon type="ios-undo-outline" />返回工艺规程</a>
<div>工艺信息</div>
</h4>
<div class="details_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/technology/details/working">工序</MenuItem>
<MenuItem name="2" to="/technology/details/controlcard">质控卡</MenuItem>
<MenuItem name="3" to="/technology/details/process">工艺BOM</MenuItem>
<MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box" >
<nuxt-child keep-alive></nuxt-child>
</Layout>
</Layout>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
}
</script>
pages/technology/details/controlcard/index.vue 0 → 100644
View file @ e0eceacd
<style lang="less">
@import '../../technolog.less';
</style>
<template>
<div>质控卡内容</div>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
},
}
}
</script>
pages/technology/details/index.vue
View file @ e0eceacd
<style lang="less">
@import '../technolog.less';
</style>
<template>
<Layout class="pt10 details_box">
<Header>
<h4 class="details_top tc">
<a class="back_href" @click="back"> <Icon type="ios-undo-outline" />返回工艺规程</a>
<div>工艺信息</div>
</h4>
<div class="details_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1">工序</MenuItem>
<MenuItem name="2" to="/technology/details/component/gongxu">质控卡</MenuItem>
<MenuItem name="3">工艺BOM</MenuItem>
<MenuItem name="4">生产准备</MenuItem>
<!-- -->
</Menu>
</div>
</Header>
<!-- <Content> -->
<Layout class="bottom_box">
<nuxt-child keep-alive></nuxt-child>
</Layout>
<!-- </Content> -->
</Layout>
<workingView></workingView>
</template>
<script>
import workingView from './working/index'
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
components:{workingView},
}
</script>
<style lang="less">
.footer02 {
background: #4c5968;
opacity: 0.9;
position: absolute;
bottom: 9px;
box-shadow: 0px -5px 6px rgba(0,0,0,0.3);
width: 83%;
z-index: 99;
padding: 10px;
color: #fff;
margin: 10px 0 10px 0;
}
</style>
\ No newline at end of file
pages/technology/details/process/index.vue 0 → 100644
View file @ e0eceacd
<style lang="less">
@import '../../technolog.less';
</style>
<template>
<div>工艺BOM</div>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
},
}
}
</script>
pages/technology/details/setup/setupDetails.vue 0 → 100644
View file @ e0eceacd
<style lang="less">
@import '../../technolog.less';
</style>
<template>
<Layout class="setdetail_box">
<Header>
<div class="setdetail_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/technology/details/setup/setupDetails">主材</MenuItem>
<MenuItem name="2" to="/technology/details/setup/setupDetails">辅材</MenuItem>
<MenuItem name="3" to="/technology/details/setup/setupDetails">工具</MenuItem>
<MenuItem name="4" to="/technology/details/setup/setupDetails">量具</MenuItem>
<MenuItem name="5" to="/technology/details/setup/setupDetails">工装</MenuItem>
<MenuItem name="6" to="/technology/details/setup/setupDetails">刀具</MenuItem>
<MenuItem name="7" to="/technology/details/setup/setupDetails">设备</MenuItem>
<MenuItem name="8" to="/technology/details/setup/setupDetails">NC程序</MenuItem>
<MenuItem name="9" to="/technology/details/setup/setupDetails">工艺附件</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box" >
<nuxt-child keep-alive></nuxt-child>
</Layout>
</Layout>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
}
</script>
pages/technology/details/setup/setupDetails/details.vue 0 → 100644
View file @ e0eceacd
<style lang="less">
@import '../../../technolog.less';
</style>
<template>
<div>主材</div>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
}
</script>
pages/technology/details/component/gongxu.vue → pages/technology/details/working/index.vue
View file @ e0eceacd
......@@ -2,7 +2,7 @@
@import '../../technolog.less';
</style>
<template>
<div>1231323</div>
<div>工序</div>
</template>
<script>
......
pages/technology/technolog.less
View file @ e0eceacd
......@@ -57,21 +57,88 @@
padding: 2px 18px;
box-shadow: #98929294 2px 1px 5px 1px;
}
.product-layout .i-layout-content {
padding: 4px 10px!important;
}
.details_box{
background: #f5f7f9;
.ivu-layout-header {
height: 32px;
line-height: 37px;
}
.details_top{
height: 32px;
line-height: 32px;
position: relative;
background: #fff;
background: #f5f7f9;
border-bottom: 1px solid #ccc;
.back_href{
position: absolute;
left: 110px;
left: 20px;
top: 0;
.ivu-icon{
font-size: 20px;
}
}
}
.details_body{
// width: 561px;
text-align: center;
.ivu-menu-horizontal {
height: 50px;
line-height: 50px;
border-left: 1px solid #ccc;
background: #f5f7f9;
.ivu-menu-item{
width: 140px;
border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc;
background: #f5f7f9;
}
.ivu-menu-item-active.ivu-menu-item-selected{
background: #fff;
border-top: 2px solid #2d8cf0;
border-bottom: 1px solid #fff;
}
}
}
.bottom_box{
margin-top: 50px;
padding: 5px 20px;
}
}
.setdetail_body{
// padding: 0 20px;
.ivu-layout-header{
height: 0;
}
.ivu-menu-horizontal{
height: 40px;
line-height: 40px;
a.ivu-menu-item-active::before{
content: "";
display: block;
border-width: 5px 5px 0;
border-style: solid;
border-color: #2d8cf0 transparent transparent;
width: 0;
height: 0;
position: absolute;
bottom: -6px;
left: 40%;
}
a.ivu-menu-item-active::after{
content: "";
display: block;
border-width: 4px 4px 0;
border-style: solid;
border-color: #fff transparent transparent;
width: 0;
height: 0;
position: absolute;
bottom: -4px;
left: 41%;
}
}
}
\ No newline at end of file
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