xuanyan пре 5 година
родитељ
комит
b2999250ab

+ 357 - 357
sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-edit.html

@@ -15,8 +15,8 @@
                 <div class="layui-tab layui-tab-card">
                     <ul class="layui-tab-title">
                         <li class="layui-this">设备基础信息</li>
-                        <li th:if="${deviceOptions} != null">设备配置信息</li>
-                        <li th:if="${deviceOptions} == null">设备配置信息</li>
+<!--                        <li th:if="${deviceOptions} != null">设备配置信息</li>-->
+<!--                        <li th:if="${deviceOptions} == null">设备配置信息</li>-->
                     </ul>
                     <div class="layui-tab-content" style="margin-top: 10px">
                         <blockquote class="layui-elem-quote layui-quote-nm">
@@ -29,15 +29,15 @@
                                     <div class="layui-input-inline" style="width: 75px">
                                         <span class="layui-form-text" th:text="${device.serialNumber}"></span>
                                     </div>
-                                    <label class="layui-form-label"><span class="must">*</span><span>设备厂商:</span></label>
-                                    <div class="layui-input-inline" style="width: 75px;">
-                                        <span class="layui-form-text" th:if="${device.deviceFactory} == 'JVT'">巨龙</span>
-                                        <span class="layui-form-text" th:if="${device.deviceFactory} == 'qinlin'">亲邻</span>
-                                    </div>
-                                    <label class="layui-form-label"><span class="must">*</span><span>设备型号:</span></label>
-                                    <div class="layui-input-inline">
-                                        <span class="layui-form-text" th:text="${device.deviceModelNumber}"></span>
-                                    </div>
+<!--                                    <label class="layui-form-label"><span class="must">*</span><span>设备厂商:</span></label>-->
+<!--                                    <div class="layui-input-inline" style="width: 75px;">-->
+<!--                                        <span class="layui-form-text" th:if="${device.deviceFactory} == 'JVT'">巨龙</span>-->
+<!--                                        <span class="layui-form-text" th:if="${device.deviceFactory} == 'qinlin'">亲邻</span>-->
+<!--                                    </div>-->
+<!--                                    <label class="layui-form-label"><span class="must">*</span><span>设备型号:</span></label>-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <span class="layui-form-text" th:text="${device.deviceModelNumber}"></span>-->
+<!--                                    </div>-->
                                 </div>
                         </blockquote>
                         <br/>
@@ -91,45 +91,45 @@
                                     </div>
                                 </fieldset>
                                 <br/>
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备功能</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持门禁卡片功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="1" title="是" th:checked="${device.haveCard} == 1">
-                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="2" title="否" th:checked="${device.haveCard} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持人脸识别功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="1" title="是" th:checked="${device.haveFace} == 1">
-                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="2" title="否" th:checked="${device.haveFace} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持键盘功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="1" title="是">
-                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="2" title="否">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持视频通话功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="1" title="是" th:checked="${device.haveCall} ==1">
-                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="2" title="否" th:checked="${device.haveCall} ==2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持一键重启功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="reboot" lay-filter="reboot" value="1" title="是" th:checked="${device.reboot} ==1">
-                                                <input type="radio" name="reboot" lay-filter="reboot" value="2" title="否" th:checked="${device.reboot} ==2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持广告功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="1" title="是">
-                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="2" title="否" >
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>设备功能</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持门禁卡片功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="1" title="是" th:checked="${device.haveCard} == 1">-->
+<!--                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="2" title="否" th:checked="${device.haveCard} == 2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持人脸识别功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="1" title="是" th:checked="${device.haveFace} == 1">-->
+<!--                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="2" title="否" th:checked="${device.haveFace} == 2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持键盘功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="1" title="是">-->
+<!--                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="2" title="否">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持视频通话功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="1" title="是" th:checked="${device.haveCall} ==1">-->
+<!--                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="2" title="否" th:checked="${device.haveCall} ==2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持一键重启功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="reboot" lay-filter="reboot" value="1" title="是" th:checked="${device.reboot} ==1">-->
+<!--                                                <input type="radio" name="reboot" lay-filter="reboot" value="2" title="否" th:checked="${device.reboot} ==2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持广告功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="1" title="是">-->
+<!--                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="2" title="否" >-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
                                 <br/>
                                 <fieldset class="layui-elem-field">
                                     <legend>备注</legend>
