Commit d1029e67 authored by 张海景's avatar 张海景

update:修改切换工作站调接口

parent c5768522
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<template v-else> <template v-else>
<u-row> <u-row>
<u-col span="3" v-for="(card, index) in workUnitList" :key="index"> <u-col span="3" v-for="(card, index) in workUnitList" :key="index">
<u-card class="station_card" :show-foot="false" :title="'工作单元' + card.workunitCode" > <u-card class="station_card" :show-foot="false" :title="'工作单元' + card.workunitCode">
<view class="station_card_text" slot="body"> <view class="station_card_text" slot="body">
{{ '工作单元名称:' + card.workunitName }} {{ '工作单元名称:' + card.workunitName }}
<u-button type="primary" @click="setWorkUnit(card)" style="margin-top: 30rpx">选择</u-button> <u-button type="primary" @click="setWorkUnit(card)" style="margin-top: 30rpx">选择</u-button>
...@@ -65,8 +65,7 @@ ...@@ -65,8 +65,7 @@
width="1600rpx" width="1600rpx"
> >
<view class="list-bar"> <view class="list-bar">
<u-form label-width="100px" :model="curTaskInfo"> <u-form label-width="100px" :model="curTaskInfo"></u-form>
</u-form>
<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }"> <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
<uni-table ref="materialRequestTable" border stripe :loading="loading" emptyText="未查询到数据"> <uni-table ref="materialRequestTable" border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr> <uni-tr>
...@@ -94,7 +93,6 @@ ...@@ -94,7 +93,6 @@
</scroll-view> </scroll-view>
</view> </view>
</u-modal> </u-modal>
</view> </view>
</template> </template>
...@@ -139,7 +137,7 @@ export default { ...@@ -139,7 +137,7 @@ export default {
}; };
}, },
created() { created() {
this.createSocket() this.createSocket();
uni.$on('switchTab', (indexCode) => { uni.$on('switchTab', (indexCode) => {
this.tabIndex = indexCode; this.tabIndex = indexCode;
}); });
...@@ -244,10 +242,10 @@ export default { ...@@ -244,10 +242,10 @@ export default {
// console.log(res, 'res888') // console.log(res, 'res888')
if (res.code === 200) { if (res.code === 200) {
this.$u.vuex('vuex_printerInfo', { this.$u.vuex('vuex_printerInfo', {
hostUrl:'http://'+ res.data.printerIp +':'+ res.data.printerPort, hostUrl: 'http://' + res.data.printerIp + ':' + res.data.printerPort,
printerName: res.data.printerName printerName: res.data.printerName
}); });
this.createSocket() this.createSocket();
} }
}); });
this.getPrint(); this.getPrint();
...@@ -278,6 +276,7 @@ export default { ...@@ -278,6 +276,7 @@ export default {
} else if (command == 'workunit') { } else if (command == 'workunit') {
this.showLogoutMenu = false; this.showLogoutMenu = false;
this.showWorkstationFlag = true; this.showWorkstationFlag = true;
this.getWorkUnitList();
} else if (command == 'print') { } else if (command == 'print') {
this.showPrintFlag = true; this.showPrintFlag = true;
this.getPrint(); this.getPrint();
......
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