From 95b03a3cc29096900346ebf49ea76ac13b069396 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 九月 2023 17:08:53 +0800
Subject: [PATCH] 左侧菜单栏布局
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 6 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java | 5 +-
CanadaMes-ui/src/views/Electrical/alarm.vue | 6 +-
CanadaMes-ui/src/views/Electrical/State.vue | 19 ++-------
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 2 +
CanadaMes-ui/src/views/Electrical/Action.vue | 7 +--
CanadaMes-ui/src/views/Electrical/Parameter.vue | 17 ++++----
CanadaMes-ui/src/layout/index.vue | 6 +-
8 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index be073bb..2140e57 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -204,9 +204,9 @@
'鐢ㄦ埛绠＄悊': 'UserManagement',
'鐢ㄦ埛鍒楄〃': 'UserList',
'璁惧绠＄悊': 'DeviceManagement',
- '鎶ヨ淇℃伅': 'AlarmInformation',
- '鍙傛暟涓嬪彂': 'ParameterSetting',
- '寮�鍏虫帶鍒�': 'SwitchControl',
+ '鎶ヨ淇℃伅': 'Alarm',
+ '鍙傛暟涓嬪彂': 'Parameter',
+ '寮�鍏虫帶鍒�': 'Action',
'IO鐘舵��': 'Sign',
'鏉冮檺绠＄悊': 'PermissionManagement',
'鏉冮檺鍒楄〃': 'PermissionList',
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index e7f938d..fa5270b 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,12 +2,11 @@
<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/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
</el-breadcrumb>
<div>Action</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 0ef74f9..2d71729 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -2,11 +2,11 @@
<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/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
</el-breadcrumb>
<div>Parameter</div>
@@ -18,10 +18,11 @@
</div>
<div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
<el-input style="width: 280px; border:none;" class="in_mc" v-model="item.name" readonly></el-input>
- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
- <span style="margin-right: 5px; font-size: 14px;">|</span>
- <input v-model="item.value2" type="number"
- style="width: 30px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+
+ <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
+ <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
+ <input v-model="item.value2" type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+
</div>
</el-form>
</div>
@@ -146,7 +147,7 @@
<style>
.kuai_div {
- width: calc(100% / 3);
+ width: calc(100% / 2);
margin-bottom: 15px;
}
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 6963507..66119b8 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -2,11 +2,11 @@
<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/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
</el-breadcrumb>
<div>Sign</div>
<div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index d06991a..e0507ec 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -2,11 +2,11 @@
<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/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
</el-breadcrumb>
<div>State</div>
@@ -51,18 +51,7 @@
{ name: 'D05.State', value: "鑷姩" },
{ name: 'D06.State', value: "鑷姩" },
],
- // canshu: [
- // 'D01.State',
- // 'D02.State',
- // 'B01.State',
- // 'B02.State',
- // 'A01.State',
- // 'A02.State',
- // 'D03.State',
- // 'D04.State',
- // 'D05.State',
- // 'D06.State',
- // ],
+
},
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 946a1e2..8d23c07 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -2,11 +2,11 @@
<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/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
</el-breadcrumb>
<div>Alarm</div>
<div class="block">
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index 96ac83d..865c95f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -18,9 +18,10 @@
List<Short> arraylist = S7control.getinstance().ReadWord("DB100.DBW0", 12);
List<Short> state = S7control.getinstance().ReadWord("DB103.DBW0", 10);
JSONObject jsonObject = new JSONObject();
-// new short[]{1111,121, 3232, 0, 1, 0, 1, 0, 1, 0, 1, 0}
+// new short[]{65545,65545, 65545, 65545, 65545, 65545, 65545, 65545, 65545,65545, 65545, 65545}
+ // new short[]{65545,65545, 65545, 65545, 65545, 65545, 65545, 65545, 65545, 65545}
jsonObject.append("params", arraylist );
- jsonObject.append("state", state);
+ jsonObject.append("state", state);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 9dc9b64..dd6690d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -74,4 +74,6 @@
//鏂板浠诲姟琛�
@Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`, `start_time`, `finsh_time`) VALUES (#{task_type},#{task_state},#{shelf_rack},#{load_rack},NOW(),NOW());")
void Inserttask(int task_type,int task_state,int shelf_rack,int load_rack);
+
+ void UpdataAddCage(double glasswidth, int cages, int cells);
}
--
Gitblit v1.8.0