@@ -146,315 +146,315 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-tab-item" th:if="${deviceOptions} != null">
-                            <div class="layui-form">
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备基本配置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>屏幕亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="screenBrightness" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.screenBrightness}" />
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>通话音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="callVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.callVolume}" />
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门时长:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="delay" type="number" lay-verify="required" value="5" autocomplete="off"
-                                                       class="layui-input textAlign" th:value="${deviceOptions.delay}">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="openDoorPwd" type="number" lay-verify="password" autocomplete="off"
-                                                       class="layui-input" oninput="if(value.length>6)value=value.slice(0,6)" th:value="${deviceOptions.openDoorPwd}">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>管理密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="adminPwd" type="number" lay-verify="adminPassword" autocomplete="off"
-                                                       class="layui-input" oninput="if(value.length>6)value=value.slice(0,6)" th:value="${deviceOptions.adminPwd}">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>显示姓名:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="isShowUsername" value="1" title="显示" th:checked="${deviceOptions.isShowUsername}==1">
-                                                <input type="radio" name="isShowUsername" value="2" title="不显示" th:checked="${deviceOptions.isShowUsername}==2">
-                                            </div>
-                                            <label class="layui-form-label"><span>启用策略:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="timeStrategyIsEnable" value="1" title="是" th:checked="${deviceOptions.timeStrategyIsEnable}==1">
-                                                <input type="radio" name="timeStrategyIsEnable" value="2" title="否" th:checked="${deviceOptions.timeStrategyIsEnable}==2">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <br/>
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备功能</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>一键全部:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="all" lay-filter="all" value="1" title="启用" th:checked="${all} == 1" checked="">
-                                                <input type="radio" name="all" lay-filter="all" value="2" title="禁用" th:checked="${all} == 2">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>刷脸开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="faceOpenDoor" lay-filter="faceOpenDoor" value="1" title="启用" th:checked="${deviceOptions.faceOpenDoor} == 1" checked="">
-                                                <input type="radio" name="faceOpenDoor" lay-filter="faceOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.faceOpenDoor} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>刷卡开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="cardOpenDoor" lay-filter="cardOpenDoor" value="1" title="启用" th:checked="${deviceOptions.cardOpenDoor} == 1" checked="">
-                                                <input type="radio" name="cardOpenDoor" lay-filter="cardOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.cardOpenDoor} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>远程开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="remoteOpenDoor" lay-filter="remoteOpenDoor" value="1" title="启用" th:checked="${deviceOptions.remoteOpenDoor} == 1" checked="">
-                                                <input type="radio" name="remoteOpenDoor" lay-filter="remoteOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.remoteOpenDoor} == 2">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>密码开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="pwdOpenDoor" lay-filter="pwdOpenDoor" value="1" title="启用" th:checked="${deviceOptions.pwdOpenDoor} == 1" checked="">
-                                                <input type="radio" name="pwdOpenDoor" lay-filter="pwdOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.pwdOpenDoor} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备键盘功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="keyboard" lay-filter="keyboard" value="1" title="启用" th:checked="${deviceOptions.keyboard} == 1" checked="">
-                                                <input type="radio" name="keyboard" lay-filter="keyboard" value="2" title="禁用" th:checked="${deviceOptions.keyboard} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>广告播放功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="adPlay" lay-filter="adPlay" value="1" title="启用" th:checked="${deviceOptions.adPlay} == 1" checked="">
-                                                <input type="radio" name="adPlay" lay-filter="adPlay" value="2" title="禁用" th:checked="${deviceOptions.adPlay} == 2">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <br/>
-                                <fieldset class="layui-elem-field">
-                                    <legend>广告设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>广告音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="adVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.adVolume}" />
-                                            </div>
-                                            <label class="layui-form-label"><span>广告播放模式:</span></label>
-                                            <div class="layui-input-inline">
-                                                <select name="playModel">
-                                                    <option value="1" th:selected="${deviceOptions.playModel}==1">循环播放</option>
-                                                    <option value="2" th:selected="${deviceOptions.playModel}==2">靠近播放</option>
-                                                    <option value="3" th:selected="${deviceOptions.playModel}==3">按性别和年龄播放</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
+<!--                        <div class="layui-tab-item" th:if="${deviceOptions} != null">-->
+<!--                            <div class="layui-form">-->
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>设备基本配置</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>屏幕亮度:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="screenBrightness" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.screenBrightness}" />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>通话音量:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="callVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.callVolume}" />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>开门时长:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="delay" type="number" lay-verify="required" value="5" autocomplete="off"-->
+<!--                                                       class="layui-input textAlign" th:value="${deviceOptions.delay}">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>开门密码:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="openDoorPwd" type="number" lay-verify="password" autocomplete="off"-->
+<!--                                                       class="layui-input" oninput="if(value.length>6)value=value.slice(0,6)" th:value="${deviceOptions.openDoorPwd}">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>管理密码:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="adminPwd" type="number" lay-verify="adminPassword" autocomplete="off"-->
+<!--                                                       class="layui-input" oninput="if(value.length>6)value=value.slice(0,6)" th:value="${deviceOptions.adminPwd}">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>显示姓名:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="isShowUsername" value="1" title="显示" th:checked="${deviceOptions.isShowUsername}==1">-->
+<!--                                                <input type="radio" name="isShowUsername" value="2" title="不显示" th:checked="${deviceOptions.isShowUsername}==2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>启用策略:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="timeStrategyIsEnable" value="1" title="是" th:checked="${deviceOptions.timeStrategyIsEnable}==1">-->
+<!--                                                <input type="radio" name="timeStrategyIsEnable" value="2" title="否" th:checked="${deviceOptions.timeStrategyIsEnable}==2">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
+<!--                                <br/>-->
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>设备功能</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>一键全部:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="all" lay-filter="all" value="1" title="启用" th:checked="${all} == 1" checked="">-->
+<!--                                                <input type="radio" name="all" lay-filter="all" value="2" title="禁用" th:checked="${all} == 2">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>刷脸开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="faceOpenDoor" lay-filter="faceOpenDoor" value="1" title="启用" th:checked="${deviceOptions.faceOpenDoor} == 1" checked="">-->
+<!--                                                <input type="radio" name="faceOpenDoor" lay-filter="faceOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.faceOpenDoor} == 2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>刷卡开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="cardOpenDoor" lay-filter="cardOpenDoor" value="1" title="启用" th:checked="${deviceOptions.cardOpenDoor} == 1" checked="">-->
+<!--                                                <input type="radio" name="cardOpenDoor" lay-filter="cardOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.cardOpenDoor} == 2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>远程开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="remoteOpenDoor" lay-filter="remoteOpenDoor" value="1" title="启用" th:checked="${deviceOptions.remoteOpenDoor} == 1" checked="">-->
+<!--                                                <input type="radio" name="remoteOpenDoor" lay-filter="remoteOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.remoteOpenDoor} == 2">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>密码开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="pwdOpenDoor" lay-filter="pwdOpenDoor" value="1" title="启用" th:checked="${deviceOptions.pwdOpenDoor} == 1" checked="">-->
+<!--                                                <input type="radio" name="pwdOpenDoor" lay-filter="pwdOpenDoor" value="2" title="禁用" th:checked="${deviceOptions.pwdOpenDoor} == 2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>设备键盘功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="keyboard" lay-filter="keyboard" value="1" title="启用" th:checked="${deviceOptions.keyboard} == 1" checked="">-->
+<!--                                                <input type="radio" name="keyboard" lay-filter="keyboard" value="2" title="禁用" th:checked="${deviceOptions.keyboard} == 2">-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>广告播放功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="adPlay" lay-filter="adPlay" value="1" title="启用" th:checked="${deviceOptions.adPlay} == 1" checked="">-->
+<!--                                                <input type="radio" name="adPlay" lay-filter="adPlay" value="2" title="禁用" th:checked="${deviceOptions.adPlay} == 2">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
+<!--                                <br/>-->
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>广告设置</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>广告音量:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="adVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.adVolume}" />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>广告播放模式:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <select name="playModel">-->
+<!--                                                    <option value="1" th:selected="${deviceOptions.playModel}==1">循环播放</option>-->
+<!--                                                    <option value="2" th:selected="${deviceOptions.playModel}==2">靠近播放</option>-->
+<!--                                                    <option value="3" th:selected="${deviceOptions.playModel}==3">按性别和年龄播放</option>-->
+<!--                                                </select>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
 <!--                                <fieldset class="layui-elem-field" id="face_options" th:styleappend="'display:' + (${device.haveFace}==1?'block':'none')">-->
