wuyouming666
2023-11-21 be244a9e202ef069ccb57040ffbec59c89d40cfd
电气管理增加渲染变频器参数页面、大车笼子定位页面、小车笼子定位页面
7个文件已修改
14个文件已添加
1697 ■■■■■ 已修改文件
CanadaMes-ui/src/configuration/Positioning1.json 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/configuration/Positioning2.json 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/configuration/ServoManualone.json 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/configuration/address.json 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/configuration/parameter1.json 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/configuration/parameter2.json 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/router/index.js 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Action.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Parameter1.vue 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Parameter2.vue 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Positioning1.vue 204 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Positioning2.vue 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/ServoManualone.vue 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Servomanual.vue 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/device/talkvue.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/configuration/Positioning1.json
New file
@@ -0,0 +1,177 @@
[
    [
        {
            "title": {
              "name": "存片格位置设定"
            }, "type": "1"
          },
      {
        "name": "1#格地址",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":"0",
        "address":"DB100.48",
        "count":10
      },
      {
        "name": "22#格地址",
        "read": 11,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "43#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "64#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "85#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "106#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "127#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "148#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "169#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "190#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      }
    ],
    [
        {
            "title": {
              "name": "出片格位置设定"
            },"type": "1",
            "value":"0"
          },
      {
        "name": "1#格地址",
        "read": 33,
        "sending": 0,
        "type": "0" ,
        "value":"0",
        "address":"DB100.68",
        "count":10
      },
      {
        "name": "22#格地址",
        "read": 11,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "43#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "64#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "85#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "106#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "127#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "148#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "169#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      },
      {
        "name": "190#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
      }
    ]
  ]
CanadaMes-ui/src/configuration/Positioning2.json
New file
@@ -0,0 +1,92 @@
[
    [
        {
            "title": {
              "name": "B01格位置设定"
            }
          },
      {
        "name": "1#格地址",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "22#格地址",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "43#格地址",
        "read": 22,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "64#格地址",
        "read": 22,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "85#格地址",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
    ],
    [
        {
            "title": {
              "name": "B02位置设定"
            }
          },
          {
            "name": "106#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
          },
          {
            "name": "127#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
          },
          {
            "name": "148#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
          },
          {
            "name": "169#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
          },
          {
            "name": "190#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
          }
    ]
  ]
CanadaMes-ui/src/configuration/ServoManualone.json
New file
@@ -0,0 +1,205 @@
[
    [
        {
          "name": "大车自动速度",
          "read": 33,
          "sending": 0,
          "type": "0",
          "address":"DB100.0",
          "count":3
        }
      ],
      [
        {
          "name": "小车自动速度",
          "read": 33,
          "sending": 0,
          "type": "0",
          "address":"DB100.0",
          "count":3
        }
      ],
    [
      {
        "name": "A01 所在格子",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "取片格子",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "存片格子",
        "read": 22,
        "sending": 0,
        "type": "0"
      },
      {
        "button": {
          "name": "故障",
          "value":0,
          "address":"DB10.0"
        }
      },
      {
        "button": {
          "name": "复位",
          "value":0,
          "address":"DB10.0"
        }
      },
      {
        "button": {
          "name": "自动启动",
          "value":0,
          "address":"DB10.0"
        }
      }
    ],
    [
        {
            "name": "A02 所在格子",
            "read": 33,
            "sending": 0,
            "type": "0",
            "address":"DB100.1",
            "count":3
          },
          {
            "name": "取片格子",
            "read": 11,
            "sending": 0,
            "type": "0"
          },
          {
            "name": "存片格子",
            "read": 22,
            "sending": 0,
            "type": "0"
          },
          {
            "button": {
              "name": "故障",
              "value":0,
              "address":"DB10.0"
            }
          },
          {
            "button": {
              "name": "复位",
              "value":0,
              "address":"DB10.0"
            }
          },
          {
            "button": {
              "name": "自动启动",
              "value":0,
              "address":"DB10.0"
            }
          }
    ],
    [
        {
            "name": "B01 所在格子",
            "read": 33,
            "sending": 0,
            "type": "0",
            "address":"DB100.2",
            "count":3
          },
          {
            "name": "目标格子",
            "read": 11,
            "sending": 0,
            "type": "0"
          },
          {
            "button": {
              "name": "故障",
              "value":0,
              "address":"DB10.0"
            }
          },
          {
            "button": {
              "name": "复位",
              "value":0,
          "address":"DB10.0"
            }
          }
    ],[
        {
            "name": "B02 所在格子",
            "read": 33,
            "sending": 0,
            "type": "0",
            "address":"DB100.3",
            "count":3
          },
          {
            "name": "目标格子",
            "read": 11,
            "sending": 0,
            "type": "0"
          },
          {
            "button": {
              "name": "故障",
              "value":0,
              "address":"DB10.0"
            }
          },
          {
            "button": {
              "name": "复位",
              "value":0,
              "address":"DB10.0"
            }
          }
    ],
     [
        {
          "name": "存片接片地址",
          "read": 33,
          "sending": 0,
          "type": "0",
          "address":"DB100.4",
          "count":3
        }
      ],
      [
        {
          "name": "出片接片地址",
          "read": 33,
          "sending": 0,
          "type": "0",
          "address":"DB100.5",
          "count":3
        }
      ]
  ]
CanadaMes-ui/src/configuration/address.json
New file
@@ -0,0 +1,55 @@
{
    "parameter1": [
      {
        "name": "DB100.0",
        "type":"w",
        "count": 12
      },
      {
        "name": "DB100.0",
        "type":"x",
        "count": 12
      }
    ],
    "parameter2": [
        {
          "name": "DB100.0",
          "count": 12
        },
        {
          "name": "DB100.0",
          "count": 12
        }
      ],
      "Positioning1": [
        {
          "name": "DB100.0",
          "count": 12
        },
        {
          "name": "DB100.0",
          "count": 12
        }
      ],
      "Positioning2": [
        {
          "name": "DB100.0",
          "count": 12
        },
        {
          "name": "DB100.0",
          "count": 12
        }
      ],
      "ServoManualone": [
        {
          "name": "DB100.0",
          "count": 12
        },
        {
          "name": "DB100.0",
          "count": 12
        }
      ]
  }
CanadaMes-ui/src/configuration/parameter1.json
New file
@@ -0,0 +1,114 @@
[
    [
        {
            "title": {
              "name": "D01~D06输送"
            }
          },
      {
        "name": "最高速度",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "高速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
    ],
    [
      {
          "title": {
            "name": "A01~A02输送"
          }
        },
    {
      "name": "最高速度",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address":"DB100.0",
      "count":3
    },
    {
      "name": "高速线速度",
      "read": 11,
      "sending": 0,
      "type": "0"
    },
    {
      "name": "低速线速度",
      "read": 11,
      "sending": 0,
      "type": "0"
    },
    {
      "name": "手动速度",
      "read": 22,
      "sending": 0,
      "type": "0"
    }
  ],[
    {
        "title": {
          "name": "B01~B02输送"
        }
      },
  {
    "name": "最高速度",
    "read": 33,
    "sending": 0,
    "type": "0",
    "address":"DB100.0",
    "count":3
  },
  {
    "name": "高速线速度",
    "read": 11,
    "sending": 0,
    "type": "0"
  },
  {
    "name": "低速线速度",
    "read": 11,
    "sending": 0,
    "type": "0"
  },
  {
    "name": "手动速度",
    "read": 22,
    "sending": 0,
    "type": "0"
  }
]
  ]
CanadaMes-ui/src/configuration/parameter2.json
New file
@@ -0,0 +1,128 @@
[
    [
        {
            "title": {
              "name": "A01输送"
            }
          },
      {
        "name": "高速线速度",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
    ],
    [
        {
            "title": {
              "name": "B02输送"
            }
          },
      {
        "name": "高速线速度",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
    ],
    [
        {
            "title": {
              "name": "A02输送"
            }
          },
      {
        "name": "高速线速度",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
    ],
    [
        {
            "title": {
              "name": "B02输送"
            }
          },
      {
        "name": "高速线速度",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
    ]
  ]
CanadaMes-ui/src/router/index.js
@@ -83,6 +83,30 @@
        path: '/Electrical/alarm',
        component: () => import('../views/Electrical/alarm')
      },
      {
        path: '/Electrical/Servomanual',
        component: () => import('../views/Electrical/Servomanual')
      },
      {
        path: '/Electrical/ServoManualone',
        component: () => import('../views/Electrical/ServoManualone')
      },
      {
        path: '/Electrical/Parameter1',
        component: () => import('../views/Electrical/Parameter1')
      },
      {
        path: '/Electrical/Parameter2',
        component: () => import('../views/Electrical/Parameter2')
      },
      {
        path: '/Electrical/Positioning1',
        component: () => import('../views/Electrical/Positioning1')
      },
      {
        path: '/Electrical/Positioning2',
        component: () => import('../views/Electrical/Positioning2')
      },
CanadaMes-ui/src/views/Electrical/Action.vue
@@ -12,7 +12,10 @@
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
       <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>
    </el-breadcrumb>
    <div>Action</div>
    <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
      <!-- <div class="kuai_div" v-for="item in record.xyData" :key="item.value">
CanadaMes-ui/src/views/Electrical/Parameter1.vue
New file
@@ -0,0 +1,104 @@
<template>
  <div class="app">
  <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
      }}</router-link>
      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
      }}</router-link>
      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
      }}</router-link>
      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
       <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>
    </el-breadcrumb>
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
        <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
        }}</router-link>
         <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
        }}</router-link> -->
          <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
          }}</router-link>
           <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
          }}</router-link>
  </el-breadcrumb>
  <el-row :gutter="18">
    <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
      <el-card class="json-block">
        <div class="button-row" style="display: flex; justify-content: space-between;">
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
            <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
          </div>
        </div>
        <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
          <div class="item-row">
            <span class="name" style="width:250px;">{{ item.name }}</span>
            <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
          </div>
        </div>
      </el-card>
    </el-col>
  </el-row>
  <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
