Skip to content

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

Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

parents 1f983b10 7642b12a
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 116 deletions
assets/images/login/bg0.png 0 → 100644
View file @ 19e3100d
This diff is collapsed.
assets/images/login/bg1.png 0 → 100644
View file @ 19e3100d
This image diff could not be displayed because it is too large. You can view the blob instead.
assets/images/login/bg2.jpg 0 → 100644
View file @ 19e3100d
This diff is collapsed.
assets/images/login/bg3.png 0 → 100644
View file @ 19e3100d
This diff is collapsed.
components/customTable/customTable.vue
View file @ 19e3100d
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<template v-slot:button> <template v-slot:button>
<div style="float:right;" class="paddingbtn"> <div style="float:right;" class="paddingbtn">
<!-- 其他 业务按钮 --> <!-- 其他 业务按钮 -->
<Button type="success" @click="openCreate">创建</Button> <Button type="primary" @click="openCreate">创建</Button>
<Button type="success" @click="openOrderSendReview" v-if="false">订单送审</Button> <Button type="primary" @click="openOrderSendReview" v-if="false">订单送审</Button>
<Button type="success" @click="openOrderSend">订单派发</Button> <Button type="primary" @click="openOrderSend">订单派发</Button>
<Button type="success" @click="updateOrderOpenModal">修改</Button> <Button type="primary" @click="updateOrderOpenModal">修改</Button>
<Button type="success" @click="delOrder">删除</Button> <Button type="primary" @click="delOrder">删除</Button>
<Button type="success" @click="openOrderSplit">订单分解</Button> <Button type="primary" @click="openOrderSplit">订单分解</Button>
<Button type="success" v-show="false">导出PDF</Button> <Button type="primary" v-show="false">导出PDF</Button>
<!-- 列设置 --> <!-- 列设置 -->
<div @click="drawerShow = true" class="divIco"> <div @click="drawerShow = true" class="divIco">
<Icon type="ios-list" class="icoListInfo" /> <Icon type="ios-list" class="icoListInfo" />
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<CreateOrder ref="createOrder"></CreateOrder> <CreateOrder ref="createOrder"></CreateOrder>
<div slot="footer"> <div slot="footer">
<Button @click="createShow = false">取消</Button> <Button @click="createShow = false">取消</Button>
<Button type="success" @click="orderCreateOrderOk">确定</Button> <Button type="primary" @click="orderCreateOrderOk">确定</Button>
</div> </div>
</Modal> </Modal>
<!-- 订单送审 --> <!-- 订单送审 -->
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<OrderSendReview ref="orderSendReview"></OrderSendReview> <OrderSendReview ref="orderSendReview"></OrderSendReview>
<div slot="footer"> <div slot="footer">
<Button @click="ModalOrderSendReview = false">取消</Button> <Button @click="ModalOrderSendReview = false">取消</Button>
<Button type="success" @click="orderSendReviewOk">确定送审</Button> <Button type="primary" @click="orderSendReviewOk">确定送审</Button>
</div> </div>
</Modal> </Modal>
<!-- 订单派发 --> <!-- 订单派发 -->
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<OrderSend ref="orderSend"></OrderSend> <OrderSend ref="orderSend"></OrderSend>
<div slot="footer"> <div slot="footer">
<Button @click="ModalOrderSend = false">取消</Button> <Button @click="ModalOrderSend = false">取消</Button>
<Button type="success" @click="orderSendOk">确定派发</Button> <Button type="primary" @click="orderSendOk">确定派发</Button>
</div> </div>
</Modal> </Modal>
<!-- 订单分解 --> <!-- 订单分解 -->
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<OrderSplit ref="orderSplit"></OrderSplit> <OrderSplit ref="orderSplit"></OrderSplit>
<div slot="footer"> <div slot="footer">
<Button @click="ModalOrderSplit = false">取消</Button> <Button @click="ModalOrderSplit = false">取消</Button>
<Button type="success" @click="orderSplitOk">确定分解</Button> <Button type="primary" @click="orderSplitOk">确定分解</Button>
</div> </div>
</Modal> </Modal>
<!-- 信息提示 --> <!-- 信息提示 -->
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
{{ metCodesStrTxt }} {{ metCodesStrTxt }}
<div slot="footer"> <div slot="footer">
<Button @click="ModalInfo = false">取消</Button> <Button @click="ModalInfo = false">取消</Button>
<Button type="success" @click="modalInfoOk">确定</Button> <Button type="primary" @click="modalInfoOk">确定</Button>
</div></Modal </div></Modal
> >
</div> </div>
......
layouts/default.vue
View file @ 19e3100d
...@@ -33,6 +33,7 @@ export default { ...@@ -33,6 +33,7 @@ export default {
}, },
mounted() { mounted() {
this.getMenu(); this.getMenu();
this.initUserInfo();
}, },
watch: { watch: {
// 监听路由 控制侧边栏显示 标记当前顶栏菜单（如需要） // 监听路由 控制侧边栏显示 标记当前顶栏菜单（如需要）
...@@ -77,19 +78,11 @@ export default { ...@@ -77,19 +78,11 @@ export default {
res.result.avatarUrl != "" && res.result.avatarUrl != "" &&
res.result.avatarUrl != null res.result.avatarUrl != null
) { ) {
this.userInfo.avatarUrl = res.result.avatarUrl; res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
this.$store.commit(
"setUserAvatar",
fileUrlDown + res.result.avatarUrl
);
} else {
this.userInfo.avatarUrl = "";
this.$store.commit("setUserAvatar", avatar);
} }
this.userName = res.result.userName; this.$store.commit("admin/user/setUserAvatar", res.result);
localStorage.setItem("userName", this.userName);
} else { } else {
this.$Message.error("查询失败!"); this.$Message.error("用户信息查询失败!");
} }
}); });
}, },
......
pages/account/login/index.vue
View file @ 19e3100d
<template> <template>
<div class="page-account"> <div class="account">
<Carousel v-model="value1" autoplay autoplay-speed="5000" loop class="zmd">
<CarouselItem>
<div class="bg bg0">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg1">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg2">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg3">1</div>
</CarouselItem>
</Carousel>
<div v-if="showI18n" class="page-account-header"> <div v-if="showI18n" class="page-account-header">
<i-header-i18n /> <i-header-i18n />
</div> </div>
<div class="page-account-container"> <div class="main">
<div class="page-account-top"> <div class="ad">
<div class="page-account-top-logo"> <img src="@/assets/images/login/ad.png" />
<img src="@/assets/images/logo.png" alt="logo" />
</div>
<div class="page-account-top-desc">SaaS MES 制造执行系统</div>
</div> </div>
<Login @on-submit="oidc"> <div class="login">
<UserName name="username" value="admin" /> <div class="page-account-top">
<Password name="password" value="admin" enter-to-submit /> <div class="page-account-top-logo tc">
<div class="page-account-auto-login"> <img src="@/assets/images/logo.png" alt="logo" />
<Checkbox v-model="autoLogin" size="large">{{ $t('page.login.remember') }}</Checkbox> </div>
<a href>{{ $t('page.login.forgot') }}</a> <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div>
</div> </div>
<Submit>{{ $t('page.login.submit') }}</Submit> <h3 class="mb10">用户登陆</h3>
</Login> <Login @on-submit="oidc">
<div class="page-account-other"> <UserName name="username" value="admin" />
<!-- <span>{{ $t('page.login.other') }}</span> <Password name="password" value="admin" enter-to-submit />
<img src="@/assets/svg/icon-social-wechat.svg" alt="wechat" /> <div class="page-account-auto-login">
<img src="@/assets/svg/icon-social-qq.svg" alt="qq" /> <Checkbox v-model="autoLogin" size="large">{{ $t('page.login.remember') }}</Checkbox>
<img src="@/assets/svg/icon-social-weibo.svg" alt="weibo" /> --> <a href>{{ $t('page.login.forgot') }}</a>
<!-- <router-link class="page-account-register" to="./register">{{ $t('page.login.signup') }}</router-link> --> </div>
<Submit>{{ $t('page.login.submit') }}</Submit>
</Login>
</div> </div>
</div> </div>
<!-- <i-copyright /> -->
</div> </div>
</template> </template>
<script> <script>
...@@ -55,6 +67,7 @@ export default { ...@@ -55,6 +67,7 @@ export default {
let that = this; let that = this;
mgr.getUser().then(function(user) { mgr.getUser().then(function(user) {
if (user) { if (user) {
console.info("user",user)
that.msg = "该用户已经登录"; that.msg = "该用户已经登录";
const userInfos = { const userInfos = {
token: user.access_token, token: user.access_token,
...@@ -106,3 +119,56 @@ export default { ...@@ -106,3 +119,56 @@ export default {
} }
}; };
</script> </script>
<style lang="less">
@jianju:50px;
.account {
position: fixed;
width: 100%;
top: 0;
bottom: 0;
.zmd {
z-index: 1;
position: absolute;
top: 0;
bottom: 0;
width: 100%;
}
.bg {
width: 100%;
height: 100vh;
background-size: 100% auto;
}
.bg0 {
background-image: url("../../../assets/images/login/bg0.png");
}
.bg1 {
background-image: url("../../../assets/images/login/bg1.png");
}
.bg2 {
background-image: url("../../../assets/images/login/bg2.jpg");
}
.bg3 {
background-image: url("../../../assets/images/login/bg3.png");
}
.main {
position: absolute;
z-index: 55;
top: @jianju;
left: @jianju;
right: @jianju;
bottom: @jianju;
background: rgba(0, 0, 0, 0.35);
display: flex;
.ad{
flex: 1;
text-align: center;
img{margin-top: 400px;}
}
.login {
background-color: white;
width: 600px;
padding: 100px 50px;
}
}
}
</style>
\ No newline at end of file
pages/aps/results/index.vue
View file @ 19e3100d
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
import expandRow from './table-expand.vue' import expandRow from "./table-expand.vue";
export default { export default {
components: { expandRow }, components: { expandRow },
...@@ -53,142 +53,144 @@ export default { ...@@ -53,142 +53,144 @@ export default {
list: [], list: [],
columns: [ columns: [
{ {
type: 'expand', type: "expand",
width: 50, width: 50,
render: (h, params) => { render: (h, params) => {
return h(expandRow, { return h(expandRow, {
props: { props: {
row: params.row row: params.row
} }
}) });
} }
}, },
{ {
title: '超期预警', title: "超期预警",
key: 'id', key: "id",
align: 'center', align: "center",
render: (h, params) => { render: (h, params) => {
return h('div', [ return h("div", [
h('Icon', { h("Icon", {
props: { props: {
type: type:
params.row.id == 1 params.row.id == 1
? 'ios-information-circle-outline' ? "ios-information-circle-outline"
: 'ios-remove-circle-outline' : "ios-remove-circle-outline"
}, },
style: { style: {
marginRight: '5px', marginRight: "5px",
fontSize: '18px', fontSize: "18px",
fontWeight: 'bold', fontWeight: "bold",
color: params.row.id == 1 ? '#FE7777' : '#0DD78D' color: params.row.id == 1 ? "#FE7777" : "#0DD78D"
} }
}) })
]) ]);
} }
}, },
{ {
title: '零件图号', title: "零件图号",
key: 'part_id', key: "part_id",
align: 'center' align: "center"
}, },
{ {
title: '零件名称', title: "零件名称",
key: 'part_name', key: "part_name",
align: 'center' align: "center"
}, },
{ {
title: '计划开始时间', title: "计划开始时间",
key: 'plan_start', key: "plan_start",
width: 220, width: 220,
align: 'center' align: "center"
}, },
{ {
title: '计划结束时间', title: "计划结束时间",
key: 'plan_start', key: "plan_start",
width: 220, width: 220,
align: 'center' align: "center"
}, },
{ {
title: '投料时间', title: "投料时间",
key: 'demand_start', key: "demand_start",
width: 220, width: 220,
align: 'center' align: "center"
}, },
{ {
title: '节点时间', title: "节点时间",
key: 'demand_finish', key: "demand_finish",
width: 220, width: 220,
align: 'center' align: "center"
}, },
{ {
title: '计划数量', title: "计划数量",
key: 'plan_qty', key: "plan_qty",
align: 'center' align: "center"
} }
] ]
} };
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
created() { created() {
this.orderlist() this.orderlist();
}, },
methods: { methods: {
orderlist() { orderlist() {
Api.getall() Api.getall()
.then((r) => { .then(r => {
if (r.success) { if (r.success) {
this.list = r.result this.list = r.result;
if (r.result) { if (r.result) {
this.listData(r.result[0].schedule_Id, 0) this.listData(r.result[0].schedule_Id, 0);
} else { } else {
this.listData(0, null) this.listData(0, null);
} }
} }
}) })
.catch((error) => { .catch(error => {
this.$$Message.error('请求失败') this.$$Message.error("请求失败");
}) });
}, },
listData(id, index) { listData(id, index) {
this.isactive = index this.isactive = index;
Api.paged({ scheduleId: id }) Api.paged({ scheduleId: id })
.then((r) => { .then(r => {
if (r.success) { if (r.success) {
this.data = r.result this.data = r.result;
} }
}) })
.catch((error) => { .catch(error => {
this.$$Message.error('请求失败') this.$$Message.error("请求失败");
}) });
}, },
clear() { clear() {
this.$Modal.confirm({ if (this.list.lenght > 0) {
title: '清空列表', this.$Modal.confirm({
content: '您确定要清空列表吗', title: "清空列表",
onOk: () => { content: "您确定要清空列表吗",
Api.clearall().then((r) => { onOk: () => {
if (r.success) { Api.clearall().then(r => {
this.$Message.success('清空列表成功') if (r.success) {
this.orderlist() this.$Message.success("清空列表成功");
} this.orderlist();
}) }
}, });
onCancel: () => { },
this.$Message.info('已取消') onCancel: () => {
} this.$Message.info("已取消");
}) }
});
}
}, },
parameter() {}, parameter() {},
addOk() {}, addOk() {},
cancel() {}, cancel() {},
comeBlck() { comeBlck() {
this.$router.push({ path: '/aps/aps' }) this.$router.push({ path: "/aps/aps" });
} }
} }
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.results { .results {
......
router/routes.js
View file @ 19e3100d
...@@ -2,7 +2,7 @@ import dashboard from './modules/dashboard'; ...@@ -2,7 +2,7 @@ import dashboard from './modules/dashboard';
import BasicLayout from '@/layouts/basic-layout'; import BasicLayout from '@/layouts/basic-layout';
/** /**
* 在主框架内显示 * 在主框架内显示22222222222222
*/ */
const frameIn = [ const frameIn = [
......
store/admin/user.js
View file @ 19e3100d
...@@ -7,6 +7,12 @@ export const mutations={ ...@@ -7,6 +7,12 @@ export const mutations={
}, },
setUser(state,info){ setUser(state,info){
state.info=info; state.info=info;
},
setUserAvatar(state,user){
let info=state.info;
info.name=user.userName;
info.avatar=user.avatarUrl;
state.info=info;
} }
} }
export const actions={ export const actions={
......
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