{{ date.hms }}
@@ -27,6 +27,32 @@ import { useI18n } from 'vue-i18n'
import setTool from './components/setTool/setTool.vue'
import weather from './components/weather/index.vue'
import headSvg from './components/head_svg.vue'
+import color1 from '@/assets/images/theme/color1/head.png'
+import color2 from '@/assets/images/theme/color2/head.png'
+import color3 from '@/assets/images/theme/color3/head.png'
+import color4 from '@/assets/images/theme/color4/head.png'
+import color5 from '@/assets/images/theme/color5/head.png'
+import color6 from '@/assets/images/theme/color6/head.png'
+
+const headImg = computed(() => {
+ switch (skinInfo.value) {
+ case 'color1':
+ return color1
+ case 'color2':
+ return color2
+ case 'color3':
+ return color3
+ case 'color4':
+ return color4
+ case 'color5':
+ return color5
+ case 'color6':
+ return color6
+ default:
+ return color1
+ }
+})
+
const skinInfo = ref(JSON.parse(localStorage.getItem("systemSetting") || '{}').skinInfo || 'color1')
diff --git a/src/renderer/src/views/components/propertyBox/attribute.vue b/src/renderer/src/views/components/propertyBox/attribute.vue
index aa3fb7b..6192e22 100644
--- a/src/renderer/src/views/components/propertyBox/attribute.vue
+++ b/src/renderer/src/views/components/propertyBox/attribute.vue
@@ -93,7 +93,7 @@
{{ item.type }}
{{ item.ip }}
{{ item.port }}
-
{{ item.userName }}
+
{{ item.username }}
{{ item.password }}
diff --git a/src/renderer/src/views/components/tree/hooks/tree.ts b/src/renderer/src/views/components/tree/hooks/tree.ts
index cf9b969..22094e4 100644
--- a/src/renderer/src/views/components/tree/hooks/tree.ts
+++ b/src/renderer/src/views/components/tree/hooks/tree.ts
@@ -571,7 +571,7 @@ export const useTree = () => {
let res = await TreeApi.getTreeList()
if ([0, 200].includes(res.code)) {
- res.data.sort((a: any, b: any) => {
+ res.data.list.sort((a: any, b: any) => {
if (a.treeIndex && b.treeIndex) {
return a.treeIndex - b.treeIndex
}
@@ -586,28 +586,28 @@ export const useTree = () => {
//将模型压平
(window as any).pressModelMap = new Map();
(window as any).pressModelEntities = new Map();
- for (let i = res.data.length - 1; i >= 0; i--) {
- if (!res.data[i].id) {
- // res.data.splice(i, 1);
- res.data[i].id = generateRandomString(20, false)
+ for (let i = res.data.list.length - 1; i >= 0; i--) {
+ if (!res.data.list[i].id) {
+ // res.data.list.splice(i, 1);
+ res.data.list[i].id = generateRandomString(20, false)
}
- if (res.data[i].sourceType == "pressModel") {
- const obj = JSON.parse(res.data[i].params);
- (window as any).pressModelMap.set(res.data[i].id + "_" + obj.modelId, res.data[i]);
+ if (res.data.list[i].sourceType == "pressModel") {
+ const obj = JSON.parse(res.data.list[i].params);
+ (window as any).pressModelMap.set(res.data.list[i].id + "_" + obj.modelId, res.data.list[i]);
}
- if (arr.includes(res.data[i].sourceType) && !res.data[i].params) {
- res.data[i].params = JSON.stringify({
- id: res.data[i].id,
- name: res.data[i].sourceName,
- show: res.data[i].isShow,
+ if (arr.includes(res.data.list[i].sourceType) && !res.data.list[i].params) {
+ res.data.list[i].params = JSON.stringify({
+ id: res.data.list[i].id,
+ name: res.data.list[i].sourceName,
+ show: res.data.list[i].isShow,
alpha: 1,
brightness: 1
})
}
- res.data[i].svg = await cusNodeIcon(res.data[i]);
+ res.data.list[i].svg = await cusNodeIcon(res.data.list[i]);
}
}
- zNodes.value = res.data
+ zNodes.value = res.data.list
treeObj.value = $.fn.zTree.init($(selector), setting, zNodes.value);
window.treeObj = treeObj.value;
window.AllNodes = treeObj.value.getNodes();