From 3c4996922ee0b0cd04f798762a5df0d08fa82fb0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 九月 2023 16:52:27 +0800
Subject: [PATCH] 修改差异
---
CanadaMes-ui/src/views/Electrical/alarm.vue | 4 ++++
CanadaMes-ui/src/views/user/index.vue | 9 +++++----
CanadaMes-ui/src/layout/index.vue | 22 +++++++++++++++-------
CanadaMes-ui/src/lang/locales/zh-CN.json | 4 +++-
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 3 +++
5 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index ee14dae..6f36852 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -35,6 +35,7 @@
"exit": "閫�鍑�",
"changePassword": "淇敼瀵嗙爜",
"resetPassword": "閲嶇疆瀵嗙爜",
+
"home": "涓婚〉",
"role": "瑙掕壊",
"langRoleManagement": "瑙掕壊绠＄悊",
@@ -170,4 +171,5 @@
"State": "State",
"Alarm": "鎶ヨ淇℃伅",
"Distribute": "涓嬪彂"
-}
\ No newline at end of file
+}
+
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 8ae46e0..23af1e7 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -31,6 +31,7 @@
<span>{{ item.name }}</span>
</template>
<!--浜岀骇鑿滃崟-->
+
<el-menu-item :index="'/'+menu.router"
v-for="menu in item.menuLists" :key="menu.id"
@click="addTag(menu.router)">
@@ -53,16 +54,15 @@
<el-menu :default-active="activePath1" class="el-menu-demo" mode="horizontal"
background-color="#576574" text-color="#fff" active-text-color="#ffd04b">
<div class="header-left">
- <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse" style="height:30px"></el-button>
+ <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse" style="height:30px;"></el-button>
</div>
- <div class="tagContainer">
- <tag v-for="(tag, index) in tags" :key="index" :tag="tag" @removeTag="removeTag(index)" @switchTag="switchTag(index)"></tag>
- <!-- <el-button icon="el-icon-circle-close" class="close-all-btn" @click="removeAllTags"></el-button> -->
- </div>
+ <div class="tagContainer" style="display: flex;">
+ <tag v-for="(tag, index) in tags" :key="index" :tag="tag" @removeTag="removeTag(index)" @switchTag="switchTag(index)"></tag>
+</div>
<template>
- <el-submenu index="1" class="custom-submenu">
+ <el-submenu index="1" class="custom-submenu" >
<template slot="title">
- <el-avatar src="../assets/emi.png" style="width:30px;height:30px;margin-top:2px;"></el-avatar>
+ <el-avatar src="../assets/emi.png" style="width:20px;height:20px;margin-top:30px;background-color: white;"></el-avatar>
</template>
<el-menu-item index="1-1" @click="logout">{{ $t('exit') }}</el-menu-item>
<el-menu-item index="1-2" @click="showChangePasswordDialog">{{ $t('changePassword') }}</el-menu-item>
@@ -149,6 +149,7 @@
...mapState('tags', ['tags'])
},
methods: {
+
logout: function () {
removeToken()
this.$router.push('/login')
@@ -168,6 +169,7 @@
this.$store.commit('tags/addTag', tag);
}
},
+
removeTag(index) {
this.$store.commit('tags/removeTag', index); // 浠� Vuex Store 涓Щ闄ゆ爣绛�
@@ -235,11 +237,16 @@
</script>
<style scoped lang="less">
+
+.el-menu--horizontal > .el-submenu .el-submenu__title {
+ height: 45px !important;
+}
.custom-submenu {
height: 90px !important;
}
+
.header-container {
@@ -250,6 +257,7 @@
.header-left {
margin-right: auto;
+width:30px;
}
.el-aside {
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index f3dd37c..93108d0 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -47,7 +47,9 @@
},
roles: [],
+
localizedRoles: [],
+
messagepack: {
data: { taskname: "" }
},
@@ -64,6 +66,7 @@
},
methods: {
+
load () {
setAll().then(res => {
this.roles = res.data.list;
@@ -83,6 +86,7 @@
content: translation[role.content] || role.content
}));
},
+
init () {
let viewname = "alarm";
diff --git a/CanadaMes-ui/src/views/user/index.vue b/CanadaMes-ui/src/views/user/index.vue
index c91da6e..82dbf5f 100644
--- a/CanadaMes-ui/src/views/user/index.vue
+++ b/CanadaMes-ui/src/views/user/index.vue
@@ -109,8 +109,8 @@
</el-select>
</el-form-item>
- <el-form-item label="瑙掕壊" prop="roleId">
- <el-select filterable v-model="addUserForm.roleId" placeholder="璇烽�夋嫨">
+ <el-form-item :label="$t('role')" prop="roleId">
+ <el-select filterable v-model="addUserForm.roleId" :placeholder="$t('langSelect')" >
<el-option v-for="item in roleList"
:key="item.id"
:value="item.id"
@@ -135,7 +135,7 @@
<el-input v-model="editUserForm.username" disabled></el-input>
</el-form-item>
<el-form-item :label="$t('role')" prop="roleId">
- <el-select filterable v-model="editUserForm.roleId" placeholder="璇烽�夋嫨">
+ <el-select filterable v-model="editUserForm.roleId" :placeholder="$t('langSelect')" >
<el-option v-for="item in roleList"
:key="item.id"
:value="item.id"
@@ -342,7 +342,8 @@
if (!valid) return;
saveOrUpdate(this.editUserForm).then(() => {
- this.$message.success("淇敼鐢ㄦ埛鎴愬姛");
+ const 淇敼鐢ㄦ埛鎴愬姛 = this.$t('淇敼鐢ㄦ埛鎴愬姛');
+ this.$message.success(淇敼鐢ㄦ埛鎴愬姛);
// 闅愯棌娣诲姞鍒嗙被瀵硅瘽妗�
this.editDialogVisible = false;
// 閲嶆柊鑾峰彇鍒嗙被鍒楄〃
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index c6e197c..bcd2cf9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -3,7 +3,9 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+
public class Plcaction extends Thread {
private static final long SEND_INTERVAL = 2000; // 鍙戦�佹秷鎭殑鏃堕棿闂撮殧
@@ -74,6 +76,7 @@
}
}
+
// 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
List<Boolean> messageBooleans = new ArrayList<>();
for (Integer value : messageValues) {
--
Gitblit v1.8.0