This commit is contained in:
2025-02-17 19:01:32 +08:00
parent fb5eb76135
commit 4de06af3d8
10 changed files with 173 additions and 111 deletions

View File

@@ -5,7 +5,7 @@
plus.screen.lockOrientation('landscape-primary'); plus.screen.lockOrientation('landscape-primary');
// plus.navigator.setFullscreen(true); // plus.navigator.setFullscreen(true);
// #endif // #endif
this.setRem(); // this.setRem();
window.addEventListener('resize', this.setRem); window.addEventListener('resize', this.setRem);
}, },
onHide: function() { onHide: function() {

View File

@@ -1,5 +1,5 @@
# 注意事项 # 注意事项
+ 原生APP云打包使用自有证书 + 原生APP云打包使用自有证书
+ 证书别名testalias + 证书别名testalias
+ 屏幕尺寸:1920px * 1280px + 屏幕横向尺寸:960px * 567px
+ app图标使用acs + app图标使用acs

View File

@@ -31,10 +31,10 @@ uni-toast .uni-toast {
background: url('./static/images/page_bg.jpg') center / cover no-repeat; background: url('./static/images/page_bg.jpg') center / cover no-repeat;
} }
.content { .content {
padding: 1.07rem .4rem .4rem .4rem; padding: calc(var(--status-bar-height) + 53.5px) 20px 20px 20px;
} }
.content_wraper { .content_wraper {
padding: .37rem .4rem .4rem .4rem; padding: 18.5px 20px 20px 20px;
background: url('./static/images/bg-task-r2.png') center / 100% 100% no-repeat; background: url('./static/images/bg-task-r2.png') center / 100% 100% no-repeat;
} }
.grid_wraper { .grid_wraper {
@@ -56,33 +56,33 @@ uni-toast .uni-toast {
text-align: left; text-align: left;
position: sticky; position: sticky;
top: -1px; top: -1px;
height: .81rem; height: 40.5px;
font-size: .36rem; font-size: 18px;
font-family: SourceHanSansCN-Bold; font-family: SourceHanSansCN-Bold;
line-height: .81rem; line-height: 40.5px;
color: #AFBED8; color: #AFBED8;
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
z-index: 99; z-index: 99;
padding: 0 .25rem; padding: 0 12.5px;
background: left center / 1px 81px url('/static/images/th_bg.png') repeat-x; background: left center / 1px 81px url('/static/images/th_bg.png') repeat-x;
} }
.grid_wraper table th div { .grid_wraper table th div {
font-size: .36rem; font-size: 18px;
font-family: 'SourceHanSansCN-Bold'; font-family: 'SourceHanSansCN-Bold';
line-height: .81rem; line-height: 40.5px;
color: #AFBED8; color: #AFBED8;
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
.grid_wraper table td { .grid_wraper table td {
padding: .05rem .05rem .05rem .25rem; padding: 2.5px 2.5px 2.5px 12.5px;
background: rgba(31,46,73,1); background: rgba(31,46,73,1);
border-bottom: 2px solid rgba(122,159,224,0.17); border-bottom: 2px solid rgba(122,159,224,0.17);
text-align: left; text-align: left;
font-size: .3rem; font-size: 15px;
line-height:.3rem; line-height:15px;
height: .82rem; height: 41px;
color: #fff; color: #fff;
} }
.grid_wraper table .tr_selected td { .grid_wraper table .tr_selected td {
@@ -109,10 +109,10 @@ uni-toast .uni-toast {
z-index: 99; z-index: 99;
} }
.grid_button { .grid_button {
font-size: .3rem; font-size: 15px;
line-height: .82rem; line-height: 41px;
color: #3CC1FF; color: #3CC1FF;
margin: 0 .1rem; margin: 0 5px;
padding: 0; padding: 0;
background: transparent; background: transparent;
border: 0; border: 0;
@@ -147,63 +147,63 @@ uni-toast .uni-toast {
margin-top: 15vh; margin-top: 15vh;
} }
.dialog__body { .dialog__body {
padding: 0.4rem; padding: 20px;
} }
.filter-item { .filter-item {
margin-bottom: 0.6rem; margin-bottom: 30px;
} }
.filter-label { .filter-label {
font-size: 0.3rem; font-size: 15px;
line-height: 0.8rem; line-height: 40px;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
text-align: left; text-align: left;
} }
.filter-input { .filter-input {
font-size: 0.3rem; font-size: 15px;
line-height: 0.8rem; line-height: 40px;
height: 0.8rem; height: 40px;
color: #fff; color: #fff;
border: 1px solid #6fc4e2; border: 1px solid #6fc4e2;
padding: 0 .2rem; padding: 0 10px;
text-align: center; text-align: center;
} }
.icon-plus { .icon-plus {
cursor: pointer; cursor: pointer;
font-size: 0.5rem; font-size: 25px;
line-height: 0.8rem; line-height: 40px;
height: 0.8rem; height: 40px;
color: #999; color: #999;
background-color: #fff; background-color: #fff;
text-align: center; text-align: center;
} }
.button_cancle { .button_cancle {
font-size: 0.3rem; font-size: 15px;
line-height: 0.8rem; line-height: 40px;
padding: 0 .3rem; padding: 0 15px;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
color: #606266; color: #606266;
margin: 0 .4rem; margin: 0 20px;
} }
.button_primary { .button_primary {
font-size: 0.3rem; font-size: 15px;
line-height: 0.8rem; line-height: 40px;
padding: 0 .3rem; padding: 0 15px;
background: #6fc4e2; background: #6fc4e2;
color: #fff; color: #fff;
margin: 0 .4rem; margin: 0 20px;
} }
.setup-wrap { .setup-wrap {
width: 8.85rem; width: 442.5px;
background: linear-gradient(45deg, rgba(28, 95, 161, 70%), rgba(20, 67, 120, 70%)); background: linear-gradient(45deg, rgba(28, 95, 161, 70%), rgba(20, 67, 120, 70%));
border: 1px solid #6fc4e2; border: 1px solid #6fc4e2;
padding: .49rem .48rem; padding: 24.5px 24px;
} }
.button { .button {
width: 3.36rem; width: 169px;
font-size: .48rem; font-size: 24px;
line-height: .94rem; line-height: 47px;
height: .94rem; height: 47px;
color: #fff; color: #fff;
background: transparent; background: transparent;
border: 0; border: 0;
@@ -212,21 +212,21 @@ uni-toast .uni-toast {
background: url('/static/images/btn_blue.png') center / 100% 100% no-repeat; background: url('/static/images/btn_blue.png') center / 100% 100% no-repeat;
} }
.uni-select { .uni-select {
font-size: 0.3rem !important; font-size: 015px !important;
height: 0.8rem !important; height: 40px !important;
border-color: #3CC1FF !important; border-color: #3CC1FF !important;
} }
.uni-select__input-box { .uni-select__input-box {
height: 0.8rem !important; height: 40px !important;
} }
.uni-select__input-placeholder { .uni-select__input-placeholder {
font-size: 0.3rem !important; font-size: 015px !important;
} }
.filter-select .uniui-bottom, .filter-select .uniui-top { .filter-select .uniui-bottom, .filter-select .uniui-top {
font-size: 0.3rem !important; font-size: 015px !important;
} }
.filter-select .uniui-clear { .filter-select .uniui-clear {
font-size: 0.4rem !important; font-size: 20px !important;
} }
.uni-select__selector { .uni-select__selector {
z-index: 200 !important; z-index: 200 !important;
@@ -240,40 +240,50 @@ uni-toast .uni-toast {
border-bottom-color: #3CC1FF !important; border-bottom-color: #3CC1FF !important;
} }
.uni-select__selector-item { .uni-select__selector-item {
font-size: 0.3rem !important; font-size: 15px !important;
line-height: 0.8rem !important; line-height: 35px !important;
color: #fff; color: #fff;
} }
.uni-select__input-text { .uni-select__input-text {
color: #fff !important; color: #fff !important;
} }
.uni-select__selector-empty {
font-size: 015px !important;
line-height: 20px !important;
color: #fff !important;
}
uni-toast .uni-toast__content { uni-toast .uni-toast__content {
font-size: .3rem; font-size: 15px;
} }
uni-toast .uni-toast { uni-toast .uni-toast {
padding: 0 .4rem; padding: 0 20px;
} }
uni-modal .uni-modal__bd { uni-modal .uni-modal__bd {
font-size: .3rem; font-size: 15px;
} }
uni-modal .uni-modal__ft { uni-modal .uni-modal__ft {
font-size: .4em; font-size: 20px;
line-height: .7rem; line-height: 35px;
} }
.uni-numbox--text { .uni-numbox--text {
font-size: .3rem !important; font-size: 15px !important;
line-height: .8rem !important; line-height: 40px !important;
margin-bottom: 0 !important; margin-bottom: 0 !important;
font-weight: 700 !important; font-weight: 700 !important;
} }
.uni-numbox--text span { .uni-numbox--text span {
font-size: .3rem !important; font-size: 15px !important;
} }
.uni-numbox-btns { .uni-numbox-btns {
padding: 0 .28rem !important; padding: 0 14px !important;
} }
.uni-numbox__value { .uni-numbox__value {
font-size: .3rem !important; font-size: 15px !important;
height: .8rem !important; height: 40px !important;
width: 2rem !important; width: 100px !important;
}
uni-modal .uni-modal {
background: linear-gradient(45deg, rgba(28,95,161,0.7), rgba(20,67,120,0.7));
border: 1px solid #6fc4e2;
color: #fff;
} }

View File

@@ -45,15 +45,15 @@
@import '@/common/style/mixin.styl'; @import '@/common/style/mixin.styl';
.header .header
position fixed position fixed
top 0 top var(--status-bar-height)
left 0 left 0
_wh(100%, .77rem) _wh(100%, 38.5px)
padding 0 0.4rem padding 0 20px
align-items flex-start align-items flex-start
justify-content flex-end justify-content flex-end
_bis(,'../static/images/bg_header.png', 100%, 100%,bottom) _bis(,'../static/images/bg_header.png', 100%, 100%,bottom)
.home_title .home_title
_font(0.4rem,.77rem, #8DBFEE, bold, center) _font(20px,38.5px, #8DBFEE, bold, center)
font-family 'SourceHanSansCN-Bold' font-family 'SourceHanSansCN-Bold'
font-style italic font-style italic
background linear-gradient(0deg, #A2C3E3 0%, #5E9ED9 11.9140625%, #A2C3E3 100%) background linear-gradient(0deg, #A2C3E3 0%, #5E9ED9 11.9140625%, #A2C3E3 100%)
@@ -64,9 +64,9 @@
.home_userinfo .home_userinfo
height 100% height 100%
.exit_text .exit_text
height .43rem height 21.5px
padding 0 .14rem padding 0 7px
border 1px solid #68AFF4 border 1px solid #68AFF4
background linear-gradient(to bottom, #152B56, #1B4181) background linear-gradient(to bottom, #152B56, #1B4181)
_font(.2rem,.43rem, #fff,,) _font(14px,21.5px, #fff,,)
</style> </style>

View File

@@ -38,7 +38,7 @@
} }
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "white",
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"

View File

@@ -42,11 +42,11 @@
@import '../../common/style/mixin.styl'; @import '../../common/style/mixin.styl';
.home_content .home_content
_wh(100%, 100%) _wh(100%, 100%)
padding 2.07rem 0.4rem 1.4rem 0.4rem padding calc(var(--status-bar-height) + 103.5px) 20px 70px 20px
_bis(,'../../static/images/home_bg.jpg', 100%, 100%,bottom) _bis(,'../../static/images/home_bg.jpg', 100%, 100%,bottom)
.zd_wrapper .zd_wrapper
_wh(100%,100%) _wh(100%,100%)
padding 0.37rem 0.4rem 0.4rem 0.4rem padding 18.5px 20px 20px 20px
_bis(,'../../static/images/bg-task-r2.png', 100%, 100%,center) _bis(,'../../static/images/bg-task-r2.png', 100%, 100%,center)
.menu-wrap .menu-wrap
flex-wrap wrap flex-wrap wrap
@@ -66,6 +66,6 @@
opacity 1 opacity 1
width 100% width 100%
.menu-name .menu-name
margin-top .6rem margin-top 30px
_font(.4rem, .4rem, #00a7ea, 700,center) _font(20px, 20px, #00a7ea, 700,center)
</style> </style>

View File

@@ -55,10 +55,20 @@
version: '', version: '',
versionCode: '', versionCode: '',
grade: false, grade: false,
androidUrl: '' androidUrl: '',
width: '',
height: ''
}; };
}, },
onLoad() {
// this.getScreenSize()
},
methods: { methods: {
getScreenSize() {
const systemInfo = uni.getSystemInfoSync();
this.width = systemInfo.screenWidth
this.height = systemInfo.screenHeight
},
toConfig () { toConfig () {
let obj = { let obj = {
baseUrl: this.baseUrl, baseUrl: this.baseUrl,
@@ -99,29 +109,29 @@
_bis(#fff,'../../static/images/page_bg.jpg', 100%, 100%,bottom) _bis(#fff,'../../static/images/page_bg.jpg', 100%, 100%,bottom)
.logo-wrap .logo-wrap
position fixed position fixed
_wh(100%, 1.25rem) _wh(100%, 62.5px)
_bis(,'../../static/images/login_header_bg.png', 16.82rem, 100%,bottom) _bis(,'../../static/images/login_header_bg.png', 841px, 100%,bottom)
h1 h1
_font(.8rem, 1rem, #CF6A46,,center) _font(40px, 50px, #CF6A46,,center)
font-family 'YouSheBiaoTiHei' font-family 'YouSheBiaoTiHei'
.login_wrap .login_wrap
position fixed position fixed
left 50% left 50%
top 50% top 50%
width 9rem width 450px
padding .87rem .85rem .82rem .98rem padding 43.5px 42.5px 41px 49px
transform translate3d(-50%, -50%, 0) transform translate3d(-50%, -50%, 0)
_bis(,'../../static/images/form_bg.png', 100%, 100%,bottom) _bis(,'../../static/images/form_bg.png', 100%, 100%,bottom)
.login_w .login_w
_wh(100%, 100%) _wh(100%, 100%)
overflow hidden overflow hidden
.login_tab .login_tab
height 1.07rem height 53.5px
margin-bottom .51rem margin-bottom 25.5px
_bis(,'../../static/images/login_tabs_bg.png', 100%, 100%,bottom) _bis(,'../../static/images/login_tabs_bg.png', 100%, 100%,bottom)
.login_tab_item .login_tab_item
_wh(2.7rem, .73rem) _wh(135px, 36.5px)
_font(.4rem,.73rem,#99B1DD,,center) _font(20px,36.5px,#99B1DD,,center)
font-family 'YouSheBiaoTiHei' font-family 'YouSheBiaoTiHei'
.login_tab_active .login_tab_active
color #fff color #fff
@@ -130,33 +140,33 @@
100% 100%
.login_card .login_card
width 100% width 100%
padding 0 .41rem padding 0 20.5px
.card_wrap .card_wrap
margin-bottom .52rem margin-bottom 26px
.login_label .login_label
_font(.3rem, .8rem, #AFBED8,700,) _font(15px, 40px, #AFBED8,700,)
.inputStyle .inputStyle
_font(.3rem, .8rem, #fff,,) _font(15px, 40px, #fff,,)
_wh(100%, .8rem) _wh(100%, 40px)
background: rgba(45,88,184,0.1); background: rgba(45,88,184,0.1);
border: 1px solid #4980BD; border: 1px solid #4980BD;
padding 0 .22rem padding 0 11px
.inputStyle[focus] .inputStyle[focus]
background: rgba(45,88,184,0.25); background: rgba(45,88,184,0.25);
border: 1px solid #21D0F2; border: 1px solid #21D0F2;
line-height .8rem line-height 40px
.login_icon .login_icon
position absolute position absolute
top 5px top 5px
right 10px right 10px
.primary-button .primary-button
_wh(3.36rem, .93rem) _wh(168px, 46.5px)
_font(.48rem,.93rem,#fff,,center) _font(24px,46.5px,#fff,,center)
font-family 'YouSheBiaoTiHei' font-family 'YouSheBiaoTiHei'
_bis(,'../../static/images/button.png', 100%, 100%,bottom) _bis(,'../../static/images/button.png', 100%, 100%,bottom)
.san_text .san_text
margin-top .4rem margin-top 20px
_font(0.34rem,0.34rem,#fff,,center) _font(17px,17px,#fff,,center)
.drift .drift
transition left .3s linear transition left .3s linear
.version-name .version-name

View File

@@ -48,6 +48,10 @@
}, },
async _callTask () { async _callTask () {
this.disabled = true this.disabled = true
if (!this.val1) {
this.disabled = false
return
}
try { try {
let res = await callTask(this.val1) let res = await callTask(this.val1)
uni.showToast({ uni.showToast({

View File

@@ -154,7 +154,7 @@
<style lang="stylus" scoped> <style lang="stylus" scoped>
.btn_wraper .btn_wraper
width 3.4rem width 170px
.filter-select .filter-select
width 3.1rem width 155px
</style> </style>

View File

@@ -62,16 +62,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <el-dialog :visible.sync="dialogVisible">
<div class="zd-row filter-item">
<div class="zd-col-6 filter-label">补发桶数</div>
<el-input-number class="zd-col-17" v-model="inputNumber" :min="1" label="请输入数字"></el-input-number>
</div>
<div class="zd-row jcenter button-wrap">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="handleConfirm"> </el-button>
</div>
</el-dialog> -->
</view> </view>
</template> </template>
@@ -126,9 +116,25 @@
this.$set(el, 'checked', false) this.$set(el, 'checked', false)
}) })
}, },
async _sendWork (e) { _sendWork (e) {
this.disabled1 = true this.disabled1 = true
e.checked = true e.checked = true
uni.showModal({
title: '提示',
content: '确定下发任务?',
cancelColor: '#fff',
confirmColor: '#6fc4e2',
success: (res) => {
if (res.confirm) {
this.__sendWork(e)
} else if (res.cancel) {
this.disabled1 = false
e.checked = false
}
}
})
},
async __sendWork (e) {
try { try {
let res = await sendWork(e.work_code) let res = await sendWork(e.work_code)
this._queryWorks() this._queryWorks()
@@ -160,9 +166,25 @@
e.checked = false e.checked = false
} }
}, },
async _pdaPause (e) { _pdaPause (e) {
this.disabled3 = true this.disabled3 = true
e.checked = true e.checked = true
uni.showModal({
title: '提示',
content: '确定暂停任务?',
cancelColor: '#fff',
confirmColor: '#6fc4e2',
success: (res) => {
if (res.confirm) {
this.__pdaPause(e)
} else if (res.cancel) {
this.disabled3 = false
e.checked = false
}
}
})
},
async __pdaPause (e) {
try { try {
let res = await pdaPause(e.work_code) let res = await pdaPause(e.work_code)
this._queryWorks() this._queryWorks()
@@ -177,9 +199,25 @@
e.checked = false e.checked = false
} }
}, },
async _finishWork (e) { _finishWork (e) {
this.disabled4 = true this.disabled4 = true
e.checked = true e.checked = true
uni.showModal({
title: '提示',
content: '确定完成任务?',
cancelColor: '#fff',
confirmColor: '#6fc4e2',
success: (res) => {
if (res.confirm) {
this.__finishWork(e)
} else if (res.cancel) {
this.disabled4 = false
e.checked = false
}
}
})
},
async __finishWork (e) {
try { try {
let res = await finishWork(e.work_code) let res = await finishWork(e.work_code)
this._queryWorks() this._queryWorks()
@@ -211,5 +249,5 @@
.grid_wraper .grid_wraper
height 100% height 100%
.btn_wraper .btn_wraper
width 3.5rem width 170px
</style> </style>