Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2025-09-12 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js

@@ -102,11 +102,10 @@
}
TCarInfoDlg.addSubmit3 = function() {
    var ajax = new $ax(Feng.ctxPath + "/tShop/addDevice", function(data){
        window.parent.TCompetition.table.refresh();
        console.log("调用方法")
        TCarInfoDlg.close();
    });
    ajax.set("id",$("#id"));
    ajax.set("siteId",$("#site"));
    ajax.set("device",$("#device"));
    ajax.start();
}
@@ -408,8 +407,7 @@
            }
        });
    });

}
};
//地图点击事件
function showInfoClick(){
    map.on('click', function (e) {
@@ -653,9 +651,9 @@
    var carPhoto = new $WebUpload("img");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var carPhoto = new $WebUpload("welfarePicture");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var welfarePicture = new $WebUpload("welfarePicture");
    welfarePicture.setUploadBarId("progressBar");
    welfarePicture.init();
    var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto");
    drivingLicensePhoto.setUploadBarId("progressBar");
    drivingLicensePhoto.init();