diff --git a/src/assets/img/technologies/EXPRESS.png b/src/assets/img/technologies/EXPRESS.png
new file mode 100644
index 00000000..70c31447
Binary files /dev/null and b/src/assets/img/technologies/EXPRESS.png differ
diff --git a/src/assets/img/technologies/SPRINGWEBFLUX.png b/src/assets/img/technologies/SPRINGWEBFLUX.png
new file mode 100755
index 00000000..92cbd91b
Binary files /dev/null and b/src/assets/img/technologies/SPRINGWEBFLUX.png differ
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index a9b72b0b..e6342930 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -111,6 +111,8 @@ const msg = {
noRoot: "Please set a root dashboard for",
noWidget: "Please add widgets.",
rename: "Rename",
+ deleteTitle: "Are you sure to delete this?",
+ rootTitle: "Are you sure to set this?",
selfObservability: "Self Observability",
satellite: "Satellite",
skyWalkingServer: "SkyWalking Server",
@@ -197,7 +199,7 @@ const msg = {
dayCutTip: "Last 1 day",
weekCutTip: "Last 1 week",
monthCutTip: "Last 1 month",
- serverZone: "Server Zone",
+ serverZone: "OAP Server Time Zone",
exportImage: "Export image",
object: "Object",
profile: "Profile",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index c24ae25b..476dd473 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -109,6 +109,8 @@ const msg = {
showGroup: "显示分组",
noWidget: "请添加组件",
rename: "重命名",
+ deleteTitle: "确定删除吗?",
+ rootTitle: "确定设置为Root吗?",
selfObservability: "自监控",
satellite: "Satellite",
skyWalkingServer: "SkyWalking服务",
@@ -199,7 +201,7 @@ const msg = {
dayCutTip: "最近1天",
weekCutTip: "最近1周",
monthCutTip: "最近1月",
- serverZone: "服务器时区",
+ serverZone: "OAP Server 时区",
exportImage: "导出为图片",
object: "粒度",
profile: "性能剖析",
diff --git a/src/views/Log.vue b/src/views/Log.vue
deleted file mode 100644
index af188897..00000000
--- a/src/views/Log.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- {{ props.msg }}
-
-
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index fd71c902..53ccb04a 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -177,8 +177,8 @@ const setUTCMin = () => {
}
.settings {
- color: #222;
- font-size: 14px;
+ color: #606266;
+ font-size: 13px;
padding: 20px;
.item {
@@ -195,9 +195,10 @@ const setUTCMin = () => {
}
.label {
- width: 100px;
+ width: 160px;
display: inline-block;
font-weight: 500;
+ color: #000;
}
}
diff --git a/src/views/dashboard/List.vue b/src/views/dashboard/List.vue
index 14d1ac59..74e654c4 100644
--- a/src/views/dashboard/List.vue
+++ b/src/views/dashboard/List.vue
@@ -51,12 +51,12 @@ limitations under the License. -->
- {{
- scope.row.name
- }}
+
+ {{ scope.row.name }}
+
-
+
@@ -74,7 +74,7 @@ limitations under the License. -->
{{ t("rename") }}
@@ -84,7 +84,7 @@ limitations under the License. -->
-
+
{{ scope.row.isRoot ? t("setNormal") : t("setRoot") }}
diff --git a/tests/unit/example.spec.ts b/tests/unit/example.spec.ts
index 5c783c43..9438cda0 100644
--- a/tests/unit/example.spec.ts
+++ b/tests/unit/example.spec.ts
@@ -14,15 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { shallowMount } from "@vue/test-utils";
-import Log from "@/views/Log.vue";
-describe("Log.vue", () => {
+describe("My First Test", () => {
it("renders props.msg when passed", () => {
const msg = "new message";
- const wrapper = shallowMount(Log, {
- props: { msg },
- });
- expect(wrapper.text()).toMatch(msg);
+ console.log(msg);
});
});