Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
| | |
| | | :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" |
| | |
| | | <span |
| | | class="name" |
| | | v-if="groupIndex === 12" |
| | | style="width: 250px" |
| | | style="width: 350px" |
| | | >{{ item.name }}</span |
| | | > |
| | | <span class="name" v-else style="width: 150px">{{ |
| | |
| | | customS7Control.writeBitToPLC(messageArray, addressList0, 0); |
| | | //急停 |
| | | customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1); |
| | | //存片等待延迟 |
| | | customS7Control.Writetime(messageArray, timeout2, 2); |
| | | |
| | | // 清空消息列表 |