From aa76c2bb31ef151c977f9552282500260265961d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 5 Sep 2022 17:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmEnvList/XmEnvListMng.vue | 9 ++++++++-
 src/views/xm/core/xmMenu/XmMenuEdit.vue      | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index 8e3e9024..3fe4a691 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -15,7 +15,11 @@
 				<el-table-column prop="ipAddress" label="内网ip" min-width="80" ></el-table-column>
 				<el-table-column prop="port" label="内网端口" min-width="80" ></el-table-column>
 				<el-table-column prop="accessUserid" label="用户编号" min-width="80" ></el-table-column>
-				<el-table-column prop="accessUrl" label="访问链接" min-width="80" ></el-table-column>
+				<el-table-column prop="accessUrl" label="访问链接" min-width="80" >
+					<template slot-scope="scope">
+						<el-link @click="toAccessUrl(scope.row)">{{scope.row.accessUrl}}</el-link>
+					</template> 
+				</el-table-column>
 				<el-table-column prop="webIpAddress" label="外网ip" min-width="80" ></el-table-column>
 				<el-table-column prop="webPort" label="外网端口" min-width="80" ></el-table-column>
 				<el-table-column prop="envState" label="状态" min-width="80" >
@@ -239,6 +243,9 @@
 			},
 			rowClick: function(row, event, column){
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
+			},
+			toAccessUrl(row){
+				window.open(row.accessUrl,row.name,null,true)
 			}
 			/**begin 自定义函数请在下面加**/
 			
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 3e0b5359..085ee334 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -123,7 +123,8 @@
 							
 							<el-col :span="8">   
 								<mdp-field-x v-model="editForm.finishRate" label="进度"> 
-									<div slot="value" style="min-width:150px;"><el-progress  :percentage="editForm.finishRate"></el-progress></div>
+									<div slot="value" style="min-width:150px;"><el-progress  :percentage="editForm.finishRate?editForm.finishRate:0"></el-progress>
+									</div>
 									<div slot="oper"><el-button  @click="activateTabPaneName='2'" type="primary">查看工时</el-button><el-button  @click="activateTabPaneName='6'" type="primary">查看子工作项</el-button></div>
 								</mdp-field-x>  
 							</el-col>