Skip to content

M
mes-pad
Commit d1029e67 authored by 张海景's avatar 张海景
Browse files
Options

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

parent c5768522
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 44 deletions
pages/index/index.vue
View file @ d1029e67
...@@ -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>
...@@ -55,46 +55,44 @@ ...@@ -55,46 +55,44 @@
width="1300rpx" width="1300rpx"
> --> > -->
<u-modal <u-modal
title="打印机" title="打印机"
show-cancel-button show-cancel-button
:show-confirm-button="false" :show-confirm-button="false"
cancel-text="返回" cancel-text="返回"
: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="showPrintFlag" v-model="showPrintFlag"
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> <uni-th width="100px" align="center">打印机类型</uni-th>
<uni-th width="100px" align="center">打印机类型</uni-th> <uni-th width="100px" align="center">打印机名称</uni-th>
<uni-th width="100px" align="center">打印机名称</uni-th> <uni-th width="100px" align="center">打印机位置</uni-th>
<uni-th width="100px" align="center">打印机位置</uni-th> <uni-th width="60px" align="center">型号</uni-th>
<uni-th width="60px" align="center">型号</uni-th> <uni-th width="60px" align="center">连接类型</uni-th>
<uni-th width="60px" align="center">连接类型</uni-th> <uni-th width="10px" align="center">操作</uni-th>
<uni-th width="10px" align="center">操作</uni-th> </uni-tr>
</uni-tr> <uni-tr v-for="(line, index) in materialRequestArrays" :key="index">
<uni-tr v-for="(line, index) in materialRequestArrays" :key="index"> <uni-td align="center">{{ line.printerType }}</uni-td>
<uni-td align="center">{{ line.printerType }}</uni-td> <uni-td align="center">{{ line.printerName }}</uni-td>
<uni-td align="center">{{ line.printerName }}</uni-td> <uni-td align="center">{{ line.printerPlace }}</uni-td>
<uni-td align="center">{{ line.printerPlace }}</uni-td> <uni-td align="center">{{ line.printerModel }}</uni-td>
<uni-td align="center">{{ line.printerModel }}</uni-td> <uni-td align="center">{{ line.connectionType }}</uni-td>
<uni-td align="center">{{ line.connectionType }}</uni-td> <uni-td align="center">
<uni-td align="center"> <view class="uni-group">
<view class="uni-group"> <button class="uni-button" v-if="line.userPrinterStatus == '1'" size="mini" type="primary">已绑定</button>
<button class="uni-button" v-if="line.userPrinterStatus == '1'" size="mini" type="primary">已绑定</button> <button class="uni-button" v-else size="mini" type="primary" @click="materialRequestFormShow(line)">绑定</button>
<button class="uni-button" v-else size="mini" type="primary" @click="materialRequestFormShow(line)">绑定</button> </view>
</view> </uni-td>
</uni-td> </uni-tr>
</uni-tr> </uni-table>
</uni-table> </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