</div>
</template>
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/parameter1'
export default {
name: "Parameter1",
mixins: [LanguageMixin],
data() {
  return {
    jsonData: data // 加载整个data.json文件作为jsonData
  }
},
methods: {
  updateButtonValue(dataGroup, itemIndex) {
    this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
  },
  submitDataToBackend() {
    const inputData = this.jsonData.map(dataGroup => {
      return dataGroup.map(item => {
        if (item.type === '0') {
          return { name: item.name, value: item.value ,address:item.address};
        } else if (item.button) {
          return { name: item.title.name, value: item.title.value ,address:item.title.address};
        }
        return null;
      });
    });
    // 模拟提交数据到后端的操作,实际情况下需要根据你的后端API进行修改
    console.log('提交以下数据到后端:', inputData);
  }
}
}
</script>
<style scoped>
.item-row {
display: flex;
align-items: center;
margin-bottom: 5px; /* 调整每个项目之间的间距 */
}
.action-button {
margin-right: 30px;
background: #66b1ff;
color: #FFF;
}
.blue-button {
  background-color: skyblue;
}
</style>
CanadaMes-ui/src/views/Electrical/Parameter2.vue
New file
@@ -0,0 +1,104 @@
<template>
    <div class="app">
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
        }}</router-link>
        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
        }}</router-link>
        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
        }}</router-link>
        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
        }}</router-link>
        <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
        }}</router-link>
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
        }}</router-link>
      </el-breadcrumb>
      <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
        }}</router-link>
          <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
          }}</router-link>
           <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
          }}</router-link> -->
            <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
          }}</router-link>
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
          }}</router-link>
    </el-breadcrumb>
    <el-row :gutter="20">
      <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block">
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
            </div>
          </div>
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
            </div>
          </div>
        </el-card>
      </el-col>
    </el-row>
    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
  </div>
  </template>
  <script>
  import LanguageMixin from '../../lang/LanguageMixin'
  import data from '../../configuration/parameter2'
  export default {
  name: "Parameter2",
  mixins: [LanguageMixin],
  data() {
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
    }
  },
  methods: {
    updateButtonValue(dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
    },
    submitDataToBackend() {
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value ,address:item.address};
          } else if (item.button) {
            return { name: item.title.name, value: item.title.value ,address:item.title.address};
          }
          return null;
        });
      });
      // 模拟提交数据到后端的操作,实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
    }
  }
  }
  </script>
  <style scoped>
  .item-row {
  display: flex;
  align-items: center;
  margin-bottom: 5px; /* 调整每个项目之间的间距 */
  }
  .action-button {
  margin-right: 30px;
  background: #66b1ff;
  color: #FFF;
  }
  .blue-button {
  background-color: skyblue;
}
  </style>
