Merge remote-tracking branch 'origin/master'

vince

2023-07-07 dbbd8b7066092b3ce4eab44fa0e2b746dad16a95

 igds-web/src/main/resources/templates/admin/inout/out-register.html

@@ -60,15 +60,19 @@
      .qyzj-btnbox .rkbk-quick {
         margin-top: 15px !important;
      }

      .color-red {
         color: red !important;
      }

      .layui-form-item .layui-input-inline {
         width: unset;
      }

      .rkbk-search-input{
         background: #FFF !important;
      }

      .rkbk-search-input.bg-date {
         background: #FFF !important;
      }
@@ -90,10 +94,10 @@
                  onclick="submit()">
               <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 完成登记
            </button>
            <button class="rkbk-quick-btn layui-btn btn-violet"
                  onclick="resetPlateNum()">
               <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别
            </button>
                <!--                <button class="rkbk-quick-btn layui-btn btn-violet"-->
                <!--                        onclick="resetPlateNum()">-->
                <!--                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别-->
                <!--                </button>-->
         </div>

         <!--流程引导-->
@@ -248,7 +252,8 @@

                  <div class="rkbk-left-form rkbk-right-form">
                     <div class="layui-form-item">
                        <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()"/>
                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn"
                                       onclick="flushICCard()"/>
                        <label class="layui-form-label color-red">智慧卡号：</label>
                        <div class="layui-input-block">
                           <input type="text" name="intelCard" id="intelCard" required
@@ -291,18 +296,25 @@
                     <h3>登记视频</h3>
                  </div>
                  <div class="kccz-r-con2">
                     <div class="kccz-r-vedio" id="kccz-r-video1">

                     </div>
                            <div class="kccz-r-vedio" id="kccz-r-video1"></div>
                     <div class="kccz-r-btnbox">
                        <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
                           <span class="kccz-r-pz"></span>
                                <div class="kccz-r-div" style="width: 110px">
                                    <span id="plateNum2">未识别</span>
                           <p>车牌识别</p>
                        </a>
                        <a href="javascript:;" class="kccz-r-btn mt-10">
                           <span id="pz-img" class="kccz-r-img"></span>
                                </div>
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">
                                    <span id="pz-img" class="kccz-r-pz"></span>
                           <p id="pz-text">自动抓拍</p>
                        </a>
                                <!--                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">-->
                                <!--                                    <span class="kccz-r-pz"></span>-->
                                <!--                                    <span id="plateNum2">未识别</span>-->
                                <!--                                    <p>车牌识别</p>-->
                                <!--                                </a>-->
                                <!--                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">-->
                                <!--                                    <span id="pz-img" class="kccz-r-img"></span>-->
                                <!--                                    <p id="pz-text">自动抓拍</p>-->
                                <!--                                </a>-->
                     </div>
                  </div>
               </div>
@@ -339,6 +351,7 @@
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/out-register.js}"></script>

<!-- 弹出框的信息 -->