ZengTao
2023-12-20 8435407b2356effeffac7cb7f55e5585fd17c37b
Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
2个文件已修改
5 ■■■■■ 已修改文件
CanadaMes-ui/src/views/Electrical/Parameter2.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -104,7 +104,7 @@
        :key="groupIndex"
        style="margin-bottom: -20px"
      >
        <el-card class="json-block" style="width: 300px; margin-bottom: 2px;height:170px;">
        <el-card class="json-block" style="width: 300px; margin-bottom: 2px;height:200px"  :height="groupIndex === 12 ? '190px' : '170px'" >
          <div
            class="button-row"
            style="display: flex; justify-content: space-between"
@@ -177,7 +177,7 @@
              <span
                class="name"
                v-if="groupIndex === 12"
                style="width: 250px"
                style="width: 350px"
                >{{ item.name }}</span
              >
              <span class="name" v-else style="width: 150px">{{
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -144,6 +144,7 @@
                            customS7Control.writeBitToPLC(messageArray, addressList0, 0);
                            //急停
                            customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1);
                            //存片等待延迟
                            customS7Control.Writetime(messageArray, timeout2, 2);
                            // 清空消息列表