添加

whychdw

2020-07-13 bad7acff0c5a884eb67307e84c2781252604f965

添加

 gd_telcom/WebRoot/control.jsp

@@ -4002,7 +4002,17 @@
                }else {
                    conresist = data.dev_conresist1;
                }
                status.setText('contactor', "接触器导通阻抗："+conresist);
                // status.setText('contactor', "接触器导通阻抗："+conresist);
				
                // 设置常闭开关的电阻值
                changeEleCircleOpt(eleCircle, 'ko', {
                    isShowValue2: true,
                    strokeStyle: '#000',
                    value2:'k1电阻:'+conresist.toFixed(1)+'mΩ',
                    value2Length: -1,
                    value2Color: '#0000DD'
                });
				
                
                status.show();
            }else{

 gd_telcom/WebRoot/js/elecircle.content.js

@@ -327,42 +327,42 @@
    });
    
    // 二极管上方的横线
//    eleCircle.drawLine({
//        startX: 380,
//        startY: 135,
//        endX: 430,
//        endY: 135,
//        strokeStyle: '#FF0000',
//    });
    eleCircle.drawLine({
        startX: 380,
        startY: 135,
        endX: 430,
        endY: 135,
        strokeStyle: '#FF0000',
    });
    // 二极管上方的竖线
//    eleCircle.drawLine({
//        startX: 430,
//        startY: 135,
//        endX: 430,
//        endY: 160,
//        strokeStyle: '#FF0000',
//    });
    eleCircle.drawLine({
        startX: 430,
        startY: 135,
        endX: 430,
        endY: 160,
        strokeStyle: '#FF0000',
    });
    
    
    
    
    // 二极管下方的竖线
//    eleCircle.drawLine({
//        startX: 430,
//        startY: 220,
//        endX: 430,
//        endY: 250,
//        strokeStyle: '#FF0000',
//    });
    eleCircle.drawLine({
        startX: 430,
        startY: 220,
        endX: 430,
        endY: 250,
        strokeStyle: '#FF0000',
    });
    
    // 二极管下方的横线
//    eleCircle.drawLine({
//        startX: 430,
//        startY: 250,
//        endX: 380,
//        endY: 250,
//        strokeStyle: '#FF0000',
//    });
    eleCircle.drawLine({
        startX: 430,
        startY: 250,
        endX: 380,
        endY: 250,
        strokeStyle: '#FF0000',
    });
    
    
    // BATC+端上方的虚线
@@ -431,11 +431,11 @@
    });
    
    // 绘制二极管Do
//    eleCircle.drawDiode({
//        startX: 430,
//        startY: 160,
//        id: 'diode'
//    });
    eleCircle.drawDiode({
        startX: 430,
        startY: 160,
        id: 'diode'
    });
    
    // 绘制ko开关
    eleCircle.drawSwitchBtn({
@@ -1050,15 +1050,6 @@
            notShow: false,
            content: {
                text: 'SD卡状态：？？？'
            }
        },
        {
            name: 'contactor',
            type: 'text',
            status: 0,
            notShow: false,
            content: {
                text: '接触器导通阻抗：？？？'
            }
        },
        {