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

wuyouming666

2024-05-09 92dab966727b26c69a8a1d5839b064f7942895e8

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

@@ -5,15 +5,15 @@


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

      }}</router-link>

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

      }}</router-link>

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

      }}</router-link> -->

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

      }}</router-link> -->

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

      }}</router-link> -->

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

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

      }}</router-link>

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

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

        }}</router-link>



    </el-breadcrumb>

@@ -21,7 +21,12 @@
    <div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">

      <div class="kuai_sb" v-for="item in record.xyData" :key="item.name">

        <el-col class="deng" :class="getStatusClass(item.value)"></el-col>

        <el-input v-model="item.name" style="width: 100%;" class="in_mc"></el-input>

        <span  style="width: 100%;" class="in_mc">{{

                item.unit

              }}</span>

        <span  style="width: 100%;" class="in_mc">{{

                item.name

              }}</span>



      </div>



@@ -163,7 +168,7 @@
      const translation = this.$t('Signlang');



      if (translation != null) {

        this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });

        this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value,unit:item.unit }; });

        //console.log(translation);

      }



@@ -200,9 +205,9 @@
}



.kuai_sb {

  text-align: center;

  width: 15%;

  margin-bottom: 15px;

  text-align: left;

  width:18%;

  margin-bottom: 5px;

}



.el-input {

@@ -215,19 +220,17 @@
}



.in_mc {

  .el-input__inner {

    border: none;

  }

  font-size: 13px;

}



.deng {

  margin-left: 40%;

  margin-left: 1%;

  display: inline-block;

  background: #A0A0A0;

  border: 0.1875em solid white;

  border-radius: 50%;

  height: 4em;

  width: 4em;

  height: 2em;

  width: 2em;

  box-shadow: 0.375em 0.375em 0 0 rgba(214, 214, 214, 0.125);

}