CanadaMes-ui/src/views/Electrical/Positioning1.vue
New file
@@ -0,0 +1,204 @@
<template>
    <div class="app">
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
        }}</router-link>
        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
        }}</router-link>
        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
        }}</router-link>
        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
        }}</router-link>
        <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
        }}</router-link>
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
        }}</router-link>
      </el-breadcrumb>
      <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
        }}</router-link>
          <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
          }}</router-link>
           <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
          }}</router-link> -->
           <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
          }}</router-link>
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
          }}</router-link>
    </el-breadcrumb>
    <el-row :gutter="18" >
      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" class='card'>
        <el-card class="json-block">
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
            </div>
          </div>
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
              <el-button v-if="item.type === '0'"  class="input-box"  @click="submitDataToBackend();">取地址</el-button>
            </div>
          </div>
        </el-card>
      </el-col>
    </el-row>
    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
  </div>
  </template>
  <script>
  let socket;
  import LanguageMixin from '../../lang/LanguageMixin'
  import data from '../../configuration/Positioning1'
  export default {
  name: "Positioning1",
  mixins: [LanguageMixin],
  data() {
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
    }
  },
  created () {
    this.initWebSocket();
    console.log('jsonData:', this.jsonData);
  },
  methods: {
    updateButtonValue(dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
    },
    submitDataToBackend() {
  const inputData = this.jsonData.map(dataGroup => {
    return dataGroup.map(item => {
      if (item.type === '0') {
        return { value: parseInt(item.value) };
      } else if (item.button) {
        return { value: parseInt(item.title.value) };
      }
      return null;
    });
  });
  // 将inputData转换为整数数组
  const integerArray = inputData.map(dataGroup => {
    return dataGroup.map(item => {
      if (item !== null) {
        return item.value;
      }
      return null;
    });
  });
  // 构建JSON对象
  const jsonObject = { data: integerArray };
  // 提交数据到后端
  const jsonString = JSON.stringify(jsonObject);
  console.log('提交以下数据到后端:', jsonString);
  socket?.send(jsonString);
},
    initWebSocket () {
      let viewname = "Positioning1";
      if (typeof WebSocket === "undefined") {
        console.log("您的浏览器不支持WebSocket");
      } else {
        let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
        if (socket != null) {
          socket.close();
          socket = null;
        }
        // 开启一个websocket服务
        socket = new WebSocket(socketUrl);
        // 打开事件
        socket.onopen = function () {
          console.log("websocket已打开");
        };
        // 收到消息
        socket.onmessage = (msg) => {
  if (!msg.data) {
    return; // 如果收到空数据,则直接返回,不执行后续逻辑
  }
  let obj = JSON.parse(msg.data);
  const jsonData2 = this.jsonData;
  document.addEventListener('mouseover', function(event) {
    const inputBox = document.querySelector('.card'); // 根据你的实际情况选择正确的选择器
    if (inputBox && !inputBox.contains(event.target)) {
      // 如果鼠标不在输入框内,更新输入框的值
      // this.submitDataToBackend()
      const params = obj.params;
      // this.submitDataToBackend()
      let currentIndex = 0;
jsonData2.forEach((group, groupIndex) => {
  group.forEach((item) => {
    if (item.type !== '1') {
      if (params[groupIndex] && params[groupIndex][currentIndex] !== undefined) {
        item.value = params[groupIndex][currentIndex];
      }
      currentIndex++;
    }
  });
  currentIndex = 0; // 手动重置索引,准备处理下一个分组
});
console.log(jsonData2);
    }
  });
};
        // 关闭事件
        socket.onclose = function () {
          console.log("websocket已关闭");
        };
        // 发生错误事件
        socket.onerror = function () {
          console.log("websocket发生了错误");
        };
      }
    },
    send () {
      socket?.send(JSON.stringify(this.messagepack));
    },
  }
  }
  </script>
  <style scoped>
  .item-row {
  display: flex;
  align-items: center;
  margin-bottom: 5px; /* 调整每个项目之间的间距 */
  }
  .action-button {
  margin-right: 30px;
  background: #66b1ff;
  color: #FFF;
  }
  .blue-button {
  background-color: skyblue;
}
  </style>
