Commit 7cc15289 authored by 张海景's avatar 张海景

update:修改pdf打印方法

parent 1e7d8f9b
...@@ -15,6 +15,10 @@ const install = (Vue, vm) => { ...@@ -15,6 +15,10 @@ const install = (Vue, vm) => {
vm.$u.get(config.adminPath + '/mobile/index', params), vm.$u.get(config.adminPath + '/mobile/index', params),
getUserInfo: (params = {}) => getUserInfo: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/user/getUserInfo', params), vm.$u.get(config.adminPath + '/mobile/user/getUserInfo', params),
getUserPrintInfo: () =>
vm.$u.get(config.adminPath + '/system/print/printer'),
getPrintDown: (params) =>
vm.$u.postJson(config.adminPath + '/common/printDown', params),
login: (params = {}) => login: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/login/loginByPassword', params), vm.$u.post(config.adminPath + '/mobile/login/loginByPassword', params),
sendCode: (params = {}) => sendCode: (params = {}) =>
...@@ -151,8 +155,6 @@ const install = (Vue, vm) => { ...@@ -151,8 +155,6 @@ const install = (Vue, vm) => {
config.adminPath + '/mobile/pro/taskissue/getReserveIssueList', config.adminPath + '/mobile/pro/taskissue/getReserveIssueList',
params params
), ),
//人员绑定打印机 //人员绑定打印机
getUserPrint:(params = {}) => getUserPrint:(params = {}) =>
vm.$u.get(config.adminPath + '/system/printerConfig/userList', params), vm.$u.get(config.adminPath + '/system/printerConfig/userList', params),
......
...@@ -2,54 +2,43 @@ ...@@ -2,54 +2,43 @@
<view class="common-container"> <view class="common-container">
<!-- <u-button @click="handleTest">跳转测试</u-button> --> <!-- <u-button @click="handleTest">跳转测试</u-button> -->
<view class="header"> <view class="header">
<image mode="widthFix" class="header-logo" style="width: 100px;margin: 10px auto;display: block;" <image mode="widthFix" class="header-logo" style="width: 100px; margin: 10px auto; display: block" src="/static/logo.png"></image>
src="/static/logo.png"></image>
<TabHeader></TabHeader> <TabHeader></TabHeader>
<view class="setting-body" <view class="setting-body" @click="handleUserTaped">
@click="handleUserTaped">
<u-icon name="list" size="45" class="setting-icon"></u-icon> <u-icon name="list" size="45" class="setting-icon"></u-icon>
{{ this.vuex_user.nickName }} {{ this.vuex_user.nickName }}
</view> </view>
</view> </view>
<view class="common-main"> <view class="common-main">
<ProdReport v-if="tabIndex === 'PRO'"></ProdReport> <ProdReport v-if="tabIndex === 'PRO'"></ProdReport>
<GxContent v-else-if="tabIndex ==='GX'"></GxContent> <GxContent v-else-if="tabIndex === 'GX'"></GxContent>
<QcContent v-else-if="tabIndex ==='QC'"></QcContent> <QcContent v-else-if="tabIndex === 'QC'"></QcContent>
<ProContent v-if="tabIndex === 'DV'"></ProContent> <ProContent v-if="tabIndex === 'DV'"></ProContent>
</view> </view>
<u-modal width="90%" v-model="showWorkstationFlag" :showConfirmButton="false" :showCancelButton="true" <u-modal width="90%" v-model="showWorkstationFlag" :showConfirmButton="false" :showCancelButton="true" title="请选择工作单元" content="操作内容">
title="请选择工作单元" content="操作内容">
<view class="station_list"> <view class="station_list">
<u-empty text="暂无工作单元" mode="list" v-if="workUnitList.length==0" <u-empty text="暂无工作单元" mode="list" v-if="workUnitList.length == 0" style="margin: 0 auto; display: block; height: 360rpx; padding: 100rpx 0"></u-empty>
style="margin: 0 auto;display: block;height: 360rpx;padding: 100rpx 0;"></u-empty>
<template v-else> <template v-else>
<u-card class="station_card" :show-foot="false" :title="'工作单元'+card.workunitCode" <u-card class="station_card" :show-foot="false" :title="'工作单元' + card.workunitCode" v-for="(card, index) in workUnitList">
v-for="(card,index) in workUnitList">
<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)" <u-button type="primary" @click="setWorkUnit(card)" style="margin-top: 30rpx">选择</u-button>
style="margin-top: 30rpx;">选择
</u-button>
</view> </view>
</u-card> </u-card>
</template> </template>
</view> </view>
</u-modal> </u-modal>
<u-modal v-model="showLogoutMenu" :showConfirmButton="false" :showCancelButton="true" width="600px" title="请选择操作">
<u-modal v-model="showLogoutMenu" :showConfirmButton=false :showCancelButton="true" width="600px"
title="请选择操作">
<view class="logoutmenu"> <view class="logoutmenu">
<u-button shape="circle" class="menu_button" @click="" type="primary">更改密码</u-button> <u-button shape="circle" class="menu_button" @click="" type="primary">更改密码</u-button>
<u-button shape="circle" class="menu_button" @click="handleCommand('workunit')" type="warning">切换工作站 <u-button shape="circle" class="menu_button" @click="handleCommand('workunit')" type="warning">切换工作站</u-button>
</u-button>
<u-button shape="circle" class="menu_button" @click="handleCommand('print')" type="error">默认打印机</u-button> <u-button shape="circle" class="menu_button" @click="handleCommand('print')" type="error">默认打印机</u-button>
<u-button shape="circle" class="menu_button" @click="handleCommand('exit')" type="error">退出登录</u-button> <u-button shape="circle" class="menu_button" @click="handleCommand('exit')" type="error">退出登录</u-button>
</view> </view>
</u-modal> </u-modal>
<!-- <u-modal <!-- <u-modal
title="领料申请" title="领料申请"
@confirm="materialRequestSave()" @confirm="materialRequestSave()"
show-cancel-button show-cancel-button
...@@ -92,7 +81,8 @@ ...@@ -92,7 +81,8 @@
<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" size="mini" type="primary" @click="materialRequestFormShow(line)">绑定</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>
</view> </view>
</uni-td> </uni-td>
</uni-tr> </uni-tr>
...@@ -102,21 +92,18 @@ ...@@ -102,21 +92,18 @@
</u-modal> </u-modal>
</view> </view>
</template> </template>
<script> <script>
import TabHeader from "./TabHeader.vue" import TabHeader from './TabHeader.vue';
import ProContent from "../mes/pro/index.vue" import ProContent from '../mes/pro/index.vue';
import GxContent from "../mes/gx/index.vue" import GxContent from '../mes/gx/index.vue';
import QcContent from "../mes/qc/index.vue" import QcContent from '../mes/qc/index.vue';
import ProdReport from "../mes/prodReport/index.vue" import ProdReport from '../mes/prodReport/index.vue';
import DictData from '@/components/DictData' import DictData from '@/components/DictData';
import UButton from '../../uview-ui/components/u-button/u-button.vue' import UButton from '../../uview-ui/components/u-button/u-button.vue';
export default { export default {
name: 'HomePage', name: 'HomePage',
components: { components: {
TabHeader, TabHeader,
...@@ -128,8 +115,7 @@ ...@@ -128,8 +115,7 @@
}, },
data() { data() {
return { return {
tabIndex: 'PRO',
tabIndex: "PRO",
showWorkstationFlag: false, showWorkstationFlag: false,
showPrintFlag: false, showPrintFlag: false,
showLogoutMenu: false, showLogoutMenu: false,
...@@ -137,24 +123,24 @@ ...@@ -137,24 +123,24 @@
loading: false, loading: false,
userInfo: { userInfo: {
nickName: '张三', nickName: '张三',
avatar: require("@/static/images/head.png"), avatar: require('@/static/images/head.png')
}, },
materialRequestArrays: [], materialRequestArrays: [],
processList: [], //工序清单 processList: [], //工序清单
workstationList: [], //工作站清单 workstationList: [], //工作站清单
workUnitList:[],//工作站清单 workUnitList: [], //工作站清单
curTaskInfo: {},//打印机的 curTaskInfo: {}, //打印机的
screenHeight: 768, screenHeight: 768,
currentFlag: 0 currentFlag: 0
} };
}, },
created() { created() {
uni.$on('switchTab', (indexCode) => { uni.$on('switchTab', (indexCode) => {
this.tabIndex = indexCode; this.tabIndex = indexCode;
}) });
uni.$on('changeWorkunit', (indexCode) => { uni.$on('changeWorkunit', (indexCode) => {
this.handleCommand('workunit'); this.handleCommand('workunit');
}) });
this.checkWorkstation(); this.checkWorkstation();
this.getWorkUnitList(); this.getWorkUnitList();
...@@ -166,12 +152,12 @@ ...@@ -166,12 +152,12 @@
methods: { methods: {
handleTest() { handleTest() {
uni.navigateTo({ uni.navigateTo({
url:'/pages/test/test' url: '/pages/test/test'
}) });
}, },
//用户部分点击 //用户部分点击
handleUserTaped() { handleUserTaped() {
console.log("TAPED") console.log('TAPED');
// this.$refs.menu_dialog.open(); // this.$refs.menu_dialog.open();
this.showLogoutMenu = true; this.showLogoutMenu = true;
}, },
...@@ -180,43 +166,43 @@ ...@@ -180,43 +166,43 @@
checkWorkstation() { checkWorkstation() {
if (this.vuex_workunit == null) { if (this.vuex_workunit == null) {
this.showWorkstationFlag = true; this.showWorkstationFlag = true;
this.$u.toast("请设置当前触控屏的工作单元!"); this.$u.toast('请设置当前触控屏的工作单元!');
} }
}, },
//获取工序清单 //获取工序清单
getProcessList() { getProcessList() {
this.$u.api.getProcessList({}).then(res => { this.$u.api.getProcessList({}).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.processList = res.data; this.processList = res.data;
this.activeProcess = res.data[0].processCode; this.activeProcess = res.data[0].processCode;
this.getWorkstationList({index: 0}); this.getWorkstationList({ index: 0 });
} else { } else {
this.$u.toast("获取工序清单异常" + res.msg); this.$u.toast('获取工序清单异常' + res.msg);
} }
}); });
}, },
//获取工作站清单 //获取工作站清单
getWorkstationList(item) { getWorkstationList(item) {
this.currentFlag = item.index; this.currentFlag = item.index;
this.activeProcess = this.processList[item.index].processCode; this.activeProcess = this.processList[item.index].processCode;
this.$u.api.getWorkstationList({ this.$u.api
.getWorkstationList({
processCode: this.activeProcess processCode: this.activeProcess
}).then(res => { })
.then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.workstationList = res.data; this.workstationList = res.data;
} else { } else {
this.$u.toast("获取工作站清单异常" + res.msg); this.$u.toast('获取工作站清单异常' + res.msg);
} }
}); });
}, },
getWorkUnitList(item) { getWorkUnitList(item) {
this.$u.api.getWorkUnitList({ this.$u.api.getWorkUnitList({}).then((res) => {
}).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.workUnitList = res.rows; this.workUnitList = res.rows;
} else { } else {
this.$u.toast("获取工作单元清单异常" + res.msg); this.$u.toast('获取工作单元清单异常' + res.msg);
} }
}); });
}, },
...@@ -226,8 +212,9 @@ ...@@ -226,8 +212,9 @@
this.showWorkstationFlag = false; this.showWorkstationFlag = false;
uni.$emit('switchWorkunit', station); uni.$emit('switchWorkunit', station);
}, },
materialRequestFormShow(row){ materialRequestFormShow(row) {
this.$u.api.addUserPrint({ this.$u.api
.addUserPrint({
userId: this.vuex_user.userId, userId: this.vuex_user.userId,
userName: this.vuex_user.userName, userName: this.vuex_user.userName,
nickName: this.vuex_user.nickName, nickName: this.vuex_user.nickName,
...@@ -242,23 +229,30 @@ ...@@ -242,23 +229,30 @@
printerStatus: row.status, printerStatus: row.status,
brand: row.brand, brand: row.brand,
connectionType: row.connectionType, connectionType: row.connectionType,
enableFlag: row.enableFlag, enableFlag: row.enableFlag
}).then((res) => { })
.then((res) => {
if (res.code === 200) { if (res.code === 200) {
if (res.msg === '操作成功') { if (res.msg === '操作成功') {
this.$u.toast('绑定成功'); this.$u.toast('绑定成功');
this.$u.api.getUserPrintInfo().then((res) => {
// console.log(res, 'res888')
if (res.code === 200) {
this.$u.vuex('vuex_printerHostUrl', 'http://' + res.data.printerIp + ':' + res.data.printerPort);
this.$u.vuex('vuex_printerName', res.data.printerName);
}
});
this.getPrint(); this.getPrint();
} else { } else {
this.$u.toast(res.msg); this.$u.toast(res.msg);
} }
} }
}); });
}, },
handleCommand(command) { handleCommand(command) {
if (command === 'exit') { if (command === 'exit') {
this.loading = true; this.loading = true;
this.$u.api.logout().then(res => { this.$u.api.logout().then((res) => {
this.loading = false; this.loading = false;
if (res.msg) { if (res.msg) {
this.$u.toast(res.msg); this.$u.toast(res.msg);
...@@ -272,44 +266,43 @@ ...@@ -272,44 +266,43 @@
}); });
}, 500); }, 500);
} }
}) });
} else if (command == 'workunit') { } else if (command == 'workunit') {
this.showLogoutMenu = false; this.showLogoutMenu = false;
this.showWorkstationFlag = true; this.showWorkstationFlag = true;
}else if(command == 'print'){ } else if (command == 'print') {
this.showPrintFlag =true; this.showPrintFlag = true;
this.getPrint(); this.getPrint();
} }
}, },
getPrint(){ getPrint() {
this.$u.api.getUserPrint().then((res) => { this.$u.api.getUserPrint().then((res) => {
if(res.code==200){ if (res.code == 200) {
this.materialRequestArrays=res.rows this.materialRequestArrays = res.rows;
} }
}); });
} }
},
} }
};
</script> </script>
<style> <style>
.common-container { .common-container {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
display: flex; display: flex;
} }
.common-head { .common-head {
height: 40px; height: 40px;
background-color: rgb(3, 26, 60); background-color: rgb(3, 26, 60);
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 15px; padding: 0 15px;
box-sizing: border-box; box-sizing: border-box;
} }
.header { .header {
width: 110px; width: 110px;
background-color: #132138; background-color: #132138;
color: aliceblue; color: aliceblue;
...@@ -324,63 +317,62 @@ ...@@ -324,63 +317,62 @@
margin: 40rpx auto; margin: 40rpx auto;
display: block; display: block;
} }
} }
.header .divItem { .header .divItem {
height: 100%; height: 100%;
align-items: center; align-items: center;
} }
.header .workstation { .header .workstation {
text-align: center; text-align: center;
flex-grow: 1; flex-grow: 1;
} }
.header .user { .header .user {
width: 30%; width: 30%;
} }
.header .user .user-icon { .header .user .user-icon {
float: right; float: right;
} }
img { img {
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 20px; border-radius: 20px;
margin-left: 10px; margin-left: 10px;
} }
.header .user .user-text { .header .user .user-text {
float: right; float: right;
} }
.logoutmenu { .logoutmenu {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.menu_button { .menu_button {
width: 100px; width: 100px;
margin: 10px; margin: 10px;
} }
.station_modal { .station_modal {
} }
.station_list { .station_list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.station_card { .station_card {
width: 250px; width: 250px;
height: 150px; height: 150px;
} }
.common-main { .common-main {
flex: 1; flex: 1;
height: 100%; height: 100%;
padding: 6px 6px 6px 0; padding: 6px 6px 6px 0;
...@@ -388,9 +380,9 @@ ...@@ -388,9 +380,9 @@
width: 100%; width: 100%;
overflow: auto; overflow: auto;
background-image: linear-gradient(to top right, rgb(19 26 56), rgb(33 64 128)); background-image: linear-gradient(to top right, rgb(19 26 56), rgb(33 64 128));
} }
.setting-body { .setting-body {
position: absolute; position: absolute;
bottom: 20rpx; bottom: 20rpx;
width: 200rpx; width: 200rpx;
...@@ -402,5 +394,5 @@ ...@@ -402,5 +394,5 @@
.setting-icon { .setting-icon {
margin: 10rpx 10rpx; margin: 10rpx 10rpx;
} }
} }
</style> </style>
...@@ -83,6 +83,13 @@ ...@@ -83,6 +83,13 @@
this.$u.toast(res.msg); this.$u.toast(res.msg);
} }
if (res.code == '200') { if (res.code == '200') {
this.$u.api.getUserPrintInfo().then(res=> {
// console.log(res, 'res888')
if (res.code === 200) {
this.$u.vuex('vuex_printerHostUrl', 'http://'+ res.data.printerIp +':'+ res.data.printerPort);
this.$u.vuex('vuex_printerName', res.data.printerName);
}
})
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'
......
<template> <template>
<view> <view>
<u-button @click="exportPDF">预览pdf</u-button> <u-button @click="exportPDF">预览pdf</u-button>
<u-button @click="handlePrint">打印pdf</u-button> <u-button @click="printPdfSocket">打印pdf</u-button>
</view> </view>
</template> </template>
<script> <script>
import io from '@hyoga/uni-socket.io';
// import { SOCKET_IO_CLIENT, OPTIONS } from '@/uni_modules/bunny-socket-io-client';
import uButton from '../../uview-ui/components/u-button/u-button.vue'; import uButton from '../../uview-ui/components/u-button/u-button.vue';
export default { export default {
components: { uButton }, components: { uButton },
data() { data() {
return { return {
socket: {},
url: 'http://192.168.3.91:8082/static/123.pdf' url: 'http://192.168.3.91:8082/static/123.pdf'
}; };
}, },
created() {
this.socket = io('http://192.168.21.104:17521', {
transports: ['websocket'],
auth: {
token: 'Bearer ' + this.vuex_token // 在此处填入你 client 设置的 token,缺省可留空
}
});
this.socket.on('connect', () => {
globalThis.connect = true;
console.log('连接成功444');
// TODO: Do something for your project
});
this.socket.on('clients', (clients) => {
globalThis.clients = clients;
console.log(clients, 'clients');
});
this.socket.on('printerList', (printerList) => {
globalThis.printerList = printerList;
console.log(printerList, 'printerList');
});
},
methods: { methods: {
handlePrint() { handlePrint() {
console.log(this.socket, 'this.$socket'); console.log(this.socket, 'this.$socket');
......
import { mapState } from 'vuex' import { mapState } from 'vuex'
import store from "@/store" import store from "@/store"
import io from '@hyoga/uni-socket.io';
// 尝试将用户在根目录中的store/index.js的vuex的state变量,全部加载到全局变量中 // 尝试将用户在根目录中的store/index.js的vuex的state变量,全部加载到全局变量中
let $uStoreKey = []; let $uStoreKey = [];
...@@ -20,8 +21,64 @@ module.exports = { ...@@ -20,8 +21,64 @@ module.exports = {
}) })
} }
}, },
data() {
return {
pdfSocket: null
}
},
computed: { computed: {
// 将vuex的state中的所有变量,解构到全局混入的mixin中 // 将vuex的state中的所有变量,解构到全局混入的mixin中
...mapState($uStoreKey) ...mapState($uStoreKey)
},
methods: {
createSocket() {
this.pdfSocket = io(this.vuex_printerHostUrl, {
transports: ['websocket'],
auth: {
token: 'Bearer ' + this.vuex_token, // 在此处填入你 client 设置的 token,缺省可留空
},
});
this.pdfSocket.on('connect', () => {
globalThis.connect = true;
console.log('连接成功444');
// TODO: Do something for your project
});
this.pdfSocket.on('clients', (clients) => {
globalThis.clients = clients;
console.log(clients, 'clients');
});
this.pdfSocket.on('printerList', (printerList) => {
globalThis.printerList = printerList;
console.log(printerList, 'printerList');
});
},
printPdfSocket() {
console.log(this.pdfSocket, 'pdfSocket')
if (!this.pdfSocket) {
this.createSocket()
}
this.$u.api
.getPrintDown({
reportName: 'mysql:qrcode-100*100',
values: {
detail: [
{
qrcode: 'qqq',
},
],
},
})
.then((res) => {
if (res.code === 200) {
this.pdfSocket.emit('news', {
client: null,
printer: this.vuex_printerName,
type: 'url_pdf',
// pdf_path: 'http://192.168.3.91:8082/static/123.pdf',
pdf_path: res.fileUrl,
});
}
});
}
} }
} }
\ No newline at end of file
...@@ -8,20 +8,22 @@ Vue.use(Vuex) ...@@ -8,20 +8,22 @@ Vue.use(Vuex)
let lifeData = {}; let lifeData = {};
try{ try {
// 尝试获取本地是否存在lifeData变量,第一次启动APP时是不存在的 // 尝试获取本地是否存在lifeData变量,第一次启动APP时是不存在的
lifeData = uni.getStorageSync('lifeData'); lifeData = uni.getStorageSync('lifeData');
}catch(e){ } catch (e) {
} }
// 需要永久存储,且下次APP启动需要取出的,在state中的变量名 // 需要永久存储,且下次APP启动需要取出的,在state中的变量名
let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_remember', 'vuex_locale','vuex_isAgent','vuex_workstation','vuex_task']; let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_remember', 'vuex_locale', 'vuex_isAgent', 'vuex_workstation',
'vuex_task', 'vuex_printerHostUrl', 'vuex_printerName'
];
// 保存变量到本地存储中 // 保存变量到本地存储中
const saveLifeData = function(key, value){ const saveLifeData = function(key, value) {
// 判断变量名是否在需要存储的数组中 // 判断变量名是否在需要存储的数组中
if(saveStateKeys.indexOf(key) != -1) { if (saveStateKeys.indexOf(key) != -1) {
// 获取本地存储的lifeData对象,将变量添加到对象中 // 获取本地存储的lifeData对象,将变量添加到对象中
let tmp = uni.getStorageSync('lifeData'); let tmp = uni.getStorageSync('lifeData');
// 第一次打开APP,不存在lifeData变量,故放一个{}空对象 // 第一次打开APP,不存在lifeData变量,故放一个{}空对象
...@@ -36,7 +38,9 @@ const store = new Vuex.Store({ ...@@ -36,7 +38,9 @@ const store = new Vuex.Store({
state: { state: {
// 如果上面从本地获取的lifeData对象下有对应的属性,就赋值给state中对应的变量 // 如果上面从本地获取的lifeData对象下有对应的属性,就赋值给state中对应的变量
// 加上vuex_前缀,是防止变量名冲突,也让人一目了然 // 加上vuex_前缀,是防止变量名冲突,也让人一目了然
vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {userName: 'Aidex'}, vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {
userName: 'Aidex'
},
vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '', vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
vuex_remember: lifeData.vuex_remember ? lifeData.vuex_remember : '', vuex_remember: lifeData.vuex_remember ? lifeData.vuex_remember : '',
vuex_locale: lifeData.vuex_locale ? lifeData.vuex_locale : '', vuex_locale: lifeData.vuex_locale ? lifeData.vuex_locale : '',
...@@ -49,6 +53,10 @@ const store = new Vuex.Store({ ...@@ -49,6 +53,10 @@ const store = new Vuex.Store({
vuex_workunit: null, vuex_workunit: null,
//当前工作站正在进行的生产任务 //当前工作站正在进行的生产任务
vuex_task: null, vuex_task: null,
// 打印机服务器地址
vuex_printerHostUrl: lifeData.vuex_printerHostUrl ? lifeData.vuex_printerHostUrl : '',
// 打印机名称s
vuex_printerName: lifeData.vuex_printerName ? lifeData.vuex_printerName : '',
// 自定义tabbar数据 // 自定义tabbar数据
// vuex_tabbar: [{ // vuex_tabbar: [{
...@@ -78,9 +86,9 @@ const store = new Vuex.Store({ ...@@ -78,9 +86,9 @@ const store = new Vuex.Store({
let nameArr = payload.name.split('.'); let nameArr = payload.name.split('.');
let saveKey = ''; let saveKey = '';
let len = nameArr.length; let len = nameArr.length;
if(len >= 2) { if (len >= 2) {
let obj = state[nameArr[0]]; let obj = state[nameArr[0]];
for(let i = 1; i < len - 1; i ++) { for (let i = 1; i < len - 1; i++) {
obj = obj[nameArr[i]]; obj = obj[nameArr[i]];
} }
obj[nameArr[len - 1]] = payload.value; obj[nameArr[len - 1]] = payload.value;
......
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