diff --git a/.eslintignore b/.eslintignore index 55a3784b..e54de5ff 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,5 @@ node_modules/ dist/ index.html -.vscode \ No newline at end of file +.vscode +docker \ No newline at end of file diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..ebc7fd6d --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +always-auth=true +registry=http://47.108.170.157:9013/ \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..05f6736b --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,6 @@ +FROM nginx +ADD nginx.conf /etc/nginx/conf.d/default.conf +ADD docker-entrypoint.sh /docker-entrypoint.sh +COPY dist /usr/share/nginx/html +CMD ["sh","/docker-entrypoint.sh"] +#ADD oauth2 /usr/share/nginx/html/oauth2 diff --git a/docker/build.sh b/docker/build.sh new file mode 100644 index 00000000..8849f58c --- /dev/null +++ b/docker/build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:1.0.0 . +docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:1.0.0 diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh new file mode 100644 index 00000000..c57efdd4 --- /dev/null +++ b/docker/docker-entrypoint.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +API_BASE_PATH=$API_BASE_PATH; +NAMESERVERS=$(cat /etc/resolv.conf | grep "nameserver" | awk '{print $2}' | tr '\n' ' ') +if [ -z "$API_BASE_PATH" ]; then + API_BASE_PATH="http://jetlinks:8844/"; +fi + +apiUrl="proxy_pass $API_BASE_PATH\$1;" +resolver="resolver $NAMESERVERS ipv6=off;" + +sed -i '11c '"$resolver"'' /etc/nginx/conf.d/default.conf +sed -i '20c '"$apiUrl"'' /etc/nginx/conf.d/default.conf + +nginx -g "daemon off;" diff --git a/docker/nginx.conf b/docker/nginx.conf new file mode 100644 index 00000000..92401367 --- /dev/null +++ b/docker/nginx.conf @@ -0,0 +1,38 @@ +server { + listen 80; + listen [::]:80; + # gzip config + gzip on; + gzip_min_length 1k; + gzip_comp_level 9; + gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml; + gzip_vary on; + gzip_disable "MSIE [1-6]\."; + resolver $NAMESERVERS ipv6=off; + root /usr/share/nginx/html; + include /etc/nginx/mime.types; + location / { + index index.html; + } + + location ^~/api/ { + if ($request_uri ~* ^/api/(.*)$) { + proxy_pass http://host.docker.internal:8840/$1; + } + #proxy_pass http://host.docker.internal:8840/; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_connect_timeout 1; + proxy_buffering off; + chunked_transfer_encoding off; + proxy_cache off; + proxy_send_timeout 30m; + proxy_read_timeout 30m; + client_max_body_size 500m; + } +} diff --git a/package.json b/package.json index e6cfab33..7174015a 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,9 @@ "name": "jetlinks-vue", "private": true, "version": "0.0.0", - "type": "module", "scripts": { "dev": "vite --mode develop", - "build": "vite build --mode production", + "build": "node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build", "preview": "vite preview", "eslint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src", "lint": "eslint src --fix --ext .ts,.tsx,.vue,.js,.jsx", @@ -22,6 +21,7 @@ "driver.js": "^0.9.8", "echarts": "^5.4.1", "event-source-polyfill": "^1.0.31", + "global": "^4.4.0", "jetlinks-store": "^0.0.3", "js-cookie": "^3.0.1", "less": "^4.1.3", @@ -31,9 +31,11 @@ "mavon-editor": "^2.10.4", "moment": "^2.29.4", "monaco-editor": "^0.24.0", + "nrm": "^1.2.5", "pinia": "^2.0.28", "unplugin-auto-import": "^0.12.1", "unplugin-vue-components": "^0.22.12", + "vite-plugin-monaco-editor": "^1.1.0", "vue": "^3.2.45", "vue-router": "^4.1.6", "vue3-markdown-it": "^1.0.10", diff --git a/src/api/device/firmware.ts b/src/api/device/firmware.ts new file mode 100644 index 00000000..f0108f98 --- /dev/null +++ b/src/api/device/firmware.ts @@ -0,0 +1,53 @@ +import server from '@/utils/request'; +import { BASE_API_PATH } from '@/utils/variable'; + +export const FIRMWARE_UPLOAD = `${BASE_API_PATH}/file/upload`; + +export const save = (data: object) => server.post(`/firmware`, data); + +export const update = (data: object) => server.patch(`/firmware`, data); + +export const remove = (id: string) => server.remove(`/firmware/${id}`); + +export const query = (data: object) => server.post(`/firmware/_query/`, data); + +export const querySystemApi = (data?: object) => + server.post(`/system/config/scopes`, data); + +export const task = (data: Record) => + server.post(`/firmware/upgrade/task/detail/_query`, data); + +export const taskById = (id: string) => + server.get(`/firmware/upgrade/task/${id}`); + +export const saveTask = (data: Record) => + server.post(`/firmware/upgrade/task`, data); + +export const deleteTask = (id: string) => + server.remove(`/firmware/upgrade/task/${id}`); + +export const history = (data: Record) => + server.post(`/firmware/upgrade/history/_query`, data); + +export const historyCount = (data: Record) => + server.post(`/firmware/upgrade/history/_count`, data); + +export const startTask = (id: string, data: string[]) => + server.post(`/firmware/upgrade/task/${id}/_start`, data); + +export const stopTask = (id: string) => + server.post(`/firmware/upgrade/task/${id}/_stop`); + +export const startOneTask = (data: string[]) => + server.post(`/firmware/upgrade/task/_start`, data); + +// export const queryProduct = (data?: any) => +// server.post(`/device-product/_query/no-paging`, data); +export const queryProduct = (data?: any) => + server.post(`/device-product/detail/_query/no-paging`, data); + +export const queryDevice = () => + server.get(`/device/instance/_query/no-paging?paging=false`); + +export const validateVersion = (productId: string, versionOrder: number) => + server.get(`/firmware/${productId}/${versionOrder}/exists`); diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts index cac9e9c2..35907a23 100644 --- a/src/api/device/instance.ts +++ b/src/api/device/instance.ts @@ -83,22 +83,22 @@ export const batchDeleteDevice = (data: string[]) => server.put(`/device-instanc * @param type 文件类型 * @returns */ - export const deviceTemplateDownload = (productId: string, type: string) => `${BASE_API_PATH}/device-instance/${productId}/template.${type}` +export const deviceTemplateDownload = (productId: string, type: string) => `${BASE_API_PATH}/device-instance/${productId}/template.${type}` - /** - * 设备导入 - * @param productId 产品id - * @param type 文件类型 - * @returns - */ - export const deviceImport = (productId: string, fileUrl: string, autoDeploy: boolean) => `${BASE_API_PATH}/device-instance/${productId}/import?fileUrl=${fileUrl}&autoDeploy=${autoDeploy}&:X_Access_Token=${LocalStore.get(TOKEN_KEY)}` - - /** - * 设备导出 - * @param productId 产品id - * @param type 文件类型 - * @returns - */ +/** + * 设备导入 + * @param productId 产品id + * @param type 文件类型 + * @returns + */ +export const deviceImport = (productId: string, fileUrl: string, autoDeploy: boolean) => `${BASE_API_PATH}/device-instance/${productId}/import?fileUrl=${fileUrl}&autoDeploy=${autoDeploy}&:X_Access_Token=${LocalStore.get(TOKEN_KEY)}` + +/** + * 设备导出 + * @param productId 产品id + * @param type 文件类型 + * @returns + */ export const deviceExport = (productId: string, type: string) => `${BASE_API_PATH}/device-instance${!!productId ? '/' + productId : ''}/export.${type}` /** @@ -143,7 +143,7 @@ export const _disconnect = (id: string) => server.post(`/device-instance/${id}/d */ export const queryUserListNoPaging = () => server.post(`/user/_query/no-paging`, { paging: false, - sorts: [{name: 'name', order: "asc"}] + sorts: [{ name: 'name', order: "asc" }] }) /** @@ -347,4 +347,59 @@ export const settingProperties = (deviceId: string, data: any) => server.put(`/d * @param data * @returns */ - export const execute = (id: string, action: string, data: any) => server.post(`/device/invoked/${id}/function/${action}`, data) +export const execute = (id: string, action: string, data: any) => server.post(`/device/invoked/${id}/function/${action}`, data) + +/** + * 查询通道列表不分页 + * @param data + * @returns + */ +export const queryChannelNoPaging = (data: any) => server.post(`data-collect/channel/_query/no-paging`, data) + +/** + * 查询采集器列表不分页 + * @param data + * @returns + */ +export const queryCollectorNoPaging = (data: any) => server.post(`/data-collect/collector/_query/no-paging`, data) + +/** + * 查询点位列表不分页 + * @param data + * @returns + */ +export const queryPointNoPaging = (data: any) => server.post(`/data-collect/point/_query/no-paging`, data) + +/** + * 查询映射列表 + * @param thingType + * @param thingId + * @param params + * @returns + */ +export const queryMapping = (thingType: string, thingId: any, params?: any) => server.get(`/things/collector/${thingType}/${thingId}/_query`, params) + +/** + * 删除映射 + * @param thingType + * @param thingId + * @param data + * @returns + */ +export const removeMapping = (thingType: string, thingId: any, data?: any) => server.post(`/things/collector/${thingType}/${thingId}/_delete`, data) + +/** + * 映射树 + * @param data + * @returns + */ +export const treeMapping = (data?: any) => server.post(`/data-collect/channel/_all/tree`, data) + +/** + * 保存映射 + * @param thingId + * @param provider + * @param data + * @returns + */ +export const saveMapping = (thingId: any, provider: string, data?: any) => server.patch(`/things/collector/device/${thingId}/${provider}`, data) \ No newline at end of file diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx index 4ebea3b2..35221782 100644 --- a/src/components/AIcon/index.tsx +++ b/src/components/AIcon/index.tsx @@ -49,6 +49,9 @@ const iconKeys = [ 'PartitionOutlined', 'ShareAltOutlined', 'playCircleOutlined', + 'RightOutlined', + 'FileTextOutlined', + 'UploadOutlined' ] const Icon = (props: {type: string}) => { diff --git a/src/components/MonacoEditor/index.vue b/src/components/MonacoEditor/index.vue index 7a22d6b7..094f23e8 100644 --- a/src/components/MonacoEditor/index.vue +++ b/src/components/MonacoEditor/index.vue @@ -6,29 +6,29 @@ diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue index 4abeb789..47a75a26 100644 --- a/src/components/Search/Search.vue +++ b/src/components/Search/Search.vue @@ -4,9 +4,9 @@
- - - + + +
- - - + + +
@@ -40,7 +40,7 @@
- +
@@ -114,8 +114,10 @@ const historyList = ref([]) const layout = ref('horizontal') // 当前组件宽度 true 大于1000 const screenSize = ref(true) +const resetNumber = ref(1) const searchItems = ref([]) + // 当前查询条件 const terms = reactive({ terms: [] }) @@ -134,7 +136,8 @@ const searchParams = reactive({ const handleItems = () => { searchItems.value = [] columnOptionMap.clear() - props.columns!.forEach((item, index) => { + const cloneColumns = cloneDeep(props.columns) + cloneColumns!.forEach((item, index) => { if (item.search && Object.keys(item.search).length) { columnOptionMap.set(item.dataIndex, item.search) searchItems.value.push({ @@ -231,6 +234,8 @@ const reset = () => { urlParams.q = null urlParams.target = null } + resetNumber.value += 1 + emit('search', terms) } watch(width, (value) => { diff --git a/src/global.d.ts b/src/global.d.ts index 78d66823..ac2781d7 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -10,4 +10,5 @@ declare module '*.gif'; declare module '*.bmp'; declare module '*.js'; declare module '*.ts'; -declare module 'js-cookie'; \ No newline at end of file +declare module 'js-cookie'; +declare module 'jetlinks-ui-components'; \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 8452514e..3b71a00b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,10 +5,13 @@ import components from './components' import router from './router' import './style.less' import 'ant-design-vue/es/notification/style/css'; +// import jConmonents from 'jetlinks-ui-components' +// import 'jetlinks-ui-components/lib/style' const app = createApp(App) app.use(store) .use(router) .use(components) + // .use(jConmonents) .mount('#app') diff --git a/src/router/index.ts b/src/router/index.ts index 0742fa05..9290694b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -8,59 +8,51 @@ import { useMenuStore } from 'store/menu' const router = createRouter({ history: createWebHashHistory(), - routes: menus + routes: menus, + scrollBehavior(to, form, savedPosition) { + return savedPosition || { top: 0 } + } }) -const filterPath = [ - '/form', - '/search' -] - router.beforeEach((to, from, next) => { // TODO 切换路由取消请求 - const isFilterPath = filterPath.includes(to.path) - if (isFilterPath) { - next() - } else { - const token = getToken() - if (token) { - if (to.path === LoginPath) { - next({ path: '/' }) - } else { - const userInfo = useUserInfo() - const system = useSystem() - const menu = useMenuStore() - - if (!menu.siderMenus.length) { - userInfo.getUserInfo().then(() => { - system.getSystemVersion().then((menuData: any[]) => { - menuData.forEach(r => { - router.addRoute('base', r) - }) - router.addRoute('base',{ - path: '/:pathMatch(.*)', - name: 'error', - component: () => NotFindPage - }) - - next({ ...to, replace: true }) - }) - }).catch(() => { - cleanToken() - next({ path: LoginPath }) - }) - } else { - next() - } - } - + const token = getToken() + if (token) { + if (to.path === LoginPath) { + next({ path: '/' }) } else { - if (to.path === LoginPath) { - next() + const userInfo = useUserInfo() + const system = useSystem() + const menu = useMenuStore() + if (!menu.siderMenus.length) { + userInfo.getUserInfo().then(() => { + system.getSystemVersion().then((menuData: any[]) => { + menuData.forEach(r => { + router.addRoute('base', r) + }) + router.addRoute('base',{ + path: '/:pathMatch(.*)', + name: 'error', + component: () => NotFindPage + }) + + next({ ...to, replace: true }) + }) + }).catch(() => { + cleanToken() + next({ path: LoginPath }) + }) } else { - next({ path: LoginPath }) + next() } } + + } else { + if (to.path === LoginPath) { + next() + } else { + next({ path: LoginPath }) + } } }) diff --git a/src/store/menu.ts b/src/store/menu.ts index 96aa4e12..6d77d988 100644 --- a/src/store/menu.ts +++ b/src/store/menu.ts @@ -1,60 +1,117 @@ -import { defineStore } from "pinia"; +import { defineStore } from 'pinia' import { queryOwnThree } from '@/api/system/menu' -import { filterAsnycRouter } from '@/utils/menu' -import { cloneDeep } from 'lodash-es' +import { filterAsnycRouter, MenuItem } from '@/utils/menu' +import { isArray } from 'lodash-es' +import router from '@/router' + +const defaultOwnParams = [ + { + terms: [ + { + terms: [ + { + column: 'owner', + termType: 'eq', + value: 'iot' + }, + { + column: 'owner', + termType: 'isnull', + value: '1', + type: 'or' + } + ] + } + ] + } +] + +type MenuStateType = { + menus: { + [key: string]: { + buttons?: string[] + path: string + } + } + siderMenus: MenuItem[] +} + export const useMenuStore = defineStore({ id: 'menu', - state: () => ({ + state: (): MenuStateType => ({ menus: {}, - menuData: [], - siderMenus: [], - menusKey: [] + siderMenus: [] }), - getters: { + getters: { hasPermission(state) { - return (menuCode: string | string[]) => { - if (!menuCode) { + return (code: string | string[]) => { + if (!code) { return true } if (!!Object.keys(state.menus).length) { - if (typeof menuCode === 'string') { - return !!this.menus[menuCode] + let codes: string[] = [] + + if (typeof code === 'string') { + codes.push(code) + } else { + codes = code } - return menuCode.some(code => !!this.menus[code]) + + return codes.some(_c => { + const menu_code = _c.split(':') + if (menu_code.length > 1) { + return !!this.menus[menu_code[0]]?.buttons?.includes(menu_code[1]) + } + return false + }) } return false } - }, + } }, actions: { + hasMenu(code: string) { + return this.menus[code]?.path + }, + /** + * 路由跳转 + * @param name 菜单code + * @param params 路由参数 + * @param query 路由参数 + */ + jumpPage(name: string, params?: Record, query?: Record) { + const path = this.hasMenu(name) + if (path) { + router.push({ + name, params, query + }) + } else { + console.warn(`没有找到对应的页面: ${name}`) + } + }, queryMenuTree(isCommunity = false): Promise { return new Promise(async (res) => { //过滤非集成的菜单 - const params = [ - { - terms: [ - { - terms: [ - { - column: 'owner', - termType: 'eq', - value: 'iot', - }, - { - column: 'owner', - termType: 'isnull', - value: '1', - type: 'or', - }, - ], - }, - ], - }, - ]; - const resp = await queryOwnThree({ paging: false, terms: params }) + const resp = await queryOwnThree({ paging: false, terms: defaultOwnParams }) if (resp.success) { const { menusData, silderMenus } = filterAsnycRouter(resp.result) + this.menus = {} + const handleMenuItem = (menu: any) => { + if (isArray(menu)) { + menu.forEach(menuItem => { + this.menus[menuItem.name] = { + path: menuItem.path, + buttons: menuItem.meta.buttons + } + if (menuItem.children && menuItem.children.length) { + handleMenuItem(menuItem.children) + } + }) + } + } + + handleMenuItem(menusData) menusData.push({ path: '/', redirect: menusData[0]?.path, @@ -63,7 +120,7 @@ export const useMenuStore = defineStore({ } }) this.siderMenus = silderMenus - console.log('silderMenus', silderMenus) + console.log('menusData', menusData) res(menusData) } }) diff --git a/src/utils/menu.ts b/src/utils/menu.ts index 516be745..98332b79 100644 --- a/src/utils/menu.ts +++ b/src/utils/menu.ts @@ -1,7 +1,6 @@ import { cloneDeep } from 'lodash-es' -import NotFindPage from '@/views/404.vue' import { BlankLayoutPage, BasicLayoutPage } from 'components/Layout' -const pagesComponent = import.meta.glob('../views/**/*.vue', { eager: true }); +const pagesComponent = import.meta.glob('../views/**/*.vue'); /** * 权限信息 @@ -152,9 +151,12 @@ const resolveComponent = (name: any) => { const importPage = pagesComponent[`../views/${name}/index.vue`]; if (!importPage) { console.warn(`Unknown page ${name}. Is it located under Pages with a .vue extension?`) + return undefined + } else { + const res = () => importPage() + return res } //@ts-ignore - return !!importPage ? importPage.default : undefined } const findChildrenRoute = (code: string, url: string, routes: any[] = []): MenuItem[] => { @@ -176,7 +178,7 @@ const findDetailRouteItem = (code: string, url: string): Partial | nul const detailComponent = resolveComponent(`${code}/Detail`) if (detailComponent) { return { - url: `${url}/Detail/:id`, + url: `${url}/detail/:id`, code: `${code}/Detail`, component: detailComponent, name: '详情信息', @@ -205,11 +207,12 @@ export function filterAsnycRouter(asyncRouterMap: any, parentCode = '', level = _asyncRouterMap.forEach((route: any) => { const _route: any = { path: `${route.url}`, + name: route.code, meta: { icon: route.icon, title: route.name, hideInMenu: route.isShow === false, - buttons: route.buttons || [] + buttons: route.buttons?.map((b: any) => b.id) || [] } } @@ -224,12 +227,13 @@ export function filterAsnycRouter(asyncRouterMap: any, parentCode = '', level = _route.children = _menusData silder.children = _silderMenus const showChildren = _route.children.some((r: any) => !r.meta.hideInMenu) - if (showChildren) { - _route.component = () => level === 1 ? BasicLayoutPage : BlankLayoutPage + + if (showChildren && _route.children.length) { + _route.component = level === 1 ? BasicLayoutPage : BlankLayoutPage _route.redirect = route.children[0].url } else { const myComponent = resolveComponent(route.code) - _route.component = myComponent ? myComponent : BlankLayoutPage; + // _route.component = myComponent ? myComponent : BlankLayoutPage; if (!!myComponent) { _route.component = myComponent; _route.children.map((r: any) => menusData.push(r)) @@ -239,7 +243,7 @@ export function filterAsnycRouter(asyncRouterMap: any, parentCode = '', level = } } } else { - _route.component = route.component || resolveComponent(route.code) || BlankLayoutPage; + _route.component = route.component || resolveComponent(route.code) || BlankLayoutPage } menusData.push(_route) silderMenus.push(silder) diff --git a/src/views/northbound/AliCloud/Detail/doc.vue b/src/views/Northbound/AliCloud/Detail/doc.vue similarity index 100% rename from src/views/northbound/AliCloud/Detail/doc.vue rename to src/views/Northbound/AliCloud/Detail/doc.vue diff --git a/src/views/northbound/AliCloud/Detail/index.vue b/src/views/Northbound/AliCloud/Detail/index.vue similarity index 100% rename from src/views/northbound/AliCloud/Detail/index.vue rename to src/views/Northbound/AliCloud/Detail/index.vue diff --git a/src/views/northbound/AliCloud/index.vue b/src/views/Northbound/AliCloud/index.vue similarity index 96% rename from src/views/northbound/AliCloud/index.vue rename to src/views/Northbound/AliCloud/index.vue index 52228bac..5300d43f 100644 --- a/src/views/northbound/AliCloud/index.vue +++ b/src/views/Northbound/AliCloud/index.vue @@ -151,12 +151,15 @@ import { import type { ActionsType } from '@/components/Table/index.vue'; import { getImage } from '@/utils/comm'; import { message } from 'ant-design-vue'; +import { useMenuStore } from 'store/menu' const router = useRouter(); const instanceRef = ref>({}); const params = ref>({}); const current = ref>({}); +const menuStory = useMenuStore() + const statusMap = new Map(); statusMap.set('enabled', 'success'); statusMap.set('disabled', 'error'); @@ -209,19 +212,14 @@ const columns = [ * 新增 */ const handleAdd = () => { - router.push('/iot/northbound/AliCloud/detail/:id'); + menuStory.jumpPage('Northbound/AliCloud/Detail', { id: ':id'}) }; /** * 查看 */ const handleView = (id: string) => { - router.push({ - path: '/iot/northbound/AliCloud/detail/' + id, - query: { - type: 'view' - } - }); + menuStory.jumpPage('Northbound/AliCloud/Detail', { id }, { type: 'view'}) }; const getActions = ( @@ -249,12 +247,7 @@ const getActions = ( }, icon: 'EditOutlined', onClick: () => { - router.push({ - path: '/iot/northbound/AliCloud/detail/' + data.id, - query: { - type: 'edit' - } - }); + menuStory.jumpPage('Northbound/AliCloud/Detail', { id: data.id }, { type: 'edit'}) }, }, { diff --git a/src/views/northbound/DuerOS/Detail/command/EditTable.vue b/src/views/Northbound/DuerOS/Detail/command/EditTable.vue similarity index 100% rename from src/views/northbound/DuerOS/Detail/command/EditTable.vue rename to src/views/Northbound/DuerOS/Detail/command/EditTable.vue diff --git a/src/views/northbound/DuerOS/Detail/command/index.vue b/src/views/Northbound/DuerOS/Detail/command/index.vue similarity index 100% rename from src/views/northbound/DuerOS/Detail/command/index.vue rename to src/views/Northbound/DuerOS/Detail/command/index.vue diff --git a/src/views/northbound/DuerOS/Detail/doc.vue b/src/views/Northbound/DuerOS/Detail/doc.vue similarity index 100% rename from src/views/northbound/DuerOS/Detail/doc.vue rename to src/views/Northbound/DuerOS/Detail/doc.vue diff --git a/src/views/northbound/DuerOS/Detail/index.vue b/src/views/Northbound/DuerOS/Detail/index.vue similarity index 100% rename from src/views/northbound/DuerOS/Detail/index.vue rename to src/views/Northbound/DuerOS/Detail/index.vue diff --git a/src/views/northbound/DuerOS/index.vue b/src/views/Northbound/DuerOS/index.vue similarity index 96% rename from src/views/northbound/DuerOS/index.vue rename to src/views/Northbound/DuerOS/index.vue index b1079742..e485aff5 100644 --- a/src/views/northbound/DuerOS/index.vue +++ b/src/views/Northbound/DuerOS/index.vue @@ -147,11 +147,13 @@ import { query, _undeploy, _deploy, _delete, queryProductList, queryTypes } from import type { ActionsType } from '@/components/Table/index.vue'; import { getImage } from '@/utils/comm'; import { message } from 'ant-design-vue'; +import { useMenuStore } from 'store/menu' const router = useRouter(); const instanceRef = ref>({}); const params = ref>({}); const current = ref>({}); +const menuStory = useMenuStore() const statusMap = new Map(); statusMap.set('enabled', 'success'); @@ -236,20 +238,14 @@ const columns = [ * 新增 */ const handleAdd = () => { - router.push('/iot/northbound/DuerOS/detail/:id'); + menuStory.jumpPage('Northbound/DuerOS/Detail', { id: ':id'}) }; /** * 查看 */ const handleView = (id: string) => { - // router.push('/iot/northbound/DuerOS/detail/' + id); - router.push({ - path: '/iot/northbound/DuerOS/detail/' + id, - query: { - type: 'view', - }, - }); + menuStory.jumpPage('Northbound/DuerOS/Detail', { id }, { type: 'view' }) }; const getActions = ( @@ -277,12 +273,7 @@ const getActions = ( }, icon: 'EditOutlined', onClick: () => { - router.push({ - path: '/iot/northbound/DuerOS/detail/' + data.id, - query: { - type: 'edit', - }, - }); + menuStory.jumpPage('Northbound/DuerOS/Detail', { id: data.id }, { type: 'edit' }) }, }, { diff --git a/src/views/device/Firmware/Save/FileUpload.vue b/src/views/device/Firmware/Save/FileUpload.vue new file mode 100644 index 00000000..b7b6398b --- /dev/null +++ b/src/views/device/Firmware/Save/FileUpload.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/views/device/Firmware/Save/index.vue b/src/views/device/Firmware/Save/index.vue new file mode 100644 index 00000000..ead74d77 --- /dev/null +++ b/src/views/device/Firmware/Save/index.vue @@ -0,0 +1,388 @@ + + + + diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue new file mode 100644 index 00000000..d8c34292 --- /dev/null +++ b/src/views/device/Firmware/index.vue @@ -0,0 +1,268 @@ + + + + diff --git a/src/views/device/Firmware/type.d.ts b/src/views/device/Firmware/type.d.ts new file mode 100644 index 00000000..80a289c0 --- /dev/null +++ b/src/views/device/Firmware/type.d.ts @@ -0,0 +1,23 @@ +export type FormDataType = { + description: string; + name: string; + productId: string | undefined; + version: undefined; + versionOrder: undefined; + signMethod: string | undefined; + sign: string; + url: string; + size: number; + properties: Array; + id?: string; + format?: string; + mode?: object; + creatorId?: string; + createTime?: number; +}; + +export interface Properties { + id: string; + value: any; + keyid: number; +} diff --git a/src/views/device/Instance/Detail/Diagnose/Message/Dialog/index.vue b/src/views/device/Instance/Detail/Diagnose/Message/Dialog/index.vue index 1e4d60f2..1da53219 100644 --- a/src/views/device/Instance/Detail/Diagnose/Message/Dialog/index.vue +++ b/src/views/device/Instance/Detail/Diagnose/Message/Dialog/index.vue @@ -1,20 +1,47 @@ @@ -17,12 +18,19 @@ type Emits = { const emit = defineEmits(); const props = defineProps({ + toParty: { type: String, default: '' }, type: { type: String, default: '' }, configId: { type: String, default: '' }, }); +const _value = computed({ + get: () => props.toParty, + set: (val: string) => emit('update:toParty', val), +}); + const options = ref([]); const queryData = async () => { + if (!props.configId) return; const { result } = await templateApi.getDept(props.type, props.configId); options.value = result.map((item: any) => ({ label: item.name, diff --git a/src/views/notice/Template/Detail/components/ToTag.vue b/src/views/notice/Template/Detail/components/ToTag.vue index 28f469b7..e304fc84 100644 --- a/src/views/notice/Template/Detail/components/ToTag.vue +++ b/src/views/notice/Template/Detail/components/ToTag.vue @@ -5,6 +5,7 @@ placeholder="请选择标签推送，多个标签用,号分隔" style="width: 100%" :allowClear="true" + v-model:value="_value" /> @@ -17,12 +18,19 @@ type Emits = { const emit = defineEmits(); const props = defineProps({ + toTag: { type: String, default: '' }, type: { type: String, default: '' }, configId: { type: String, default: '' }, }); +const _value = computed({ + get: () => props.toTag, + set: (val: string) => emit('update:toTag', val), +}); + const options = ref([]); const queryData = async () => { + if (!props.configId) return; const { result } = await templateApi.getTags(props.configId); options.value = result.map((item: any) => ({ label: item.name, diff --git a/src/views/notice/Template/Detail/components/ToUser.vue b/src/views/notice/Template/Detail/components/ToUser.vue index 21bd9aa2..3edabeac 100644 --- a/src/views/notice/Template/Detail/components/ToUser.vue +++ b/src/views/notice/Template/Detail/components/ToUser.vue @@ -5,6 +5,7 @@ placeholder="请选择收信人" style="width: 100%" :allowClear="true" + v-model:value="_value" /> @@ -17,12 +18,19 @@ type Emits = { const emit = defineEmits(); const props = defineProps({ + toUser: { type: String, default: '' }, type: { type: String, default: '' }, configId: { type: String, default: '' }, }); +const _value = computed({ + get: () => props.toUser, + set: (val: string) => emit('update:toUser', val), +}); + const options = ref([]); const queryData = async () => { + if (!props.configId) return; const { result } = await templateApi.getUser(props.type, props.configId); options.value = result.map((item: any) => ({ label: item.name, diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue index db0506ac..2ba78972 100644 --- a/src/views/notice/Template/Detail/index.vue +++ b/src/views/notice/Template/Detail/index.vue @@ -1,6 +1,6 @@ @@ -188,9 +254,19 @@ - - diff --git a/src/views/notice/Template/Log/index.vue b/src/views/notice/Template/Log/index.vue index 4718e6a7..0933690c 100644 --- a/src/views/notice/Template/Log/index.vue +++ b/src/views/notice/Template/Log/index.vue @@ -94,7 +94,7 @@ const columns = [ search: { type: 'date', handleValue: (v: any) => { - return '123'; + return v; }, }, }, @@ -110,7 +110,7 @@ const columns = [ { label: '失败', value: 'error' }, ], handleValue: (v: any) => { - return '123'; + return v; }, }, }, @@ -139,7 +139,16 @@ const handleSearch = (e: any) => { const handleError = (e: any) => { Modal.info({ title: '错误信息', - content: JSON.stringify(e), + content: h( + 'p', + { + style: { + maxHeight: '300px', + overflowY: 'auto', + }, + }, + JSON.stringify(e), + ), }); }; /** @@ -148,7 +157,16 @@ const handleError = (e: any) => { const handleDetail = (e: any) => { Modal.info({ title: '详情信息', - content: JSON.stringify(e), + content: h( + 'p', + { + style: { + maxHeight: '300px', + overflowY: 'auto', + }, + }, + JSON.stringify(e), + ), }); }; diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue index 70d3738c..4edb02b8 100644 --- a/src/views/notice/Template/index.vue +++ b/src/views/notice/Template/index.vue @@ -1,5 +1,5 @@ - diff --git a/src/views/notice/const.ts b/src/views/notice/const.ts index 9bd71ca6..32116d21 100644 --- a/src/views/notice/const.ts +++ b/src/views/notice/const.ts @@ -184,11 +184,11 @@ export const TEMPLATE_FIELD_MAP = { }, voice: { aliyun: { - templateType: '', + templateType: 'tts', templateCode: '', ttsCode: '', message: '', - playTimes: undefined, + playTimes: 1, calledShowNumbers: '', calledNumber: '', } diff --git a/src/views/rule-engine/Scene/Save/index.vue b/src/views/rule-engine/Scene/Save/index.vue new file mode 100644 index 00000000..593b1d44 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue new file mode 100644 index 00000000..71ae1f6c --- /dev/null +++ b/src/views/rule-engine/Scene/index.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/typings.ts b/src/views/rule-engine/Scene/typings.ts new file mode 100644 index 00000000..94ef1e01 --- /dev/null +++ b/src/views/rule-engine/Scene/typings.ts @@ -0,0 +1,307 @@ +type State = { + value: string; + text: string; +}; + +type Action = { + executor: string; + configuration: Record; +}; + +type Trigger = { + type: string; + device: Record; +}; + +export enum ParallelEnum { + 'parallel' = 'parallel', + 'serial' = 'serial', +} + +export type ParallelType = keyof typeof ParallelEnum; + +export enum Source { + 'manual' = 'manual', + 'metric' = 'metric', + 'fixed' = 'fixed', +} + +export enum ActionDeviceSelector { + 'all' = 'all', + 'fixed' = 'fixed', + 'tag' = 'tag', + 'relation' = 'relation', +} + +export enum ActionDeviceSource { + 'fixed' = 'fixed', + 'upper' = 'upper', + 'relation' = 'relation', +} + +export enum OperatorType { + 'online' = 'online', + 'offline' = 'offline', + 'reportEvent' = 'reportEvent', + 'reportProperty' = 'reportProperty', + 'readProperty' = 'readProperty', + 'writeProperty' = 'writeProperty', + 'invokeFunction' = 'invokeFunction', +} + +export enum TimerTrigger { + 'week' = 'week', + 'month' = 'month', + 'cron' = 'cron', +} + +export enum TimeUnit { + 'seconds' = 'seconds', + 'minutes' = 'minutes', + 'hours' = 'hours', +} + +export enum Executor { + 'notify' = 'notify', + 'delay' = 'delay', + 'device' = 'device', + 'alarm' = 'alarm', +} + +export enum DeviceMessageType { + 'INVOKE_FUNCTION' = 'INVOKE_FUNCTION', + 'READ_PROPERTY' = 'READ_PROPERTY', + 'WRITE_PROPERTY' = 'WRITE_PROPERTY', +} + +export enum ActionAlarmMode { + 'trigger' = 'trigger', + 'relieve' = 'relieve', +} + +export interface OperationTimerPeriod { + from: string; + to: string; + every: string[]; + unit: keyof typeof TimeUnit; +} + +export interface OperationTimer { + trigger: keyof typeof TimerTrigger; + mod: string; + cron?: string; + when?: string[]; + period?: OperationTimerPeriod; + once?: Record; +} + +export interface TriggerDeviceOptions { + operator: keyof typeof OperatorType; + /** 触发类型为readProperty,writeProperty,invokeFunction时不能为空 */ + timer?: OperationTimer; + /** 触发类型为reportEvent时不能为空 */ + eventId?: string; + /** 触发类型为readProperty时不能为空 */ + readProperties?: string[]; + /** 触发类型为writeProperty时不能为空 */ + writeProperties?: Record; + /** 触发类型为invokeFunction时不能为空 */ + functionId?: string; + /** 触发类型为invokeFunction时不能为空 */ + functionParameters?: Record[]; +} + +/** + * 设备触发配置 + */ +export interface TriggerDevice { + productId: string; + selector: string; + selectorValues?: Record[]; + operation?: TriggerDeviceOptions; +} + +export interface ShakeLimitType { + enabled: boolean; + groupType?: string; // 执行动作没有该参数 + time: number; + threshold: number; + alarmFirst: boolean; +} + +export interface BranchesType { + enabled: boolean; + groupType?: string; // 执行动作没有该参数 + time: number; + threshold: number; + alarmFirst: boolean; +} + +export interface SceneItem { + parallel: boolean; + state: State; + actions: Action[]; + trigger: Trigger; + id: string; + name: string; + description: string; + branches: BranchesType[]; + options: any; + triggerType: string; +} + +export type TriggerType = { + type: string; + /** + * 防抖配置 + */ + shakeLimit?: ShakeLimitType; + /** + * 拓展信息 + */ + options?: Record; + /** + * 设备触发配置 + */ + device?: TriggerDevice; + /** + * 定时触发配置 + */ + timer?: OperationTimer; +}; + +export interface TermsVale { + source: keyof typeof Source; + /** 手动输入值,source为 manual 时不能为空 */ + value?: Record | any[]; + /** 指标值,source为 metric 时不能为空 */ + metric?: Record; +} + +export type TermsType = { + column?: string; + value?: TermsVale; + type?: string; + termType?: string; + options?: any[]; + terms?: TermsType[]; + key?: string; +}; + +export type PlatformRelation = { + objectType: string; + objectId: string; +}; + +export type Relationship = { + objectType: string; + objectSource: { + source: string; + upperKey: string; + }; + related: { + objectType: string; + relation: string; + }; +}; + +export interface NotifyVariablesType { + source: string; + value?: Record; + upperKey?: string; + relation?: PlatformRelation | Relationship; +} + +export interface NotifyProps { + notifyType: string; + notifierId: string; + templateId: string; + variables: Record; + options?: Record; +} + +export type SelectorValuesType = + | { value: string; name: string } + | { value: { column: string; value: any }[]; name: string } + | { value: { objectType: string; relation: any }[] }; + +export type ActionDeviceMessageType = { + deviceId: string; + messageType: keyof typeof DeviceMessageType; + /** 功能调用时使用 */ + functionId?: string; + /** 功能调用时使用 */ + inputs?: Record[]; + /** 读取属性时使用, 读取属性时为String数组，设置属性时为 Object */ + properties?: string[] | Record; +}; + +export interface ActionsDeviceProps { + selector: keyof typeof ActionDeviceSelector; + source: keyof typeof ActionDeviceSource; + productId?: string; + message?: ActionDeviceMessageType; + selectorValues?: SelectorValuesType[]; + /** 来源为upper时不能为空 */ + upperKey?: string; + /** 来源为relation时不能为空 */ + relation?: any; +} + +export interface BranchesThen { + parallel: boolean; + actions: ActionsType[]; + key?: string; +} + +export interface ActionBranchesProps { + when: TermsType[]; + shakeLimit: ShakeLimitType; + then: BranchesThen[]; + key?: string; +} + +export interface ActionsType { + executor: keyof typeof Executor; + /** 执行器类型为notify时不能为空 */ + notify?: NotifyProps; + /** 执行器类型为delay时不能为空 */ + delay?: { + time?: number; + unit?: keyof typeof TimeUnit; + }; + device?: ActionsDeviceProps; + alarm?: { + mode: keyof typeof ActionAlarmMode; + }; + terms?: TermsType[]; + /** map中的key，用于删除 */ + key?: string; + options?: Record; +} + +export interface FormModelType { + id?: string; + name?: string; + /** + * 触发方式 + */ + trigger?: TriggerType; + /** + * 触发条件,结构与通用查询条件相同。条件数据来自接口：根据触发器解析出支持的条件列 + */ + terms?: TermsType[]; + /** + * 执行动作 + */ + actions?: ActionsType[]; + /** + * 动作分支 + */ + branches?: ActionBranchesProps[]; + /** + * 拓展信息,用于前端存储一些渲染数据 + */ + options?: Record; + description?: string; +} diff --git a/vite.config.ts b/vite.config.ts index 17c5e7fd..7048d340 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,6 +10,7 @@ import {VueAmapResolver} from '@vuemap/unplugin-resolver' import VueSetupExtend from 'vite-plugin-vue-setup-extend' import { createStyleImportPlugin, AndDesignVueResolve } from 'vite-plugin-style-import' import * as path from 'path' +import monacoEditorPlugin from 'vite-plugin-monaco-editor'; // https://vitejs.dev/config/ @@ -47,7 +48,9 @@ export default defineConfig(({ mode}) => { }, }, plugins: [ + vue(), + monacoEditorPlugin({}), vueJsx(), Components({ resolvers: [AntDesignVueResolver({ importStyle: 'less' }), VueAmapResolver()],