CanadaMes-ui/src/views/Electrical/Positioning2.vue
New file
@@ -0,0 +1,105 @@
<template>
    <div class="app">
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
        }}</router-link>
        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
        }}</router-link>
        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
        }}</router-link>
        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
        }}</router-link>
        <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
        }}</router-link>
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
        }}</router-link>
      </el-breadcrumb>
      <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
        }}</router-link>
          <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
          }}</router-link>
           <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
          }}</router-link>
           <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
          }}</router-link>
           <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
          }}</router-link>
    </el-breadcrumb>
    <el-row :gutter="18">
      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block">
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
            </div>
          </div>
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
              <el-button v-if="item.type === '0'" v-model="item.value" class="input-box"  @click="submitDataToBackend();">取地址</el-button>
            </div>
          </div>
        </el-card>
      </el-col>
    </el-row>
    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
  </div>
  </template>
  <script>
  import LanguageMixin from '../../lang/LanguageMixin'
  import data from '../../configuration/Positioning2'
  export default {
  name: "Positioning2",
  mixins: [LanguageMixin],
  data() {
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
    }
  },
  methods: {
    updateButtonValue(dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
    },
    submitDataToBackend() {
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value ,address:item.address};
          } else if (item.button) {
            return { name: item.title.name, value: item.title.value ,address:item.title.address};
          }
          return null;
        });
      });
      // 模拟提交数据到后端的操作,实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
    }
  }
  }
  </script>
  <style scoped>
  .item-row {
  display: flex;
  align-items: center;
  margin-bottom: 5px; /* 调整每个项目之间的间距 */
  }
  .action-button {
  margin-right: 30px;
  background: #66b1ff;
  color: #FFF;
  }
  .blue-button {
  background-color: skyblue;
}
  </style>
