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-inner-tabs.vue b/src/bg-ui/bg-inner-tabs.vue index c17e1dc252eb9c6e66b459a24b832e15bcff5582..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-pro.vue b/src/bg-ui/bg-table-pro.vue index 8e61ac8daf928f873328cc70ac4a54d12c473172..de8d9f42ea3b935fc52de1d28055859791dc616f 100644 --- a/src/bg-ui/bg-table-pro.vue +++ b/src/bg-ui/bg-table-pro.vue @@ -178,4 +178,9 @@ const getRowInfo = (row, key) => { $_prop_path: propPath, }; }; + +defineExpose({ + clearSelection, + getRowInfo, +}); diff --git a/src/bg-ui/bg-table.vue b/src/bg-ui/bg-table.vue index 38ec75b35fed71ea4e02d3da0d83c62fb24c7f03..5177bc1715ba8b75e9db57401cdb25a297c4b241 100644 --- a/src/bg-ui/bg-table.vue +++ b/src/bg-ui/bg-table.vue @@ -1,6 +1,5 @@ @@ -24,7 +23,7 @@ import { watch, ref, nextTick } from "vue"; import { selectTableMixin } from "./hook/mixin-select-table"; -const { - nowSelectData, - allSelectData, - initAllSelectData, - selectData, - initSelectTableData, - runPage, - dealSelectData, -} = selectTableMixin(); +const { nowSelectData, allSelectData, initAllSelectData, selectData, initSelectTableData, runPage, dealSelectData } = + selectTableMixin(); const props = defineProps({ - height: { - type: [Number, String], - default: "auto", - }, headers: { type: Array, require: true, @@ -87,6 +75,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/main.js b/src/main.js index 99b063addae6c5c642aebb03c36d5b7792331fa4..94a645017b6a7cdfa2757ce6e58f92a8587653ac 100644 --- a/src/main.js +++ b/src/main.js @@ -30,9 +30,8 @@ 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"; -console.log(config.version); const createVue = createApp(App); // createVue.use(ElementPlus, { locale }); @@ -60,6 +59,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/auto-maintenance/host-manage/add/index.vue b/src/page/main/auto-maintenance/host-manage/add/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..0a3725d2440dd7f0a3c84744314c18677e16d38e --- /dev/null +++ b/src/page/main/auto-maintenance/host-manage/add/index.vue @@ -0,0 +1,202 @@ + + + + + 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..5b58564416ef372e0c2f93ab91f9a94f5c7bc6c7 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 @@