优化其他小区添加

wuxw

2019-12-22 5d09d7360dc19afeba2c117774bcfea20e917d55

 WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html

@@ -18,7 +18,7 @@
                        <div class="col-sm-4">
                            <select class="custom-select" v-model="machineManageInfo.conditions.machineTypeCd">
                                <option selected value="">请选择设备类型</option>
                                <option value="9999">锐目门禁</option>
                                <option value="992019111002270001">锐目门禁</option>
                                <option value="9998">其他</option>
                            </select></div>
                        <div class="col-sm-3">
@@ -71,15 +71,14 @@
                        <tr>
                            <!--<th class="text-center">设备ID</th>-->
                            <th class="text-center">设备编码</th>
                            <th class="text-center">版本号</th>
                            <!--<th class="text-center">版本号</th>-->
                            <th class="text-center">设备名称</th>
                            <th class="text-center">设备类型</th>
                            <th class="text-center">设备IP</th>
                            <th class="text-center">设备MAC</th>
                            <th class="text-center">设备位置</th>

                            <th class="text-center">状态</th>
<!--                            <th class="text-center">设备IP</th>-->
<!--                            <th class="text-center">设备MAC</th>-->
                            <th class="text-center">操作</th>


                        </tr>
                        </thead>
@@ -87,12 +86,13 @@
                        <tr v-for="machine in machineManageInfo.machines">
                            <!--<td class="text-center">{{machine.machineId}}</td>-->
                            <td class="text-center">{{machine.machineCode}}</td>
                            <td class="text-center">{{machine.machineVersion}}</td>
                            <!--<td class="text-center">{{machine.machineVersion}}</td>-->
                            <td class="text-center">{{machine.machineName}}</td>
                            <td class="text-center">{{machine.machineTypeCdName}}</td>
                            <td class="text-center">{{machine.machineIp}}</td>
                            <td class="text-center">{{machine.machineMac}}</td>
                            <td class="text-center">{{machine.machineMac}}</td>
                            <td class="text-center">{{machine.locationObjName}}</td>
                            <td class="text-center">{{machine.stateName}}</td>
                           <!-- <td class="text-center">{{machine.machineIp}}</td>
                            <td class="text-center">{{machine.machineMac}}</td>-->
                            <td class="text-center">
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openEditMachineModel(machine)">修改</button>
@@ -101,8 +101,17 @@
                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteMachineModel(machine)">删除</button>
                                </div>
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openMachineDetailModel(machine)">详情</button>
                                    <button class="btn-white btn btn-xs" v-on:click="_openRestartMachineModel(machine)">重启</button>
                                </div>
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openUpgradeMachineModel(machine)">升级</button>
                                </div>
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openForbiddenMachineModel(machine)">禁用</button>
                                </div>
                                <!--<div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openMachineDetailModel(machine)">详情</button>
                                </div>-->
                            </td>

                        </tr>
@@ -129,5 +138,6 @@
    ></vc:create>
    <vc:create name="editMachine"></vc:create>
    <vc:create name="deleteMachine"></vc:create>
    <vc:create name="machineState"></vc:create>

</div>