diff --git a/.beagle.yml b/.beagle.yml index f626c295e2ca2ea57f39e413b2b2c87ade694451..1012890f6e26de98434322d5e3e8f14f6232382b 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -29,9 +29,11 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - name: build # 项目打包 image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:16.16.0-slim - # 将宿主机中文件夹挂载到容器中,宿主机文件夹中的文件会被容器访问并修改,起到使用缓存的作用,避免每次运行都要重现下载依赖,提高运行速度 + # 将宿主机中文件夹挂载到容器中,宿主机文件夹中的文件会被容器访问并修改,起到使用缓存的作用,避免每次运行都要重现下载依赖,提高运行速度 commands: - - yarn + # - npm install -g cnpm --registry=https://registry.npm.taobao.org + # - cnpm install + # - yarn - export NODE_ENV=production - yarn build @@ -51,12 +53,12 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - name: docker-amd64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 - # 将宿主机的 docker和配置挂载到运行的 docker 容器中,那么在容器中运行 docker 命令时,等同于在宿主机中运行该docker命令 + # 将宿主机的 docker和配置挂载到运行的 docker 容器中,那么在容器中运行 docker 命令时,等同于在宿主机中运行该docker命令 volumes: - name: docker-sock path: /var/run/docker.sock # 将下载依赖的目录挂载出来,防止重复下载 settings: # 当前设置 - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-amd64 # 基础镜像 + base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-amd64 # 基础镜像 dockerfile: .beagle/dockerfile repo: smart-operation/so-manage-ui # 生成镜像的 分组/名称 version: "v3.0.1" # 版本号 @@ -80,7 +82,7 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 from_secret: KUBERNETES_SERVER KUBERNETES_TOKEN: from_secret: KUBERNETES_TOKEN - + - name: docker-arm64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 volumes: @@ -153,7 +155,6 @@ trigger: branch: - master - kind: pipeline name: master steps: @@ -195,7 +196,7 @@ steps: - name: docker-sock path: /var/run/docker.sock pull: always - environment: + environment: REGISTRY_USER: from_secret: REGISTRY_USER REGISTRY_PASSWORD: @@ -224,7 +225,7 @@ steps: - name: harbor-arch image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:1.0 settings: - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/mips64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/mips64le template: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0-ARCH target: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0 username: @@ -269,4 +270,4 @@ kind: secret name: SECRET_KEY_MINIO get: name: SECRET_KEY_MINIO - path: devops-secrets \ No newline at end of file + path: devops-secrets diff --git a/.vscode/settings.json b/.vscode/settings.json index 29a7e571a7b00dece05b6991a16bf42c5100aba6..2c0882957ae57ac55273edbd87c616145a49b0f2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,5 +13,6 @@ "editor.formatOnSave": true, "[vue]": { "editor.defaultFormatter": "esbenp.prettier-vscode" - } + }, + "vue.codeActions.enabled": false } diff --git a/package.json b/package.json index 39ac5520e96aa7d820f73266b7d789b73be9d5c9..af9316dcb9102f2f4437665592a02f0d21de4db2 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "element-plus": "^2.2.19", "github-markdown-css": "^5.1.0", "html2canvas": "^1.4.1", + "install": "^0.13.0", "lodash": "^4.17.21", "markdown-it": "^13.0.1", "mavon-editor": "^3.0.1", @@ -36,4 +37,4 @@ "@vue/compiler-sfc": "^3.2.31", "vite": "^3.0.0" } -} \ No newline at end of file +} diff --git "a/public/\344\270\273\346\234\272IP\346\250\241\346\235\277.xlsx" "b/public/\344\270\273\346\234\272IP\346\250\241\346\235\277.xlsx" new file mode 100644 index 0000000000000000000000000000000000000000..9529eba1dab55c6c1784d7bfac9c2ab840951c4a Binary files /dev/null and "b/public/\344\270\273\346\234\272IP\346\250\241\346\235\277.xlsx" differ diff --git a/src/bg-ui/bg-code-editor.vue b/src/bg-ui/bg-code-editor.vue index 7ecb6c65bdab91a110d80d9333bb372febd82f20..1101ebbd50c795b8f4730f1bf02a3b8cffe565a2 100644 --- a/src/bg-ui/bg-code-editor.vue +++ b/src/bg-ui/bg-code-editor.vue @@ -143,9 +143,9 @@ const { content } = toRefs(states); right: 0 !important; } /* 光标颜色 */ -.vue-ace-editor :deep() .ace_cursor { +/* .vue-ace-editor :deep() .ace_cursor { color: #fff; -} +} */ .vue-ace-editor-disable :deep() .ace_scrollbar-v { width: 6px !important; right: 2px; diff --git a/src/bg-ui/bg-inner-tabs.vue b/src/bg-ui/bg-inner-tabs.vue index 886c58590078bea38148841e84dd7f77c6e03d0c..7aae8103bb0dee55c152e0e95c662f60ccf732b6 100644 --- a/src/bg-ui/bg-inner-tabs.vue +++ b/src/bg-ui/bg-inner-tabs.vue @@ -12,7 +12,7 @@ diff --git a/src/bg-ui/bg-table.vue b/src/bg-ui/bg-table.vue index 7a2e56395c26a9d1dd7160382bd7c64ab494d5ea..69161f9e0906123afe4620f582e8f780050f08c9 100644 --- a/src/bg-ui/bg-table.vue +++ b/src/bg-ui/bg-table.vue @@ -1,6 +1,5 @@ @@ -57,10 +56,6 @@ const { nowSelectData, allSelectData, initAllSelectData, selectData, initSelectT selectTableMixin(); const props = defineProps({ - height: { - type: [Number, String], - default: "auto", - }, headers: { type: Array, require: true, @@ -81,6 +76,10 @@ const props = defineProps({ type: String, default: "序号", }, + emptyText: { + type: String, + default: "暂无数据", + }, stripe: { type: Boolean, default: false, diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue index 8e7ecea50112e27541b182d59584aa79a9fe4238..6f48fa516bdc0949fd39393ef8b8920c65017737 100644 --- a/src/bg-ui/bg-upload.vue +++ b/src/bg-ui/bg-upload.vue @@ -6,6 +6,8 @@ directory: 'file', uniqueCode: false, }" + :limit="limit" + :http-request="httpRequest" :before-upload="handleBeforeUpload" :on-exceed="handleExceed" :on-success="handleSuccess" @@ -95,6 +97,9 @@ const props = defineProps({ type: String, default: "", }, + httpRequest: { + type: Function, + }, limit: { type: Number, default: 9999, @@ -123,10 +128,6 @@ watch( } ); const handleBeforeUpload = (file) => { - if (state.fileList && state.fileList.length >= props.limit) { - ElMessage.error(`只允许上传${props.limit}个文件`); - return false; - } let temp = file.name.split("."); let type = temp[temp.length - 1].toLocaleLowerCase(); let fileTypesOk = props.fileTypes.indexOf(type) > -1 || props.fileTypes.length == 0; @@ -143,7 +144,7 @@ const handleBeforeUpload = (file) => { return fileTypesOk && fileMaxSizeOk; }; const handleExceed = (file, fileList) => { - console.log(file, fileList); + ElMessage.error(`只允许上传${props.limit}个文件`); }; const handlePreview = (val) => { let a = document.createElement("a"); // 生成一个a元素 diff --git a/src/components/edit-table.vue b/src/components/edit-table.vue index e2b8dd63ab90e2e51491bdd8c4d94fecbbea7f99..9988f7cf4459aada95bf2fde53917fb3b11da041 100644 --- a/src/components/edit-table.vue +++ b/src/components/edit-table.vue @@ -1,101 +1,98 @@ diff --git a/src/components/login-by-account.vue b/src/components/login-by-account.vue index b422913070dd48baafabdd34cfd240d408b88e4f..ed741821d0b1b43765dce0332bc7998c0e67acd4 100644 --- a/src/components/login-by-account.vue +++ b/src/components/login-by-account.vue @@ -120,9 +120,7 @@ const login = () => { ElMessage.error(data.data); } }) - .catch((error) => { - console.log(error); - }); + .catch((error) => {}); }; const getUserInfo = () => { return axios.get(`/v1/api/user/getUserInfo`); diff --git a/src/main.js b/src/main.js index cc00e8aac2c7031a7d14eb132ff9cf08e39bcff7..7c8289202ef595f49281cb18991be8a4c3c06702 100644 --- a/src/main.js +++ b/src/main.js @@ -30,7 +30,7 @@ import store from "@/store"; import i18n from "./i18n/i18n.js"; import axios from "./request/http.js"; - +import api from "./request/api.js"; import config from "../package.json"; import { menuData } from "@/components/menu.js"; @@ -61,6 +61,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) { } createVue.config.globalProperties.$axios = axios; +createVue.config.globalProperties.$api = api; import menu from "./router/function.js"; diff --git a/src/page/main/authority/organization/directory-form.vue b/src/page/main/authority/organization/directory-form.vue index fe3e73bce575030254c77da3f4f6aa460c06316d..d49ffdde314ae38932fe704dbbd885a12530e40b 100644 --- a/src/page/main/authority/organization/directory-form.vue +++ b/src/page/main/authority/organization/directory-form.vue @@ -77,7 +77,7 @@ const treeProps = { disabled: "disabled", }; const getOrgTree = () => { - axios.get(`/apaas/system/v5/org/tree`).then((res) => { + axios.get(`/v1/api/org/tree`).then((res) => { if (res.data.code == 200) { const orgDataTemp = res.data.data || []; orgDataTemp.shift(); diff --git a/src/page/main/authority/organization/index.vue b/src/page/main/authority/organization/index.vue index 85dcf891c8427c08208c2e85ecffacfc775f1013..307b852eb61d790fbc0735d5cf7d76716e4197e5 100644 --- a/src/page/main/authority/organization/index.vue +++ b/src/page/main/authority/organization/index.vue @@ -22,29 +22,19 @@ 基本信息 - - 查看详情 - - - - +
- - - +
@@ -163,172 +120,49 @@ - -
- - 您正在对 {{ selectedRow.system_account }}做删除操作。 -
- -
- -
- - 您正在对 {{ selectedRow.system_account }}做修改密码操作,修改后旧密码将无法登录。 -
-
- - - - - - - - - - - - -
- -
- -
- - 您正在对 {{ selectedName.join("、") }}做删除操作。 -
- -
- -
- - 您正在对 {{ selectedName.join("、") }}做重置密码操作。 -
-
重置密码为123456,是否继续?
- -
diff --git a/src/page/main/authority/organization/org-detail/index.vue b/src/page/main/authority/organization/org-detail/index.vue index 70717d663d0292a48f0d044fcfebb95cfc315425..9d1ec1c9c0611b070208996cdd69b93010fd0cce 100644 --- a/src/page/main/authority/organization/org-detail/index.vue +++ b/src/page/main/authority/organization/org-detail/index.vue @@ -149,7 +149,7 @@ const formatFile = (url) => { const getDetail = () => { axios - .get(`/apaas/system/v5/org/detail?organization_id=${route.query.id}&key_word=&state=&limit=&page=&data_type=1`) + .get(`/v1/api/org/detail?organization_id=${route.query.id}&key_word=&state=&limit=&page=&data_type=1`) .then((res) => { if (res.data.code == 200) { const detail = res.data.data.org_info; diff --git a/src/page/main/authority/organization/org-form.vue b/src/page/main/authority/organization/org-form.vue index 2a210383ad7cef582366caa735c01c11d72c3ecb..6ee628152829de339c959ada6fed16531d21b6ab 100644 --- a/src/page/main/authority/organization/org-form.vue +++ b/src/page/main/authority/organization/org-form.vue @@ -22,16 +22,6 @@ - - - 将文件拖到此处,或 点击上传 - - @@ -51,7 +41,6 @@ const orgForm = reactive({ name: "", organization_code: "", description: "", - attachment: [], }); const checkCode = (rule, value, callback) => { @@ -115,7 +104,7 @@ const treeProps = { disabled: "disabled", }; const getOrgTree = () => { - axios.get(`/apaas/system/v5/org/tree`).then((res) => { + axios.get(`/v1/api/org/tree`).then((res) => { if (res.data.code == 200) { const orgDataTemp = res.data.data || []; orgDataTemp.shift(); diff --git a/src/page/main/authority/organization/org-user/org-account-form.vue b/src/page/main/authority/organization/org-user/org-account-form.vue index a8bb71bcbb485290f5f8decfaa3e852ecf23c121..a257b25928a94d6588044d7c0bbb3e97b82d0253 100644 --- a/src/page/main/authority/organization/org-user/org-account-form.vue +++ b/src/page/main/authority/organization/org-user/org-account-form.vue @@ -198,7 +198,7 @@ const treeProps = { value: "organization_id", }; const getOrgTree = () => { - axios.get(`/apaas/system/v5/org/tree`).then((res) => { + axios.get(`/v1/api/org/tree`).then((res) => { if (res.data.code == 200) { orgData.value = res.data.data || []; } else { diff --git a/src/page/main/authority/organization/platform-user/index.vue b/src/page/main/authority/organization/platform-user/index.vue index 4d49034952ee1aa151e98ca08f9250c550be49ec..2f7003d0bd022a696e5ba736ce8f4ac8cf8f0387 100644 --- a/src/page/main/authority/organization/platform-user/index.vue +++ b/src/page/main/authority/organization/platform-user/index.vue @@ -211,7 +211,7 @@ const cancel = () => { }; const getOrgTree = () => { - axios.get(`/apaas/system/v5/org/tree`).then((res) => { + axios.get(`/v1/api/org/tree`).then((res) => { if (res.data.code == 200) { orgId.value = res.data.data[0].organization_id; } else { diff --git a/src/page/main/authority/organization/tree.vue b/src/page/main/authority/organization/tree.vue index 0111bb2bd2ced03e3e7683a3b0b4ad541a431c23..d5e3bdefd0fde0adbb2afb82999813bb63b365ee 100644 --- a/src/page/main/authority/organization/tree.vue +++ b/src/page/main/authority/organization/tree.vue @@ -20,10 +20,7 @@ @click.stop="showAction($event, data, node)"> - +
@@ -141,8 +138,8 @@ diff --git a/src/page/main/auto-maintenance/host-manage/components/check-status-dialog.vue b/src/page/main/auto-maintenance/host-manage/components/check-status-dialog.vue new file mode 100644 index 0000000000000000000000000000000000000000..711beda3b6c0963610dbca2055f1898681bda6ea --- /dev/null +++ b/src/page/main/auto-maintenance/host-manage/components/check-status-dialog.vue @@ -0,0 +1,343 @@ + + + + + + + diff --git a/src/page/main/auto-maintenance/host-manage/components/list-table.vue b/src/page/main/auto-maintenance/host-manage/components/list-table.vue new file mode 100644 index 0000000000000000000000000000000000000000..64398335eb1ca6fc102aa61363659c4810032297 --- /dev/null +++ b/src/page/main/auto-maintenance/host-manage/components/list-table.vue @@ -0,0 +1,290 @@ + + + + + diff --git a/src/page/main/auto-maintenance/host-manage/detail/index.vue b/src/page/main/auto-maintenance/host-manage/detail/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..adeae81de65ec119bd8d1b20335a96ab381b849e --- /dev/null +++ b/src/page/main/auto-maintenance/host-manage/detail/index.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/page/main/auto-maintenance/host-manage/index.vue b/src/page/main/auto-maintenance/host-manage/index.vue index daa286274f40856b41ae44ef5622dfaf1153ed59..4daf1102b7ea184af1658194e9e8929ed85e9459 100644 --- a/src/page/main/auto-maintenance/host-manage/index.vue +++ b/src/page/main/auto-maintenance/host-manage/index.vue @@ -5,7 +5,7 @@