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

ZengTao

2023-11-29 aaaee895fe0de47a5c4ddae90fff7c598985db3e

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

@@ -11,20 +11,36 @@
      }}</router-link>

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

      }}</router-link>

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

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

    </el-breadcrumb>



    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

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

      <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 to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')

        }}</router-link> 

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

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

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

      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition')
      }}</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('AutomaticParameterSetting')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualJog')
          }}</router-link>

  </el-breadcrumb>



@@ -39,7 +55,8 @@
        <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">

          <div class="item-row">

            <span class="name" style="width:250px;">{{ item.name }}</span>

            <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"  @keyup.enter.native="submitDataToBackend"></el-input>

              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"
                @keyup.enter.native="submitDataToBackend"></el-input>
          </div>

        </div>

      

@@ -146,6 +163,7 @@
      let index = 0;

      for (let i = 0; i < jsonData2.length; i++) {

        let arr = jsonData2[i];


        for (let j = 0; j < arr.length; j++) {

          let obj = arr[j];

          if (obj.type === '0' && Object.prototype.hasOwnProperty.call(obj, 'value')) {

@@ -206,7 +224,8 @@
.item-row {

display: flex;

align-items: center;

margin-bottom: 5px; /* 调整每个项目之间的间距 */

  margin-bottom: 5px;
  /* 调整每个项目之间的间距 */
}



.action-button {

@@ -214,6 +233,7 @@
background: #66b1ff;

color: #FFF;

}


.blue-button {

  background-color: skyblue;

}