This commit is contained in:
njdaoyehu 2024-11-26 17:35:13 +08:00
parent be171cebe2
commit f95cf00ee0
6 changed files with 31 additions and 10 deletions

View File

@ -151,7 +151,7 @@
</style> </style>
<div class="app-loading"> <div class="app-loading">
<div class="app-loading-wrap"> <div class="app-loading-wrap">
<img src="<%= VITE_PUBLIC_PATH %>logo.png" class="app-loading-logo" alt="Logo" /> <!-- <img src="<%= VITE_PUBLIC_PATH %>logo.png" class="app-loading-logo" alt="Logo" />-->
<!-- <div class="app-loading-dots">--> <!-- <div class="app-loading-dots">-->
<!-- <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>--> <!-- <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>-->
<!-- </div>--> <!-- </div>-->

View File

@ -4,7 +4,13 @@
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import {onMounted} from "vue";
defineOptions({ defineOptions({
name: 'AUTH_DASHBOARD' name: 'AUTH_DASHBOARD'
}) })
onMounted(() => {
WebViewService.setIsLoading(false).then(() => {});
});
</script> </script>

View File

@ -48,7 +48,7 @@
import { columns, searchFormSchema } from './schema'; import { columns, searchFormSchema } from './schema';
import { useMessage } from '@/hooks/web/useMessage'; import { useMessage } from '@/hooks/web/useMessage';
import {SvgIcon} from "@/components/Icon"; import {SvgIcon} from "@/components/Icon";
import {h} from "vue"; import {h, onMounted} from "vue";
import {PlusOutlined} from "@ant-design/icons-vue"; import {PlusOutlined} from "@ant-design/icons-vue";
const { createMessage } = useMessage(); const { createMessage } = useMessage();
@ -78,6 +78,10 @@
}, },
}); });
onMounted(() => {
WebViewService.setIsLoading(false).then(() => {});
});
const handleParams = (params) => { const handleParams = (params) => {
const { pageNum, pageSize, field = 'id', order = 'descend', ...rest } = params; const { pageNum, pageSize, field = 'id', order = 'descend', ...rest } = params;
const handledParams: any = { const handledParams: any = {

View File

@ -181,7 +181,7 @@
const handleImport = () => { const handleImport = () => {
WebViewService.importExcel().then((str) => { WebViewService.importExcel().then((str) => {
useMessage().createMessage.success("数据导入成功!"); WebViewService.setMessage("数据导入成功!", "success").then(() => {});
const data = JSON.parse(str); const data = JSON.parse(str);
if (data.length === 0) return; if (data.length === 0) return;
const taskName = data[0].name; const taskName = data[0].name;
@ -198,26 +198,26 @@
isUpdate: false, isUpdate: false,
}); });
}, error => { }, error => {
useMessage().createMessage.error(error); WebViewService.setMessage("数据导入失败!", "error").then(() => {});
}); });
} }
const handleDownload = (record: Recordable) => { const handleDownload = (record: Recordable) => {
const ids = [...new Set([...(record.id ? [record.id] : []), ...(checkedKeys.value.map(d => (d)))])] const ids = [...new Set([...(record.id ? [record.id] : []), ...(checkedKeys.value.map(d => (d)))])]
DeviceClientService.assignTasks(ids).then(() => { DeviceClientService.assignTasks(ids).then(() => {
useMessage().createMessage.success("下发任务成功!"); WebViewService.setMessage("下发任务成功!", "success").then(() => {});
}, error => { }, error => {
useMessage().createMessage.error(error); WebViewService.setMessage("下发任务失败!", "error").then(() => {});
}); });
}; };
const handleSync = (record: Recordable) => { const handleSync = (record: Recordable) => {
const ids = [...new Set([...(record.id ? [record.id] : []), ...(checkedKeys.value.map(d => (d)))])] const ids = [...new Set([...(record.id ? [record.id] : []), ...(checkedKeys.value.map(d => (d)))])]
DeviceClientService.syncTasks(ids).then(() => { DeviceClientService.syncTasks(ids).then(() => {
useMessage().createMessage.success("同步任务成功!"); WebViewService.setMessage("同步任务成功!", "success").then(() => {});
reload(); reload();
}, error => { }, error => {
useMessage().createMessage.error(error); WebViewService.setMessage("同步任务失败!", "error").then(() => {});
}); });
}; };
@ -236,9 +236,11 @@
DeviceClientService.getDeviceConnected().then((d) => { DeviceClientService.getDeviceConnected().then((d) => {
deviceConnectedList.value = d; deviceConnectedList.value = d;
}, error => { }, error => {
useMessage().createMessage.error(error); WebViewService.setMessage("获取设备连接出错", "error").then(() => {});
}); });
}, 300); }, 300);
WebViewService.setIsLoading(false).then(() => {});
}); });
onUnmounted(()=> { onUnmounted(()=> {

View File

@ -18,6 +18,7 @@
import { columns, searchFormSchema } from './schema'; import { columns, searchFormSchema } from './schema';
import { useMessage } from "@/hooks/web/useMessage"; import { useMessage } from "@/hooks/web/useMessage";
import {SvgIcon} from "@/components/Icon"; import {SvgIcon} from "@/components/Icon";
import {onMounted} from "vue";
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const { hasPermission } = usePermission(); const { hasPermission } = usePermission();
@ -40,6 +41,10 @@
rowKey: (record: any) => record.id, rowKey: (record: any) => record.id,
}); });
onMounted(() => {
WebViewService.setIsLoading(false).then(() => {});
});
const handleParams = (params, embedded = true) => { const handleParams = (params, embedded = true) => {
const { pageNum, pageSize, field = 'id', order = 'descend', ...rest } = params; const { pageNum, pageSize, field = 'id', order = 'descend', ...rest } = params;
const handledParams: any = { pageNum, pageSize, orderByClause: `${field} ${order === 'descend' ? 'desc' : 'asc'}` }; const handledParams: any = { pageNum, pageSize, orderByClause: `${field} ${order === 'descend' ? 'desc' : 'asc'}` };

View File

@ -39,7 +39,7 @@
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import {defineComponent, h} from 'vue'; import {defineComponent, h, onMounted} from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import * as UserApi from '/@/api/system/userApi'; import * as UserApi from '/@/api/system/userApi';
import { useDrawer } from '/@/components/Drawer'; import { useDrawer } from '/@/components/Drawer';
@ -103,6 +103,10 @@
reload(); reload();
} }
onMounted(() => {
WebViewService.setIsLoading(false).then(() => {});
});
return { return {
registerTable, registerTable,
registerDrawer, registerDrawer,