From b99c89f417ad8da22f1f4302431ad4be87e89a02 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 25 十二月 2023 15:38:00 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/page/PackingLedgerDetails/index.vue | 11 ++++++++---
vue.config.js | 2 +-
src/views/quality/Packaging_ledger/index.vue | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/page/PackingLedgerDetails/index.vue b/src/page/PackingLedgerDetails/index.vue
index 70e5bfd..e4cd53b 100644
--- a/src/page/PackingLedgerDetails/index.vue
+++ b/src/page/PackingLedgerDetails/index.vue
@@ -1,6 +1,6 @@
<template>
- <div >
- <el-card class="box-card" v-for="(el,item) in testStandardParams" >
+ <div class="app">
+ <el-card class="card" v-for="(el,item) in testStandardParams" >
<div>
<el-form :model="el" label-width="80px">
<el-form-item label="搴忓彿:">
@@ -68,7 +68,12 @@
</script>
<style>
-.box-card{
+.app{
+ /* position: relative; */
+ height: 100%;
+ overflow: auto;
+}
+.card{
margin: 20px;
border-radius: 40px;
}
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index b4f78d4..c465c2d 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -174,7 +174,7 @@
export default {
data(){
return {
- str:"http://192.168.2.213:8080/#/pack?id=50",
+ str:"http://192.168.2.213:8080/#/pack?id=",
qrData:[],
diaPrintTab: false,
multipleSelection: [],
diff --git a/vue.config.js b/vue.config.js
index 2131d04..9fd7884 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@
*/
-//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://localhost:9999'
--
Gitblit v1.9.3