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

ZengTao

2023-11-29 aaaee895fe0de47a5c4ddae90fff7c598985db3e

 CanadaMes-ui/src/views/Electrical/Positioning1.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>

  

@@ -43,7 +59,9 @@
              



              

              <el-button v-if="item.type === '0' && item.name !== '格子间距'  && item.name !== '出片接片地址'   && item.name !== '存片接片地址'"  class="input-box"  @click="submitDataToBackend();">取地址</el-button>

              <el-button
                v-if="item.type === '0' && item.name !== '格子间距' && item.name !== '出片接片地址' && item.name !== '存片接片地址'"
                class="input-box" @click="submitDataToBackend();">取地址</el-button>
            </div>

          </div>

        

@@ -196,7 +214,8 @@
  .item-row {

  display: flex;

  align-items: center;

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

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

  

  .action-button {

@@ -204,6 +223,7 @@
  background: #66b1ff;

  color: #FFF;

  }


  .blue-button {

  background-color: skyblue;

}