diff --git a/.env.development b/.env.development index 64e3ed13b..39a9b0c3e 100644 --- a/.env.development +++ b/.env.development @@ -8,3 +8,4 @@ VITE_APP_PORT = 9999 VITE_APP_BASE_API = '/dev-api' VITE_APP_BASE_URL = 'http://myvuetest.net' VITE_APP_TOKEN_KEY = 'offlineAccessSystemAppToken' +VITE_APP_SJZT_URL = 'http://172.20.5.86/prod-api' diff --git a/.env.production b/.env.production index 46ddbf3c2..0513524e2 100644 --- a/.env.production +++ b/.env.production @@ -4,3 +4,4 @@ VITE_APP_TITLE = '数通智联化工云平台' VITE_APP_PORT = 17777 VITE_APP_BASE_API = '' VITE_APP_TOKEN_KEY = 'onlineAccessSystemAppToken' +VITE_APP_SJZT_URL = 'http://120.224.6.6:29911/prod-api' diff --git a/src/api/date/apidate.ts b/src/api/date/apidate.ts new file mode 100644 index 000000000..6e9e997e6 --- /dev/null +++ b/src/api/date/apidate.ts @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export function getOrPostDate(methodStr:string,data?: any) { + return request({ + url: "/systemapi/dataCenter/gaindataCenter", + method: "POST", + data: data + }); +} diff --git a/src/api/date/type.ts b/src/api/date/type.ts new file mode 100644 index 000000000..2ea0cd302 --- /dev/null +++ b/src/api/date/type.ts @@ -0,0 +1,49 @@ +//数据库类型 +export const dateTypes = [ + { + value: '1', + label: '关系型数据库', + }, + { + value: '2', + label: '时序数据库', + }, + { + value: '3', + label: '非关系型数据库', + } +] +//数据库产品 +export const dataSourceTypes = [ + { + value: '1', + label: 'mysql', + }, + { + value: '2', + label: 'RTD', + }, + { + value: '3', + label: '暂时未知', + }, + { + value: '4', + label: 'sql server', + }, + { + value: '5', + label: 'redis', + } +] +//接口方式 +export const interfaceTypes = [ + { + value: '1', + label: 'SQL', + }, + { + value: '2', + label: 'API', + } +] diff --git a/src/types/components.d.ts b/src/types/components.d.ts index e2838bd1b..3067ce771 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -31,6 +31,7 @@ declare module '@vue/runtime-core' { ElCard: typeof import('element-plus/es')['ElCard'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] + ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] @@ -62,6 +63,7 @@ declare module '@vue/runtime-core' { ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElPopover: typeof import('element-plus/es')['ElPopover'] + ElProgress: typeof import('element-plus/es')['ElProgress'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] @@ -109,8 +111,15 @@ declare module '@vue/runtime-core' { HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] + IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] + IEpDelete: typeof import('~icons/ep/delete')['default'] + IEpEdit: typeof import('~icons/ep/edit')['default'] + IEpPlus: typeof import('~icons/ep/plus')['default'] + IEpRefresh: typeof import('~icons/ep/refresh')['default'] + IEpSearch: typeof import('~icons/ep/search')['default'] IEpSetting: typeof import('~icons/ep/setting')['default'] + IEpView: typeof import('~icons/ep/view')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default'] List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] diff --git a/src/utils/request.ts b/src/utils/request.ts index fce7d06ae..1c5a3a56d 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -33,7 +33,7 @@ service.interceptors.request.use( service.interceptors.response.use( (response: AxiosResponse) => { const { code, msg } = response.data; - if (code === 0 || code === 10001) { + if (code === 0 || code === 200 || code === 10001) { return response.data; } if (code === 7 || code === 300 || code === 301 || code === 302){ diff --git a/src/utils/requestfile.ts b/src/utils/requestfile.ts index dc4652933..7f812fe29 100644 --- a/src/utils/requestfile.ts +++ b/src/utils/requestfile.ts @@ -31,7 +31,7 @@ service.interceptors.request.use( service.interceptors.response.use( (response: AxiosResponse) => { const { code, msg } = response.data; - if (code === 0) { + if (code === 0 || code === 200) { return response.data; } if (code === 7 || code === 300 || code === 301 || code === 302){ diff --git a/src/views/date/assets.vue b/src/views/date/assets.vue new file mode 100644 index 000000000..0156f30c9 --- /dev/null +++ b/src/views/date/assets.vue @@ -0,0 +1,222 @@ + + + + diff --git a/src/views/sysworkflow/lowcodepage/appPage/index.vue b/src/views/sysworkflow/lowcodepage/appPage/index.vue new file mode 100644 index 000000000..1bbf864b8 --- /dev/null +++ b/src/views/sysworkflow/lowcodepage/appPage/index.vue @@ -0,0 +1,37 @@ + + + + diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue index 0f6f55124..6cf3324d3 100644 --- a/src/views/sysworkflow/lowcodepage/index.vue +++ b/src/views/sysworkflow/lowcodepage/index.vue @@ -17,6 +17,9 @@ import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue import LowCodeFormGroupPage from "@/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue" import AppFormList from "@/views/sysworkflow/lowcodepage/appFormList.vue" +import DesignAPPpage from "@/views/sysworkflow/lowcodepage/appPage/index.vue" //自建应用 + +const appPageShow = ref(false) const contbody = ref() //实例化内容容器 const addFormIsShow = ref(false) const addFormGroupIsShow = ref(false) @@ -44,7 +47,9 @@ const handleCommand = (command: string,groupId: string) => { // addFormIsShow.value = true drawerWith.value = contbody.value?.clientWidth addFormIsShow.value = true; - + }else if(command == "addFormApp"){ + drawerWith.value = contbody.value?.clientWidth + appPageShow.value = true }else{ addFormGroupIsShow.value = true drawerGroupWith.value = 400 @@ -190,7 +195,7 @@ const getRongQiAttr = () => { - + diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue index 06ba9c398..068ff581e 100644 --- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue +++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue @@ -69,6 +69,19 @@ const drawerOpenOrClose = computed({ emits("update:isopen", val); }, }); + +const drawbox = computed({ + get: () => { + if(props.drawerwith > 1200){ + return '50%'; + }else{ + return props.drawerwith + } + }, + set: (val:number) => { + return val + }, +}); const isFlowTable = ref(false) //判断是不是流程表单 //获取表单数据 const getTaskFormData = () =>{ @@ -108,6 +121,7 @@ const getTaskFormData = () =>{ //监听页面变化 watch(()=>props.isopen,()=>{ if(props.isopen){ + getTaskFormData(); }else{ initData() @@ -396,7 +410,7 @@ const saveDraftPage = (type: string,val?:any) => { }