wuyouming666
2024-01-24 dd5432591b4018bd1244102b8cf86c22569ec163
地址参数设置增加  设定按钮
6个文件已修改
134 ■■■■ 已修改文件
CanadaMes-ui/src/lang/locales/en-US.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/lang/locales/zh-CN.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Positioning1.vue 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/resources/JsonFile/PlcSign.json 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/lang/locales/en-US.json
@@ -568,7 +568,8 @@
                "A02行走伺服回零":"A02 SERVE TRAVEL Home"
              },
              "A01行走伺服回零":"A01 SERVE TRAVEL Home",
                "A02行走伺服回零":"A02 SERVE TRAVEL Home"
                "A02行走伺服回零":"A02 SERVE TRAVEL Home",
                "Set":"Set"
  
}
CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -514,6 +514,7 @@
  "Servomanualone":"半自动",
  "Address parameter settings":"地址参数设置",
  "Speed parameter settings":"速度参数设置",
  "InteractionState":"交互状态"
  "InteractionState":"交互状态",
  "Set":"设定"
}
CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -114,13 +114,13 @@
      >
    </el-breadcrumb>
    <el-row :gutter="18" class="card">
    <el-row :gutter="18" class="card"  style="width: 1400px">
      <el-col
        :span="7"
        v-for="(dataGroup, groupIndex) in jsonData"
        :key="groupIndex"
      >
        <el-card class="json-block">
        <el-card class="json-block"   style="width: 400px">
          <div
            class="button-row"
            style="display: flex; justify-content: space-between"
@@ -143,15 +143,17 @@
              <span class="name" style="width: 250px">{{ item.name }}</span>
              <el-input
                v-if="item.type === '0'"
                style="width: 120px"
                v-model="item.value"
                class="input-box"  :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"
                @keyup.enter.native="submitDataToBackend($event)"
              ></el-input>
              <span v-if="item.unit" :name="item.unit">{{ item.unit }}</span>
              <!-- <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 !== 'GridSpacing' "
                class="input-box" @click="updateButtonValue(dataGroup, itemIndex,groupIndex);">{{ $t("Set") }}</el-button>
            </div>
          </div>
        </el-card>
@@ -172,6 +174,12 @@
  data() {
    return {
      jsonData: data, // 加载整个data.json文件作为jsonData
      A01:"",
      A02:"",
      B01:"",
      B02:"",
      jianju:""
    };
  },
  activated() {
@@ -184,8 +192,45 @@
    this.$forceUpdate();
  },
  methods: {
    updateButtonValue(dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, "value", 1); // 点击按钮后将值改为1
    updateButtonValue(dataGroup, itemIndex,groupIndex) {
      if(groupIndex==1){
  const value = parseFloat(this.A01);
  this.$set(dataGroup[itemIndex], "value", value);
  console.log(value)
}
if(groupIndex==2){
  const value = parseFloat(this.A02) ;
  this.$set(dataGroup[itemIndex], "value", value);
  console.log(value)
}
if(groupIndex==3){
  const value = parseFloat(this.A01) + parseFloat(this.jianju);
  this.$set(dataGroup[itemIndex], "value", value);
  console.log(value)
}
if(groupIndex==4){
  const value=parseFloat(this.A02)+parseFloat(this.jianju)
this.$set(dataGroup[itemIndex], "value", value);
}
if(groupIndex==5){
  const value=parseFloat(this.B01)-parseFloat(this.jianju)
this.$set(dataGroup[itemIndex], "value", value);
}
if(groupIndex==6){
  const value=parseFloat(this.B02)+parseFloat(this.jianju)
this.$set(dataGroup[itemIndex], "value", value);
}
     this.submitDataToBackend(event);
    },
    //提交数据到后端
    submitDataToBackend(event) {
@@ -287,6 +332,24 @@
        }
      }
    }
                    this.A01 = obj.shishi1[0][0];
                    this.A02 = obj.shishi1[0][1];
                    this.B01= obj.shishi1[0][2];
                    this.B02 = obj.shishi1[0][3];
                    this.jianju = obj.params[0][0];
  }
};
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java
@@ -58,36 +58,41 @@
            // 调用initbit方法
            PlcBitObject plcBitObject = initUtil.initbit(jsonFilePath2);
            readAndUpdateBitValues(plcBitObject);
          readAndUpdateWordValues(plcParameterObject);
            readAndUpdateWordValues(plcParameterObject);
            readAndUpdateWordValues(plcStateObject);