CanadaMes-ui/src/views/Electrical/ServoManualone.vue
New file
@@ -0,0 +1,104 @@
<template>
    <div class="app">
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
        }}</router-link>
        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
        }}</router-link>
        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
        }}</router-link>
        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
        }}</router-link>
        <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
        }}</router-link>
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
        }}</router-link>
      </el-breadcrumb>
      <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
        <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
        }}</router-link>
          <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
        }}</router-link> -->
          <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
          }}</router-link>
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
          }}</router-link>
    </el-breadcrumb>
    <el-row :gutter="20">
      <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block"  style="width:450px;">
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
            <div class="item-row">
              <span class="name" style="width:100px;">{{ item.name }}</span>
              <el-input style="width:250px;" v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
            </div>
          </div>
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <el-button v-if="item.button" :name="item.button.name" class="action-button" @click="updateButtonValue(dataGroup, itemIndex);submitDataToBackend();">{{ item.button.name }}</el-button>
            </div>
          </div>
        </el-card>
      </el-col>
    </el-row>
    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
  </div>
</template>
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ServoManualone'
export default {
  name: "ServoManualone",
  mixins: [LanguageMixin],
  data() {
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
    }
  },
  methods: {
    updateButtonValue(dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
    },
    submitDataToBackend() {
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value ,address:item.address};
          } else if (item.button) {
            return { name: item.button.name, value: item.button.value ,address:item.button.address};
          }
          return null;
        });
      });
      // 模拟提交数据到后端的操作,实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
    }
  }
}
</script>
<style scoped>
.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 2px; /* 调整每个项目之间的间距 */
}
.action-button {
  margin-right: 10px;
  background: #66b1ff;
  color: #FFF;
}
.blue-button {
  background-color: skyblue;
}
</style>
CanadaMes-ui/src/views/Electrical/Servomanual.vue
New file
@@ -0,0 +1,71 @@
<template>
    <div class="app">
  <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
        }}</router-link>
        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
        }}</router-link>
        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
        }}</router-link>
        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
        }}</router-link>
        <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
        }}</router-link>
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
        }}</router-link>
      </el-breadcrumb>
      <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
       <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
        <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
        }}</router-link>
         <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
          }}</router-link> -->
            <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
          }}</router-link>
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
          }}</router-link>
    </el-breadcrumb>
  </div >
