Merge pull request #27 from TinyAllen/develop
merge from develop
diff --git a/README.md b/README.md
index fd59a4e..69c6aef 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@
### Running the docker image
```
-docker run -p 8080:80 -d -e SKYWALKING_URL=127.0.0.1:1234,127.0.0.1:1235 SKYWALKING_COMMON=127.0.0.1:8080,127.0.0.1:80801 rocketbot
+docker run -p 8080:80 -d -e SKYWALKING_URL=127.0.0.1:1234,127.0.0.1:1235 rocketbot
```
`SKYWALKING_URL` is the address of your backend, multiple IP is changed by comma.
diff --git a/config/index.js b/config/index.js
index ba9285f..ed45fb5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -12,8 +12,8 @@
assetsPublicPath: '/',
proxyTable: {
"/api":{
- target: "http://192.168.1.250:12800/",
- // target: "http://106.75.237.45:12800/",
+ // target: "http://192.168.1.250:12800/",
+ target: "http://106.75.237.45:12800/",
changeOrigin: true,
pathRewrite: (path) => {
return "/graphql"
diff --git a/src/views/containers/login.vue b/src/views/containers/login.vue
index 4d2be04..2b48f21 100644
--- a/src/views/containers/login.vue
+++ b/src/views/containers/login.vue
@@ -141,14 +141,14 @@
}
}
.rk-login-l{
- width: 75%;
+ width: 38.2%;
height: 100%;
display: table;
}
.rk-login-r{
position: relative;
height: 100%;
- width: 100%;
+ width: 61.8%;
background-color: #21272b;
overflow: hidden;
}
diff --git a/src/views/containers/trace-detail.vue b/src/views/containers/trace-detail.vue
index 55cd527..6b56e93 100644
--- a/src/views/containers/trace-detail.vue
+++ b/src/views/containers/trace-detail.vue
@@ -27,7 +27,7 @@
<div v-for="(i, index) in this.currentSpan.logs" :key="index">
<div class="mb10 sm"><span class="mr10">Time:</span><span class="grey">{{i.time | dateformat}}</span></div>
<div class="mb15" v-for="(_i, _index) in i.data" :key="_index">
- <span class="one-fifth">{{_i.key}}:</span><pre class="four-fifth mt0 mb0" style="font-sizeļ¼12px;overflow:auto">{{_i.value}}</pre>
+ <span class="one-fifth">{{_i.key}}:</span><pre class="four-fifth mt0 mb0" style="font-size:12px;overflow:auto">{{_i.value}}</pre>
</div>
</div>
</div>
