删除多余代码

This commit is contained in:
shefengchun 2023-02-02 16:21:37 +08:00
parent f44f60d038
commit 09f20b4123
2 changed files with 36 additions and 44 deletions

View File

@ -1,22 +1,31 @@
<template> <template>
<div> <div>
<q-list dense bordered separator> <q-list dense bordered separator>
<q-item clickable v-ripple v-for="(item, index) in data"> <q-item clickable v-ripple v-for="(item, index) in data">
<q-item-section > <q-item-section>
<DebuggingItem :name="Object.keys(item)[0]" :value="Object.values(item)[0]"> <DebuggingItem
:name="Object.keys(item)[0]"
:value="Object.values(item)[0]"
>
</DebuggingItem> </DebuggingItem>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-ripple v-for="(item, index) in btn"> <q-item clickable v-ripple v-for="(item, index) in btn">
<q-item-section > <q-item-section>
<div><q-btn color="white" text-color="black" @click="send_btn(Object.keys(item)[0])" :label="$t(btn_name(Object.keys(item)[0]))" /></div> <div>
<q-btn
color="white"
text-color="black"
@click="send_btn(Object.keys(item)[0])"
:label="$t(btn_name(Object.keys(item)[0]))"
/>
</div>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { import {
defineComponent, defineComponent,
@ -38,7 +47,7 @@ export default defineComponent({
name: "Debugging", name: "Debugging",
components: { components: {
vue3ResizeDrag, vue3ResizeDrag,
DebuggingItem DebuggingItem,
}, },
setup() { setup() {
let set = GlobalData.getInstance().getCurrentClient(); let set = GlobalData.getInstance().getCurrentClient();
@ -46,37 +55,37 @@ export default defineComponent({
let $t = useI18n(); let $t = useI18n();
const data = computed(() => { const data = computed(() => {
let array = []; let array = [];
let tmp = JSON.parse($store.state.fusion_configuration).options let tmp = JSON.parse($store.state.fusion_configuration).options;
for (let key in tmp) { for (let key in tmp) {
if (key.indexOf("@") != -1&&key.indexOf("@btn") == -1) { if (key.indexOf("@") != -1 && key.indexOf("@btn") == -1) {
array.push({ [key]: tmp[key] }) array.push({ [key]: tmp[key] });
} }
} }
return array return array;
}) });
const btn = computed(() => { const btn = computed(() => {
let array = []; let array = [];
let tmp = JSON.parse($store.state.fusion_configuration).options let tmp = JSON.parse($store.state.fusion_configuration).options;
for (let key in tmp) { for (let key in tmp) {
if (key.indexOf("@btn") != -1) { if (key.indexOf("@btn") != -1) {
array.push({ [key]: tmp[key] }) array.push({ [key]: tmp[key] });
} }
} }
return array return array;
}) });
const btn_name=(name:string):string=>{ const btn_name = (name: string): string => {
return name.split("@")[2] return name.split("@")[2];
} };
const send_btn=(name:string)=>{ const send_btn = (name: string) => {
set?.SetBlendingOption(name,"1"); set?.SetBlendingOption(name, "1");
} };
return { return {
btn_name, btn_name,
send_btn, send_btn,
data, data,
btn btn,
} };
} },
}) });
</script> </script>

View File

@ -230,9 +230,6 @@ export default defineComponent({
const select_configuration = ref(false) const select_configuration = ref(false)
const del_dialog = ref(false) const del_dialog = ref(false)
const select_configuration_name = ref("") const select_configuration_name = ref("")
// const send_hide_desktop = () => {
// set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
// };
const send_disable_blending_params = () => { const send_disable_blending_params = () => {
set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0"); set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
}; };
@ -246,8 +243,6 @@ export default defineComponent({
const EnableBlending = ref(false); const EnableBlending = ref(false);
let optionsstr = ref(); let optionsstr = ref();
optionsstr.value = "FusionLocale"; optionsstr.value = "FusionLocale";
// const hide_desktop_value_id = ref("debug@show_mask");
// const hide_desktop_value = ref(false);
const disable_blending_params_id = ref("1"); const disable_blending_params_id = ref("1");
const disable_blending_params = ref(false); const disable_blending_params = ref(false);
const show_blending_grids_id = ref("blending_grids_show"); const show_blending_grids_id = ref("blending_grids_show");
@ -333,7 +328,6 @@ export default defineComponent({
set?.GetBlendingConfig("").then((res) => { set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : ""); let tmp = JSON.parse(res ? res.config : "");
let local_options = [ let local_options = [
// [hide_desktop_value_id, hide_desktop_value],
[disable_blending_params_id, disable_blending_params], [disable_blending_params_id, disable_blending_params],
[show_blending_grids_id, show_blending_grids] [show_blending_grids_id, show_blending_grids]
]; ];
@ -359,7 +353,6 @@ export default defineComponent({
'' ''
] ]
const apply_the_selected_configuration = () => { const apply_the_selected_configuration = () => {
//
set?.ApplyBlendingScene(select_configuration_name.value).then((res) => { set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
let tmp = JSON.parse(res ? res.config : ""); let tmp = JSON.parse(res ? res.config : "");
EnableBlending.value = tmp.enable; EnableBlending.value = tmp.enable;
@ -397,14 +390,6 @@ export default defineComponent({
set?.SaveBlendingConfig(save_cover_name.value); set?.SaveBlendingConfig(save_cover_name.value);
clear(); clear();
save_cover_name.value = save_name.value = '' save_cover_name.value = save_name.value = ''
// set?.GetBlendingConfig("").then((res) => {
// let tmp = JSON.parse(res ? res.config : "");
// EnableBlending.value = tmp.enable;
// $store.commit("setEnablefusion", tmp.enable);
// config.value.col = tmp.col;
// config.value.row = tmp.row;
// $store.commit("setfusion_configuration", res?.config);
// });
$store.commit("setSelectedProjector", "0/0"); $store.commit("setSelectedProjector", "0/0");
} }
@ -429,8 +414,6 @@ export default defineComponent({
del_scenes, del_scenes,
filterFn, filterFn,
setModel, setModel,
// send_hide_desktop,
// hide_desktop_value,
send_disable_blending_params, send_disable_blending_params,
disable_blending_params, disable_blending_params,
send_show_blending_grids, send_show_blending_grids,