//            List<Boolean> getplcvlues = S7control.getinstance().ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
//            plcBitObject.setPlcBitList(getplcvlues);
           // int index = plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddressIndex();
         //   System.out.println(index);
           // plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index);
            // System.out.println(plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index));
            // S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index), (short) 100);
     List<String> addresses = new ArrayList<>();
      addresses.add("conveyorVelocity(AutoFAST)");
      addresses.add("A02ID");
System.out.println(plcParameterObject.getPlcParameterValues(addresses));
//     List<String> addresses = new ArrayList<>();
//      addresses.add("conveyorVelocity(AutoFAST)");
//      addresses.add("A02ID");
//System.out.println(plcParameterObject.getPlcParameterValues(addresses));
            List<String> addresses2 = new ArrayList<>();
            addresses2.add("conveyorVelocity(AutoSLOW)");
            addresses2.add("D01.SRdec");
            addresses2.add("D01.SRinpos");
            addresses2.add("D05.SRinpos");
            System.out.println(plcBitObject.getPlcBitValues(addresses2));
            int index2 = plcBitObject.getPlcBit("DO1id").getAddressIndex();
           int index2 = plcBitObject.getPlcBit("D05.SRinpos").getAddressIndex();
            System.out.println(index2);
            plcBitObject.getPlcBit("DO1id").getAddress(index2);
            System.out.println(plcBitObject.getPlcBit("DO1id").getAddress(index2));
            List<String> addresses3 = new ArrayList<>();
            addresses3.add("A02ID1");
            addresses3.add("A01CurrentGrid");
            System.out.println(plcStateObject.getPlcParameterValues(addresses3));
           plcBitObject.getPlcBit("D05.SRinpos").getAddress(index2);
           System.out.println(plcBitObject.getPlcBit("D05.SRinpos").getAddress(index2));
//
//
//            List<String> addresses3 = new ArrayList<>();
//            addresses3.add("A02ID1");
//            addresses3.add("A01CurrentGrid");
//            System.out.println(plcStateObject.getPlcParameterValues(addresses3));
        }
    }
}
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -49,12 +49,18 @@
//            Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11, 12,13,14,15,16,17,18,19,20,11, 12,13,14,15,16,17,18,19,20 };
//            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
            List<Short> arraylist5 = S7control.getinstance().ReadWord("DB106.0", 1);
            List<Short> arraylist6 = S7control.getinstance().ReadWord("DB106.12", 1);
            List<Short> arraylist7 = S7control.getinstance().ReadWord("DB106.40", 1);
            List<Short> arraylist8 = S7control.getinstance().ReadWord("DB106.50", 1);
            arraylist5.addAll(arraylist6);
            arraylist5.addAll(arraylist7);
            arraylist5.addAll(arraylist8);
            JSONObject jsonObject = new JSONObject();
            jsonObject.append("params", arraylist);
            jsonObject.append("shishi1", arraylist5);
//            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
springboot-vue3/src/main/resources/JsonFile/PlcSign.json
@@ -1,5 +1,5 @@
{
  "plcAddressBegin":"DB100.0.0",
  "plcAddressBegin":"DB102.0.0",
  "plcAddressLenght":"11",
  "dataType":"bit",
  "parameteInfor":[
@@ -8,7 +8,7 @@
      "addressIndex":"0"
    },
    {
      "codeId": "conveyorVelocity(AutoSLOW)",
      "codeId": "D01.SRinpos",
      "addressIndex":"1"
    },
    {
@@ -40,7 +40,7 @@
      "addressIndex":"9"
    },
    {
      "codeId": "DO1id",
      "codeId": "D05.SRinpos",
      "addressIndex":"10"
    }
  ]