diff --git a/public/images/device/instance/button.png b/public/images/device/button.png similarity index 100% rename from public/images/device/instance/button.png rename to public/images/device/button.png diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue index 0915064a..dee607c8 100644 --- a/src/components/CardBox/index.vue +++ b/src/components/CardBox/index.vue @@ -2,22 +2,21 @@
- - - -
- -
-
- - +
+ +
+ +
+ + +
- - +
+
@@ -201,6 +200,13 @@ const handleClick = () => { margin-right: 16px; } + .card-item-body { + display: flex; + flex-direction: column; + flex-grow: 1; + width: 0; + } + .card-state { position: absolute; top: 30px; diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx index 774b95b8..232cc992 100644 --- a/src/components/Table/index.tsx +++ b/src/components/Table/index.tsx @@ -207,6 +207,7 @@ const JTable = defineComponent({ _dataSource.value = [] } } else { + console.log(props?.dataSource) _dataSource.value = props?.dataSource || [] } loading.value = false @@ -220,6 +221,16 @@ const JTable = defineComponent({ {deep: true, immediate: true} ) + watch( + () => props.dataSource, + (newValue) => { + if(props.dataSource){ + handleSearch(props.params) + } + }, + {deep: true, immediate: true} + ) + onMounted(() => { window.onresize = () => { windowChange() diff --git a/src/views/device/Instance/Detail/Running/index.vue b/src/views/device/Instance/Detail/Running/index.vue new file mode 100644 index 00000000..e2e39b8a --- /dev/null +++ b/src/views/device/Instance/Detail/Running/index.vue @@ -0,0 +1,46 @@ + + + \ No newline at end of file diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue index d9f2f0e5..02bd7026 100644 --- a/src/views/device/Instance/Detail/index.vue +++ b/src/views/device/Instance/Detail/index.vue @@ -32,7 +32,7 @@
@@ -41,6 +41,7 @@ + diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue index d7605411..c004f166 100644 --- a/src/views/device/Product/Save/index.vue +++ b/src/views/device/Product/Save/index.vue @@ -194,6 +194,7 @@
+ + diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue index 896f2983..ca732ea1 100644 --- a/src/views/init-home/index.vue +++ b/src/views/init-home/index.vue @@ -16,426 +16,7 @@ >配置平台名称、登录背景图、主题色等基本信息 - - - - - - - - - 白色 - 黑色 - - - - - - - - - - - - - - - -
- 推荐尺寸200*200 -
-
- 支持jpg,png -
-
-
- - - - - -
- 推荐尺寸64*64 -
-
- 支持icon格式 -
-
-
-
-
- - -
-
- -
-
- -
-
-
- 点击修改 -
-
-
- -
-
-
-
- -
-
-
- 支持4M以内的图片:支持jpg、png -
-
- 建议尺寸1400x1080 -
-
-
-
-
+