Skip to content

M
mes-ui
Commit b9d362e4 authored by renjintao's avatar renjintao
Browse files
Options

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

parents 2b7a2554 20d71b37
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 29 deletions
components/page/remote.vue
View file @ b9d362e4
......@@ -103,9 +103,9 @@ export default {
// this.cssId = remoteData.cssId;
// }else{
if (this.$props.url) {
const res = await Axios.get(this.$props.url);
const res = await this.$api.get(this.$props.url);
// this.cssId = this.getId();
this.resData = res.data;
this.resData = res;
console.log(this.resData)
}
......
pages/produce/execute/components/functional.vue 0 → 100644
View file @ b9d362e4
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="addd">
<ul>
<li><a @click="gnFunto(0,0)" :class="{active:gnFlag == 0}"><Icon type="ios-clipboard" /> 进度汇报</a></li>
<li><a @click="gnFunto(1,1)" :class="{active:gnFlag == 1}"><Icon type="ios-cube" /> 物料领用</a></li>
<li><a @click="gnFunto(2,2)" :class="{active:gnFlag == 2}"><Icon type="md-build" /> 产品装配</a></li>
<li><a @click="gnFunto(3,3)" :class="{active:gnFlag == 3}"><Icon type="ios-time" /> 工时分配</a></li>
<li><a @click="gnFunto(4,4)" :class="{active:gnFlag == 4}"><Icon type="ios-checkmark-circle" /> 生产准备</a></li>
<li><a @click="gnFunto(5,5)" :class="{active:gnFlag == 5}"><Icon type="ios-eye" /> 工艺查看</a></li>
<li><a @click="gnFunto(6,6)" :class="{active:gnFlag == 6}"><Icon type="ios-paper" /> 工艺案例</a></li>
<li><a @click="gnFunto(7,7)" :class="{active:gnFlag == 7}"><Icon type="ios-medal" /> 质量判定</a></li>
<li><a @click="gnFunto(8,8)" :class="{active:gnFlag == 8}"><Icon type="ios-create" /> 数据填报</a></li>
<li><a @click="gnFunto(9,9)" :class="{active:gnFlag == 9}"><Icon type="logo-codepen" /> 测试数据</a></li>
</ul>
</div>
</template>
<script>
export default {
name:'functional',
data(){
return{
gnFlag:0,
}
},
methods: {
gnFunto(number,type){
this.gnFlag = number
}
},
}
</script>
\ No newline at end of file
pages/produce/execute/components/orderlist.vue 0 → 100644
View file @ b9d362e4
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="order_list">
<h4 class="order_title">
<span class="gd_tt">工单列表</span>
<a ><Icon type="ios-list" size="18" /> 展开全部列表</a>
</h4>
</div>
</template>
<script>
export default {
name:'orderlist',
data(){
return{
gnFlag:0,
}
},
methods: {
gnFunto(number,type){
this.gnFlag = number
}
},
}
</script>
\ No newline at end of file
pages/produce/execute/execute.less
View file @ b9d362e4
......@@ -22,12 +22,15 @@
line-height: 176px;
font-size: 22px;
color: #fff;
}
.button{
margin: 0 9%;
}
}
.gd_list{
position: absolute;
top: 45%;
left: 1px;
left: 0px;
background: #2680EB;
color: #fff;
width: 32px;
......@@ -38,7 +41,7 @@
.gn_area{
position: absolute;
top: 45%;
right: 1px;
right: 0px;
background: #515A6E;
color: #fff;
width: 32px;
......@@ -69,4 +72,60 @@
margin: 10px 0 0 170px;
}
}
}
.gd_box{
.ivu-drawer-wrap{
.ivu-drawer-left{
width: 370px!important;
.ivu-drawer-content{
.ivu-drawer-body {
padding: 0;
.order_title {
border-bottom: 1px solid #ccc;
height: 50px;
line-height: 50px;
padding: 0 0 0 15px;
.gd_tt{
margin: 0 55px 0 0;
}
}
}
}
}
}
}
.gn_box{
.ivu-drawer-wrap{
.ivu-drawer-right{
width: 180px!important;
.ivu-drawer-content{
background: #515A6E;
.ivu-drawer-body {
padding: 13vh 0;
}
li{
line-height: 66px;
height: 66px;
a{
color: #fff;
width: 100%;
display: block;
text-align: center;
font-size: 16px;
}
a:hover{
background: #2680EB;
}
}
}
}
}
.addd{
a.active{
background: #2680EB;
}
}
}
\ No newline at end of file
pages/produce/execute/index.vue
View file @ b9d362e4
......@@ -12,14 +12,12 @@
<Icon type="md-play" />
开工</a>
</div>
<div class="star" v-else-if="starmodal">
<Button size='large' type="primary"><Icon type="ios-pause" />暂停</Button>
<Button size='large' type="primary"><Icon type="ios-pause" />校验</Button>
<Button size='large' type="primary"><Icon type="ios-pause" />完工</Button>
<Button size='large' type="primary"><Icon type="ios-pause" />转序交换</Button>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 校验</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<a class="gd_list" @click="value1 = true">工单列表</a>
<a class="gn_area" @click="value2 = true">功能区</a>
<div class="footer_box">
<div class="ul_box fl">
<ul>
......@@ -52,26 +50,28 @@
图片区
</div>
</div>
<Drawer title="Basic Drawer" :closable="false" v-model="value2">
<p>Some contents...</p>
<p>Some contents...</p>
<p>Some contents...</p>
<a class="gd_list" @click="orderlistMode = true">工单列表</a>
<a class="gn_area" @click="functionalMode = true">功能区</a>
<!-- title="工单列表" -->
<Drawer placement="left" class="gd_box" :closable="false" v-model="orderlistMode">
<orderlist ref="orderlist"/>
</Drawer>
<Drawer title="Basic Drawer" placement="left" :closable="false" v-model="value1">
<p>Some contents...</p>
<p>Some contents...</p>
<p>Some contents...</p>
<!-- title="功能区" -->
<Drawer class="gn_box" :closable="false" v-model="functionalMode">
<functional ref="functional" />
</Drawer>
</div>
</template>
<script>
import functional from "./components/functional";
import orderlist from "./components/orderlist";
export default {
// components: { ProductTree, Search },
components: { functional, orderlist},
data(){
return{
starmodal: true,
value1:false,
value2:false,
orderlistMode:false,
functionalMode:false,
}
},
created() {
......
pages/test/user.vue
View file @ b9d362e4
<template>
<div style="padding:50px;">
<UserSelect v-model="user" :multiple="true" theme="list"/>
<!-- <DepartmentSelect v-model="dep" />
<UserSelect v-model="user" :multiple="true"/>
<!-- <DepartmentSelect v-model="dep" /> -->
<Button @click="setUser">Set</Button>{{dep}} -->
<Button @click="setUser">Set</Button>
{{user}}
</div>
</template>
......@@ -12,12 +12,12 @@ export default {
data(){
return {
dep:39,
user:[21,22,23]
user:[128]
}
},
methods:{
setUser(){
this.user=[25]
this.user=[128]
}
}
}
......
static/config.js
View file @ b9d362e4
......@@ -20,12 +20,12 @@ window.resourceUrl = `http://${address}:10000/resource`; // 制造资源地址
window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址
window.certificateUrl = `http://${address}:10000/qms`; //质量
window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理
window.apsUrl = `http://${systemApi.aps}:10000/aps`;//aps排产
window.apsUrl = `http://${address}:10000/aps`;//aps排产
window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
window.iconImg = `/imgicon/`;
/* window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.designUrl = `http://${address}:10030/api/services/app`; //Process-api 工艺规程
window.PlanUrl = `http://${address}:10050/api/services/app`; //Process-api
window.routeUrl = `http://${address}:10050/api/services/app`; //Process-api
......
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