| CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CanadaMes-ui/src/views/Electrical/Parameter2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CanadaMes-ui/src/views/Electrical/Positioning1.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CanadaMes-ui/src/views/Electrical/Servomanual.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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: { 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; } }); }); 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; } }); }); 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: { 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; } }); }); 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); // //根据玻璃完成出片任务