-                                <fieldset class="layui-elem-field" id="face_options" th:if="${device.haveFace} == 1">
-                                    <legend>人脸识别功能设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>补光灯亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="fillLight" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.fillLight}" />
-                                            </div>
-                                            <label class="layui-form-label"><span>识别框位置:</span></label>
-                                            <div class="layui-input-inline">
-                                                <select name="discernBoxPosition">
-                                                    <option value="1" th:selected="${deviceOptions.discernBoxPosition} ==1">左上角</option>
-                                                    <option value="2" th:selected="${deviceOptions.discernBoxPosition} ==2">左下角</option>
-                                                    <option value="3" th:selected="${deviceOptions.discernBoxPosition} ==3">中间位置</option>
-                                                    <option value="4" th:selected="${deviceOptions.discernBoxPosition} ==4">右下角</option>
-                                                </select>
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>识别度达:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="faceResolution" type="number" placeholder="" class="layui-input textAlign"
-                                                       lay-verify="number|size" th:value="${deviceOptions.faceResolution}" />
-                                            </div>
-                                            <div class="layui-form-mid layui-word-aux">%,时可进行开门</div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>活体检测:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="liveDetect" value="1" title="开启" th:checked="${deviceOptions.liveDetect} ==1">
-                                                <input type="radio" name="liveDetect" value="2" title="关闭" th:checked="${deviceOptions.liveDetect} ==2">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <div class="layui-form-item">
-                                    <div class="layui-input-block">
-                                        <button class="layui-btn" lay-submit lay-filter="entity_submit_event" value="options">提交</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-tab-item" th:if="${deviceOptions} == null">
-                            <div class="layui-form">
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备基本配置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>屏幕亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="screenBrightness" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>通话音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="callVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign"  />
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门时长:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="delay" type="number" lay-verify="required" value="5" autocomplete="off"
-                                                       class="layui-input textAlign" >
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="openDoorPwd" type="number" lay-verify="password" autocomplete="off"
-                                                       class="layui-input" >
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>管理密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="adminPwd" type="number" lay-verify="adminPassword" autocomplete="off"
-                                                       class="layui-input" >
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>显示姓名:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="isShowUsername" value="1" title="显示" >
-                                                <input type="radio" name="isShowUsername" value="2" title="不显示" >
-                                            </div>
-                                            <label class="layui-form-label"><span>启用策略:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="timeStrategyIsEnable" value="1" title="是" >
-                                                <input type="radio" name="timeStrategyIsEnable" value="2" title="否" >
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <br/>
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备功能</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>刷脸开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="faceOpenDoor" value="1" title="启用" >
-                                                <input type="radio" name="faceOpenDoor" value="2" title="禁用" >
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>刷卡开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="cardOpenDoor" value="1" title="启用" >
-                                                <input type="radio" name="cardOpenDoor" value="2" title="禁用" >
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>远程开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="remoteOpenDoor" value="1" title="启用" >
-                                                <input type="radio" name="remoteOpenDoor" value="2" title="禁用" >
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>密码开门功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="pwdOpenDoor" value="1" title="启用" >
-                                                <input type="radio" name="pwdOpenDoor" value="2" title="禁用" >
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备键盘功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="keyboard" value="1" title="启用" >
-                                                <input type="radio" name="keyboard" value="2" title="禁用" >
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>广告播放功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="adPlay" value="1" title="启用" >
-                                                <input type="radio" name="adPlay" value="2" title="禁用" >
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <br/>
-                                <fieldset class="layui-elem-field">
-                                    <legend>广告设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>广告音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="adVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                            <label class="layui-form-label"><span>广告播放模式:</span></label>
-                                            <div class="layui-input-inline">
-                                                <select name="playModel">
-                                                    <option value="1" >循环播放</option>
-                                                    <option value="2" >靠近播放</option>
-                                                    <option value="3" >按性别和年龄播放</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
+<!--                                <fieldset class="layui-elem-field" id="face_options" th:if="${device.haveFace} == 1">-->
+<!--                                    <legend>人脸识别功能设置</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>补光灯亮度:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="fillLight" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceOptions.fillLight}" />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>识别框位置:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <select name="discernBoxPosition">-->
+<!--                                                    <option value="1" th:selected="${deviceOptions.discernBoxPosition} ==1">左上角</option>-->
+<!--                                                    <option value="2" th:selected="${deviceOptions.discernBoxPosition} ==2">左下角</option>-->
+<!--                                                    <option value="3" th:selected="${deviceOptions.discernBoxPosition} ==3">中间位置</option>-->
+<!--                                                    <option value="4" th:selected="${deviceOptions.discernBoxPosition} ==4">右下角</option>-->
+<!--                                                </select>-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>识别度达:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="faceResolution" type="number" placeholder="" class="layui-input textAlign"-->
+<!--                                                       lay-verify="number|size" th:value="${deviceOptions.faceResolution}" />-->
+<!--                                            </div>-->
+<!--                                            <div class="layui-form-mid layui-word-aux">%,时可进行开门</div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>活体检测:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="liveDetect" value="1" title="开启" th:checked="${deviceOptions.liveDetect} ==1">-->
+<!--                                                <input type="radio" name="liveDetect" value="2" title="关闭" th:checked="${deviceOptions.liveDetect} ==2">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
+<!--                                <div class="layui-form-item">-->
+<!--                                    <div class="layui-input-block">-->
+<!--                                        <button class="layui-btn" lay-submit lay-filter="entity_submit_event" value="options">提交</button>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                        <div class="layui-tab-item" th:if="${deviceOptions} == null">-->
+<!--                            <div class="layui-form">-->
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>设备基本配置</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>屏幕亮度:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="screenBrightness" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign" />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>通话音量:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="callVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign"  />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>开门时长:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="delay" type="number" lay-verify="required" value="5" autocomplete="off"-->
+<!--                                                       class="layui-input textAlign" >-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>开门密码:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="openDoorPwd" type="number" lay-verify="password" autocomplete="off"-->
+<!--                                                       class="layui-input" >-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>管理密码:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="adminPwd" type="number" lay-verify="adminPassword" autocomplete="off"-->
+<!--                                                       class="layui-input" >-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>显示姓名:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="isShowUsername" value="1" title="显示" >-->
+<!--                                                <input type="radio" name="isShowUsername" value="2" title="不显示" >-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>启用策略:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="timeStrategyIsEnable" value="1" title="是" >-->
+<!--                                                <input type="radio" name="timeStrategyIsEnable" value="2" title="否" >-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
+<!--                                <br/>-->
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>设备功能</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>刷脸开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="faceOpenDoor" value="1" title="启用" >-->
+<!--                                                <input type="radio" name="faceOpenDoor" value="2" title="禁用" >-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>刷卡开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="cardOpenDoor" value="1" title="启用" >-->
+<!--                                                <input type="radio" name="cardOpenDoor" value="2" title="禁用" >-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>远程开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="remoteOpenDoor" value="1" title="启用" >-->
+<!--                                                <input type="radio" name="remoteOpenDoor" value="2" title="禁用" >-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>密码开门功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="pwdOpenDoor" value="1" title="启用" >-->
+<!--                                                <input type="radio" name="pwdOpenDoor" value="2" title="禁用" >-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>设备键盘功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="keyboard" value="1" title="启用" >-->
+<!--                                                <input type="radio" name="keyboard" value="2" title="禁用" >-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>广告播放功能:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="adPlay" value="1" title="启用" >-->
+<!--                                                <input type="radio" name="adPlay" value="2" title="禁用" >-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
+<!--                                <br/>-->
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>广告设置</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>广告音量:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="adVolume" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign" />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>广告播放模式:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <select name="playModel">-->
+<!--                                                    <option value="1" >循环播放</option>-->
+<!--                                                    <option value="2" >靠近播放</option>-->
+<!--                                                    <option value="3" >按性别和年龄播放</option>-->
+<!--                                                </select>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
 <!--                                <fieldset class="layui-elem-field" id="face_options" th:styleappend="'display:' + (${device.haveFace}==1?'block':'none')">-->
