修复进入检测时的缺陷， 系统自测时去掉目标压力值显示，报告生成后，泄漏值输入框自动关闭

Calibrationpara.cpp

@@ -294,6 +294,8 @@ void CalibrationPara::load_parameters()
     }else{
         qDebug() << "json_error.error occurred";
     }
+
+    qDebug() << "load_parameters m_paras.size:" << m_paras.size();
 }
 
 void CalibrationPara::save_parameters()

Deviceinfo.cpp

@@ -26,9 +26,9 @@ bool DeviceInfo::update_testinfo(const QString& jsonStr )
     QJsonObject jsonObj = jsonDoc.object();
 
 
-    if(jsonObj.contains("target") && jsonObj.value("target").isDouble()){
-        m_testinfo.m_target = jsonObj.value("target").toDouble();
-    }
+    //if(jsonObj.contains("target") && jsonObj.value("target").isDouble()){
+    //    m_testinfo.m_target = jsonObj.value("target").toDouble();
+    //}
 
     if(jsonObj.contains("interval") && jsonObj.value("interval").isDouble()){
         m_testinfo.m_interval = jsonObj.value("interval").toInt();

PageMain.qml

@@ -293,6 +293,7 @@ Rectangle{
        padding:        0
        closePolicy:    Popup.CloseOnEscape  //| Popup.CloseOnPressOutside
        property var    raiseItem:          null
+       property bool   item_opened:  false
        background: Rectangle {
             color:      Qt.rgba(0,0,0,0)   //背景为无色
        }
@@ -306,10 +307,12 @@ Rectangle{
        }
        onOpened: {
            loaderCenter.sourceComponent = popupCenter.raiseItem
+           popupCenter.item_opened = true
        }
        onClosed: {
            loaderCenter.sourceComponent = null
            popupCenter.raiseItem = null
+           popupCenter.item_opened = false
        }
 
     }
@@ -357,6 +360,9 @@ Rectangle{
 
         if(str === "close"){
             genreportprogress.exit()
+            if(popupCenter.item_opened == true){
+                popupCenter.close()
+            }
         }else{
             genreportprogress.show(str)
         }

PageSelfTest.qml

@@ -178,7 +178,7 @@ Item {
                                              "idx":tmp_id,
                                              "date":item.dt,
                                              "time":item.time,
-                                             "target":item.target,
+                                             //"target":item.target,
                                              "interval":item.interval,
                                              "threshold":item.threshold,
                                              "start":item.begin,
@@ -731,7 +731,7 @@ Item {
                                         //生成测试结果 JSON 字符串
                                         var recordJson={}
 
-                                        recordJson.target = Number(selttest_Model.get(styleData.row).target)
+                                        //recordJson.target = Number(selttest_Model.get(styleData.row).target)
                                         recordJson.interval = Number(selttest_Model.get(styleData.row).interval)
                                         recordJson.threshold = Number(selttest_Model.get(styleData.row).threshold)
                                         recordJson.begin = Number(selttest_Model.get(styleData.row).start)
@@ -790,7 +790,7 @@ Item {
                     TableViewColumn{role: "idx"; title: "ID"; width: 40;delegate: itemDelegateText}
                     TableViewColumn{role: "date"; title: "自检日期"; width: 120;delegate: itemDelegateText}
                     TableViewColumn{role: "time"; title: "完成时间"; width: 120;delegate: itemDelegateText}
-                    TableViewColumn{role: "target"; title: "目标压力(kPa)"; width: 120;delegate: itemDelegateText}
+                    //TableViewColumn{role: "target"; title: "目标压力(kPa)"; width: 120;delegate: itemDelegateText}
                     TableViewColumn{role: "interval"; title: "检测时间(秒)"; width: 120;delegate: itemDelegateText}
                     TableViewColumn{role: "threshold"; title: "变化限值(kPa)"; width: 120;delegate: itemDelegateText}
                     TableViewColumn{role: "start"; title: "开始压力(kPa)"; width: 120;delegate: itemDelegateText}

PageSetting.qml

@@ -666,7 +666,7 @@ Item{
 
                         onClicked: {
                             //log.show(utr.state)
-                            //console.log("state ===="+utr.state);
+                            //console.log("state ==== 1111");
 
                             if(root.check_invalid()){
                                 var infoArry = [];
@@ -676,7 +676,7 @@ Item{
                                 infoArry.push(company);
                                 infoArry.push(total_volume);
                                 infoArry.push(compartment_num);
-                                for(var i=0; i<8; i++){
+                                for(var i=0; i<4; i++){
                                     infoArry.push(volume_arry[i])
                                 }
 
@@ -685,7 +685,7 @@ Item{
                                     log.show("设置罐车参数不成功")
                                 }else{
 
-                                    for(var n=0; n<8; n++){
+                                    for(var n=0; n<4; n++){
                                         switch(n){
                                         case 0:
                                             page_recoveryvalve1.volume = volume_arry[n]

RecoveryValve.qml

@@ -398,6 +398,7 @@ Item{
 
                                            //testService.reportpic_Ready(compartment_id);
 
+
                                            if(testService.check_alltest_ok(1)){
                                                var fileName = root.carplate
                                                var text = getWordSaveFileName(fileName)
@@ -407,6 +408,7 @@ Item{
                                                saveWordDialog.open()
                                            }
 
+
                                        }
                                    }
 

TestService.cpp

@@ -91,7 +91,7 @@ bool TestService::setTankinfo(const QVariantList& list)
         }else if(4 == i){
             compartment_num = item_string.toInt();
         }else{
-            if(i< (8+5))
+            if(i< (MAX_COMPARTMENT_NUM+5))
                 volume[i-5] = item_string.toInt();
         }
     }

main.qml

@@ -24,8 +24,11 @@ Window {
         anchors.horizontalCenter: parent.horizontalCenter
         fillMode: Image.PreserveAspectFit
         source: "img/main_zjtj_bj.jpg"
+        //source: "img/main_jl_bj.jpg"
     }
 
+
+
     BackendLogic {
             id: backend
     }
@@ -43,23 +46,28 @@ Window {
             anchors.fill:parent
             fillMode: Image.PreserveAspectFit
             source:"img/zjtj_logo.png"
+            //source:"img/jl_logo.png"
         }
 
     }
 
-    Button {
-        text: "点击进入"
+
+
+    UserButton {
+        text: "登  录"
         font.bold: true
         font.pixelSize: 24
-        width:240
-        height:120
+        width:180
+        height:60
         anchors.centerIn: parent
 
+/*
         background: Image {
             anchors.fill:parent
             fillMode: Image.PreserveAspectFit
             source:"img/blue_button.png"
         }
+        */
         //icon.source: "img/blue_button.png"
         //icon.color: "transparent"
 
@@ -83,9 +91,7 @@ Window {
         }
 
         onClicked: {
-
             backend.shutdown()
-
         }
     }
 
@@ -149,7 +155,7 @@ Window {
         var jsonobj = backend.getDeviceInfo()
         model_text.text = "设备型号:"+jsonobj.model
         devid_text.text = "设备ID:"+jsonobj.id
-        manufacture_text.text = "制造商:"+jsonobj.manufacture
+        //manufacture_text.text = "制造商:"+jsonobj.manufacture
 
     }
 

qml.qrc

@@ -50,5 +50,7 @@
         <file>TNormalProgress.qml</file>
         <file>img/fail_circle.png</file>
         <file>img/ok_circle.png</file>
+        <file>img/jl_logo.png</file>
+        <file>img/main_jl_bj.jpg</file>
     </qresource>
 </RCC>