root/hht-huahong-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
caill
2024-04-23 13:27:46 +08:00
parent 4929a5b789
commit 8e99beb223
2 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pages/login/setup.vue
View File

@@ -7,11 +7,11 @@
<view class="setup-label">服务器地址</view> <view class="setup-label">服务器地址</view>
<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip"> <input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
</view> </view>
<view class="setup-item"> <!-- <view class="setup-item">
<view class="setup-label">ACS地址</view> <view class="setup-label">ACS地址</view>
<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip"> <input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
</view> </view>
<!-- <view class="setup-item"> <view class="setup-item">
<view class="setup-label">刷新时间(s)</view> <view class="setup-label">刷新时间(s)</view>
<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime"> <input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
</view> --> </view> -->
@@ -50,20 +50,20 @@
}) })
return return
} }
if (this.acsip === '') { // if (this.acsip === '') {
uni.showToast({ // uni.showToast({
title: '请填写ACS地址', // title: '请填写ACS地址',
icon: 'none' // icon: 'none'
}) // })
return // return
} // }
if (this.setTime === '') { // if (this.setTime === '') {
uni.showToast({ // uni.showToast({
title: '请填写刷新时间', // title: '请填写刷新时间',
icon: 'none' // icon: 'none'
}) // })
return // return
} // }
// 存值 // 存值
this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, setTime: this.setTime * 1000}) this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, setTime: this.setTime * 1000})
uni.redirectTo({ uni.redirectTo({

18
pages/manage/cbj-carry.vue
View File

@@ -20,7 +20,7 @@
/> />
</view> </view>
</view> </view>
<view v-show="tab === 1 || tab === 2" class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-5"> <view class="zd-col-5">
<span class="filter_label">点位</span> <span class="filter_label">点位</span>
</view> </view>
@@ -36,16 +36,6 @@
<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select> <zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
</view> </view>
</view> </view>
<view v-show="tab === 3" class="zd-row border-bottom">
<view class="zd-col-5">
<span class="filter_label">点位编码</span>
</view>
<view class="zd-col-19 filter_select">
<search-box
v-model="val2"
/>
</view>
</view>
</view> </view>
<view v-show="tab === 1" class="zd_wrapper grid-wraper"> <view v-show="tab === 1" class="zd_wrapper grid-wraper">
<view class="slide_new"> <view class="slide_new">
@@ -122,8 +112,8 @@
<button class="zd-col-15 button-primary" :class="{'button-info': !pkId2 || !val1 || !index1}" :disabled="disabled2" @tap="_cbjmlTask">满料入库</button> <button class="zd-col-15 button-primary" :class="{'button-info': !pkId2 || !val1 || !index1}" :disabled="disabled2" @tap="_cbjmlTask">满料入库</button>
</view> </view>
<view v-show="tab === 3" class="zd-row submit-bar"> <view v-show="tab === 3" class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="index2 = '', val2 = ''">清空</button> <button class="zd-col-6 button-default" @tap="index2 = '', index1 = ''">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !val2 || !index2}" :disabled="disabled4" @tap="_cbjskTask">空料位送空蛊</button> <button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled4" @tap="_cbjskTask">空料位送空蛊</button>
</view> </view>
<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'"> <view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="pop-line"></view> <view class="pop-line"></view>
@@ -262,7 +252,7 @@
async _cbjskTask () { async _cbjskTask () {
this.disabled4 = true this.disabled4 = true
try { try {
let res = await cbjskTask(this.index2, this.val2) let res = await cbjskTask(this.index2, this.index1)
this.disabled4 = false this.disabled4 = false
uni.showToast({ uni.showToast({
title: res.message, title: res.message,