From aef419bafa2b0ee3d95233639d994be9601bf843 Mon Sep 17 00:00:00 2001 From: zhangboxuan Date: Thu, 25 Apr 2024 20:07:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=20task#=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createEditModal/createEditModal.vue | 34 +- .../bindIsoTempModal/bindTemplateBox.vue | 140 +++--- .../bindIsoTempModal/bindTemplateModal.vue | 38 +- .../changeSpecModal/createEditBox.vue | 183 ++++---- .../changeSpecModal/createEditModal.vue | 34 +- src/views/workorder/detail/detail-drawer.vue | 32 +- src/views/workorder/detail/detail.vue | 302 +++++++------ src/views/workorder/detail/ipsetDeiatl.vue | 12 +- .../workorder/detail/modifyVdcDetail.vue | 56 +-- .../workorder/drawer/PassServervmApply.vue | 389 ++++++++-------- .../workorder/drawer/PassServervmIsoApply.vue | 424 +++++++++--------- .../workorder/drawer/PassServervmModify.vue | 242 +++++----- .../workorder/drawer/computResources.vue | 180 ++++---- .../drawer/pass-apply-servervm-drawer.vue | 88 ++-- src/views/workorder/drawer/pass-drawer.vue | 92 ++-- .../drawer/pass-modify-servervm-drawer.vue | 36 +- src/views/workorder/drawer/refuse-drawer.vue | 72 +-- .../workorder/drawer/selectCluster-drawer.vue | 128 +++--- .../workorder/drawer/selectNetwork-drawer.vue | 122 ++--- .../drawer/selectTagNames-drawer.vue | 141 +++--- src/views/workorder/drawer/setDiskInfo.vue | 158 +++---- 21 files changed, 1449 insertions(+), 1454 deletions(-) diff --git a/src/views/resource/availabilityZone/createEditModal/createEditModal.vue b/src/views/resource/availabilityZone/createEditModal/createEditModal.vue index 27f60cc..d92baa7 100644 --- a/src/views/resource/availabilityZone/createEditModal/createEditModal.vue +++ b/src/views/resource/availabilityZone/createEditModal/createEditModal.vue @@ -1,55 +1,55 @@ \ No newline at end of file + diff --git a/src/views/workorder/bindIsoTempModal/bindTemplateBox.vue b/src/views/workorder/bindIsoTempModal/bindTemplateBox.vue index 7ca55d8..b9389e8 100644 --- a/src/views/workorder/bindIsoTempModal/bindTemplateBox.vue +++ b/src/views/workorder/bindIsoTempModal/bindTemplateBox.vue @@ -18,16 +18,16 @@ ref="isotable" :data="tableData" :total="total" - :pageSize="pageSize" - :currentPage="pageNo" - :defaultSelectedKeys="defaultSelectedKeysNew" + :page-size="pageSize" + :current-page="pageNo" + :default-selected-keys="defaultSelectedKeysNew" + :rowkey="rowkey" + selection-type="singleTable" + style="margin-top: 20px" @current-change="handlePageChange" @size-change="handleSizeChange" @handleSelectione="handleSelectione" @row-click="rowSelect" - :rowkey="rowkey" - selectionType="singleTable" - style="margin-top: 20px" > \ No newline at end of file + diff --git a/src/views/workorder/changeSpecModal/createEditBox.vue b/src/views/workorder/changeSpecModal/createEditBox.vue index 1584dc3..4b17644 100644 --- a/src/views/workorder/changeSpecModal/createEditBox.vue +++ b/src/views/workorder/changeSpecModal/createEditBox.vue @@ -6,15 +6,14 @@ - + :form-options="firstVdcFormData" + /> + :form-options="vdcFormData" + />
\ No newline at end of file + diff --git a/src/views/workorder/detail/detail-drawer.vue b/src/views/workorder/detail/detail-drawer.vue index 9fe0311..d72df84 100644 --- a/src/views/workorder/detail/detail-drawer.vue +++ b/src/views/workorder/detail/detail-drawer.vue @@ -1,55 +1,55 @@ \ No newline at end of file + diff --git a/src/views/workorder/detail/detail.vue b/src/views/workorder/detail/detail.vue index d1ac186..da038c5 100644 --- a/src/views/workorder/detail/detail.vue +++ b/src/views/workorder/detail/detail.vue @@ -2,7 +2,7 @@
- + {{ modifyServerVM.workOrderTypeDesc }} @@ -51,68 +51,78 @@ v-for="(item, index) in modifyServerVM.disks" :key="'disk' + index" > - {{ $t("common.hard") - }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ - item.diskSize - }}GB,{{ item.purpose - }}({{ $t("common.newDisk") }}) - {{ $t("common.hard") - }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ - item.diskSize - }}GB - {{ $t("common.hard") - }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}: + {{ $t("common.hard") + }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ + item.diskSize + }}GB,{{ item.purpose + }}({{ $t("common.newDisk") }}) + {{ $t("common.hard") + }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ + item.diskSize + }}GB + {{ $t("common.hard") + }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}: {{ item.oldDiskSize }}GB -> {{ item.diskSize }}GB - {{ $t("common.hard") - }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ - item.diskSize - }}GB + {{ $t("common.hard") + }}{{ modifyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ + item.diskSize + }}GB

