fix: 修复datSource问题
This commit is contained in:
parent
e09eda6b41
commit
2ba0164295
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 544 B |
|
@ -207,6 +207,7 @@ const JTable = defineComponent<JTableProps>({
|
|||
_dataSource.value = []
|
||||
}
|
||||
} else {
|
||||
console.log(props?.dataSource)
|
||||
_dataSource.value = props?.dataSource || []
|
||||
}
|
||||
loading.value = false
|
||||
|
@ -220,6 +221,16 @@ const JTable = defineComponent<JTableProps>({
|
|||
{deep: true, immediate: true}
|
||||
)
|
||||
|
||||
watch(
|
||||
() => props.dataSource,
|
||||
(newValue) => {
|
||||
if(props.dataSource){
|
||||
handleSearch(props.params)
|
||||
}
|
||||
},
|
||||
{deep: true, immediate: true}
|
||||
)
|
||||
|
||||
onMounted(() => {
|
||||
window.onresize = () => {
|
||||
windowChange()
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
<template>
|
||||
<a-card>
|
||||
<a-row type="flex">
|
||||
<a-col flex="200px">
|
||||
<div>
|
||||
<a-input-search
|
||||
v-model:value="value"
|
||||
placeholder="请输入事件名称"
|
||||
style="width: 200px; margin-bottom: 10px"
|
||||
@search="onSearch"
|
||||
/>
|
||||
<a-tabs
|
||||
tab-position="left"
|
||||
:style="{ height: '600px' }"
|
||||
v-model:activeKey="activeKey"
|
||||
tabBarStyle="width: 200px"
|
||||
>
|
||||
<a-tab-pane v-for="i in tabList" :key="i.key" :tab="i.tab" />
|
||||
</a-tabs>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col flex="auto">
|
||||
<!-- <component :is="tabs[activeKey]" /> -->
|
||||
123
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
const activeKey = ref<string>('property')
|
||||
const tabList = ref<{key: string, tab: string}[]>([
|
||||
{
|
||||
key: 'property',
|
||||
tab: '属性'
|
||||
},
|
||||
{
|
||||
key: 'event1',
|
||||
tab: '事件1'
|
||||
}
|
||||
])
|
||||
|
||||
const onSearch = () => {
|
||||
|
||||
}
|
||||
</script>
|
|
@ -32,7 +32,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<template #extra>
|
||||
<img @click="handleRefresh" :src="getImage('/device/instance/button.png')" style="margin-right: 20px; cursor: pointer;" />
|
||||
<img @click="handleRefresh" :src="getImage('/device/button.png')" style="margin-right: 20px; cursor: pointer;" />
|
||||
</template>
|
||||
<component :is="tabs[instanceStore.tabActiveKey]" />
|
||||
</page-container>
|
||||
|
@ -41,6 +41,7 @@
|
|||
<script lang="ts" setup>
|
||||
import { useInstanceStore } from '@/store/instance';
|
||||
import Info from './Info/index.vue';
|
||||
import Running from './Running/index.vue'
|
||||
import Metadata from '../../components/Metadata/index.vue';
|
||||
import { _deploy, _disconnect } from '@/api/device/instance'
|
||||
import { message } from 'ant-design-vue';
|
||||
|
@ -59,6 +60,10 @@ const list = [
|
|||
key: 'Info',
|
||||
tab: '实例信息'
|
||||
},
|
||||
{
|
||||
key: 'Running',
|
||||
tab: '运行状态'
|
||||
},
|
||||
{
|
||||
key: 'Metadata',
|
||||
tab: '物模型'
|
||||
|
@ -67,7 +72,8 @@ const list = [
|
|||
|
||||
const tabs = {
|
||||
Info,
|
||||
Metadata
|
||||
Metadata,
|
||||
Running
|
||||
}
|
||||
|
||||
watch(
|
||||
|
|
|
@ -385,7 +385,7 @@ const handleAdd = () => {
|
|||
* 查看
|
||||
*/
|
||||
const handleView = (id: string) => {
|
||||
router.push('/device/instance/detail/' + id);
|
||||
router.push('/iot/device/instance/detail/' + id);
|
||||
};
|
||||
|
||||
const getActions = (
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div>123</div>
|
||||
<page-container>阿里云</page-container>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div>
|
||||
<page-container>
|
||||
<JTable
|
||||
:columns="columns"
|
||||
:request="request"
|
||||
|
@ -69,7 +69,7 @@
|
|||
</a-space>
|
||||
</template>
|
||||
</JTable>
|
||||
</div>
|
||||
</page-container>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
|
|
Loading…
Reference in New Issue