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

ZengTao

2024-01-25 20f9e20e45a66a5dad1217c93455685d8174c6cf

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

@@ -8,13 +8,13 @@
        active-class="blue-button"
        >{{ $t("Alarm") }}</router-link
      >
      <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"
@@ -229,7 +229,7 @@
  const specialChars = /[^\w\s]/g;
  if(obj.zuhe1){
    
//console.log(obj);
console.log(obj);

 for (let i = 0; i < jsondata2.length; i++) {
  const item = jsondata2[i];