- {{ $t("common.network") - }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ - item.purpose - }}({{ $t("common.newnetwork") }}) + {{ $t("common.network") + }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ + item.purpose + }}({{ $t("common.newnetwork") }}) - + - {{ $t("common.network") - }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ - item.purpose - }} - {{ $t("common.network") - }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ - item.purpose - }} + {{ $t("common.network") + }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ + item.purpose + }} + {{ $t("common.network") + }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ + item.purpose + }} - + - {{ $t("common.network") - }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ - item.purpose - }} + {{ $t("common.network") + }}{{ modifyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ + item.purpose + }} - +

@@ -147,7 +157,7 @@ - + {{ applyServerVmType[applyServerVM.applyServerVmType] }} @@ -169,7 +179,7 @@ @@ -254,55 +264,58 @@ {{ $t("common.hard") }}{{ applyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ item.diskSize - }}GB + }}GB {{ $t("common.hard") }}{{ applyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ item.oldDiskSize }}GB -> {{ item.diskSize }}GB - {{ $t("common.hard") - }}{{ applyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ - item.diskSize - }}GB + {{ $t("common.hard") + }}{{ applyServerVM.disks.length > 1 ? index + 1 : "" }}:{{ + item.diskSize + }}GB

- {{ $t("common.network") - }}{{ applyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ - item.purpose - }}({{ $t("common.newnetwork") }}) + {{ $t("common.network") + }}{{ applyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ + item.purpose + }}({{ $t("common.newnetwork") }}) - + - {{ $t("common.network") - }}{{ applyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ - item.purpose - }} - {{ $t("common.network") - }}{{ applyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ - item.purpose - }} - + {{ $t("common.network") + }}{{ applyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ + item.purpose + }} + {{ $t("common.network") + }}{{ applyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ + item.purpose + }} + {{ $t("common.network") }}{{ applyServerVM.networks.length > 1 ? index + 1 : "" }}:{{ item.purpose }} - +

