diff --git a/src/views/resource/availabilityZone/createEditModal/createEditModal.vue b/src/views/resource/availabilityZone/createEditModal/createEditModal.vue
index 27f60ccfdcad12c044cac49f02df70562575bb63..d92baa79df93484bd255d50553f6b0c3a7c489ef 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 7ca55d8b182037d0286e6a0e0e2179a43ec5a2bf..b9389e8701ef5cff0c027127d128d10a3d6d7403 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 1584dc3665c95e5c119ee888121c59e7d5f20d9d..4b17644ccc7e831f1d728c2e41e8a356c08cb554 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 9fe0311525e985678fb5f0cb9c21871382c8f22a..d72df8499bd66d8fd1cfcc9cc2b733cf3da5997c 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 d1ac18611ba708843d192c917a5052d16859c0a9..da038c5f5f3013854f672a9140ecfd6cc1e7468c 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 f670654f6983b4403c57f91678c466009d279ece..3f3a8aa538cc128694bb166f1d4694c47482a6bf 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 efc3378de9c27927fb78dc47aa003bc66fcdecae..3fd31a980a22800d946d639cd4162ea801136760 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 bfac1c2fa4f10840799553466818336818c5c2e6..e4e60d3301b00de637d758b0868b3a8f5642bda5 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 6c6951e5a40112dcbbf898d268f072f2bc8748ac..7f554e6525fe32aff5edaa35a9522877595bc198 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 b8372b7fb682ea22fe2c526613ee49ae4b11c3a7..476df39d5b3935e11f91385a7d2eac2b4ae7f1b0 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 2e547f0de0022c6293f4a2a58d932f2d0c74067e..4553a16a632a243a37cf35bd4110de95025326fc 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 029763ce56503382911e29812ffb46681786b3e1..6e6ec682508af36b4f8ef6e6b2ef06aab128246a 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 d9eb2cb13dbcfe2874caa7937c644bb9c427acf4..5687c3fadfe470e7c65b32f919be47b7b490d444 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
+