Skip to content

M
mes-pad
Commit 30cda62f authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

样式适配小的平板

parent 55ca5aac
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 107 deletions
App.vue
View file @ 30cda62f
...@@ -31,6 +31,7 @@ export default { ...@@ -31,6 +31,7 @@ export default {
<style lang="scss"> <style lang="scss">
/*每个页面公共css */ /*每个页面公共css */
@import '@/uview-ui/index.scss'; @import '@/uview-ui/index.scss';
@import '@/static/css/global.scss';
/deep/ .uni-select__selector-scroll { /deep/ .uni-select__selector-scroll {
max-height: 120px !important; max-height: 120px !important;
} }
......
common/checkappupdate.js
View file @ 30cda62f
...@@ -11,88 +11,94 @@ function check(param = {}) { ...@@ -11,88 +11,94 @@ function check(param = {}) {
plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => { plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
let platform = plus.os.name.toLocaleLowerCase() let platform = plus.os.name.toLocaleLowerCase()
try { try {
param.func().then(result => { console.log(widgetInfo.version)
let data = result.data ? result.data[0] : null; uni.request({
if (widgetInfo.version === data.version) { url: config.baseUrl + '/md/appconfig/getVersion',
return; success: (result) => {
} result = result.data
console.log('result', result)
if (result.code == 200) { let data = result.data ? result.data[0] : null;
// android进行如下操作 console.log(widgetInfo.version, data.version)
uni.showModal({ if (widgetInfo.version === data.version) {
title: param.title, return;
content: data.updateDesc ? data.updateDesc + '' : param.content, }
showCancel: false, if (result.code == 200) {
confirmText: param.oktext, // android进行如下操作
cancelText: param.canceltext, uni.showModal({
success: res => { title: param.title,
if (!res.confirm) { content: data.updateDesc ? data.updateDesc + '' : param.content,
console.log('取消了升级'); showCancel: false,
plus.runtime.quit(); confirmText: param.oktext,
} cancelText: param.canceltext,
success: res => {
// 清除缓存 if (!res.confirm) {
// request.clearLogin(); console.log('取消了升级');
plus.runtime.quit();
}
// 开始下载
// 创建下载任务 // 清除缓存
var dtask = plus.downloader.createDownload(data.url, { // request.clearLogin();
filename: "_downloads/"
},
function (d, status) { // 开始下载
// 下载完成 // 创建下载任务
if (status == 200) { var dtask = plus.downloader.createDownload(data.url, {
plus.runtime.install(d.filename, { filename: "_downloads/"
force: true },
}, function () { function (d, status) {
//进行重新启动; // 下载完成
plus.runtime.restart(); if (status == 200) {
}, (e) => { plus.runtime.install(d.filename, {
uni.showToast({ force: true
title: '安装升级包失败:' + JSON }, function () {
.stringify(e), //进行重新启动;
icon: 'none' plus.runtime.restart();
}) }, (e) => {
}); uni.showToast({
} else { title: '安装升级包失败:' + JSON
this.tui.toast("下载升级包失败，请手动去站点下载安装，错误码: " + .stringify(e),
status); icon: 'none'
} })
}); });
} else {
let view = new plus.nativeObj.View("maskView", { this.tui.toast("下载升级包失败，请手动去站点下载安装，错误码: " +
backgroundColor: "rgba(0,0,0,.6)", status);
left: '0px', }
bottom: "0px", });
width: plus.screen.resolutionWidth,
height: plus.screen.resolutionHeight let view = new plus.nativeObj.View("maskView", {
}) backgroundColor: "rgba(0,0,0,.6)",
left: '0px',
view.drawText('开始下载', {}, { bottom: "0px",
size: '12px', width: plus.screen.resolutionWidth,
color: '#FFFFFF' height: plus.screen.resolutionHeight
}); })
view.show() view.drawText('开始下载', {}, {
size: '12px',
color: '#FFFFFF'
dtask.addEventListener("statechanged", (e) => { });
if (e && e.downloadedSize > 0) {
let jindu = ((e.downloadedSize / e.totalSize) * view.show()
100).toFixed(2)
view.reset();
view.drawText('进度:' + jindu + '%', {}, { dtask.addEventListener("statechanged", (e) => {
size: '12px', if (e && e.downloadedSize > 0) {
color: '#FFFFFF' let jindu = ((e.downloadedSize / e.totalSize) *
}); 100).toFixed(2)
} view.reset();
}, false); view.drawText('进度:' + jindu + '%', {}, {
dtask.start(); size: '12px',
} color: '#FFFFFF'
}) });
} }
}) }, false);
dtask.start();
}
})
}
}
})
} catch (e) { } catch (e) {
console.log('eee',e) console.log('eee',e)
} }
......
pages/mes/prodReport/index.vue
View file @ 30cda62f
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
<view> <view>
<u-form :model="tableParams" labelAlign="right" class="tableForm"> <u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item label="编排单号" label-width="70px" name="arrangeCode"> <u-form-item label="编排单号" label-width="70px" name="arrangeCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode" <uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode" style="width: 1.15rem"
@iconClick="iconClickArrangeCode" placeholder="请输入编排单号" /> @iconClick="iconClickArrangeCode" placeholder="请输入编排单号" />
</u-form-item> </u-form-item>
<u-form-item label="生产工单编号" label-width="100px" name="workorderCode"> <u-form-item label="生产工单编号" label-width="95px" name="workorderCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.workorderCode" <uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.workorderCode" style="width: 1.15rem"
@iconClick="iconClickWorkorderCode" placeholder="请输入生产工单编号" /> @iconClick="iconClickWorkorderCode" placeholder="请输入生产工单编号" />
</u-form-item> </u-form-item>
<u-form-item name="allowProduce" label-width="80px" label="当前可加工"> <u-form-item name="allowProduce" label-width="80px" label="当前可加工">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
:localdata="allowProduceLocal"></uni-data-checkbox> :localdata="allowProduceLocal"></uni-data-checkbox>
</u-form-item> </u-form-item>
<u-form-item name="allowProduce"> <u-form-item name="allowProduce">
<u-button @click="getTaskList()" type="primary" size="medium">搜索</u-button> <u-button @click="getTaskList()" type="primary" size="medium" style="width: 0.5rem">搜索</u-button>
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<!-- </view>--> <!-- </view>-->
<!-- </view> --> <!-- </view> -->
</view> </view>
<scroll-view class="prod-body-right" scroll-y> <scroll-view class="prod-body-right" scroll-y >
<view style="text-align: center; line-height: 80rpx; font-size: 28rpx; font-weight: 600"> <view style="text-align: center; line-height: 80rpx; font-size: 28rpx; font-weight: 600">
{{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }} {{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }}
</view> </view>
...@@ -528,25 +528,25 @@ ...@@ -528,25 +528,25 @@
<u-modal title="投料校验" @cancel="$refs.appScan.closed(), (feedingInspectionVisible = false)" show-cancel-button <u-modal title="投料校验" @cancel="$refs.appScan.closed(), (feedingInspectionVisible = false)" show-cancel-button
cancelText="关闭" :show-confirm-button="false" cancelText="关闭" :show-confirm-button="false"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="feedingInspectionVisible" width="100%" :content-style="{ height: '87vh' }"> v-model="feedingInspectionVisible" width="100%" height="100%" :content-style="{ height: '87vh' }">
<view style="display: flex"> <view style="display: flex; width: 100%;">
<view style="width: 520px" v-if="feedingInspectionVisible"> <view style="width: 510px" v-if="feedingInspectionVisible">
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<app-scan ref="appScan" @getCode="feedingInspectionScan"></app-scan> <app-scan ref="appScan" @getCode="feedingInspectionScan"></app-scan>
<!-- #endif --> <!-- #endif -->
</view> </view>
<view class="list-bar"> <view class="list-bar" style="width: calc(100% - 510px);">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" <scroll-view scroll-y="true" scroll-x="true" class="scroll-list" show-scrollbar
:style="{ height: this.screenHeight - 280 + 'px' }"> :style="{ height: this.screenHeight - 280 + 'px'}" @touchmove.stop>
<uni-table border stripe :loading="loading" emptyText="未查询到数据"> <uni-table border stripe :loading="loading" emptyText="未查询到数据" class="mynotable">
<uni-tr> <uni-tr>
<uni-th width="100px" align="center">操作</uni-th> <uni-th width="100px" align="center">操作</uni-th>
<uni-th width="65px" align="center">状态</uni-th> <uni-th width="65px" align="center">状态</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th> <uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th> <uni-th width="110px" align="center">产品物料名称</uni-th>
<uni-th width="80px" align="center">领料数量</uni-th> <uni-th width="80px" align="center">领料数量</uni-th>
<uni-th width="110px" align="center">批次号</uni-th> <uni-th width="110px" align="center">批次号</uni-th>
</uni-tr> </uni-tr>
<uni-tr v-for="(line, index) in feedingInspectionList" :key="index"> <uni-tr v-for="(line, index) in feedingInspectionList" :key="index">
<uni-td align="center"> <uni-td align="center">
<view class="uni-group"> <view class="uni-group">
...@@ -567,11 +567,11 @@ ...@@ -567,11 +567,11 @@
</u-modal> </u-modal>
<u-modal title="反冲料登记" @cancel="$refs.appScan.closed(), (recoilMaterialVisible = false)" show-cancel-button <u-modal title="反冲料登记" @cancel="$refs.appScan.closed(), (recoilMaterialVisible = false)" show-cancel-button
cancelText="关闭" :show-confirm-button="false" cancelText="关闭" :show-confirm-button="false" height="100%"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="recoilMaterialVisible" width="100%" :content-style="{ height: '87vh' }"> v-model="recoilMaterialVisible" width="100%" :content-style="{ height: '87vh' }">
<view style="display: flex"> <view style="display: flex">
<view style="width: 520px" v-if="recoilMaterialVisible"> <view style="width: 510px" v-if="recoilMaterialVisible">
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<app-scan ref="appScan" @getCode="recoilMaterialScan" v-if="!recoilMaterialFlag"></app-scan> <app-scan ref="appScan" @getCode="recoilMaterialScan" v-if="!recoilMaterialFlag"></app-scan>
<!-- #endif --> <!-- #endif -->
...@@ -582,9 +582,9 @@ ...@@ -582,9 +582,9 @@
position: 'absolute', position: 'absolute',
background: 'black'}"></view> background: 'black'}"></view>
</view> </view>
<view class="list-bar"> <view class="list-bar" style="width: calc(100% - 510px);">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }"> <scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px'}" @touchmove.stop>
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据"> <uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据" class="mynotable">
<uni-tr> <uni-tr>
<!-- <uni-th width="200px" align="center">操作</uni-th> --> <!-- <uni-th width="200px" align="center">操作</uni-th> -->
<uni-th width="110px" align="center">产品物料编码</uni-th> <uni-th width="110px" align="center">产品物料编码</uni-th>
...@@ -2846,6 +2846,9 @@ export default { ...@@ -2846,6 +2846,9 @@ export default {
.tableForm { .tableForm {
display: flex; display: flex;
margin: 20rpx 0rpx; margin: 20rpx 0rpx;
/deep/ .uni-data-checklist .checklist-group .checklist-box {
margin-right: 0.15rem;
}
} }
.task_card { .task_card {
...@@ -2952,13 +2955,19 @@ export default { ...@@ -2952,13 +2955,19 @@ export default {
width: 300rpx; width: 300rpx;
padding: 10rpx; padding: 10rpx;
overflow: auto; overflow: auto;
.u-btn { .u-btn {
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
margin: 20rpx 10rpx; margin: 20rpx 10rpx;
font-size: 40rpx; font-size: 40rpx;
} }
/deep/ .uni-scroll-view{
-ms-overflow-style: none; /* IE 10+ */
scrollbar-width: none; /* Firefox */
&::-webkit-scrollbar {
display: none; /* 对于 Chrome, Safari 和 Opera 隐藏滚动条 */
}
}
} }
.times { .times {
...@@ -2966,4 +2975,13 @@ export default { ...@@ -2966,4 +2975,13 @@ export default {
height: 360rpx; height: 360rpx;
} }
} }
</style> </style>
<style lang="scss">
.mynotable {
width: 100% !important;
/deep/ .uni-table {
min-width: 100% !important;
}
}
</style>
\ No newline at end of file
static/css/global.scss 0 → 100644
View file @ 30cda62f
::v-deep ::-webkit-scrollbar {
// 滚动条整体样式
display: block;
width: 10rpx !important;
height: 10rpx !important;
-webkit-appearance: auto !important;
background: transparent;
overflow: auto !important;
}
::v-deep ::-webkit-scrollbar-thumb {
// 滚动条里面小方块
border-radius: 10rpx !important;
box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
background-color: #E2E2E2 !important;
}
::v-deep ::-webkit-scrollbar-track {
// 滚动条
border-radius: 10rpx !important;
box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0) !important;
background-color: transparent !important;
}
html {
font-size: calc(100vw / 7.5);
}
\ 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