完善信号源对话框英文翻译, 注册对话框移动到工厂模式

This commit is contained in:
fangxiang 2022-07-06 14:44:11 +08:00
parent 31b0a82725
commit 37baa6d678
16 changed files with 147 additions and 16 deletions

View File

@ -58,6 +58,7 @@ export default defineComponent({
console.log(e); console.log(e);
} }
try {
{ {
const user_search = (<any>window).user_search || {}; const user_search = (<any>window).user_search || {};
if (typeof user_search == "object") { if (typeof user_search == "object") {
@ -65,8 +66,16 @@ export default defineComponent({
"setAvancedDebug", "setAvancedDebug",
typeof user_search["debug"] != "undefined" typeof user_search["debug"] != "undefined"
); );
$store.commit(
"setFactoryMode",
typeof user_search["factory"] != "undefined"
);
} }
} }
} catch (e) {
console.log(e);
}
window.onresize = (evt: any) => window.onresize = (evt: any) =>
EventBus.getInstance().emit(EventNamesDefine.WindowResize, evt); EventBus.getInstance().emit(EventNamesDefine.WindowResize, evt);

View File

@ -127,10 +127,17 @@
<q-separator /> <q-separator />
<q-card-actions align="right"> <q-card-actions align="right">
<q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup /> <q-btn
flat
:label="$t('Cancel')"
no-caps
color="primary"
v-close-popup
/>
<q-btn <q-btn
ref="accept" ref="accept"
flat flat
no-caps
:label="$t('Accept')" :label="$t('Accept')"
type="submit" type="submit"
color="primary" color="primary"

View File

@ -415,6 +415,7 @@
<q-btn <q-btn
:loading="loading" :loading="loading"
flat flat
no-caps
:label="$t('close and reset')" :label="$t('close and reset')"
color="primary" color="primary"
v-close-popup v-close-popup
@ -422,6 +423,7 @@
<q-btn <q-btn
ref="accept" ref="accept"
flat flat
no-caps
:label="$t('close and save')" :label="$t('close and save')"
:loading="loading" :loading="loading"
type="submit" type="submit"

View File

@ -352,6 +352,7 @@
<q-btn <q-btn
ref="accept" ref="accept"
flat flat
no-caps
:label="$t('register')" :label="$t('register')"
:loading="loading" :loading="loading"
:disable="loading" :disable="loading"

View File

