From 0caf50fbb2416170b98b49613a26891baeafcbef Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 13 九月 2023 09:41:12 +0800
Subject: [PATCH] 提交不同，用于拉取
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 8 +-
CanadaMes-ui/src/layout/index.vue | 151 +++++++++++++++++++++++++------------------------
2 files changed, 81 insertions(+), 78 deletions(-)
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 4e5d820..9ab850b 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -1,7 +1,7 @@
<template>
- <el-container style="flex: 1;">
- <div style="width: 200px;background-color: #222f3e" :style="{width: isCollapse?'70px':'250px'}">
- <el-aside :width="isCollapse?'70px':'250px'">
+ <el-container style="flex: 1;height: 100%;">
+ <div style="width: 200px;background-color: #222f3e;height: 100%;" :style="{ width: isCollapse ? '70px' : '250px' }">
+ <el-aside :width="isCollapse ? '70px' : '250px'">
<el-col :gutter="20">
<el-row :span="4">
<div class="logo" @click="goToHome">
@@ -9,10 +9,9 @@
</div>
</el-row>
<el-row :span="20">
- <el-menu :default-active="activePath" class="el-menu-vertical-demo"
- background-color="#222f3e" text-color="#fff" active-text-color="#ffd04b"
- :collapse="isCollapse" :unique-opened="true"
- :collapse-transition="false" :router="true">
+ <el-menu :default-active="activePath" class="el-menu-vertical-demo" background-color="#222f3e"
+ text-color="#fff" active-text-color="#ffd04b" :collapse="isCollapse" :unique-opened="true"
+ :collapse-transition="false" :router="true">
<!-- <el-menu-item index="/" @click="goToHome">
<template slot="title">
@@ -31,10 +30,9 @@
<span>{{ item.name }}</span>
</template>
<!--浜岀骇鑿滃崟-->
-
- <el-menu-item :index="'/'+menu.router"
- v-for="menu in item.menuLists" :key="menu.id"
- @click="addTag(menu.router)">
+
+ <el-menu-item :index="'/' + menu.router" v-for="menu in item.menuLists" :key="menu.id"
+ @click="addTag(menu.router)">
<template slot="title">
<!--鍥炬爣-->
<i :class="menu.icon"></i>
@@ -50,19 +48,22 @@
</div>
<el-container>
<el-header class="header-container">
-
- <el-menu :default-active="activePath1" class="el-menu-demo" mode="horizontal"
- background-color="#576574" text-color="#fff" active-text-color="#ffd04b">
+
+ <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" style="display: flex;">
- <tag v-for="(tag, index) in tags" :key="index" :tag="tag" @removeTag="removeTag(index)" @switchTag="switchTag(index)"></tag>
-</div>
+ <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:20px;height:20px;margin-top:30px;background-color: white;"></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>
@@ -91,7 +92,7 @@
</el-header>
<el-main>
<keep-alive>
- <router-view/>
+ <router-view />
</keep-alive>
</el-main>
</el-container>
@@ -111,7 +112,7 @@
name: "Layout",
store,
mixins: [LanguageMixin],
- data() {
+ data () {
return {
activeTag: '', // 褰撳墠婵�娲荤殑鏍囩
dialogVisible: false,
@@ -133,7 +134,7 @@
components: {
Tag
},
- created() {
+ created () {
selectList(this.menuListForm).then(res => {
this.menuList = res.data
@@ -149,48 +150,48 @@
...mapState('tags', ['tags'])
},
methods: {
-
+
logout: function () {
removeToken()
this.$router.push('/login')
},
- goToHome() {
+ goToHome () {
this.$router.push('/home');
},
...mapMutations('tags', ['addTag', 'removeTag', 'switchTag']),
- addTag(router) {
- let submenuItem;
- const menuItem = this.menuList.find(item => item.menuLists.some(menu => menu.router === router));
- if (menuItem) {
- submenuItem = menuItem.menuLists.find(menu => menu.router === router);
- }
- if (submenuItem) {
- const tag = submenuItem.router;
- this.$store.commit('tags/addTag', tag);
- }
-},
+ addTag (router) {
+ let submenuItem;
+ const menuItem = this.menuList.find(item => item.menuLists.some(menu => menu.router === router));
+ if (menuItem) {
+ submenuItem = menuItem.menuLists.find(menu => menu.router === router);
+ }
+ if (submenuItem) {
+ const tag = submenuItem.router;
+ this.$store.commit('tags/addTag', tag);
+ }
+ },
- removeTag(index) {
+ removeTag (index) {
this.$store.commit('tags/removeTag', index); // 浠� Vuex Store 涓Щ闄ゆ爣绛�
},
- showChangePasswordDialog() {
+ showChangePasswordDialog () {
this.dialogVisible = true;
},
- savePassword() {
+ savePassword () {
const { oldPassword, newPassword, confirmPassword } = this.formData;
if (newPassword !== confirmPassword) {
this.$message.error('鏂板瘑鐮佷笌纭瀵嗙爜涓嶄竴鑷�');
return;
}
- changePassword({oldPassword, newPassword}).then(res => {
+ changePassword({ oldPassword, newPassword }).then(res => {
console.log(res.data);
this.$message.success('瀵嗙爜淇敼鎴愬姛');
removeToken()
this.$router.push('/login')
}).catch(() => {
-
+
});
this.dialogVisible = false;
@@ -198,7 +199,7 @@
toggleCollapse: function () {
this.isCollapse = !this.isCollapse;
},
- replaceChineseWithEnglish(menuData) {
+ replaceChineseWithEnglish (menuData) {
// 瀹氫箟涓嫳鏂囧鐓у叧绯诲璞�
const translation = {
'鐢ㄦ埛绠＄悊': 'UserManagement',
@@ -225,7 +226,7 @@
}
},
watch: {
- '$route'(to) {
+ '$route' (to) {
// 鍒囨崲璺敱鏃舵洿鏂版縺娲荤殑鏍囩
const tag = this.menuList.some(item => item.menuLists.some(menu => '/' + menu.router === to.path));
if (tag) {
@@ -237,69 +238,71 @@
</script>
<style scoped lang="less">
-
-.el-menu--horizontal > .el-submenu .el-submenu__title {
+.el-menu--horizontal>.el-submenu .el-submenu__title {
height: 45px !important;
}
-.custom-submenu {
-
-
- height: 90px !important;
+
+.custom-submenu {
+
+
+ height: 90px !important;
}
.header-container {
- height: 30px !important; /* 璁剧疆杈冨皬鐨勯珮搴� */
+ height: 30px !important;
+ /* 璁剧疆杈冨皬鐨勯珮搴� */
}
.header-left {
- margin-right: auto;
-width:30px;
-
+ margin-right: auto;
+ width: 30px;
+
}
+
.el-aside {
- height: 100vh;
- background-color: #222f3e;
- line-height: 200px;
+ height: 100vh;
+ background-color: #222f3e;
+ line-height: 200px;
}
.el-menu-vertical-demo:not(.el-menu--collapse) {
- width: 200px;
- min-height: 400px;
+ width: 200px;
+ min-height: 400px;
}
.el-menu-demo {
- display: flex;
- width: 100%;
- height: 100%;
- justify-content: flex-end;
- align-items: center;
+ display: flex;
+ width: 100%;
+ height: 100%;
+ justify-content: flex-end;
+ align-items: center;
}
.el-menu-vertical-demo {
- border: 0;
+ border: 0;
}
.logo {
- background-color: #222f3e;
- display: flex;
- justify-content: center;
- align-items: center;
- height: 60px;
+ background-color: #222f3e;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 60px;
- .sys-name {
- font-size: 20px;
- color: #ffffff;
- margin-left: 10px;
- }
+ .sys-name {
+ font-size: 20px;
+ color: #ffffff;
+ margin-left: 10px;
+ }
}
.el-header {
- background-color: #576574;
+ background-color: #576574;
}
</style>
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index 69a97b7..877b813 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -16,10 +16,10 @@
e.printStackTrace();
}
- List<Short> plclist = S7control.getinstance().ReadWord("DB103.DBW0", 10);
- // Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
- // 1, 0, };
- // List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+ // List<Short> plclist = S7control.getinstance().ReadWord("DB103.DBW0", 10);
+ Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+ 1, 0, };
+ List<Short> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
List<String> Intlist = new ArrayList<>();
--
Gitblit v1.8.0