From c85904597bf93e0fbae321093a970dd973b0f64f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 54 ++++++++++--------
CanadaMes-ui/src/views/Electrical/Servomanual.vue | 8 ++
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 50 +++++++++-------
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 9 ++-
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 9 ++-
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 2
6 files changed, 76 insertions(+), 56 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
index 4be46c2..3a663e8 100644
--- a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -68,30 +68,15 @@
>
<!-- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
}}</router-link> -->
+ <router-link v-if="hasPermission" to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Cage Positions')
+ }}</router-link>
+
+ <router-link v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Speed parameter settings')
+ }}</router-link>
- <router-link
- to="/Electrical/Positioning1"
- tag="el-button"
- type="text"
- active-class="blue-button"
- >{{ $t("Cage Positions") }}</router-link
- >
- <!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning2')
- }}</router-link> -->
-
- <!-- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition2')
- }}</router-link> -->
- <router-link
- to="/Electrical/AutomaticParameterSetting"
- tag="el-button"
- type="text"
- active-class="blue-button"
- >{{ $t("Speed parameter settings") }}</router-link
- >
-
- <router-link
+<router-link v-if="plcmes"
to="/Electrical/InteractionState"
tag="el-button"
type="text"
@@ -160,6 +145,9 @@
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/AutomaticParameterSetting'
import {SelectPassword} from "../../api/home";
+import {
+SelectPermissionByUserName, currentUsername
+} from "../../api/home";
let socket;
@@ -174,6 +162,8 @@
jianju: "",
isPromptVisible: false,
+ hasPermission: false, // 榛樿娌℃湁鏉冮檺
+ plcmes:false
}
},
activated () {
@@ -188,6 +178,20 @@
this.load();
this.showPasswordPrompt();
+ currentUsername().then(res => {
+ SelectPermissionByUserName(res.data).then(res => {
+ res.data.permission.forEach(item => {
+ if (item.permissionId == "36" && item.state == 1) {
+ this.hasPermission = true;
+ }
+ if (item.permissionId == "50" && item.state == 1) {
+ this.plcmes = true;
+ }
+
+ });
+ });
+
+ });
},
methods: {
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index c83b78f..b0011a9 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -56,7 +56,7 @@
$t('Speed parameter settings')
}}</router-link>
-<router-link v-if="hasPermission"
+<router-link v-if="plcmes"
to="/Electrical/InteractionState"
tag="el-button"
type="text"
@@ -139,8 +139,8 @@
language: this.$i18n.locale,
embeddedComponent: ManualonePosition2,
embeddedComponent2: ManualJog,
- hasPermission: false // 榛樿娌℃湁鏉冮檺
-
+ hasPermission: false, // 榛樿娌℃湁鏉冮檺
+ plcmes:false
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
},
@@ -159,6 +159,9 @@
if (item.permissionId == "36" && item.state == 1) {
this.hasPermission = true;
}
+ if (item.permissionId == "50" && item.state == 1) {
+ this.plcmes = true;
+ }
});
});
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index fce0e2d..b49619c 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -56,7 +56,7 @@
$t('Speed parameter settings')
}}</router-link>
-<router-link v-if="hasPermission"
+<router-link v-if="plcmes"
to="/Electrical/InteractionState"
tag="el-button"
type="text"
@@ -213,8 +213,8 @@
language: this.$i18n.locale,
- hasPermission: false // 榛樿娌℃湁鏉冮檺
-
+ hasPermission: false, // 榛樿娌℃湁鏉冮檺
+ plcmes:false
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
};
},
@@ -235,6 +235,9 @@
if (item.permissionId == "36" && item.state == 1) {
this.hasPermission = true;
}
+ if (item.permissionId == "50" && item.state == 1) {
+ this.plcmes = true;
+ }
});
});
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index d8276e4..d79f73d 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -69,35 +69,20 @@
<!-- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
}}</router-link> -->
- <router-link
- to="/Electrical/Positioning1"
- tag="el-button"
- type="text"
- active-class="blue-button"
- >{{ $t("Cage Positions") }}</router-link
- >
- <!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning2')
- }}</router-link> -->
+ <router-link v-if="hasPermission" to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Cage Positions')
+ }}</router-link>
+
+ <router-link v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Speed parameter settings')
+ }}</router-link>
- <!-- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition2')
- }}</router-link> -->
- <router-link
- to="/Electrical/AutomaticParameterSetting"
- tag="el-button"
- type="text"
- active-class="blue-button"
- >{{ $t("Speed parameter settings") }}</router-link
- >
-
- <router-link
+<router-link v-if="plcmes"
to="/Electrical/InteractionState"
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("PLC-MES Info") }}</router-link
- >
+ >{{ $t("PLC-MES Info") }}</router-link>
</el-breadcrumb>
<el-row :gutter="18" class="card" style="width: 1400px">
@@ -219,6 +204,9 @@
import LanguageMixin from "../../lang/LanguageMixin";
import data from "../../configuration/Positioning1";
import {SelectPassword} from "../../api/home";
+import {
+SelectPermissionByUserName, currentUsername
+} from "../../api/home";
export default {
name: "Positioning1",
@@ -235,6 +223,8 @@
jianju: "",
isPromptVisible: false,
+ hasPermission: false, // 榛樿娌℃湁鏉冮檺
+ plcmes:false
};
},
@@ -251,6 +241,22 @@
// 璋冪敤鍑芥暟锛屾樉绀哄瘑鐮佽緭鍏ュ璇濇
this.showPasswordPrompt();
+
+
+currentUsername().then(res => {
+ SelectPermissionByUserName(res.data).then(res => {
+ res.data.permission.forEach(item => {
+ if (item.permissionId == "36" && item.state == 1) {
+ this.hasPermission = true;
+ }
+ if (item.permissionId == "50" && item.state == 1) {
+ this.plcmes = true;
+ }
+
+ });
+ });
+
+ });
},
methods: {
diff --git a/CanadaMes-ui/src/views/Electrical/Servomanual.vue b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
index 29a3155..89ea9c7 100644
--- a/CanadaMes-ui/src/views/Electrical/Servomanual.vue
+++ b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -56,7 +56,7 @@
$t('Speed parameter settings')
}}</router-link>
-<router-link v-if="hasPermission"
+<router-link v-if="plcmes"
to="/Electrical/InteractionState"
tag="el-button"
type="text"
@@ -83,7 +83,8 @@
return {
jsonData: data,
- hasPermission: false // 榛樿娌℃湁鏉冮檺
+ hasPermission: false, // 榛樿娌℃湁鏉冮檺
+ plcmes:false
}
},
created () {
@@ -96,6 +97,9 @@
if (item.permissionId == "36" && item.state == 1) {
this.hasPermission = true;
}
+ if (item.permissionId == "50" && item.state == 1) {
+ this.plcmes = true;
+ }
});
});
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index b166b15..f73bc6d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -176,7 +176,7 @@
@Select("select ifnull(max(sequence),0)+1 from out_slice ")
Short SelectMaxSquence();
//鏌ヨ鐢ㄦ埛鏉冮檺
- @Select("select rp.* from role_permission rp inner join user r on rp.role_id=r.role_id and r.username=#{username} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35 or permission_id=36 or permission_id=37 or permission_id=38 or permission_id=39)")
+ @Select("select rp.* from role_permission rp inner join user r on rp.role_id=r.role_id and r.username=#{username} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35 or permission_id=36 or permission_id=37 or permission_id=38 or permission_id=39 or permission_id=50)")
List<RolePermission> SelectPermissionByUserName(String username);
// //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
--
Gitblit v1.8.0