合并代码

puzhibing

2024-03-04 7e7f901b2172281dc294dfbc67e6ad00625f09f4

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

@@ -42,6 +42,8 @@
        },
    ];
};


function currentTime(timestamp){
    var time = timestamp + '';
    if(time.length != 13){
@@ -88,7 +90,23 @@
        return true;
    }
};

/**
 *
 * 点击门店设置门禁
 */
TCompetition.addDevice = function () {
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '添加门禁',
            area: ['50%', '50%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/tShop/tShop_addDevice/' +TCompetition.seItem.id
        });
        this.layerIndex = index;
    }
};
/**
 * 点击添加车辆管理
 */
@@ -278,7 +296,6 @@
                Feng.success("重置成功!");
                TCompetition.table.refresh();
            }, function (data) {
                Feng.error("重置失败!" + data.responseJSON.message + "!");
            });
            ajax.set("id",id);
            ajax.start();