Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-12-25 b99c89f417ad8da22f1f4302431ad4be87e89a02

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 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;
}

 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: [],

 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'