</template>
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ServoManualone'
export default {
  name: "Servomanual",
  mixins: [LanguageMixin],
  data () {
    return {
      jsonData: data  // 加载整个data.json文件作为jsonData
    }
  },
  created() {
    // 通过路由跳转到/Electrical/Servomanualone页面
    this.$router.push('/Electrical/Servomanualone');
  }
}
</script>
<style scoped>
.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 10px; /* 调整每个项目之间的间距 */
}
.action-button {
  margin-right: 60px; /* 调整按钮之间的间距 */
}
.blue-button {
  background-color: skyblue;
}
</style>
CanadaMes-ui/src/views/device/talkvue.vue
New file
@@ -0,0 +1,22 @@
<template>
  <div class="container">
    <iframe src="http://localhost:8080/GERP/optimize/optimize/html/youhuacaidan.jsp"></iframe>
  </div>
</template>
<style>
.container {
  position: fixed;
  left: 5;
  width: 100%;
  height: 100%;
}
iframe {
  width: 96%;
  height: 99%;
}
</style>
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -123,7 +123,7 @@
          }
          // 将消息值写入 PLC
          S7control.getinstance().WriteWord(addressList, messageValues);
//          S7control.getinstance().WriteWord(addressList, messageValues);
          System.out.println("messageValues:" + messageValues);
          System.out.println("addressList:" + addressList);
          // 清空消息列表
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
New file
@@ -0,0 +1,136 @@
package com.example.springboot.component;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import org.apache.commons.io.FileUtils;
public class PlcPositioning1 extends Thread {
    String name = "";
    Integer count = 0;
    public static String readFileToString(String filePath) throws IOException {
        File file = new File(filePath);
        return FileUtils.readFileToString(file, "UTF-8");
    }
    public void readValue() {
        String str = "";
        BufferedReader bufferedReader = null;
        FileInputStream fileInputStream;
        try {
            // 从文件中读取字节数据存入 fileInputStream
            fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
            // 读取 fileInputStream 中字节并将其解码为字符
            InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
            // 提高读取效率,在 BufferedReader 内包装 InputStreamReader
            bufferedReader = new BufferedReader(inputStreamReader);
            String line = null;
            // 将 bufferedReader 内容一行一行赋值给str
            while ((line = bufferedReader.readLine()) != null) {
                str += line;
            }
            // 将str字符串格式转为json
            JSONObject jsonObject = new JSONObject(str);
            // 获取json中的值
            JSONArray address = jsonObject.getJSONArray("Positioning1");
            for (int i = 0; i < address.size(); i++) {
                JSONObject ress = (JSONObject) address.get(i);
                this.name = ress.getStr("name");
                this.count = ress.getInt("count");
                System.out.println("messageValues:" + this.name);
                System.out.println("messageValues:" + this.count);
            }
        } catch (FileNotFoundException e) {
            e.printStackTrace();
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        } catch (IOException e) {
            e.printStackTrace();
        }
    }
    @Override
    public void run() {
        while (this != null) {
            try {
                Thread.sleep(500);
            } catch (InterruptedException e) {
                e.printStackTrace();
            }
//        this.readValue();
//            String PlcAddress = this.name;
//            Integer Plccount = this.count;
            // System.out.println(stt);
            // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
            // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
            Short[] values1 = { 1,2, 3, 4, 5, 6, 7, 8, 9, 10 };
            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
            Short[] values2 = { 11, 12,13,14,15,16,17,18,19,20 };
            List<Short> state = new ArrayList<>(Arrays.asList(values2));
            JSONObject jsonObject = new JSONObject();
            // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
            // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
            jsonObject.append("params", arraylist);
            jsonObject.append("params", state);
            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
            if (sendwServer != null) {
                sendwServer.sendMessage(jsonObject.toString());
            }
            WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
            if (webSocketServer != null) {
                List<String> messages = webSocketServer.getMessages();
                String addressList = "DB100.0";
                if (!messages.isEmpty()) {
                    // 将最后一个消息转换为 short 类型的列表
                    String lastMessage = messages.get(messages.size() - 1);
                    System.out.println("messages:" + messages);
                    String[] parts = lastMessage.split(",");
                    List<Short> messageValues = new ArrayList<>();
                    for (String part : parts) {
                        try {
                            // 使用正则表达式清除非数字字符
                            String cleanedPart = part.replaceAll("[^0-9-]", "");
                            short value = Short.parseShort(cleanedPart.trim());
                            messageValues.add(value);
                        } catch (NumberFormatException e) {
                            // 如果无法解析为 short 类型,则忽略该部分
                            e.printStackTrace();
                        }
                    }
                    // 将消息值写入 PLC
//        S7control.getinstance().WriteWord(addressList, messageValues);
                    System.out.println("messageValues:" + messageValues);
                    System.out.println("addressList:" + addressList);
                    // 清空消息列表
                    webSocketServer.clearMessages();
                }
            }
        }
    }
}
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -13,6 +13,7 @@
import com.example.springboot.component.Plcalarm;
import com.example.springboot.component.Plcsign;
import com.example.springboot.component.Plcstate;
import com.example.springboot.component.PlcPositioning1;
@Component
@Order(1)
@@ -27,16 +28,17 @@
    // new PlcHold().start();
    new Plcaction().start();
    new Plchome().start();
    new PlcParameter().start();
    new Plcalarm().start();
    new Plcsign().start();
    new Plcstate().start();