@ -331,6 +331,7 @@ import TimerSignalSourceDialog from "src/components/TimerSignalSourceDialog.vue"
import FileEntity from "src/entities/FileEntity"; import FileEntity from "src/entities/FileEntity";
import FileSuffixHelper from "src/common/FileSuffixHelper"; import FileSuffixHelper from "src/common/FileSuffixHelper";
import { Protocol } from "src/entities/WSProtocol";
export default defineComponent({ export default defineComponent({
name: "ComponentSignalSourceDialog", name: "ComponentSignalSourceDialog",
@ -391,16 +392,23 @@ export default defineComponent({
label: $t.t("clock"), label: $t.t("clock"),
value: "EwindowType::Clock", value: "EwindowType::Clock",
}, },
{
label: $t.t("weather"),
value: "EwindowType::Weather",
},
{ {
label: $t.t("timer"), label: $t.t("timer"),
value: "EwindowType::Timer", value: "EwindowType::Timer",
}, },
]; ];
if (
($store.state.device_attribute & Protocol.EDeviceAttribute.CustomISV) !=
0
) {
signal_source_options.push({
label: $t.t("weather"),
value: "EwindowType::Weather",
});
}
const tree_nodes = computed({ const tree_nodes = computed({
get: () => $store.state.signal_source_tree, get: () => $store.state.signal_source_tree,
set: (val) => {}, set: (val) => {},

View File

@ -97,6 +97,7 @@
<q-btn <q-btn
flat flat
color="primary" color="primary"
no-caps
:label="$t('add row')" :label="$t('add row')"
class="col-2" class="col-2"
@click="advance_ip_addRow" @click="advance_ip_addRow"
@ -104,6 +105,7 @@
<q-btn <q-btn
:disable="advance_ip_table_selected.length == 0" :disable="advance_ip_table_selected.length == 0"
flat flat
no-caps
color="primary" color="primary"
:label="$t('edit row')" :label="$t('edit row')"
class="col-2" class="col-2"
@ -112,6 +114,7 @@
<q-btn <q-btn
:disable="advance_ip_table_selected.length == 0" :disable="advance_ip_table_selected.length == 0"
flat flat
no-caps
color="primary" color="primary"
:label="$t('delete row')" :label="$t('delete row')"
class="col-2" class="col-2"

View File

@ -332,6 +332,7 @@
<q-btn <q-btn
:loading="loading" :loading="loading"
flat flat
no-caps
:label="$t('close and reset')" :label="$t('close and reset')"
color="primary" color="primary"
v-close-popup v-close-popup
@ -339,6 +340,7 @@
<q-btn <q-btn
ref="accept" ref="accept"
flat flat
no-caps
:label="$t('close and save')" :label="$t('close and save')"
:loading="loading" :loading="loading"
type="submit" type="submit"

View File

@ -17,7 +17,7 @@
<div class="row"> <div class="row">
<div class="col-auto text-h6"> <div class="col-auto text-h6">
{{ type == 1 ? $t("add") : type == 2 ? $t("edit") : $t("view") {{ type == 1 ? $t("add") : type == 2 ? $t("edit") : $t("view")
}}{{ $t("timing task") }} }}{{ $t(" ") }}{{ $t("timing task") }}
</div> </div>
<q-space /> <q-space />
<div> <div>

View File

@ -192,6 +192,7 @@
<q-btn <q-btn
:loading="loading" :loading="loading"
flat flat
no-caps
:label="$t('close and reset')" :label="$t('close and reset')"
color="primary" color="primary"
v-close-popup v-close-popup
@ -199,6 +200,7 @@
<q-btn <q-btn
ref="accept" ref="accept"
flat flat
no-caps
:label="$t('close and save')" :label="$t('close and save')"
:loading="loading" :loading="loading"
type="submit" type="submit"

View File

@ -2,6 +2,7 @@
// so you can safely delete all default props below // so you can safely delete all default props below
export default { export default {
" ": " ",
title: "MediaPlayerWebAPP", title: "MediaPlayerWebAPP",
failed: " failed", failed: " failed",
success: " successful", success: " successful",
@ -24,7 +25,7 @@ export default {
"edit window rect": "Window Size Adjust", "edit window rect": "Window Size Adjust",
"set the window rectangle beyond the desktop rectangle, the window rectangle will be clipped, are you sure to use this window rectangle": "set the window rectangle beyond the desktop rectangle, the window rectangle will be clipped, are you sure to use this window rectangle":
"if the window size exceeds the desktop size, the window size will be clipped. Are you sure to use this window size", "if the window size exceeds the desktop size, the window size will be clipped. Are you sure to use this window size",
hour_2_: "hour", hour_2_: "Hour",
"system setting": "System", "system setting": "System",
"grid setting": "Layout", "grid setting": "Layout",
subtitle: "OSD", subtitle: "OSD",
@ -98,6 +99,8 @@ export default {
"polling data": "Loop Signal Data", "polling data": "Loop Signal Data",
delay: "Delay", delay: "Delay",
"add row": "Add Row", "add row": "Add Row",
"edit row": "Edit Row",
"delete row": "Delete Row",
"new polling": "New Loop Signal", "new polling": "New Loop Signal",
"add mode": "Add Mode", "add mode": "Add Mode",
"edit mode": "Edit Mode", "edit mode": "Edit Mode",
@ -198,4 +201,60 @@ export default {
usb8: "usb8", usb8: "usb8",
usb9: "usb9", usb9: "usb9",
"device standby mode": "Device Standby Mode", "device standby mode": "Device Standby Mode",
"server ip address": "Server Ip Address",
"please input server ip address": "Please Input Server Ip Address",
"user name": "User Name",
"please input user name": "Please Input User Name",
password: "Password",
"please input password": "Please Input Password",
"remember password": "Remember Password",
"auto login": "Auto Login",
login: "Login",
"register dialog": "Register Dialog",
registered: "Registered",
"register date": "Register Date",
"register code": "Register Code",
"active code": "Active Code",
register: "Register",
"http url": "Htpp Url",
image: "Image",
rtsp: "RTSP",
clock: "Clock",
weather: "Weather",
timer: "Timer",
"clock setting": "Clock Setting",
"weather setting": "Weather Setting",
"timer setting": "Timer Setting",
"clock type": "Clock Type",
"font size": "Font Size",
"font color": "Font Color",
"background color": "Background Color",
"date format": "Date Format",
"time format": "Time Format",
text: "Text",
date: "Date",
week: "Week",
"background transparent": "Background Transparent",
"multiple lines": "Multiple Lines",
"font bold": "Font Bold",
"auto location": "Auto Location",
location: "Location",
city_province: "Province",
city_city: "City",
city_area: "Area",
"timer type": "Timer Type",
"forward timer": "Forward Timer",
"backward timer": "Backward Timer",
"timer mode": "Timer Mode",
"relative time": "Relative Time",
duration: "Duration",
second: "Second",
minute: "Minute",
hour: "Hour",
day: "Day",
"new task": "New Task",
"advanced network setting": "Advanced Network Setting",
"network disconnect!": "Network Disconnect!",
"wait reconnection": "Wait Reconnection",
"back to login page": "Back To Login Page",
}; };

View File

@ -2,6 +2,7 @@
// so you can safely delete all default props below // so you can safely delete all default props below
export default { export default {
" ": "",
title: "MediaPlayerWebApp", title: "MediaPlayerWebApp",
failed: "失败", failed: "失败",
fail: "失败", fail: "失败",

View File

@ -221,6 +221,7 @@
class="text-h5" class="text-h5"
style="width: 60%" style="width: 60%"
color="accent" color="accent"
no-caps
:loading="data.loading" :loading="data.loading"
:label="$t('login')" :label="$t('login')"
rounded rounded

View File

@ -190,7 +190,12 @@
{{ $t("background image setting") }} {{ $t("background image setting") }}
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup @click="switchLanguage"> <q-item
clickable
v-close-popup
@click="switchLanguage"
v-if="!is_custon_isv"
>
<q-item-section avatar> <q-item-section avatar>
<q-icon name="img:pad/toolbar/cn_en.png" /> <q-icon name="img:pad/toolbar/cn_en.png" />
</q-item-section> </q-item-section>
@ -249,6 +254,7 @@ import SystemSettingDialog from "src/components/SystemSettingDialog.vue";
import GlobalData from "src/common/GlobalData"; import GlobalData from "src/common/GlobalData";
import { Protocol } from "src/entities/WSProtocol"; import { Protocol } from "src/entities/WSProtocol";
import { component } from "v-viewer";
export default defineComponent({ export default defineComponent({
name: "PadTopToolbarPage", name: "PadTopToolbarPage",
@ -278,17 +284,24 @@ export default defineComponent({
0 0
); );
const is_custon_isv = ref(
($store.state.device_attribute & Protocol.EDeviceAttribute.CustomISV) != 0
);
watch( watch(
() => $store.state.device_attribute, () => $store.state.device_attribute,
(value) => { (value) => {
function_center_control.value = function_center_control.value =
(value & Protocol.EDeviceAttribute.CenterControl) != 0; (value & Protocol.EDeviceAttribute.CenterControl) != 0;
is_custon_isv.value =
(value & Protocol.EDeviceAttribute.CustomISV) != 0;
} }
); );
return { return {
plan_running, plan_running,
function_center_control, function_center_control,
is_custon_isv,
window_rect_edit_dialog, window_rect_edit_dialog,
toogleFullScreen() { toogleFullScreen() {

View File

@ -175,6 +175,7 @@
class="full-width text-h6" class="full-width text-h6"
:loading="data.loading" :loading="data.loading"
:label="$t('login')" :label="$t('login')"
no-caps
style=" style="
background: #273de4; background: #273de4;
box-shadow: 0 4px 6px 0px rgb(39 60 228 / 40%); box-shadow: 0 4px 6px 0px rgb(39 60 228 / 40%);

View File

@ -300,7 +300,12 @@
{{ $t("upgrade") }} {{ $t("upgrade") }}
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup @click="switchLanguage"> <q-item
clickable
v-close-popup
@click="switchLanguage"
v-if="!is_custon_isv"
>
<q-item-section avatar> <q-item-section avatar>
<!-- <q-icon name="info_outline" /> --> <!-- <q-icon name="info_outline" /> -->
<q-icon name="translate" /> <q-icon name="translate" />
@ -313,6 +318,7 @@
clickable clickable
v-close-popup v-close-popup
@click="$refs.register_dialog.showDialog()" @click="$refs.register_dialog.showDialog()"
v-if="$store.state.factory_mode"
> >
<q-item-section avatar> <q-item-section avatar>
<!-- <q-icon name="devices" /> --> <!-- <q-icon name="devices" /> -->
@ -455,6 +461,10 @@ export default defineComponent({
0 0
); );
const is_custon_isv = ref(
($store.state.device_attribute & Protocol.EDeviceAttribute.CustomISV) != 0
);
const window_rect_edit_dialog: Ref<any> = ref(null); const window_rect_edit_dialog: Ref<any> = ref(null);
const plan_running = computed( const plan_running = computed(
@ -525,6 +535,8 @@ export default defineComponent({
(value) => { (value) => {
function_center_control.value = function_center_control.value =
(value & Protocol.EDeviceAttribute.CenterControl) != 0; (value & Protocol.EDeviceAttribute.CenterControl) != 0;
is_custon_isv.value =
(value & Protocol.EDeviceAttribute.CustomISV) != 0;
} }
); );
@ -534,6 +546,7 @@ export default defineComponent({
edge_blending_dialog, edge_blending_dialog,
register_dialog, register_dialog,
function_center_control, function_center_control,
is_custon_isv,
window_rect_edit_dialog, window_rect_edit_dialog,
async backupDB() { async backupDB() {

View File

@ -36,6 +36,7 @@ export interface StateInterface {
// Declared as unknown to avoid linting issue. Best to strongly type as per the line above. // Declared as unknown to avoid linting issue. Best to strongly type as per the line above.
initialized: boolean; initialized: boolean;
advanced_debug: boolean; advanced_debug: boolean;
factory_mode: boolean;
signal_source_tree: SignalSourceTreeItemEntity[]; signal_source_tree: SignalSourceTreeItemEntity[];
polling_tree: PollingTreeItemEntity[]; polling_tree: PollingTreeItemEntity[];
mode_tree: ModeTreeItemEntity[]; mode_tree: ModeTreeItemEntity[];
@ -285,6 +286,7 @@ export default store(function (/* { ssrContext } */) {
// state // state
initialized: false, initialized: false,
advanced_debug: false, advanced_debug: false,
factory_mode: false,
signal_source_tree: [], signal_source_tree: [],
polling_tree: [], polling_tree: [],
mode_tree: [], mode_tree: [],
@ -338,6 +340,13 @@ export default store(function (/* { ssrContext } */) {
} }
state.advanced_debug = playload; state.advanced_debug = playload;
}, },
setFactoryMode(state: StateInterface, playload?: any) {
if (playload || playload == "true") {
console.log("factory", playload);
state.advanced_debug = playload;
}
state.factory_mode = playload;
},
setArrayValue(state: StateInterface, playload?: any) { setArrayValue(state: StateInterface, playload?: any) {
if (Array.isArray(playload.value)) { if (Array.isArray(playload.value)) {
const arr: Array<any> = (<any>state)[playload.name]; const arr: Array<any> = (<any>state)[playload.name];