From 5e59e17e798d33f781ee60dd937951f8b10a28e4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 4 Apr 2020 19:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=A8=E7=A6=81=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machineManage/machineManage.html          | 137 ++++++++++--------
 .../resourceStoreManage.html                  |   4 +-
 2 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/public/components/machineManage/machineManage.html b/public/components/machineManage/machineManage.html
index 03bd487b1..21b5644bf 100644
--- a/public/components/machineManage/machineManage.html
+++ b/public/components/machineManage/machineManage.html
@@ -1,18 +1,20 @@
-<div  class="animated fadeInRight ecommerce">
+<div class="animated fadeInRight ecommerce">
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;" v-on:click="_moreCondition()">{{machineManageInfo.moreCondition == true?'隐藏':'更多'}}</button>
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                            v-on:click="_moreCondition()">{{machineManageInfo.moreCondition == true?'隐藏':'更多'}}</button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入设备编码" v-model="machineManageInfo.conditions.machineCode" class=" form-control">
+                                <input type="text" placeholder="请输入设备编码"
+                                    v-model="machineManageInfo.conditions.machineCode" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4">
@@ -24,7 +26,8 @@
                             </select></div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入设备名称" v-model="machineManageInfo.conditions.machineName" class=" form-control">
+                                <input type="text" placeholder="请输入设备名称"
+                                    v-model="machineManageInfo.conditions.machineName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-1">
@@ -36,12 +39,14 @@
                     <div class="row">
                         <div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入设备IP" v-model="machineManageInfo.conditions.machineIp" class=" form-control">
+                                <input type="text" placeholder="请输入设备IP"
+                                    v-model="machineManageInfo.conditions.machineIp" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入设备MAC" v-model="machineManageInfo.conditions.machineMac" class=" form-control">
+                                <input type="text" placeholder="请输入设备MAC"
+                                    v-model="machineManageInfo.conditions.machineMac" class=" form-control">
                             </div>
                         </div>
                     </div>
@@ -65,66 +70,73 @@
                 </div>
                 <div class="ibox-content">
 
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <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">方向</th>
-                            <th class="text-center">状态</th>
-                            <th class="text-center">时间</th>
-<!--                            <th class="text-center">设备MAC</th>-->
-                            <th class="text-center">操作</th>
+                            <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">方向</th>
+                                <th class="text-center">状态</th>
+                                <th class="text-center">时间</th>
+                                <!--                            <th class="text-center">设备MAC</th>-->
+                                <th class="text-right">操作</th>
 
-                        </tr>
+                            </tr>
                         </thead>
                         <tbody>
-                        <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.machineName}}</td>
-                            <td class="text-center">{{machine.machineTypeCdName}}</td>
-                            <td class="text-center">{{machine.locationObjName}}</td>
-                            <td class="text-center">{{machine.directionName}}</td>
-                            <td class="text-center">{{machine.stateName}}</td>
-                           <td class="text-center">{{machine.createTime}}</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>
-                                </div>
-                                <div class="btn-group">
-                                    <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="_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 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.machineName}}</td>
+                                <td class="text-center">{{machine.machineTypeCdName}}</td>
+                                <td class="text-center">{{machine.locationObjName}}</td>
+                                <td class="text-center">{{machine.directionName}}</td>
+                                <td class="text-center">{{machine.stateName}}</td>
+                                <td class="text-center">{{machine.createTime}}</td>
+                                <!--<td class="text-center">{{machine.machineMac}}</td>-->
+                                <td class="text-right">
+                                    <button class="btn-white btn btn-xs dropdown-toggle" data-toggle="dropdown"
+                                        aria-haspopup="true" aria-expanded="false">变更
+                                    </button>
+                                    <div class="dropdown-menu p-4 text-muted" style="max-width: 200px;">
+                                        <p style="margin:10px 0;">
+                                            <a href="javascript:void(0)"
+                                                v-on:click="_openEditMachineModel(machine)">修改设备</a>
+                                            <span>|</span>
+                                            <a href="javascript:void(0)"
+                                                v-on:click="_openDeleteMachineModel(machine)">删除设备</a>
+                                        </p>
+                                        <p style="margin:10px 0;">
+                                            <a href="javascript:void(0)"
+                                                v-on:click="_openRestartMachineModel(machine)">重启设备</a>
+                                            <span>|</span>
+                                            <a href="javascript:void(0)"
+                                                v-on:click="_openUpgradeMachineModel(machine)">升级设备</a>
+                                        </p>
+                                        <p style="margin:10px 0;">
+                                            <a href="javascript:void(0)"
+                                                v-on:click="_openForbiddenMachineModel(machine)">禁用设备</a>
+                                            <span>|</span>
 
-                        </tr>
+                                        </p>
+
+                                    </div>
+
+                                </td>
+
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
@@ -135,12 +147,9 @@
     </div>
 
 
-    <vc:create name="addMachine"
-               callBackListener=""
-               callBackFunction=""
-    ></vc:create>
+    <vc:create name="addMachine" callBackListener="" callBackFunction=""></vc:create>
     <vc:create name="editMachine"></vc:create>
     <vc:create name="deleteMachine"></vc:create>
     <vc:create name="machineState"></vc:create>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/resourceStoreManage/resourceStoreManage.html b/public/components/resourceStoreManage/resourceStoreManage.html
index ffd68ec1f..fbd34a9fb 100644
--- a/public/components/resourceStoreManage/resourceStoreManage.html
+++ b/public/components/resourceStoreManage/resourceStoreManage.html
@@ -65,7 +65,7 @@
                             <th class="text-center">物品编码</th>
                             <th class="text-center">物品价格</th>
                             <th class="text-center">物品库存</th>
-                            <th class="text-center">操作</th>
+                            <th class="text-right">操作</th>
 
 
                         </tr>
@@ -77,7 +77,7 @@
                             <td class="text-center">{{resourceStore.resCode}}</td>
                             <td class="text-center">{{resourceStore.price}}</td>
                             <td class="text-center">{{resourceStore.stock}}</td>
-                            <td class="text-center">
+                            <td class="text-right">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditResourceStoreModel(resourceStore)">修改