Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-24 503bc89c55d675a27b689419aa906a070ca5cb03

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html

@@ -68,7 +68,7 @@
                        </div>
                    </div>

                    <div class="form-group">
                   <!-- <div class="form-group">
                        <label class="col-sm-2 control-label">专车改派：</label>
                        <div class="col-sm-10">
                            <div class="form-group">
@@ -82,28 +82,26 @@
                            </div>
                        </div>
                    </div>
                    <!--
                    <div class="form-group">
                        <label class="col-sm-2 control-label">出租车改派：</label>
                        <label class="col-sm-2 control-label">接送机改派：</label>
                        <div class="col-sm-10">
                            <div class="form-group">
                                <div class="col-sm-9">
                                    <input type="checkbox" class="js-switch1" id="isTaxiCar"
                                    <input type="checkbox" class="js-switch1" id="isTransfer"
                                           @if(isNotEmpty(reformist)){
                                           ${1 == reformist.isTaxiCar ? '' : 'checked=checked'}
                                           ${1 == reformist.isTransfer ? '' : 'checked=checked'}
                                    @}
                                    />
                                </div>
                            </div>
                        </div>
                    </div>
                    -->
                    </div>-->

                    <div class="ibox-title" >
                        <h3>推单设置:</h3>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">推单：</label>
                        <label class="col-sm-2 control-label">专车推单：</label>
                        <div class="col-sm-10">
                            第一轮推单：推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(zcOne)){
@@ -175,81 +173,79 @@
                            <br/>
                        </div>
                    </div>
                    <!--
                    <div class="form-group">
                        <label class="col-sm-2 control-label">出租车推单：</label>
                        <label class="col-sm-2 control-label">接送机推单：</label>
                        <div class="col-sm-10">
                            第一轮推单：推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(czcOne)){
                                                    value="${czcOne.pushDistance}"
                                                    @if(isNotEmpty(jsjOne)){
                                                    value="${jsjOne.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="czc1" id="czc1" class="form-control newWidth" />&nbsp;公里，
                                                    name="jsj1" id="jsj1" class="form-control newWidth" />&nbsp;公里，
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(czcOne)){
                                              value="${czcOne.pushTime}"
                                              @if(isNotEmpty(jsjOne)){
                                              value="${jsjOne.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="czc2" id="czc2" class="form-control newWidth" />&nbsp;秒钟；
                                              name="jsj2" id="jsj2" class="form-control newWidth" />&nbsp;秒钟；
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(czcOne)){
                                                 value="${czcOne.driverProportion}"
                                                 @if(isNotEmpty(jsjOne)){
                                                 value="${jsjOne.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="czc3" id="czc3" class="form-control newWidth" />&nbsp;%
                                                 name="jsj3" id="jsj3" class="form-control newWidth" />&nbsp;%
                            <br/>
                            <br/>
                            第二轮推单：推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(czcTwo)){
                                                    value="${czcTwo.pushDistance}"
                                                    @if(isNotEmpty(jsjTwo)){
                                                    value="${jsjTwo.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="czc4" id="czc4" class="form-control newWidth" />&nbsp;公里，
                                                    name="jsj4" id="jsj4" class="form-control newWidth" />&nbsp;公里，
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(czcTwo)){
                                              value="${czcTwo.pushTime}"
                                              @if(isNotEmpty(jsjTwo)){
                                              value="${jsjTwo.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="czc5" id="czc5" class="form-control newWidth" />&nbsp;秒钟；
                                              name="jsj5" id="jsj5" class="form-control newWidth" />&nbsp;秒钟；
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(czcTwo)){
                                                 value="${czcTwo.driverProportion}"
                                                 @if(isNotEmpty(jsjTwo)){
                                                 value="${jsjTwo.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="czc6" id="czc6" class="form-control newWidth" />&nbsp;%
                                                 name="jsj6" id="jsj6" class="form-control newWidth" />&nbsp;%
                            <br/>
                            <br/>
                            第三轮推单：推单距离为&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                    @if(isNotEmpty(czcThree)){
                                                    value="${czcThree.pushDistance}"
                                                    @if(isNotEmpty(jsjThree)){
                                                    value="${jsjThree.pushDistance}"
                                                    @}else{
                                                    value=""
                                                    @}
                                                    name="czc7" id="czc7" class="form-control newWidth" />&nbsp;公里，
                                                    name="jsj7" id="jsj7" class="form-control newWidth" />&nbsp;公里，
                            推单时间为&nbsp;<input type="text" oninput="checkIsInt(this)"
                                              @if(isNotEmpty(czcThree)){
                                              value="${czcThree.pushTime}"
                                              @if(isNotEmpty(jsjThree)){
                                              value="${jsjThree.pushTime}"
                                              @}else{
                                              value=""
                                              @}
                                              name="czc8" id="czc8" class="form-control newWidth" />&nbsp;秒钟；
                                              name="jsj8" id="jsj8" class="form-control newWidth" />&nbsp;秒钟；
                            每次推所有司机的&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                                 @if(isNotEmpty(czcThree)){
                                                 value="${czcThree.driverProportion}"
                                                 @if(isNotEmpty(jsjThree)){
                                                 value="${jsjThree.driverProportion}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="czc9" id="czc9" class="form-control newWidth" />&nbsp;%
                                                 name="jsj9" id="jsj9" class="form-control newWidth" />&nbsp;%
                            <br/>
                        </div>
                    </div>
                    -->
                    <div class="form-group">
                        <label class="col-sm-2 control-label">取消设置：</label>
                        <div class="col-sm-10">
@@ -268,9 +264,8 @@
                                               @}
                                               name="ptCancel2" id="ptCancel2" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            <!--
                            <br/>
                            出租车订单取消规则：出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                            接送机订单取消规则：接送机订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                             @if(isNotEmpty(ptCancel2)){
                                                             value="${ptCancel2.minuteNum}"
                                                             @}else{
@@ -285,7 +280,6 @@
                                               @}
                                               name="ptCancel4" id="ptCancel4" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            -->
                        </div>
                    </div>
                    <div class="form-group">
@@ -306,9 +300,8 @@
                                               @}
                                               name="yyCancel2" id="yyCancel2" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            <!--
                            <br/>
                            出租车订单取消规则：出租车订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                            接送机订单取消规则：接送机订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                             @if(isNotEmpty(yyCancel2)){
                                                             value="${yyCancel2.minuteNum}"
                                                             @}else{
@@ -323,12 +316,11 @@
                                               @}
                                               name="yyCancel4" id="yyCancel4" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            -->
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-sm-2 control-label">电话设置：</label>
                        <div class="col-sm-10">
                        <div class="col-sm-3">
                            报警电话：&nbsp;<input type="text"
                                              @if(isNotEmpty(phone1)){
                                              value="${phone1.phone}"
@@ -356,6 +348,12 @@
                                              name="phone3" id="phone3" class="form-control newWidth" />&nbsp;
                            <br/>
                        </div>
                        <div class="col-sm-3">
                            <#avatar id="userQrCode" name="用户端客服二维码" avatarImg="${reformist.userQrCode}"/>
                        </div>
                        <div class="col-sm-3">
                            <#avatar id="driverQrCode" name="司机端客服二维码" avatarImg="${reformist.driverQrCode}"/>
                        </div>
                    </div>
                </div>
            </div>
@@ -381,6 +379,16 @@
            $("#three1").attr("checked","checked");
        }
        threeClick($("input[name='three']:checked").val());


        // 初始化图片上传
        var userQrCode = new $WebUpload("userQrCode");
        userQrCode.setUploadBarId("progressBar");
        userQrCode.init();
        var driverQrCode = new $WebUpload("driverQrCode");
        driverQrCode.setUploadBarId("progressBar");
        driverQrCode.init();

    });

    //人脸识别打开按钮被点击
@@ -418,18 +426,25 @@
        var three = $("input[name='three']:checked").val();
        var openValue = $("#openValue").val();

        var isSpecialCar = $("#isSpecialCar").is(":checked");
        if (isSpecialCar){
            isSpecialCar = 2;
        } else {
            isSpecialCar = 1;
        }
        // var isSpecialCar = $("#isSpecialCar").is(":checked");
        // if (isSpecialCar){
        //     isSpecialCar = 2;
        // } else {
        //     isSpecialCar = 1;
        // }
        var isTaxiCar = $("#isTaxiCar").is(":checked");
        if (isTaxiCar){
            isTaxiCar = 2;
        } else {
            isTaxiCar = 1;
        }

        // var isTransfer = $("#isTransfer").is(":checked");
        // if (isTransfer){
        //     isTransfer = 2;
        // } else {
        //     isTransfer = 1;
        // }

        var zc1 = $("#zc1").val().trim();
        var zc2 = $("#zc2").val().trim();
@@ -441,37 +456,39 @@
        var zc8 = $("#zc8").val().trim();
        var zc9 = $("#zc9").val().trim();

        // var czc1 = $("#czc1").val().trim();
        // var czc2 = $("#czc2").val().trim();
        // var czc3 = $("#czc3").val().trim();
        // var czc4 = $("#czc4").val().trim();
        // var czc5 = $("#czc5").val().trim();
        // var czc6 = $("#czc6").val().trim();
        // var czc7 = $("#czc7").val().trim();
        // var czc8 = $("#czc8").val().trim();
        // var czc9 = $("#czc9").val().trim();
        var jsj1 = $("#jsj1").val().trim();
        var jsj2 = $("#jsj2").val().trim();
        var jsj3 = $("#jsj3").val().trim();
        var jsj4 = $("#jsj4").val().trim();
        var jsj5 = $("#jsj5").val().trim();
        var jsj6 = $("#jsj6").val().trim();
        var jsj7 = $("#jsj7").val().trim();
        var jsj8 = $("#jsj8").val().trim();
        var jsj9 = $("#jsj9").val().trim();

        var ptCancel1 = $("#ptCancel1").val().trim();
        var ptCancel2 = $("#ptCancel2").val().trim();
        // var ptCancel3 = $("#ptCancel3").val().trim();
        // var ptCancel4 = $("#ptCancel4").val().trim();
        var ptCancel3 = $("#ptCancel3").val().trim();
        var ptCancel4 = $("#ptCancel4").val().trim();
        // var ptCancel5 = $("#ptCancel5").val().trim();
        // var ptCancel6 = $("#ptCancel6").val().trim();

        var yyCancel1 = $("#yyCancel1").val().trim();
        var yyCancel2 = $("#yyCancel2").val().trim();
        // var yyCancel3 = $("#yyCancel3").val().trim();
        // var yyCancel4 = $("#yyCancel4").val().trim();
        var yyCancel3 = $("#yyCancel3").val().trim();
        var yyCancel4 = $("#yyCancel4").val().trim();

        var phone1 = $("#phone1").val().trim();
        var phone2 = $("#phone2").val().trim();
        var phone3 = $("#phone3").val().trim();
        var userQrCode = $("#userQrCode").val().trim();
        var driverQrCode = $("#driverQrCode").val().trim();

        if ("" == one || "" == two || "" == three
            || "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
            /*|| "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9
            || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6*/
            || "" == yyCancel1 || "" == yyCancel2 /*|| "" == yyCancel3 || "" == yyCancel4*/
            || "" == jsj1 || "" == jsj2 || "" == jsj3 || "" == jsj4 || "" == jsj5 || "" == jsj6 || "" == jsj7 || "" == jsj8 || "" == jsj9
            || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 /*|| "" == ptCancel5 || "" == ptCancel6*/
            || "" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4
            || "" == phone1 || "" == phone2 ) {
            Feng.info("输入框不能为空!");
            return;
@@ -489,12 +506,12 @@
            || !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
            || !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)

            // || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
            // || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
            // || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)
            || !regDouble.test(jsj1) || !regInt.test(jsj2) || !regDouble.test(jsj3)
            || !regDouble.test(jsj4) || !regInt.test(jsj5) || !regDouble.test(jsj6)
            || !regDouble.test(jsj7) || !regInt.test(jsj8) || !regDouble.test(jsj9)

            || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2)  /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4)|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
            || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) /*|| !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)*/) {
            || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2)  || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) /*|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
            || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)) {
            Feng.info("格式不正确!");
            return ;
        }
@@ -515,8 +532,9 @@
            ajax.set("openValue",0);
        }

        ajax.set("isSpecialCar", isSpecialCar);
        ajax.set("isTaxiCar", isTaxiCar);
        ajax.set("isSpecialCar", 0);
        ajax.set("isTaxiCar", 0);
        ajax.set("isTransfer", 0);

        ajax.set("zc1", zc1);
        ajax.set("zc2", zc2);
@@ -528,31 +546,33 @@
        ajax.set("zc8", zc8);
        ajax.set("zc9", zc9);

        ajax.set("czc1", 0);
        ajax.set("czc2", 0);
        ajax.set("czc3", 0);
        ajax.set("czc4", 0);
        ajax.set("czc5", 0);
        ajax.set("czc6", 0);
        ajax.set("czc7", 0);
        ajax.set("czc8", 0);
        ajax.set("czc9", 0);
        ajax.set("jsj1", jsj1);
        ajax.set("jsj2", jsj2);
        ajax.set("jsj3", jsj3);
        ajax.set("jsj4", jsj4);
        ajax.set("jsj5", jsj5);
        ajax.set("jsj6", jsj6);
        ajax.set("jsj7", jsj7);
        ajax.set("jsj8", jsj8);
        ajax.set("jsj9", jsj9);

        ajax.set("ptCancel1", ptCancel1);
        ajax.set("ptCancel2", ptCancel2);
        ajax.set("ptCancel3", 0);
        ajax.set("ptCancel4", 0);
        ajax.set("ptCancel3", ptCancel3);
        ajax.set("ptCancel4", ptCancel4);
        ajax.set("ptCancel5", 0);
        ajax.set("ptCancel6", 0);

        ajax.set("yyCancel1", yyCancel1);
        ajax.set("yyCancel2", yyCancel2);
        ajax.set("yyCancel3", 0);
        ajax.set("yyCancel4", 0);
        ajax.set("yyCancel3", yyCancel3);
        ajax.set("yyCancel4", yyCancel4);

        ajax.set("phone1", phone1);
        ajax.set("phone2", phone2);
        ajax.set("phone3", phone3);
        ajax.set("userQrCode", userQrCode);
        ajax.set("driverQrCode", driverQrCode);
        ajax.start();

    }