diff --git a/src/components/Drawer/src/BasicDrawer.vue b/src/components/Drawer/src/BasicDrawer.vue index 498e52e..0381a99 100644 --- a/src/components/Drawer/src/BasicDrawer.vue +++ b/src/components/Drawer/src/BasicDrawer.vue @@ -89,7 +89,6 @@ opt.getContainer = `.${prefixVar}-layout-content` as any; } } - console.log('getProps:opt',opt); return opt as DrawerProps; }); diff --git a/src/components/SimpleMenu/src/components/MenuItem.vue b/src/components/SimpleMenu/src/components/MenuItem.vue index 0b7afc7..703ae74 100644 --- a/src/components/SimpleMenu/src/components/MenuItem.vue +++ b/src/components/SimpleMenu/src/components/MenuItem.vue @@ -107,7 +107,6 @@ //update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后,打开菜单,显示名称未展示为菜单名称 function storePathTitle(path) { - console.log('storePathTitle', path); let title = ''; if (instance!.attrs) { let item: any = instance!.attrs.item; diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index a234b1f..0bc85c0 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -131,5 +131,5 @@ export function registerGlobComp(app: App) { .use(Cascader) .use(Rate) .use(Progress); - console.log("---初始化---, 全局注册Antd、仪表盘、流程设计器、online、流程等组件--------------") + // console.log("---初始化---, 全局注册Antd、仪表盘、流程设计器、online、流程等组件--------------") } diff --git a/src/hooks/web/useWebSocket.ts b/src/hooks/web/useWebSocket.ts index 31ee8a2..a0ad07f 100644 --- a/src/hooks/web/useWebSocket.ts +++ b/src/hooks/web/useWebSocket.ts @@ -28,10 +28,10 @@ export function connectWebSocket(url: string) { protocols: [token], // update-begin--author:liaozhiyang---date:20240726---for:[issues/6662] 演示系统socket总断,换一个写法 onConnected: function (ws) { - console.log('[WebSocket] 连接成功', ws); + // console.log('[WebSocket] 连接成功', ws); }, onDisconnected: function (ws, event) { - console.log('[WebSocket] 连接断开:', ws, event); + // console.log('[WebSocket] 连接断开:', ws, event); }, onError: function (ws, event) { console.log('[WebSocket] 连接发生错误: ', ws, event); @@ -78,11 +78,11 @@ export function connectWebSocket(url: string) { } function onOpen() { - console.log('[WebSocket] 连接成功'); + // console.log('[WebSocket] 连接成功'); } function onClose(e) { - console.log('[WebSocket] 连接断开:', e); + // console.log('[WebSocket] 连接断开:', e); } function onError(e) { diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 8700459..4582c80 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -212,7 +212,7 @@ export const usePermissionStore = defineStore({ // 后台菜单构建 case PermissionModeEnum.BACK: const { createMessage, createWarningModal } = useMessage(); - console.log(" --- 构建后台路由菜单 --- ") + // console.log(" --- 构建后台路由菜单 --- ") // 菜单加载提示 // createMessage.loading({ // content: t('sys.app.menuLoading'), diff --git a/src/views/iot/baseIot/BaseIot.data.ts b/src/views/iot/baseIot/BaseIot.data.ts new file mode 100644 index 0000000..55d0877 --- /dev/null +++ b/src/views/iot/baseIot/BaseIot.data.ts @@ -0,0 +1,75 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const baseSxtColumns: BasicColumn[] = [ + { + title: '设备序号', + align: "center", + dataIndex: 'deviceIndex', + width: 120, + }, + { + title: '设备名称', + align: "center", + dataIndex: 'deviceName' + }, + { + title: '设备状态', + align: "center", + dataIndex: 'deviceStatus_dictText', + width: 120, + }, + { + title: '设备型号', + align: "center", + dataIndex: 'deviceModel', + width: 220, + }, + { + title: 'NUID', + align: "center", + dataIndex: 'nuId', + width: 120, + }, + { + title: '操作', + align: "center", + dataIndex: 'action', + width: 120, + }, +]; + +export const checkSxtColumns: BasicColumn[] = [ + { + title: '设备序号', + align: "center", + dataIndex: 'deviceIndex', + width: 120, + }, + { + title: '设备名称', + align: "center", + dataIndex: 'deviceName' + }, + { + title: '设备状态', + align: "center", + dataIndex: 'deviceStatus_dictText', + width: 120, + }, + { + title: '设备型号', + align: "center", + dataIndex: 'deviceModel', + width: 220, + }, + { + title: '操作', + align: "center", + dataIndex: 'action', + width: 120, + }, +]; \ No newline at end of file diff --git a/src/views/iot/baseIot/CheckBaseIotList.vue b/src/views/iot/baseIot/CheckBaseIotList.vue new file mode 100644 index 0000000..aec3a83 --- /dev/null +++ b/src/views/iot/baseIot/CheckBaseIotList.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/views/iot/baseIot/compoents/SxtForm.vue b/src/views/iot/baseIot/compoents/SxtForm.vue new file mode 100644 index 0000000..0098306 --- /dev/null +++ b/src/views/iot/baseIot/compoents/SxtForm.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/iot/baseIot/compoents/SxtModal.vue b/src/views/iot/baseIot/compoents/SxtModal.vue new file mode 100644 index 0000000..1ab6ab1 --- /dev/null +++ b/src/views/iot/baseIot/compoents/SxtModal.vue @@ -0,0 +1,66 @@ + + + + + +