#

luxiaotao1123

2020-11-21 67e37919387a601c256e42be903d47f1e82779dd

#

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.Arith;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnp;
@@ -137,9 +138,11 @@
            crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
            crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
            crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
            float xSpeed = siemensNet.getByteTransform().TransSingle(result.Content, 34);
            crnProtocol.setXSpeed((float) Arith.multiplys(3, xSpeed, 1.15));
            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
            float zSpeed = siemensNet.getByteTransform().TransSingle(result.Content, 42);
            crnProtocol.setZSpeed((float) Arith.multiplys(3, zSpeed, 5));
            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));

 src/main/webapp/views/monitor/monitor.html

@@ -405,8 +405,8 @@
                name: '走行速度',
                type: 'gauge',
                min: 0,
                max: 110,
                splitNumber: 11,
                max: 130,
                splitNumber: 13,
                radius: '50%',
                axisLine: {            // 坐标轴线
                    lineStyle: {       // 属性lineStyle控制线条样式
@@ -544,7 +544,7 @@
                center: ['75%', '50%'],    // 默认全局居中
                radius: '30%',
                min: 0,
                max: 4,
                max: 25,
                startAngle: 135,
                endAngle: 45,
                splitNumber: 2,