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

wu

2024-01-15 a32b9d4d64094df2f6a8df3420839a96e9469ca2

 CanadaMes-ui/src/views/Electrical/ManualonePosition.vue

@@ -18,31 +18,24 @@
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Automatic State')

      }}</router-link>

      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{

      <!-- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{

        $t('ManualJog')

      }}</router-link>

      }}</router-link> -->

      

       <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{

        $t('ManualonePosition')

      }}</router-link>



<router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{

        $t('Servomanualone')

      }}</router-link>

      <!-- <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/Servomanualone" tag="el-button" type="text" active-class="blue-button">

    {{ $t('Servomanualone') }}

  </router-link>

      
     

      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{

      <router-link   v-if="hasPermission" to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{

        $t('Address parameter settings')

      }}</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">{{

  
      <router-link   v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{

        $t('Speed parameter settings')

      }}</router-link>

      

@@ -93,6 +86,7 @@
 <div class="container">

 

    <component :is="embeddedComponent"></component>

    <component :is="embeddedComponent2"></component>

  </div> 



    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->

@@ -106,6 +100,10 @@
import data from '../../configuration/Manualoneposition'



import ManualonePosition2 from './ManualonePosition2.vue';

import ManualJog from './ManualJog.vue';

import {

SelectPermissionByUserName, currentUsername

} from "../../api/home";

// import { createWebSocket } from '../../api/websocket.js';

let socket;

export default {

@@ -116,6 +114,8 @@
      jsonData: data,

      language: this.$i18n.locale,

      embeddedComponent: ManualonePosition2,

      embeddedComponent2: ManualJog,

      hasPermission: false // 默认没有权限



      // 加载整个data.json文件作为jsonData

    }

@@ -129,7 +129,17 @@
      this.replaceChineseWithEnglish();

    }

    this.$forceUpdate();

    currentUsername().then(res => {

                SelectPermissionByUserName(res.data).then(res => {

                    res.data.permission.forEach(item => {

                        if (item.permissionId == "36" && item.state == 1) {

                            this.hasPermission = true;

                        }

                       
                    });

                });



            });



  },

  methods: {