-
@@ -253,7 +253,6 @@ export default defineComponent({
const createEditor = () => {
if (!wysiwyg_editor.value) {
throw "wysiwyg_editor is null";
- return;
}
const fontOptions: number[] = [9, 11, 13, 17];
diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue
new file mode 100644
index 0000000..8e55318
--- /dev/null
+++ b/src/components/SystemSettingDialog.vue
@@ -0,0 +1,567 @@
+
+
+
+
+
+
+ {{ $t("system setting") }}
+
+
+
+
+
+ {{ $t("close") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t("auto ip") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("ip address") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("gateway") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("netmask") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("mac address") + ":"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t("brightness") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("contrast") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("hue") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("device resolution") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("output board resolution") + ":"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t("use ntp") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("ntp server") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("ntp sync delay(S)") + ":"
+ }}
+
+
+
+
+
+ {{
+ $t("current datetime") + ":"
+ }}
+
+
+
+
+
+
+
+
+ {{
+ $t("time zone") + ":"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/entities/ApplicationConfigEntity.ts b/src/entities/ApplicationConfigEntity.ts
index a7094bc..6d5475a 100644
--- a/src/entities/ApplicationConfigEntity.ts
+++ b/src/entities/ApplicationConfigEntity.ts
@@ -1,7 +1,13 @@
export default class ApplicationConfigEntity {
+ auto_ip_address: string = "";
gateway: string = "";
mac_address: string = "";
- network_mask: string = "";
+ subnet_mask: string = "";
+ ip_address: string = "";
+ use_ntp: string = "";
+ ntp_server: string = "";
+ ntp_sync_delay: string = "";
+ time_zone: string = "";
wall_row: number = 1;
wall_col: number = 1;
screen_width: number = 1;
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index cc4637b..69dd7cb 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -118,6 +118,7 @@ export default {
"local disk": "本地磁盘",
usb: "U盘",
"Please input vaild ip address": "请输入合法的IP地址",
+ "Please input vaild mac address": "请输入合法的MAC地址",
"server ip address": "服务器地址",
"please input server ip address": "请输入服务器地址",
mode: "模式",
@@ -172,4 +173,58 @@ export default {
"editor error": "富文本编辑器内部错误",
"Exit Fullscreen": "退出全屏",
"Go Fullscreen": "全屏",
+ logout: "注销",
+ "system setting": "系统设置",
+ "network setting": "网络设置",
+ "graphics setting": "图像设置",
+ "other setting": "其它设置",
+ "UTC-12(Central Pacific)": "UTC-12(太平洋中部)",
+ "UTC-11(Central Pacific)": "UTC-11(太平洋中部)",
+ "UTC-10(Honolulu of USA)": "UTC-10(美国檀香山)",
+ "UTC-9(Alaska of USA)": "UTC-9 (美国阿拉斯加州)",
+ "UTC-8(California of USA)": "UTC-8 (美国加里福利亚州)",
+ "UTC-7(Phoenix of USA, Arizona of USA)": "UTC-7 (美国亚利桑那州,菲尼克斯)",
+ "UTC-6(Chicago of USA, Mexico)": "UTC-6 (美国芝加哥,墨西哥)",
+ "UTC-5(New York of USA)": "UTC-5 (美国纽约)",
+ "UTC-4(Republic of Chile)": "UTC-4 (智利共和国)",
+ "UTC-3(Brazil, Argentina)": "UTC-3 (巴西,阿根廷)",
+ "UTC-2(Mid Atlantic)": "UTC-2 (大西洋中部)",
+ "UTC-1(West African continent)": "UTC-1 (非洲大陆西)",
+ "UTC(England, Portugal)": "UTC (英国,葡萄牙)",
+ "UTC+1(Spain, France, Germany, ...)": "UTC+1 (西班牙,法国,德国)",
+ "UTC+2(Turkey, South Africa, Rome, Egypt, ...)":
+ "UTC+2 (土耳其,南非,罗马尼亚)",
+ "UTC+3(Moscow of Russia, Iran)": "UTC+3 (俄罗斯莫斯科,伊朗)",
+ "UTC+4(The united Arab emirates)": "UTC+4 (阿联酋)",
+ "UTC+5(Pakistan, India)": "UTC+5 (巴基斯坦,印度)",
+ "UTC+6(Bangladesh, Myanmar, Xinjiang Autonomous Region of China)":
+ "UTC+6 (孟加拉国,缅甸,中国新疆自治区)",
+ "UTC+7(Thailand, Malaysia, Singapore)": "UTC+7 (泰国,马来西亚,新加坡)",
+ "UTC+8(Beijing of China, Philippines)": "UTC+8 (中国北京,菲律宾)",
+ "UTC+9(Japan)": "UTC+9 (日本)",
+ "UTC+10(Vladivostok of Russia, Guam, Australia)":
+ "UTC+10(俄罗斯海参崴,美国关岛,澳大利亚)",
+ "UTC+11(Solomon Islands)": "UTC+11(所罗门群岛)",
+ "UTC+12(New Zealand)": "UTC+12(新西兰)",
+ "ntp sync delay(S)": "NTP同步间隔(秒)",
+ "ntp server": "NTP服务器",
+ disable: "禁用",
+ enable: "启用",
+ apply: "应用",
+ "apply and exit": "应用并退出",
+ revert: "恢复",
+ "revert and exit": "不保存退出",
+ "auto ip": "自动获取IP地址",
+ gateway: "网关",
+ netmask: "子网掩码",
+ "mac address": "MAC地址",
+ "ip address": "IP地址",
+ brightness: "亮度",
+ contrast: "对比度",
+ hue: "锐度",
+ "device resolution": "设备分辨率",
+ "output board resolution": "输出板分辨率",
+ "use ntp": "使用NTP服务器",
+ "current datetime": "当前日期时间",
+ "time zone": "时区",
};
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index f778467..c9fc4dd 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -143,6 +143,7 @@ import PermissionLevel from "src/entities/PermissionLevel";
import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router";
import EventBus, { EventNamesDefine } from "src/common/EventBus";
+import { useStore } from "src/store";
class _Data {
user_name: string | null = null;
@@ -180,6 +181,7 @@ export default defineComponent({
const $q = useQuasar();
const $t = useI18n();
const $route = useRouter();
+ const $store = useStore();
const data = reactive(new _Data());
let web_socket: ClientConnection | null = null;
let is_pwa = ["fullscreen", "standalone", "minimal-ui"].some(
@@ -197,9 +199,6 @@ export default defineComponent({
data,
landspace,
is_pwa,
- loga(a: any) {
- console.log(a);
- },
async onSubmit() {
return new Promise((resolve) => {
data.loading = true;
@@ -245,6 +244,9 @@ export default defineComponent({
SessionStorage.set("name", data.ip_address);
SessionStorage.set("user_name", data.user_name);
SessionStorage.set("password", data.password);
+
+ $store.commit("setDeviceIpAddress", data.ip_address);
+
$route.push("/");
} else {
$q.notify({
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 1577896..883040a 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -1,6 +1,6 @@
-
+
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
@@ -92,14 +101,14 @@
stretch
flat
icon="devices"
- label="localhost"
+ :label="$store.state.device_ip_address"
class="q-mr-sm"
>
-
+
+
- localhost
- localhost
+ {{ $t("logout") }}
@@ -112,6 +121,7 @@
+