@@ -340,7 +353,7 @@
- + {{ applyDeferredDetail.workOrderTypeDesc }} @@ -387,7 +400,7 @@ - + {{ registerUserDetail.workOrderTypeDesc }} @@ -434,7 +447,7 @@ - + {{ updateUserDetail.workOrderTypeDesc }} @@ -489,8 +502,7 @@ - - +
@@ -502,26 +514,26 @@ import { getApplyDeferredDetail, getRegisterUserDetail, getUpdateUserDetail, - applyModifyVdcDetail, -} from "@/api/workOrder"; + applyModifyVdcDetail +} from '@/api/workOrder' -import ipsetDeiatl from "./ipsetDeiatl"; -import modifyVdcDetail from "./modifyVdcDetail.vue"; -import dictionary from "@/assets/common/dataDictionary/dictionary"; +import ipsetDeiatl from './ipsetDeiatl' +import modifyVdcDetail from './modifyVdcDetail.vue' +import dictionary from '@/assets/common/dataDictionary/dictionary' export default { - name: "WorkDetail", + name: 'WorkDetail', + components: { ipsetDeiatl, modifyVdcDetail }, props: { formOptions: { type: Object, - default: () => ({}), - }, + default: () => ({}) + } }, - components: { ipsetDeiatl, modifyVdcDetail }, data() { return { - workOrderId: "", - type: "", + workOrderId: '', + type: '', // 变更云服务器 modifyServerVM: {}, // 申请云服务器 @@ -533,83 +545,83 @@ export default { // 修改账号 updateUserDetail: {}, applyServerVmType: { - ISO: "ISO镜像", - TEMPLATE: "模板", + ISO: 'ISO镜像', + TEMPLATE: '模板' }, modifyVdcVMDetail: { - formData: {}, - }, - }; + formData: {} + } + } + }, + computed: { + isModifyServerVM: function() { + return this.type === 'MODIFY_SERVERVM' + }, + isApplyServerVM: function() { + return this.type === 'APPLY_SERVERVM' + }, + isApplyDeferredDetail: function() { + return this.type === 'DEFERRED_SERVERVM' + }, + isRegisterUserDetail: function() { + return this.type === 'REGISTER_USER' + }, + isUpdateUserDetail: function() { + return this.type === 'MODIFY_USER' + }, + isModifyVdcVM: function() { + return this.type === 'MODIFY_VDC' + } }, created() { - let { formData } = this.formOptions; + const { formData } = this.formOptions - this.workOrderId = formData.workOrderId; - this.type = formData.type; - const workOrderId = this.workOrderId; - const type = this.type; + this.workOrderId = formData.workOrderId + this.type = formData.type + const workOrderId = this.workOrderId + const type = this.type // 申请云服务器 this.isApplyServerVM && getApplyServerVmDetail({ workOrderId, type }).then((data) => { - this.applyServerVM = data; - }); + this.applyServerVM = data + }) // 变更云服务器 this.isModifyServerVM && getModifyServerVmDetail({ workOrderId, type }).then((data) => { - this.modifyServerVM = data; - }); + this.modifyServerVM = data + }) // 延期云服务器 this.isApplyDeferredDetail && getApplyDeferredDetail({ workOrderId, type }).then((data) => { - this.applyDeferredDetail = data; - }); + this.applyDeferredDetail = data + }) // 注册账号 this.isRegisterUserDetail && getRegisterUserDetail({ workOrderId, type }).then((data) => { - this.registerUserDetail = data; - }); + this.registerUserDetail = data + }) // 修改账号 this.isUpdateUserDetail && getUpdateUserDetail({ workOrderId, type }).then((data) => { - this.updateUserDetail = data; - }); + this.updateUserDetail = data + }) // 工单详情-变更VDC this.isModifyVdcVM && applyModifyVdcDetail({ workOrderId }).then((data) => { - this.modifyVdcVMDetail.formData = data; - }); + this.modifyVdcVMDetail.formData = data + }) }, mounted() {}, - computed: { - isModifyServerVM: function () { - return this.type === "MODIFY_SERVERVM"; - }, - isApplyServerVM: function () { - return this.type === "APPLY_SERVERVM"; - }, - isApplyDeferredDetail: function () { - return this.type === "DEFERRED_SERVERVM"; - }, - isRegisterUserDetail: function () { - return this.type === "REGISTER_USER"; - }, - isUpdateUserDetail: function () { - return this.type === "MODIFY_USER"; - }, - isModifyVdcVM: function () { - return this.type === "MODIFY_VDC"; - }, - }, methods: { getmcCloneTypeDesc(key) { - return dictionary.getDesc(key, dictionary.cloneTypeArr); - }, - }, -}; + return dictionary.getDesc(key, dictionary.cloneTypeArr) + } + } +} \ No newline at end of file + diff --git a/src/views/workorder/detail/ipsetDeiatl.vue b/src/views/workorder/detail/ipsetDeiatl.vue index f670654..3f3a8aa 100644 --- a/src/views/workorder/detail/ipsetDeiatl.vue +++ b/src/views/workorder/detail/ipsetDeiatl.vue @@ -55,14 +55,14 @@ \ No newline at end of file + diff --git a/src/views/workorder/drawer/PassServervmApply.vue b/src/views/workorder/drawer/PassServervmApply.vue index efc3378..3fd31a9 100644 --- a/src/views/workorder/drawer/PassServervmApply.vue +++ b/src/views/workorder/drawer/PassServervmApply.vue @@ -45,35 +45,34 @@ {{ item.label }} + :label="item.value" + >{{ item.label }} - + /> + :form-data="formData" + /> - + :form-data="disksformData" + page-mode="TEMPADD" + /> - + :form-data="networksformData" + page-mode="TEMPADD" + /> \ No newline at end of file + diff --git a/src/views/workorder/drawer/PassServervmIsoApply.vue b/src/views/workorder/drawer/PassServervmIsoApply.vue index bfac1c2..e4e60d3 100644 --- a/src/views/workorder/drawer/PassServervmIsoApply.vue +++ b/src/views/workorder/drawer/PassServervmIsoApply.vue @@ -39,8 +39,7 @@ :key="item.value" :label="item.label" :value="item.value" - > - + /> @@ -61,8 +60,7 @@ :key="item.systemName" :label="item.systemName" :value="item.systemName" - > - + /> @@ -89,27 +87,26 @@ - + /> + :form-data="formData" + /> - + :form-data="disksformData" + page-mode="ISOADD" + /> - + :form-data="networksformData" + page-mode="ISOADD" + /> - + /> \ No newline at end of file + diff --git a/src/views/workorder/drawer/PassServervmModify.vue b/src/views/workorder/drawer/PassServervmModify.vue index 6c6951e..7f554e6 100644 --- a/src/views/workorder/drawer/PassServervmModify.vue +++ b/src/views/workorder/drawer/PassServervmModify.vue @@ -28,8 +28,8 @@ + :form-data="passModifyformData" + /> - + :form-data="disksformData" + page-mode="CHANGE" + /> - + :form-data="networksformData" + page-mode="CHANGE" + />
@@ -110,90 +108,90 @@
\ No newline at end of file + diff --git a/src/views/workorder/drawer/computResources.vue b/src/views/workorder/drawer/computResources.vue index b8372b7..476df39 100644 --- a/src/views/workorder/drawer/computResources.vue +++ b/src/views/workorder/drawer/computResources.vue @@ -63,92 +63,95 @@
\ No newline at end of file + diff --git a/src/views/workorder/drawer/pass-apply-servervm-drawer.vue b/src/views/workorder/drawer/pass-apply-servervm-drawer.vue index 2e547f0..4553a16 100644 --- a/src/views/workorder/drawer/pass-apply-servervm-drawer.vue +++ b/src/views/workorder/drawer/pass-apply-servervm-drawer.vue @@ -1,10 +1,10 @@ diff --git a/src/views/workorder/drawer/pass-drawer.vue b/src/views/workorder/drawer/pass-drawer.vue index 029763c..6e6ec68 100644 --- a/src/views/workorder/drawer/pass-drawer.vue +++ b/src/views/workorder/drawer/pass-drawer.vue @@ -45,104 +45,104 @@ diff --git a/src/views/workorder/drawer/refuse-drawer.vue b/src/views/workorder/drawer/refuse-drawer.vue index d9eb2cb..5687c3f 100644 --- a/src/views/workorder/drawer/refuse-drawer.vue +++ b/src/views/workorder/drawer/refuse-drawer.vue @@ -47,85 +47,85 @@ \ No newline at end of file + -- Gitee