-                                <fieldset class="layui-elem-field" id="face_options2" th:if="${device.haveFace} == 1">
-                                    <legend>人脸识别功能设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>补光灯亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="fillLight" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign"  />
-                                            </div>
-                                            <label class="layui-form-label"><span>识别框位置:</span></label>
-                                            <div class="layui-input-inline">
-                                                <select name="discernBoxPosition">
-                                                    <option value="1" >左上角</option>
-                                                    <option value="2" >左下角</option>
-                                                    <option value="3" >中间位置</option>
-                                                    <option value="4" >右下角</option>
-                                                </select>
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>识别度达:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="faceResolution" type="number" placeholder="" class="layui-input textAlign"
-                                                       lay-verify="number|size" />
-                                            </div>
-                                            <div class="layui-form-mid layui-word-aux">%,时可进行开门</div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>活体检测:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="liveDetect" value="1" title="开启" >
-                                                <input type="radio" name="liveDetect" value="2" title="关闭" >
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <div class="layui-form-item">
-                                    <div class="layui-input-block">
-                                        <button class="layui-btn" lay-submit lay-filter="entity_submit_event" value="addOptions">提交</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+<!--                                <fieldset class="layui-elem-field" id="face_options2" th:if="${device.haveFace} == 1">-->
+<!--                                    <legend>人脸识别功能设置</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>补光灯亮度:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="fillLight" type="number" lay-verify="required|size" placeholder="提示:请输入0-100的数字"-->
+<!--                                                       autocomplete="off" class="layui-input textAlign"  />-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>识别框位置:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <select name="discernBoxPosition">-->
+<!--                                                    <option value="1" >左上角</option>-->
+<!--                                                    <option value="2" >左下角</option>-->
+<!--                                                    <option value="3" >中间位置</option>-->
+<!--                                                    <option value="4" >右下角</option>-->
+<!--                                                </select>-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span class="must">*</span><span>识别度达:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input name="faceResolution" type="number" placeholder="" class="layui-input textAlign"-->
+<!--                                                       lay-verify="number|size" />-->
+<!--                                            </div>-->
+<!--                                            <div class="layui-form-mid layui-word-aux">%,时可进行开门</div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>活体检测:</span></label>-->
+<!--                                            <div class="layui-input-inline">-->
+<!--                                                <input type="radio" name="liveDetect" value="1" title="开启" >-->
+<!--                                                <input type="radio" name="liveDetect" value="2" title="关闭" >-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
+<!--                                <div class="layui-form-item">-->
+<!--                                    <div class="layui-input-block">-->
+<!--                                        <button class="layui-btn" lay-submit lay-filter="entity_submit_event" value="addOptions">提交</button>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
                     </div>
                 </div>
             </div>

