From 24c2d968b683c1b5b15bed651dd088cdd0f0839d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 十二月 2023 12:19:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 24 +++++++++++++++++-------
src/views/plan/manufacturingorder/index.vue | 1 +
vue.config.js | 3 ++-
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 2b59511..c5911e0 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -19,11 +19,11 @@
@refreshDataList="getData"
></table-form>
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
- <div class="dia_body">
- <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
+ <div class="dia_body" id="printRaw">
+ <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px; font-size: 16px !important;">
<el-row>
<el-col :span="8" :offset="1">搴忓彿锛�</el-col>
- <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="1">缂栧彿锛�</el-col>
@@ -43,7 +43,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
+ <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
</span>
</el-dialog>
</basic-container>
@@ -289,13 +289,23 @@
printFun() {
// this.printDialogVisible = false;
this.diaPrintTab = false;
- console.log(printRaw);
PrintJS({
- printable: "printRaw",//椤甸潰
+ printable: 'printRaw',//椤甸潰
type: "html",//鏂囨。绫诲瀷
maxWidth:450,
targetStyles:['*'],
- style:"@page {margin:0 ;resolution: 300dpi;portrait}",
+ style: `@page {
+ margin:0;
+ size: 360px 175px;
+ }
+ hrml{
+ zoom:100%;
+ }
+ @media print{
+ width: 360px;
+ height: 175px;
+ margin:0;
+ }`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
font_size: '',
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index b1bc910..09b4935 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -1419,6 +1419,7 @@
},
// table鑷甫浜嬩欢
handleSelectionChange(val) {
+ console.log(val,"涓�琛�");
let orderData = []
orderData =val.map( el =>{
return{
diff --git a/vue.config.js b/vue.config.js
index d03924e..95588b2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,11 +3,12 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://192.168.2.7:9999'
+const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
- const url = 'http://localhost:9999'
+// const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3