diff --git a/.npmrc b/.npmrc index 35e540d..7c029b0 100644 --- a/.npmrc +++ b/.npmrc @@ -2,3 +2,5 @@ shamefully-hoist=true auto-install-peers=true strict-peer-dependencies=false +@qomo:registry=https://packages.aliyun.com/669a1b3bbedb1acc325c96c0/npm/npm-registry/ +@qomo-platform:registry=https://packages.aliyun.com/669a1b3bbedb1acc325c96c0/npm/npm-registry/ diff --git a/package.json b/package.json index aefdbcf..67088d8 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "@element-plus/icons-vue": "2.3.1", - "@qomo-platform/core": "^1.0.100", + "@qomo-platform/core": "^1.0.151", "@vueup/vue-quill": "1.2.0", "@vueuse/core": "10.6.1", "axios": "1.6.7", @@ -33,6 +33,7 @@ "pinia-plugin-persistedstate": "^3.2.1", "postcss-pxtorem": "^6.1.0", "prettier": "^3.2.5", + "uuid": "^10.0.0", "vite-plugin-qiankun": "^1.0.15", "vue": "3.3.9", "vue-router": "4.2.5" diff --git a/src/api/index.js b/src/api/index.js index 7a0dc7f..1a94f33 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,3 +1,51 @@ +import request from "@/service/request"; export function getDictCode(params) { - return request.get(`/sys/dictItem/type`,params); + return request.get(`/sys/dictItem/type`, params); +} + +//保存流程图 +export function saveFlowModel(data) { + return request.post("/api/flowDefinition/saveModel", {}, data, { + message: { + success: `保存成功`, + error: true + } + }); +} +//执行流程 +export function flowInstanceExecute(id) { + return request.post(`/api/dataIntegration/flowInstance/execute/${id}`, {}, {}, { + message: { + success: `流程开始运行`, + error: true + } + }); +} +//查询数据源 +export function dataSourceList(params) { + return request.get("/api/group/treeList", params, { + error: true + }); +} +//查询组件 +export function getComponentTree(params) { + return request.get("/api/componentGroup/getComponentTree", params, { + error: true + }); +} +//查询数据库列表 +export function databaseListSchemas(params) { + return request.get('/api/database/listSchemas', params, { + error: true + }); +} + +//查询表 +export function listTablesBySchemaPage(params) { + return request.get('/api/database/listTablesBySchemaPage', params); +} + +// 获取表字段 +export function listColumns(params) { + return request.get('/api/database/listColumns', params); } \ No newline at end of file diff --git a/src/api/modelManagement.js b/src/api/modelManagement.js new file mode 100644 index 0000000..847c060 --- /dev/null +++ b/src/api/modelManagement.js @@ -0,0 +1,32 @@ +import request from "@/service/request"; +/*获取模型列表*/ +export function modelList(params) { + return request.get(`/cost-model/pageList`, params); +} +// /*新增小时费率*/ +// export function addHourRate(data) { +// return request.post("/hourRate/add", {}, data, { +// message: { +// success: "新增成功", +// error: true +// } +// }); +// } +// /*编辑小时费率*/ +// export function editHourRate(data) { +// return request.post("/hourRate/edit", {}, data, { +// message: { +// success: "编辑成功", +// error: true +// } +// }); +// } +/*删除*/ +export function deleteModel(data) { + return request.post("/cost-model/delete",{}, data,{ + message: { + success: "删除成功", + error: true + } + }); +} diff --git a/src/assets/imgs/database.png b/src/assets/imgs/database.png new file mode 100644 index 0000000..1db8144 Binary files /dev/null and b/src/assets/imgs/database.png differ diff --git a/src/assets/imgs/dateIcon.png b/src/assets/imgs/dateIcon.png new file mode 100644 index 0000000..82a7e6e Binary files /dev/null and b/src/assets/imgs/dateIcon.png differ diff --git a/src/assets/imgs/icon_folder.png b/src/assets/imgs/icon_folder.png new file mode 100644 index 0000000..0d4ab47 Binary files /dev/null and b/src/assets/imgs/icon_folder.png differ diff --git a/src/assets/imgs/icon_report.png b/src/assets/imgs/icon_report.png new file mode 100644 index 0000000..5bf235f Binary files /dev/null and b/src/assets/imgs/icon_report.png differ diff --git a/src/assets/imgs/numberIcon.png b/src/assets/imgs/numberIcon.png new file mode 100644 index 0000000..3d241de Binary files /dev/null and b/src/assets/imgs/numberIcon.png differ diff --git a/src/assets/imgs/stringIcon.png b/src/assets/imgs/stringIcon.png new file mode 100644 index 0000000..ec01c61 Binary files /dev/null and b/src/assets/imgs/stringIcon.png differ diff --git a/src/components/SqlStatement/index.vue b/src/components/SqlStatement/index.vue new file mode 100644 index 0000000..349bab3 --- /dev/null +++ b/src/components/SqlStatement/index.vue @@ -0,0 +1,245 @@ + + diff --git a/src/components/SqlStatementType/index.vue b/src/components/SqlStatementType/index.vue new file mode 100644 index 0000000..6ce2291 --- /dev/null +++ b/src/components/SqlStatementType/index.vue @@ -0,0 +1,273 @@ + + diff --git a/src/flowableComponents/code_1tp3f06n2osg0/index.vue b/src/flowableComponents/code_1tp3f06n2osg0/index.vue new file mode 100644 index 0000000..e50aa72 --- /dev/null +++ b/src/flowableComponents/code_1tp3f06n2osg0/index.vue @@ -0,0 +1,102 @@ + + diff --git a/src/flowableComponents/code_1tvqz9qc8o3k0/index.vue b/src/flowableComponents/code_1tvqz9qc8o3k0/index.vue new file mode 100644 index 0000000..d091640 --- /dev/null +++ b/src/flowableComponents/code_1tvqz9qc8o3k0/index.vue @@ -0,0 +1,102 @@ + + diff --git a/src/flowableComponents/code_4sx7fvcei1w0/index.vue b/src/flowableComponents/code_4sx7fvcei1w0/index.vue new file mode 100644 index 0000000..e50aa72 --- /dev/null +++ b/src/flowableComponents/code_4sx7fvcei1w0/index.vue @@ -0,0 +1,102 @@ + + diff --git a/src/flowableComponents/code_mmnbnhf6uhc0/index.vue b/src/flowableComponents/code_mmnbnhf6uhc0/index.vue new file mode 100644 index 0000000..e50aa72 --- /dev/null +++ b/src/flowableComponents/code_mmnbnhf6uhc0/index.vue @@ -0,0 +1,102 @@ + + diff --git a/src/flowableComponents/code_oq3y1fnvwhs0/index.vue b/src/flowableComponents/code_oq3y1fnvwhs0/index.vue new file mode 100644 index 0000000..e50aa72 --- /dev/null +++ b/src/flowableComponents/code_oq3y1fnvwhs0/index.vue @@ -0,0 +1,102 @@ + + diff --git a/src/flowableComponents/dbOutput/index.vue b/src/flowableComponents/dbOutput/index.vue index 4f2b37d..1ca97b1 100644 --- a/src/flowableComponents/dbOutput/index.vue +++ b/src/flowableComponents/dbOutput/index.vue @@ -7,39 +7,94 @@ import { watchEffect, watch } from "vue"; +import { useExposeDialogArgs } from "@qomo-platform/core"; +import SqlStatement from "@/components/SqlStatement"; export default defineComponent({ name: "dbOutput", - props:{ - nodeDetail:{ - type:Object + props: { + nodeDetail: { + type: Object } }, setup(props, { attrs, expose, slots = {} }) { - const formInline = reactive({}); + const nodeDetail = computed(() => props?.nodeDetail); + const baseFormRef = ref({}); + const baseMonacoEditorRef = ref(); + const { findNodesPrev, findNodesNext, getNodeData } = attrs; + const submit = () => { + let params = baseFormRef.value.formData; + return { + params + }; + }; - const submit = ()=>{ - let param = formInline; - + const open = () => { + init(nodeDetail.value); + baseMonacoEditorRef.value?.restLayout(); + }; - return param - } + // onMounted(()=>{ + // init(nodeDetail.value) + // }) + + // watch(nodeDetail,(v)=>{ + // init(v) + // },{ + // deep:true + // }) + watch( + () => baseFormRef.value.formData, + val => {}, + { + deep: true + } + ); + + const init = v => { + const data = findNodesNext(props?.nodeDetail.id); + baseFormRef.value.setFormData( + JSON.parse(v?.taskParams || "{}")?.params || {} + ); + }; + + const handleOK = value => {}; expose({ - submit - }) + submit, + open + }); + return () => ( - - - - - - - - - - - + ( +
+
+ +
+
+ +
+ +
+
+
+
+ ) + }} + /> ); } }); diff --git a/src/platform.ts b/src/platform.ts index 93c5c11..8592fe4 100644 --- a/src/platform.ts +++ b/src/platform.ts @@ -20,6 +20,46 @@ export const qomoPlatformOptions = { label: "首批", value: "C" } + ], + modelStatus: [ + { + label: "草稿", + value: "1" + }, + { + label: "已发布", + value: "2" + }, + { + label: "运行中", + value: "3" + }, + { + label: "已完成", + value: "4" + } + ], + feeTypeList:[ + { + label: "机器折旧费", + value: "EquipmentFee" + }, + { + label: "辅料费", + value: "SupplyMaterialFee" + }, + { + label: "水电费", + value: "DriverFee" + }, + { + label: "其他费用", + value: "OtherFee" + }, + { + label: "物流费", + value: "LogisticsFee" + } ] }, async provider(dictType) { diff --git a/src/router/index.js b/src/router/index.js index 5d3410e..3548605 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -69,18 +69,18 @@ export const constantRoutes = [ }, ] }, - // { - // path: '', - // component: Layout, - // children: [ - // { - // path: "/hour", - // component: () => import("@/views/hour/index"), - // name: "Hour", - // meta: { title: "小时费率", icon: "money", affix: true } - // } - // ] - // }, + { + path: '', + component: Layout, + children: [ + { + path: "/hour", + component: () => import("@/views/hour/index"), + name: "Hour", + meta: { title: "小时费率", icon: "money", affix: true } + } + ] + }, // { // path: '', // component: Layout, @@ -153,6 +153,19 @@ export const constantRoutes = [ } ] }, + { + path: '', + component: Layout, + children: [ + { + path: "modelManagement/index", + component: () => import("@/views/modelManagement/index"), + name: "Modelmanagement", + meta: { title: "成本计算模型管理", icon: "tree", affix: true } + } + ] + }, + // Bom,工序,采购价格 ]; //本地调试默认路由 diff --git a/src/utils/auth.js b/src/utils/auth.js index 785a25d..1800a4d 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -3,13 +3,13 @@ import Cookies from "js-cookie"; const TokenKey = "Admin-Token"; export function getToken() { - return Cookies.get(TokenKey); + return window.localStorage.getItem(TokenKey); } export function setToken(token) { - return Cookies.set(TokenKey, token); + return window.localStorage.setItem(TokenKey, token); } export function removeToken() { - return Cookies.remove(TokenKey); + return window.localStorage.removeItem(TokenKey); } diff --git a/src/views/modelManagement/index.vue b/src/views/modelManagement/index.vue new file mode 100644 index 0000000..cedacdd --- /dev/null +++ b/src/views/modelManagement/index.vue @@ -0,0 +1,140 @@ + + diff --git a/src/views/test/index.vue b/src/views/test/index.vue index b2f5fd6..a681f95 100644 --- a/src/views/test/index.vue +++ b/src/views/test/index.vue @@ -1,1253 +1,55 @@ diff --git a/vite.config.js b/vite.config.js index 1458485..8180e50 100644 --- a/vite.config.js +++ b/vite.config.js @@ -22,7 +22,7 @@ function getLocalIpAddress() { // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => { const env = loadEnv(mode, process.cwd()); - const { VITE_APP_ENV ,VITE_APP_PATH} = env; + const { VITE_APP_ENV, VITE_APP_PATH } = env; return { // 部署生产环境和开发环境下的URL。 // 默认情况下,vite 会假设你的应用是被部署在一个域名的根路径上 @@ -50,18 +50,32 @@ export default defineConfig(({ mode, command }) => { disableHostCheck: true, host: getLocalIpAddress(), open: true, - hmr:{overlay:false}, + hmr: { overlay: false }, proxy: { // https://cn.vitejs.dev/config/#server-proxy "/qomo": { // target: "http://172.16.0.241:8095", //wq - target: "http://172.16.0.214:8095", //bgy - // target: "http://192.168.50.9:8095", + target: "http://172.16.0.162:8082", //bgy + // target: "http://192.168.50.9:2999",//中智平台 changeOrigin: true, pathRewrite: { "^/qomo": "/qomo" } }, + "/qomo/flowSocket": { + // target: 'ws://192.168.0.66:60601/',这是后端接口地址 + target: 'ws://172.16.0.162:8082', + // target: 'ws://192.168.50.99:2999', + changeOrigin: true, + ws: true + }, + "/qomo/taskSocket": { + // target: 'ws://192.168.0.66:60601/',这是后端接口地址 + target: 'ws://172.16.0.162:8082', + // target: 'ws://192.168.50.99:2999', + changeOrigin: true, + ws: true + }, }, headers: { "Access-Control-Allow-Origin": "*"