+ 298 - 298
sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-info.html

@@ -19,113 +19,113 @@
                     <div class="layui-tab layui-tab-card">
                         <ul class="layui-tab-title">
                             <li class="layui-this">基本设备信息</li>
-                            <li>远程设备信息</li>
+<!--                            <li>远程设备信息</li>-->
                         </ul>
                         <div class="layui-tab-content">
                             <div style="display: flex;justify-content: center;">
-                                <button type="button" lay-submit="" lay-filter="obtainInfo" sptg:security="device:info:obtain"
-                                        class="layui-btn layui-btn-primary layui-btn-sm">远程设备信息获取
-                                </button>
-                                <button type="button" lay-submit="" lay-filter="refresh" class="layui-btn layui-btn-primary layui-btn-sm">
-                                    <i class="layui-icon layui-icon-refresh"></i>
-                                </button>
+<!--                                <button type="button" lay-submit="" lay-filter="obtainInfo" sptg:security="device:info:obtain"-->
+<!--                                        class="layui-btn layui-btn-primary layui-btn-sm">远程设备信息获取-->
+<!--                                </button>-->
+<!--                                <button type="button" lay-submit="" lay-filter="refresh" class="layui-btn layui-btn-primary layui-btn-sm">-->
+<!--                                    <i class="layui-icon layui-icon-refresh"></i>-->
+<!--                                </button>-->
                             </div>
                             <div class="layui-tab-item layui-show">
                             <div id="device_info"></div>
                             </div>
-                            <div class="layui-tab-item">
-                                <fieldset class="layui-elem-field">
-                                    <legend>远程设备信息</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>设备序列号:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.serialNumber}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>远程设备IP:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.remoteIp}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>远程设备端口:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.remotePort}:'未知'"></span></div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>摄像头型号:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.cameraModel}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>流量卡IMEI码:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.imei}:'未知'"></span></div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>屏幕亮度:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.screenBrightness}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>声音大小:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.volume}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>人脸识别度:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.faceThreshold} + '%,时可进行开门':'未知'"></span></div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>定时开关屏:</span></label>
-                                            <div th:switch="${deviceRemoteInfo} != null">
-                                                <div class="layui-input-inline">
-                                                    <div th:case="true" >
-                                                        <div th:switch="${deviceRemoteInfo.timingOpenScreen}">
-                                                            <span class="layui-badge layui-bg-green" style="margin-top: 10px;" th:case="1">开启</span>
-                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="2">关闭</span>
-                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="*">未知</span>
-                                                        </div>
-                                                    </div>
-                                                    <div th:case="false"><span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span></div>
-                                                </div>
-                                            </div>
-                                            <label class="layui-form-label"><span>活体检测:</span></label>
-                                            <div th:switch="${deviceRemoteInfo} != null">
-                                                <div class="layui-input-inline">
-                                                    <div th:case="true" >
-                                                        <div th:switch="${deviceRemoteInfo.liveDetect}">
-                                                            <span class="layui-badge layui-bg-green" style="margin-top: 10px;" th:case="1">开启</span>
-                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="2">关闭</span>
-                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="*">未知</span>
-                                                        </div>
-                                                    </div>
-                                                    <div th:case="false"><span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span></div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>CPU温度:</span></label>
-                                            <div th:switch="${deviceRemoteInfo} != null">
-                                                <div class="layui-input-inline">
-                                                    <div th:case="true">
-                                                        <div th:switch="${deviceRemoteInfo.cpuTemperature} != null">
-                                                            <span class="layui-form-text" th:case="true" th:text="${deviceRemoteInfo.cpuTemperature} + '°C'"></span>
-                                                            <span class="layui-form-text" th:case="*">未知</span>
-                                                        </div>
-                                                    </div>
-                                                    <div th:case="*"><span class="layui-form-text">未知</span></div>
-                                                </div>
-                                            </div>
-                                            <label class="layui-form-label"><span>硬盘空间使用率:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.diskSpaceUsage} + '%':'未知'"></span></div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>设备门禁卡总数:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.cardTotal}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>设备人脸总数:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.faceTotal}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>设备禁用信息:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.disableInfo}:'未知'"></span></div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>设备当前版本:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.pkgVersion}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>恢复出厂的升级包版本:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.restorePkgVersion}:'未知'"></span></div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>创建时间:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${#dates.format(deviceRemoteInfo.createDate,'yyyy-MM-dd HH:mm:ss')}:'未知'"></span></div>
-                                            <label class="layui-form-label"><span>更新时间:</span></label>
-                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${#dates.format(deviceRemoteInfo.updateDate,'yyyy-MM-dd HH:mm:ss')}:'未知'"></span></div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                            </div>
+<!--                            <div class="layui-tab-item">-->
+<!--                                <fieldset class="layui-elem-field">-->
+<!--                                    <legend>远程设备信息</legend>-->
+<!--                                    <div class="layui-field-box">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>设备序列号:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.serialNumber}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>远程设备IP:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.remoteIp}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>远程设备端口:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.remotePort}:'未知'"></span></div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>摄像头型号:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.cameraModel}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>流量卡IMEI码:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.imei}:'未知'"></span></div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>屏幕亮度:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.screenBrightness}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>声音大小:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.volume}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>人脸识别度:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.faceThreshold} + '%,时可进行开门':'未知'"></span></div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>定时开关屏:</span></label>-->
+<!--                                            <div th:switch="${deviceRemoteInfo} != null">-->
+<!--                                                <div class="layui-input-inline">-->
+<!--                                                    <div th:case="true" >-->
+<!--                                                        <div th:switch="${deviceRemoteInfo.timingOpenScreen}">-->
+<!--                                                            <span class="layui-badge layui-bg-green" style="margin-top: 10px;" th:case="1">开启</span>-->
+<!--                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="2">关闭</span>-->
+<!--                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="*">未知</span>-->
+<!--                                                        </div>-->
+<!--                                                    </div>-->
+<!--                                                    <div th:case="false"><span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span></div>-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>活体检测:</span></label>-->
+<!--                                            <div th:switch="${deviceRemoteInfo} != null">-->
+<!--                                                <div class="layui-input-inline">-->
+<!--                                                    <div th:case="true" >-->
+<!--                                                        <div th:switch="${deviceRemoteInfo.liveDetect}">-->
+<!--                                                            <span class="layui-badge layui-bg-green" style="margin-top: 10px;" th:case="1">开启</span>-->
+<!--                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="2">关闭</span>-->
+<!--                                                            <span class="layui-badge layui-bg-black" style="margin-top: 10px;" th:case="*">未知</span>-->
+<!--                                                        </div>-->
+<!--                                                    </div>-->
+<!--                                                    <div th:case="false"><span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span></div>-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>CPU温度:</span></label>-->
+<!--                                            <div th:switch="${deviceRemoteInfo} != null">-->
+<!--                                                <div class="layui-input-inline">-->
+<!--                                                    <div th:case="true">-->
+<!--                                                        <div th:switch="${deviceRemoteInfo.cpuTemperature} != null">-->
+<!--                                                            <span class="layui-form-text" th:case="true" th:text="${deviceRemoteInfo.cpuTemperature} + '°C'"></span>-->
+<!--                                                            <span class="layui-form-text" th:case="*">未知</span>-->
+<!--                                                        </div>-->
+<!--                                                    </div>-->
+<!--                                                    <div th:case="*"><span class="layui-form-text">未知</span></div>-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                            <label class="layui-form-label"><span>硬盘空间使用率:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.diskSpaceUsage} + '%':'未知'"></span></div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>设备门禁卡总数:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.cardTotal}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>设备人脸总数:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.faceTotal}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>设备禁用信息:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.disableInfo}:'未知'"></span></div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>设备当前版本:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.pkgVersion}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>恢复出厂的升级包版本:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${deviceRemoteInfo.restorePkgVersion}:'未知'"></span></div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label"><span>创建时间:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${#dates.format(deviceRemoteInfo.createDate,'yyyy-MM-dd HH:mm:ss')}:'未知'"></span></div>-->
+<!--                                            <label class="layui-form-label"><span>更新时间:</span></label>-->
+<!--                                            <div class="layui-input-inline"><span class="layui-form-text" th:text="${deviceRemoteInfo}?${#dates.format(deviceRemoteInfo.updateDate,'yyyy-MM-dd HH:mm:ss')}:'未知'"></span></div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </fieldset>-->
+<!--                            </div>-->
                         </div>
                     </div>
                 </div>
@@ -154,22 +154,22 @@
                     <label class="layui-form-label"><span>设备序列号:</span></label>
                     <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.serialNumber }}</span></div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>设备厂商:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  layui.each(d.data.deviceFactoryDict, function(index, item){ }}
