Merge branch 'master' of github.com:KubeOperator/ekko

Author: zhengkunwang223

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:14-alpine as stage-web-build
+FROM node:14.18.1 as stage-web-build
 
 LABEL stage=stage-web-build
 
-RUN apk add make python  gcc g++
+RUN apt-get install -y make python gcc g++
 
 WORKDIR /build/kubepi/web
 
@@ -12,7 +12,6 @@ RUN make build_web
 
 RUN rm -fr web
 
-
 FROM golang:1.16 as stage-bin-build
 
 ENV GOPROXY="https://goproxy.cn,direct"
@@ -27,7 +26,6 @@ WORKDIR /build/kubepi/bin
 
 COPY --from=stage-web-build /build/kubepi/web .
 
-
 RUN go mod download
 
 RUN make build_gotty
@@ -56,7 +54,6 @@ RUN ARCH=$(uname -m) && case $ARCH in aarch64) ARCH="arm64";; x86_64) ARCH="amd6
 
 COPY vimrc.local /etc/vim
 
-
 EXPOSE 80
 
 USER root

README.md

@@ -20,7 +20,7 @@ KubePi 允许管理员导入多个 Kubernetes 集群，并且通过权限控制
 
     sudo docker run --privileged -d --restart=unless-stopped -p 80:80 kubeoperator/kubepi-server
 
-打开浏览器访问http://localhost
+打开浏览器访问：http://localhost:80/
 
 ### 在线体验
 
@@ -41,7 +41,7 @@ KubePi 允许管理员导入多个 Kubernetes 集群，并且通过权限控制
 ### 致谢
 
 - [Vue](https://cn.vuejs.org) 前端框架
-- [FIT2CLOUD UI](https://github.com/fit2cloud-ui/fit2cloud-ui/) FIT2CLOUD UI组件库
+- [FIT2CLOUD UI](https://github.com/fit2cloud-ui/fit2cloud-ui/) FIT2CLOUD UI 组件库
 - [Vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) 项目脚手架
 
 ### License & Copyright

web/dashboard/src/business/network/services/index.vue

@@ -42,7 +42,13 @@
         <template v-slot:default="{row}">
           <div v-for="(value,key,index) in row.spec.ports" v-bind:key="index" type="info" size="mini">
             <span style="font-size: 12px" v-if="row.spec.type ==='NodePort'"> 
-              {{ value.port }} : {{ value.nodePort }} /{{ value.protocol }} ---> {{ value.targetPort }}
+              {{ value.port }}:{{ value.nodePort }}/{{ value.protocol }}
+            </span>
+            <span style="font-size: 12px" v-if="row.spec.type !=='NodePort' && value.port === value.targetPort"> 
+              {{ value.port }}/{{ value.protocol }}
+            </span>
+            <span style="font-size: 12px" v-if="row.spec.type !=='NodePort' && value.port !== value.targetPort"> 
+              {{ value.port }}:{{ value.targetPort }}/{{ value.protocol }}
             </span>
             <br>
           </div>