From 5dfed3ca0e7246431e0dc6c1b49f914fe1ea347f Mon Sep 17 00:00:00 2001
From: cj <545665592@qq.com>
Date: Wed, 24 Apr 2019 15:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E6=9C=BA?=
 =?UTF-8?q?=E5=99=A8=E6=93=8D=E4=BD=9C=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E5=90=A6=E6=98=AF=E4=B8=BA=E8=99=9A=E6=9C=BA=E7=9A=84=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E4=B8=8D=E9=80=89=E4=B8=AD=E6=98=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/WEB-INF/jsp/manage/machine/addMachine.jsp   | 2 +-
 .../src/main/webapp/WEB-INF/jsp/manage/machine/machineList.jsp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/addMachine.jsp b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/addMachine.jsp
index 656f8da3..48e06581 100644
--- a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/addMachine.jsp
+++ b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/addMachine.jsp
@@ -67,7 +67,7 @@
                                             <option value="0" <c:if test="${machine.info.virtual == 0}">selected="selected"</c:if>>
                                                 否
                                             </option>
-                                            <option value="1" <c:if test="${machine.info.virtual == 2}">selected="selected"</c:if>>
+                                            <option value="1" <c:if test="${machine.info.virtual == 1}">selected="selected"</c:if>>
                                                 是
                                             </option>
                                         </select>
diff --git a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/machineList.jsp b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/machineList.jsp
index dec0f63a..a325858c 100644
--- a/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/machineList.jsp
+++ b/cachecloud-open-web/src/main/webapp/WEB-INF/jsp/manage/machine/machineList.jsp
@@ -204,7 +204,7 @@
                                         <td>
                                         	<a href="/server/index.do?ip=${machine.info.ip}" class="btn btn-info" target="_blank">监控</a>
                                         	&nbsp;
-                                            <a href="javascript;" data-target="#addMachineModal${machine.info.id}" class="btn btn-info" data-toggle="modal">修改</a>
+                                            <a href="javascript:void(0);" data-target="#addMachineModal${machine.info.id}" class="btn btn-info" data-toggle="modal">修改</a>
                                             &nbsp;
                                             
                                             <button id="removeMachineBtn${machine.info.id}" onclick="removeMachine(this.id,'${machine.info.ip}')" type="button" class="btn btn-info">删除</button>