-                            {{#  if(d.data.deviceFactory == item.dictKey){ }}
-                            <span class="layui-badge layui-bg-blue" style="margin-top: 10px;">{{ item.dictValue }}</span>
-                        {{#  } }}
-                        {{#  }); }}
-                    </div>
-                    <label class="layui-form-label"><span>设备型号:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{ null == d.data.deviceModelNumber ? '未知' : d.data.deviceModelNumber }}</span></div>
-                    <label class="layui-form-label"><span>设备版本号:</span></label>
-                    <div class="layui-input-inline">
-                        <span class="layui-form-text">{{ null == d.data.versionNumber ? '未知' : d.data.versionNumber }}</span>
-                    </div>
-                </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>设备厂商:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  layui.each(d.data.deviceFactoryDict, function(index, item){ }}-->
+<!--                            {{#  if(d.data.deviceFactory == item.dictKey){ }}-->
+<!--                            <span class="layui-badge layui-bg-blue" style="margin-top: 10px;">{{ item.dictValue }}</span>-->
+<!--                        {{#  } }}-->
+<!--                        {{#  }); }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>设备型号:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{ null == d.data.deviceModelNumber ? '未知' : d.data.deviceModelNumber }}</span></div>-->
+<!--                    <label class="layui-form-label"><span>设备版本号:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        <span class="layui-form-text">{{ null == d.data.versionNumber ? '未知' : d.data.versionNumber }}</span>-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="layui-form-item">
                     <label class="layui-form-label"><span>创建人:</span></label>
                     <div class="layui-input-inline">
@@ -206,188 +206,188 @@
                 </div>
             </div>
         </fieldset>
-        <fieldset class="layui-elem-field">
-            <legend>基本配置</legend>
-            <div class="layui-field-box">
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>设备尺寸:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.size ? d.data.size + '寸' : '未知'}}</span></div>
-                    <label class="layui-form-label"><span>屏幕亮度:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.screenBrightness : '未知' }}</span></div>
-                    <label class="layui-form-label"><span>通话音量:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.callVolume : '未知' }}</span></div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>开门密码:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.openDoorPwd : '未知' }}</span></div>
-                    <label class="layui-form-label"><span>管理密码:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.adminPwd : '未知' }}</span></div>
-                    <label class="layui-form-label"><span>开门时长:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.delay + 's' : '未知' }}</span></div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>显示姓名:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.options ? d.data.options.isShowUsername == 1 : '未知'){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">显示</span>
-                        {{#  } else if(d.data.options ? d.data.options.isShowUsername == 2 : '未知') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不显示</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>启用策略:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.timeStrategyIsEnable == 1){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">是</span>
-                        {{#  } else if(d.data.timeStrategyIsEnable == 2) { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">否</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>设备朝向:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.isOut == 1){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">进</span>
-                        {{#  } else if(d.data.isOut == 2) { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">出</span>
-                        {{#  } }}
-                    </div>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset class="layui-elem-field">
-            <legend>广告信息</legend>
-            <div class="layui-field-box">
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>广告音量:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{d.data.options ?  d.data.options.adVolume : '未知' }}</span></div>
-                    <label class="layui-form-label"><span>广告播放模式:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(!d.data.options){ }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span>
-                        {{#  } else if(d.data.options.playModel == '1') { }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">循环播放</span>
-                        {{#  } else if(d.data.options.playModel == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">靠近播放</span>
-                        {{#  } else if(d.data.options.playModel == '3') { }}
-                        <span class="layui-badge layui-bg-blue" style="margin-top: 10px;">按性别和年龄播放</span>
-                        {{#  } }}
-                    </div>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset class="layui-elem-field">
-            <legend>设备功能</legend>
-            <div class="layui-field-box">
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>是否支持门禁卡片功能:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.haveCard == '1'){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>
-                        {{#  } else if(d.data.haveCard == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>是否支持人脸识别功能:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.haveFace == '1'){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>
-                        {{#  } else if(d.data.haveFace == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>是否支持视频通话功能:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.haveCall == '1'){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>
-                        {{#  } else if(d.data.haveCall == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>
-                        {{#  } }}
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>是否支持视频通话功能:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.haveCall == '1'){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>
-                        {{#  } else if(d.data.haveCall == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>是否支持一键重启功能:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.reboot == '1'){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>
-                        {{#  } else if(d.data.reboot == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>
-                        {{#  } }}
-                    </div>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset class="layui-elem-field">
-            <legend>人脸识别功能信息</legend>
-            <div class="layui-field-box">
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>活体检测:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(!d.data.options){ }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span>
-                        {{#  } else if(d.data.options.liveDetect == '1') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">开启</span>
-                        {{#  } else if(d.data.options.liveDetect == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">关闭</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>识别框位置:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(!d.data.options){ }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span>
-                        {{#  } else if(d.data.options.discernBoxPosition == '1') { }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">左上角</span>
-                        {{#  } else if(d.data.options.discernBoxPosition == '2') { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">左下角</span>
-                        {{#  } else if(d.data.options.discernBoxPosition == '3') { }}
-                        <span class="layui-badge layui-bg-blue" style="margin-top: 10px;">中间位置</span>
-                        {{#  } else if(d.data.options.discernBoxPosition == '4') { }}
-                        <span class="layui-badge layui-bg-cyan" style="margin-top: 10px;">右下角</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label" style="padding-right: 0px"><span>识别度达:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{d.data.options ? d.data.options.fillLight + '%,时可进行开门' : '未知'}}</span></div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>补光灯亮度:</span></label>
-                    <div class="layui-input-inline"><span class="layui-form-text">{{d.data.options ? d.data.options.fillLight : '未知' }}</span></div>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset class="layui-elem-field">
-            <legend>流量卡信息</legend>
-            <div class="layui-field-box">
-                <div class="layui-form-item">
-                    <label class="layui-form-label"><span>绑定状态:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.flowCardId != null){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">已绑定</span>
-                        {{#  } else { }}
-                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未绑定</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>流量卡卡号:</span></label>
-                    <div class="layui-input-inline">
-                        {{#  if(d.data.flowCardId != null){ }}
-                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">{{ d.data.flowCardNum }}</span>
-                        {{#  } else { }}
-                        <span class="layui-badge layui-bg-red" style="margin-top: 10px;">未绑定</span>
-                        {{#  } }}
-                    </div>
-                    <label class="layui-form-label"><span>流量卡有效期:</span></label>
-                    <div class="layui-input-inline" style="width: 300px">
-                        <span class="layui-form-text">{{ d.data.flowCardBeginDate != null ? layui.util.toDateString(d.data.flowCardBeginDate,"yyyy-MM-dd HH:mm:ss") : ""}}
-                            - {{ d.data.flowCardEndDate != null ? layui.util.toDateString(d.data.flowCardEndDate,"yyyy-MM-dd HH:mm:ss") : "" }}</span>
-                    </div>
-                </div>
-            </div>
-        </fieldset>
+<!--        <fieldset class="layui-elem-field">-->
+<!--            <legend>基本配置</legend>-->
+<!--            <div class="layui-field-box">-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>设备尺寸:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.size ? d.data.size + '寸' : '未知'}}</span></div>-->
+<!--                    <label class="layui-form-label"><span>屏幕亮度:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.screenBrightness : '未知' }}</span></div>-->
+<!--                    <label class="layui-form-label"><span>通话音量:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.callVolume : '未知' }}</span></div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>开门密码:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.openDoorPwd : '未知' }}</span></div>-->
+<!--                    <label class="layui-form-label"><span>管理密码:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.adminPwd : '未知' }}</span></div>-->
+<!--                    <label class="layui-form-label"><span>开门时长:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{ d.data.options ? d.data.options.delay + 's' : '未知' }}</span></div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>显示姓名:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.options ? d.data.options.isShowUsername == 1 : '未知'){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">显示</span>-->
+<!--                        {{#  } else if(d.data.options ? d.data.options.isShowUsername == 2 : '未知') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不显示</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>启用策略:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.timeStrategyIsEnable == 1){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">是</span>-->
+<!--                        {{#  } else if(d.data.timeStrategyIsEnable == 2) { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">否</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>设备朝向:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.isOut == 1){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">进</span>-->
+<!--                        {{#  } else if(d.data.isOut == 2) { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">出</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </fieldset>-->
+<!--        <fieldset class="layui-elem-field">-->
+<!--            <legend>广告信息</legend>-->
+<!--            <div class="layui-field-box">-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>广告音量:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{d.data.options ?  d.data.options.adVolume : '未知' }}</span></div>-->
+<!--                    <label class="layui-form-label"><span>广告播放模式:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(!d.data.options){ }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span>-->
+<!--                        {{#  } else if(d.data.options.playModel == '1') { }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">循环播放</span>-->
+<!--                        {{#  } else if(d.data.options.playModel == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">靠近播放</span>-->
+<!--                        {{#  } else if(d.data.options.playModel == '3') { }}-->
+<!--                        <span class="layui-badge layui-bg-blue" style="margin-top: 10px;">按性别和年龄播放</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </fieldset>-->
+<!--        <fieldset class="layui-elem-field">-->
+<!--            <legend>设备功能</legend>-->
+<!--            <div class="layui-field-box">-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>是否支持门禁卡片功能:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.haveCard == '1'){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>-->
+<!--                        {{#  } else if(d.data.haveCard == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>是否支持人脸识别功能:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.haveFace == '1'){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>-->
+<!--                        {{#  } else if(d.data.haveFace == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>是否支持视频通话功能:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.haveCall == '1'){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>-->
+<!--                        {{#  } else if(d.data.haveCall == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>是否支持视频通话功能:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.haveCall == '1'){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>-->
+<!--                        {{#  } else if(d.data.haveCall == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>是否支持一键重启功能:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.reboot == '1'){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">支持</span>-->
+<!--                        {{#  } else if(d.data.reboot == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">不支持</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </fieldset>-->
+<!--        <fieldset class="layui-elem-field">-->
+<!--            <legend>人脸识别功能信息</legend>-->
+<!--            <div class="layui-field-box">-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>活体检测:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(!d.data.options){ }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span>-->
+<!--                        {{#  } else if(d.data.options.liveDetect == '1') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">开启</span>-->
+<!--                        {{#  } else if(d.data.options.liveDetect == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">关闭</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>识别框位置:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(!d.data.options){ }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未知</span>-->
+<!--                        {{#  } else if(d.data.options.discernBoxPosition == '1') { }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">左上角</span>-->
+<!--                        {{#  } else if(d.data.options.discernBoxPosition == '2') { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">左下角</span>-->
+<!--                        {{#  } else if(d.data.options.discernBoxPosition == '3') { }}-->
+<!--                        <span class="layui-badge layui-bg-blue" style="margin-top: 10px;">中间位置</span>-->
+<!--                        {{#  } else if(d.data.options.discernBoxPosition == '4') { }}-->
+<!--                        <span class="layui-badge layui-bg-cyan" style="margin-top: 10px;">右下角</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label" style="padding-right: 0px"><span>识别度达:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{d.data.options ? d.data.options.fillLight + '%,时可进行开门' : '未知'}}</span></div>-->
+<!--                </div>-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>补光灯亮度:</span></label>-->
+<!--                    <div class="layui-input-inline"><span class="layui-form-text">{{d.data.options ? d.data.options.fillLight : '未知' }}</span></div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </fieldset>-->
+<!--        <fieldset class="layui-elem-field">-->
+<!--            <legend>流量卡信息</legend>-->
+<!--            <div class="layui-field-box">-->
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label"><span>绑定状态:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.flowCardId != null){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">已绑定</span>-->
+<!--                        {{#  } else { }}-->
+<!--                        <span class="layui-badge layui-bg-black" style="margin-top: 10px;">未绑定</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>流量卡卡号:</span></label>-->
+<!--                    <div class="layui-input-inline">-->
+<!--                        {{#  if(d.data.flowCardId != null){ }}-->
+<!--                        <span class="layui-badge layui-bg-green" style="margin-top: 10px;">{{ d.data.flowCardNum }}</span>-->
+<!--                        {{#  } else { }}-->
+<!--                        <span class="layui-badge layui-bg-red" style="margin-top: 10px;">未绑定</span>-->
+<!--                        {{#  } }}-->
+<!--                    </div>-->
+<!--                    <label class="layui-form-label"><span>流量卡有效期:</span></label>-->
+<!--                    <div class="layui-input-inline" style="width: 300px">-->
+<!--                        <span class="layui-form-text">{{ d.data.flowCardBeginDate != null ? layui.util.toDateString(d.data.flowCardBeginDate,"yyyy-MM-dd HH:mm:ss") : ""}}-->
+<!--                            - {{ d.data.flowCardEndDate != null ? layui.util.toDateString(d.data.flowCardEndDate,"yyyy-MM-dd HH:mm:ss") : "" }}</span>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </fieldset>-->
         <fieldset class="layui-elem-field">
             <legend>备注</legend>
             <div class="layui-field-box">

+ 1 - 1
sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-manage.html

@@ -160,7 +160,7 @@
                 {{# } }}
                 {{#  if(d.deviceFactory == 'ZONGHENG'){ }}
                     <li> <a  lay-event="edit" sptg:security="device:info:update">修改</a></li>
-                    <li> <a  lay-event="zhDataSyncFn" id="zhDataSyncFn"  sptg:security="device:data:sync">数据同步</a></li>
+<!--                    <li> <a  lay-event="zhDataSyncFn" id="zhDataSyncFn"  sptg:security="device:data:sync">数据同步</a></li>-->
                 {{# } }}
                     <!--<li> <a  lay-event="edit" sptg:security="device:info:update">修改</a></li>-->
                     <!--<li> <a  lay-event="relate" sptg:security="device:info:relate">关联小区</a></li>-->