//    new Plcaction().start();
//
//    new Plchome().start();
//
//  new PlcParameter().start();
//
//    new Plcalarm().start();
//
//    new Plcsign().start();
//
//    new Plcstate().start();
 new PlcPositioning1().start();
  }
}
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -203,7 +203,7 @@
            map.put("message", "300");
        } else {
            homeMapper.Inglassid(glass, cage, cell, tier);
            spianMapper.UpdataAddCage1(glass.getGlassWidth(), cage, cell);
            spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell);
        }
        return Result.success(map);
    }
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -1,20 +1,20 @@
package com.example.springboot.entity;
public class Glass{
public class Glass {
    private Integer id;
    private String orderId;
    private double width;
    private double height;
    private String glassId;
    public Integer id() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public Integer getId() {
        return id;
    }
@@ -26,7 +26,7 @@
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }
    public double getwidth() {
        return width;
    }
@@ -43,15 +43,18 @@
        this.width = width;
    }
     public String getGlassId() {
    public double getWidth() {
        return width;
    }
    public String getGlassId() {
        return glassId;
    }
    public void setGlassId(String glassId) {
        this.glassId = glassId;
    }
}
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -135,7 +135,7 @@
     StorageCage SelectQueout(String orderid,int cage,int cell);
     //获取进片队列id
     @Select("select glassid from queue where type=1 and state=0;")
     @Select("select glassid from queue where type=1")
//     @Select("select glassid from queue where type=1")
     String Selectqueueid();
     //获取进片队列id
     @Select("select state from queue where type=1")