Skip to content

M
mes-pad
Commit 250b3774 authored by mengcheng's avatar mengcheng
Browse files
Options

修改主体样式

parent 93f2a653
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 138 deletions
common/config.js
View file @ 250b3774
...@@ -21,8 +21,8 @@ const config = { ...@@ -21,8 +21,8 @@ const config = {
} }
// 设置后台接口服务的基础地址 // 设置后台接口服务的基础地址
// config.baseUrl = 'http://localhost:8080'; config.baseUrl = 'http://localhost:8080';
//config.baseUrl = "http://101.43.244.58:8080/"; //config.baseUrl = "http://101.43.244.58:8080/";
config.baseUrl = "/api"; //config.baseUrl = "/api";
export default config; export default config;
\ No newline at end of file
components/TabBar/TabBarItem.vue
View file @ 250b3774
...@@ -50,8 +50,15 @@ export default { ...@@ -50,8 +50,15 @@ export default {
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
padding: 0 15px; padding: 0 15px;
width: 100px; width: 120px;
height: 100px; height: 120px;
border-top: 1px solid #505462;
border-bottom: 1px solid #505462;
display: flex;
flex-wrap: wrap;
align-content: center;
flex-direction: column;
justify-content: center;
} }
.active { .active {
...@@ -59,7 +66,7 @@ export default { ...@@ -59,7 +66,7 @@ export default {
} }
.inActive { .inActive {
background-color: #0285ff; background-color: #4ea381;
} }
.tab-bar-item img { .tab-bar-item img {
......
pages/index/TabHeader.vue
View file @ 250b3774
...@@ -83,7 +83,6 @@ export default { ...@@ -83,7 +83,6 @@ export default {
.hengxian { .hengxian {
width: 35px; width: 35px;
margin-top: 10px;
} }
.divider { .divider {
......
pages/index/index.vue
View file @ 250b3774
<template> <template>
<view class="common-container"> <view class="common-container">
<!-- <view class="common-head">-->
<!-- <view class="header">-->
<!-- <view class="title">-->
<!-- MES宝申科技-->
<!-- </view>-->
<!-- <view class="workstation" @click="handleCommand('workstation')">-->
<!-- {{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}-->
<!-- <u-icon name="edit-pen-fill" size="46" color="#2979ff"></u-icon>-->
<!-- </view>-->
<!-- <view class="user" @tap="handleUserTaped">-->
<!-- <view class="user-icon">-->
<!-- <img :src="userInfo.avatar"></img>-->
<!-- </view>-->
<!-- <view class="user-text">-->
<!-- {{ this.vuex_user.nickName }}-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view class="header"> <view class="header">
<view class="title"> <image mode="widthFix" class="header-logo" src="@/static/logo.png"></image>
<image mode="widthFix" style="width: 160rpx;margin: 40rpx 20rpx;display: block;"
src="@/static/logo.png"></image>
</view>
<TabHeader></TabHeader> <TabHeader></TabHeader>
<u-button style="position: absolute;bottom: 50rpx;margin: 0 auto;" @click="handleUserTaped"> <view class="setting-body"
<u-icon name="setting" size="35"></u-icon> @click="handleUserTaped">
设置 <u-icon name="list" size="45" class="setting-icon"></u-icon>
</u-button> {{ this.vuex_user.nickName }}
</view>
</view> </view>
<view class="common-main"> <view class="common-main">
<ProdReport v-if="tabIndex === 'PRO'"></ProdReport> <ProdReport v-if="tabIndex === 'PRO'"></ProdReport>
...@@ -193,12 +172,12 @@ export default { ...@@ -193,12 +172,12 @@ export default {
} }
</script> </script>
<style> <style >
.common-container { .common-container {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
display: grid; display: grid;
grid-template-columns: 100px 1fr; grid-template-columns: 120px 1fr;
} }
.common-head { .common-head {
...@@ -211,13 +190,18 @@ export default { ...@@ -211,13 +190,18 @@ export default {
} }
.header { .header {
width: 200rpx;
background-color: #132138; background-color: #132138;
color: aliceblue; color: aliceblue;
font-size: 25px; font-size: 25px;
font-family: 华文楷体; font-family: 华文楷体;
line-height: 80rpx; line-height: 80rpx;
height: inherit; height: inherit;
.header-logo {
width: 180rpx;
margin: 40rpx auto;
display: block;
}
} }
.header .divItem { .header .divItem {
...@@ -225,9 +209,6 @@ export default { ...@@ -225,9 +209,6 @@ export default {
align-items: center; align-items: center;
} }
.header .title {
width: 30%;
}
.header .workstation { .header .workstation {
text-align: center; text-align: center;
...@@ -284,4 +265,18 @@ img { ...@@ -284,4 +265,18 @@ img {
overflow: auto; overflow: auto;
background-image: linear-gradient(to top right, rgb(19 26 56), rgb(33 64 128)); background-image: linear-gradient(to top right, rgb(19 26 56), rgb(33 64 128));
} }
.setting-body {
position: absolute;
bottom: 50rpx;
width: 200rpx;
margin: 0 auto;
font-size: 36rpx;
font-weight: initial;
text-align: center;
.setting-icon {
margin: 10rpx 10rpx;
}
}
</style> </style>
pages/mes/prodReport/index.vue
View file @ 250b3774
<style lang="scss">
.prod-body {
//display: flex;
height: 100%;
//overflow: hidden;
display: grid;
grid-template-columns: 1fr 150px;
}
.prod-body-left {
//flex-grow: 1;
// padding: 10rpx;
overflow: hidden;
.prod-body-left-btns {
height: 80rpx;
.u-btn {
width: 250rpx;
height: 60rpx;
line-height: 60rpx;
display: inline-block;
margin: 10rpx 20rpx;
}
.workstation{
display: inline-block;
}
}
.prod-body-left-task {
height: calc(100% - 80rpx - 500rpx);
border: 1px solid rgb(232, 232, 232);
}
.prod-body-left-num {
height: 60rpx;
line-height: 60rpx;
padding: 0 16rpx;
background-color: #add8e6;
}
.prod-body-left-bom {
height: 500rpx;
.prod-body-left-bom-type {
width: 500rpx;
height: 80rpx;
padding-top: 10rpx;
.u-subsection {
border-radius: 5px 5px 0 0 !important;
}
}
.prod-body-left-bom-table {
height: 400rpx;
border: 1px solid rgb(232, 232, 232);
}
}
}
.prod-body-right {
width: 300rpx;
padding: 10rpx;
overflow: auto;
.u-btn {
height: 100rpx;
line-height: 100rpx;
margin: 20rpx 10rpx;
font-size: 40rpx;
}
}
</style>
<template> <template>
<view class="commonBody"> <view class="commonBody">
<view class="prod-body"> <view class="prod-body">
<view class="prod-body-left"> <view class="prod-body-left">
<!-- <view class="prod-body-left-btns">--> <!-- <view class="prod-body-left-btns">-->
<!-- <view class="workstation">--> <!-- <view class="workstation">-->
<!-- 工作站名称：--> <!-- 工作站名称：-->
<!-- {{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}--> <!-- {{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}-->
<!-- &lt;!&ndash; <u-icon name="edit-pen-fill" size="46" color="#2979ff"></u-icon>&ndash;&gt;--> <!-- &lt;!&ndash; <u-icon name="edit-pen-fill" size="46" color="#2979ff"></u-icon>&ndash;&gt;-->
<!-- </view>--> <!-- </view>-->
<!-- <u-button type="primary" @click="changeWorkstation">切换工作站</u-button>--> <!-- <u-button type="primary" @click="changeWorkstation">切换工作站</u-button>-->
<!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产任务</u-button>&ndash;&gt;--> <!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产任务</u-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('KnifeTemp')">刀模上架</u-button>&ndash;&gt;--> <!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('KnifeTemp')">刀模上架</u-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产投料</u-button>&ndash;&gt;--> <!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产投料</u-button>&ndash;&gt;-->
<!-- </view>--> <!-- </view>-->
<view class="prod-body-left-task"> <view class="prod-body-left-task">
<zb-table :columns="tableColumn" :stripe="true" @rowClick="rowClick" <zb-table :columns="tableColumn" :stripe="true" @rowClick="rowClick"
...@@ -119,7 +38,8 @@ ...@@ -119,7 +38,8 @@
<u-col span="4"> <u-col span="4">
<u-form-item label="物料条码" label-width="150"> <u-form-item label="物料条码" label-width="150">
<SearchInput v-model="materialRecordInfo.materialBatchNumber" placeholder="请输入物料条码" <SearchInput v-model="materialRecordInfo.materialBatchNumber" placeholder="请输入物料条码"
hassearchbtn="true" @inputchange="search"/> hassearchbtn="true"
@inputchange="(val)=>{materialRecordInfo.materialBatchNumber=val}"/>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="2"> <u-col span="2">
...@@ -145,7 +65,9 @@ ...@@ -145,7 +65,9 @@
</view> </view>
</view> </view>
<view class="prod-body-right"> <view class="prod-body-right">
<view style="text-align: center;line-height: 80rpx;font-size: 28rpx;font-weight: 600;"> {{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}</view> <view style="text-align: center;line-height: 80rpx;font-size: 28rpx;font-weight: 600;">
{{ this.vuex_workstation == null ? '请选择工作站' : this.vuex_workstation.workstationName }}
</view>
<u-button type="primary" @click="changeWorkstation">切换工作站</u-button> <u-button type="primary" @click="changeWorkstation">切换工作站</u-button>
<br/> <br/>
<u-button type="warning" @click="commonClick('KnifeTemp')">刀模上架</u-button> <u-button type="warning" @click="commonClick('KnifeTemp')">刀模上架</u-button>
...@@ -577,6 +499,8 @@ export default { ...@@ -577,6 +499,8 @@ export default {
}); });
}, },
addMaterialUsageRecord() { addMaterialUsageRecord() {
console.log(this.materialRecordInfo.materialBatchNumber)
console.log(this.curTaskInfo.itemCode)
if (this.materialRecordInfo.materialBatchNumber !== this.curTaskInfo.itemCode && this.currentType === 0) { if (this.materialRecordInfo.materialBatchNumber !== this.curTaskInfo.itemCode && this.currentType === 0) {
this.$u.toast('物料不在生产目录中！'); this.$u.toast('物料不在生产目录中！');
return return
...@@ -699,7 +623,7 @@ export default { ...@@ -699,7 +623,7 @@ export default {
} }
</script> </script>
<style> <style lang="scss" scoped>
.commonBody { .commonBody {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -747,4 +671,83 @@ export default { ...@@ -747,4 +671,83 @@ export default {
::v-deep .u-form-item { ::v-deep .u-form-item {
padding: 0px; padding: 0px;
} }
.prod-body {
//display: flex;
height: 100%;
//overflow: hidden;
display: grid;
grid-template-columns: 1fr 150px;
}
.prod-body-left {
//flex-grow: 1;
// padding: 10rpx;
overflow: hidden;
.prod-body-left-btns {
height: 80rpx;
.u-btn {
width: 250rpx;
height: 60rpx;
line-height: 60rpx;
display: inline-block;
margin: 10rpx 20rpx;
}
.workstation {
display: inline-block;
}
}
.prod-body-left-task {
height: calc(100% - 80rpx - 500rpx);
border: 1px solid rgb(232, 232, 232);
}
.prod-body-left-num {
height: 60rpx;
line-height: 60rpx;
padding: 0 16rpx;
background-color: #add8e6;
}
.prod-body-left-bom {
height: 500rpx;
.prod-body-left-bom-type {
width: 500rpx;
height: 80rpx;
padding-top: 10rpx;
.u-subsection {
border-radius: 5px 5px 0 0 !important;
}
}
.prod-body-left-bom-table {
height: 400rpx;
border: 1px solid rgb(232, 232, 232);
}
}
}
.prod-body-right {
width: 300rpx;
padding: 10rpx;
overflow: auto;
.u-btn {
height: 100rpx;
line-height: 100rpx;
margin: 20rpx 10rpx;
font-size: 40rpx;
}
}
</style> </style>
pages/mes/qc/index.vue
View file @ 250b3774
...@@ -463,10 +463,11 @@ export default { ...@@ -463,10 +463,11 @@ export default {
.button-frame { .button-frame {
width: 80px; width: 80px;
height: 80px; height: 80px;
background-color: aliceblue; background-color: #76bd1d;
border-radius: 10px; border-radius: 10px;
box-shadow: 2px 2px 3px #888888; box-shadow: 2px 2px 3px #888888;
display: grid; display: grid;
color: #FFFFFF;
place-items: center; place-items: center;
} }
......
pages/sys/login/login.vue
View file @ 250b3774
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
loading: false, loading: false,
loginForm: { loginForm: {
username: "admin", username: "admin",
password: "000000", password: "admin123",
rememberMe: false, rememberMe: false,
validCode:'', validCode:'',
uuid: "" uuid: ""
......
static/icons/png/pro.png
View replaced file @ 93f2a653 View file @ 250b3774
static/icons/png/pro.png

7 KB | W: | H:

static/icons/png/pro.png

3.97 KB | W: | H:

static/icons/png/pro.png
static/icons/png/pro.png
static/icons/png/pro.png
static/icons/png/pro.png
  • 2-up
  • Swipe
  • Onion skin
static/icons/png/qc.png
View replaced file @ 93f2a653 View file @ 250b3774
static/icons/png/qc.png

7.49 KB | W: | H:

static/icons/png/qc.png

2.83 KB | W: | H:

static/icons/png/qc.png
static/icons/png/qc.png
static/icons/png/qc.png
static/icons/png/qc.png
  • 2-up
  • Swipe
  • Onion skin
vue.config.js
View file @ 250b3774
...@@ -17,8 +17,7 @@ module.exports = { ...@@ -17,8 +17,7 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/api': { '/api': {
//target: 'http://101.43.244.58:8080/', target: 'http://101.43.244.58:8080/',
target: 'http://192.168.3.91:8080/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '' '^/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