Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-05-11 7dfc5501decb84bce7fe0563956eae705844a2f2

 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: {