diff --git a/react-ui/config/config.ts b/react-ui/config/config.ts
index 961f0025..405f85cb 100644
--- a/react-ui/config/config.ts
+++ b/react-ui/config/config.ts
@@ -76,7 +76,7 @@ export default defineConfig({
* @name layout 插件
* @doc https://umijs.org/docs/max/layout-menu
*/
- title: '复杂智能软件',
+ title: '智能软件开发平台',
layout: {
locale: true,
...defaultSettings,
diff --git a/react-ui/config/defaultSettings.ts b/react-ui/config/defaultSettings.ts
index 4acad99b..18889073 100644
--- a/react-ui/config/defaultSettings.ts
+++ b/react-ui/config/defaultSettings.ts
@@ -16,7 +16,7 @@ const Settings: ProLayoutProps & {
fixSiderbar: false,
splitMenus: false,
colorWeak: false,
- title: '复杂智能软件',
+ title: '智能软件开发平台',
pwa: true,
logo: '/assets/images/left-top-logo.png',
iconfontUrl: '//at.alicdn.com/t/c/font_4511326_ndnvm4elll.js',
diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx
index 1d11a6e6..10ab35bb 100644
--- a/react-ui/src/app.tsx
+++ b/react-ui/src/app.tsx
@@ -193,6 +193,7 @@ export const antd: RuntimeAntdConfig = (memo) => {
colorSuccess: themes['successColor'],
colorError: themes['errorColor'],
colorWarning: themes['warningColor'],
+ colorLink: themes['primaryColor'],
};
memo.theme.components ??= {};
memo.theme.components.Tabs = {};
diff --git a/react-ui/src/global.less b/react-ui/src/global.less
index 36b95a1c..126b9e52 100644
--- a/react-ui/src/global.less
+++ b/react-ui/src/global.less
@@ -98,7 +98,7 @@ body {
}
.ant-table-wrapper .ant-table-pagination.ant-pagination {
margin: 0;
- padding: 21px 16px;
+ padding: 20px 16px;
background-color: #fff;
}
// .ant-table-wrapper .ant-table {
@@ -190,32 +190,21 @@ body {
.ant-modal .ant-modal-footer > .ant-btn + .ant-btn {
margin-left: 20px;
}
-.ant-pagination .ant-pagination-item-active a {
- color: #fff;
- background: rgba(22, 100, 255, 0.8);
- // color: #fff;
- border-radius: 6px;
+.ant-pagination .ant-pagination-item.ant-pagination-item-active {
+ background: @primary-color;
+ border-width: 0;
+
+ a {
+ color: #fff;
+ }
}
.ant-pagination .ant-pagination-item-active:hover {
- // color: #fff;
- // background: rgba(22, 100, 255, 0.8);
- // border-color: rgba(22, 100, 255, 0.8);
- border-radius: 6px;
+ color: #fff;
+ background: rgba(22, 100, 255, 0.8);
+ border-color: rgba(22, 100, 255, 0.8);
}
.ant-pagination .ant-pagination-item {
border: 1px solid #e6e6e6;
- border-radius: 6px;
-}
-
-.ant-tabs {
- .ant-tabs-nav::before,
- div > .ant-tabs-nav::before {
- border: none;
- }
-
- .ant-tabs-nav {
- margin-bottom: 0;
- }
}
// ::-webkit-scrollbar-button {
diff --git a/react-ui/src/pages/Model/personalData.jsx b/react-ui/src/pages/Model/personalData.jsx
index 2f08f149..fb478666 100644
--- a/react-ui/src/pages/Model/personalData.jsx
+++ b/react-ui/src/pages/Model/personalData.jsx
@@ -4,7 +4,7 @@ import creatByImg from '@/assets/img/creatBy.png';
import KFIcon from '@/components/KFIcon';
import { addModel, getAssetIcon, getModelList } from '@/services/dataset/index.js';
import { UploadOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Modal, Pagination, Radio, Select, Upload } from 'antd';
+import { Button, Form, Input, Modal, Pagination, Select, Upload } from 'antd';
import moment from 'moment';
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
@@ -106,6 +106,10 @@ const PublicData = () => {
setIsModalOpen(false);
};
const onFinish = (values) => {
+ const params = {
+ ...values,
+ available_range: 0,
+ };
addModel(values).then((ret) => {
console.log(ret);
getModelLists(queryFlow);
@@ -379,12 +383,12 @@ const PublicData = () => {
>
-
+ {/*
仅自己可见
工作空间可见
-
+ */}
{
+const ModelMenus = ({ onParDragEnd }) => {
const [modelMenusList, setModelMenusList] = useState([]);
useEffect(() => {
getComponentAll().then((ret) => {
@@ -55,6 +55,7 @@ const modelMenus = ({ onParDragEnd }) => {
{item.value && item.value.length > 0
? item.value.map((ele) => (
{
dragEnd(e, ele);
@@ -78,4 +79,4 @@ const modelMenus = ({ onParDragEnd }) => {
);
};
-export default modelMenus;
+export default ModelMenus;
diff --git a/react-ui/src/pages/User/Login/index.tsx b/react-ui/src/pages/User/Login/index.tsx
index 6aefa7ae..6e043763 100644
--- a/react-ui/src/pages/User/Login/index.tsx
+++ b/react-ui/src/pages/User/Login/index.tsx
@@ -246,10 +246,10 @@ const Login: React.FC = () => {
style={{ height: '42px', marginRight: '10px' }}
alt=""
/>
- 复杂智能软件
+ 智能软件开发平台
-
复杂智能软件
+
智能软件开发平台

{
hello~
欢迎登陆
- 复杂智能软件
+ 智能软件开发平台
queryByCategoryId(Integer categoryId);
+ AssetIcon queryByPath(String path);
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java
index 3dd35a39..7aa8a4ac 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java
@@ -22,6 +22,15 @@ public interface AssetIconService {
*/
AssetIcon queryById(Integer id);
+
+ /**
+ * 通过path查询单条数据
+ *
+ * @param path 路径
+ * @return 实例对象
+ */
+ AssetIcon queryByPath(String path);
+
/**
* 分页查询
*
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java
index 2ba4d300..09610ce8 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java
@@ -2,7 +2,6 @@ package com.ruoyi.platform.service.impl;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.domain.AssetIcon;
-import com.ruoyi.platform.domain.Models;
import com.ruoyi.platform.mapper.AssetIconDao;
import com.ruoyi.platform.service.AssetIconService;
import com.ruoyi.system.api.model.LoginUser;
@@ -38,6 +37,12 @@ public class AssetIconServiceImpl implements AssetIconService {
return this.assetIconDao.queryById(id);
}
+
+ @Override
+ public AssetIcon queryByPath(String path) {
+ return this.assetIconDao.queryByPath(path);
+ }
+
/**
* 分页查询
*
@@ -125,4 +130,6 @@ public class AssetIconServiceImpl implements AssetIconService {
public List
queryByCategoryId(Integer categoryId) {
return this.assetIconDao.queryByCategoryId(categoryId);
}
+
+
}
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
index 2482481d..c221b7e6 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
@@ -3,10 +3,12 @@ package com.ruoyi.platform.service.impl;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.annotations.CheckDuplicate;
+import com.ruoyi.platform.domain.AssetIcon;
import com.ruoyi.platform.domain.Dataset;
import com.ruoyi.platform.domain.DatasetVersion;
import com.ruoyi.platform.mapper.DatasetDao;
import com.ruoyi.platform.mapper.DatasetVersionDao;
+import com.ruoyi.platform.service.AssetIconService;
import com.ruoyi.platform.service.DatasetService;
import com.ruoyi.platform.service.DatasetVersionService;
import com.ruoyi.platform.service.MinioService;
@@ -59,6 +61,9 @@ public class DatasetServiceImpl implements DatasetService {
@Resource
private DatasetVersionService datasetVersionService;
+ @Resource
+ private AssetIconService assetIconService;
+
@Resource
private MinioService minioService;
@@ -79,7 +84,17 @@ public class DatasetServiceImpl implements DatasetService {
*/
@Override
public Dataset queryById(Integer id) {
- return this.datasetDao.queryById(id);
+
+ Dataset dataset = this.datasetDao.queryById(id);
+ String dataType = dataset.getDataType();
+ String dataTag = dataset.getDataTag();
+ //去资产管理表中查询对应的图标名
+ AssetIcon dataTypeAssetIcon = assetIconService.queryByPath(dataType);
+ AssetIcon dataTagAssetIcon = assetIconService.queryByPath(dataTag);
+ dataset.setDatasetTypeName(dataTypeAssetIcon.getName());
+ dataset.setDatasetTagName(dataTagAssetIcon.getName());
+ return dataset;
+
}
/**
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
index 7b4b7775..76d510f5 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
@@ -316,6 +316,7 @@ public class ImageServiceImpl implements ImageService {
String filePath = "/data/argo-workflow/" + bucketName + "/" +path;
String logs2 = k8sClientUtil.executeCommand(pod,"docker load -i "+filePath);
// 在容器里执行 docker tag name:tag nexus3.kube-system.svc:8083/imageName:imageTag
+
if (StringUtils.isNoneBlank(logs2)){
String substring = logs2.substring(logs2.indexOf(":")+1).trim();
String tagCmd = "docker tag " + substring + " " + harborUrl + "/" + repository + "/" + username + "/" + imageName + ":" + imageTag;
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml
index 21422c29..119c5fa4 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml
@@ -43,6 +43,13 @@
+
+
+
insert into asset_icon(name, category_id, path, description, create_by, create_time, update_by, update_time, state)
values (#{assetIcon.name}, #{assetIcon.categoryId}, #{assetIcon.path}, #{assetIcon.description}, #{assetIcon.createBy}, #{assetIcon.createTime}, #{assetIcon.updateBy}, #{assetIcon.updateTime}, #{assetIcon.state})
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml
index d7a0ec1d..d4bae103 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml
@@ -152,13 +152,13 @@
description = #{dataset.description},
- available_range = #{dataset.availableRange}
- ,
+ available_range = #{dataset.availableRange},
+
data_type = #{dataset.dataType},
- data_tag = #{dataset.dataTag}
+ data_tag = #{dataset.dataTag},
create_by = #{dataset.createBy},
@@ -179,6 +179,7 @@
where id = #{dataset.id}
+
delete from dataset where id = #{id}
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml
index 672f8a37..776cbbac 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml
@@ -154,7 +154,7 @@
description = #{models.description},
- available_range = #{models.availableRange}
+ available_range = #{models.availableRange},
model_type = #{models.modelType},