diff --git a/src/resources/api/deploy/application-config/env.js b/src/resources/api/deploy/application-config/env.js
index 71b0524a0d33e1e602b1c0ed773abc1ca5dd3643..291974b3b8c3bba6ea40983691f75ae45ec30f64 100644
--- a/src/resources/api/deploy/application-config/env.js
+++ b/src/resources/api/deploy/application-config/env.js
@@ -43,6 +43,10 @@ const env = {
   getInstanceList(params) {
     // 实例列表
     return axios.post('/api/rest/deploy/app/module/env/auto/config/instance/search', params);
+  },
+  saveEnvDbResource(params) {
+    // 保存环境db资源
+    return axios.post('/api/rest/deploy/app/config/env/cientity/save', params);
   }
 };
 
diff --git a/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..fbcd63f8048e1a67635c7086153329752b11dd70
--- /dev/null
+++ b/src/views/pages/deploy/application-config/config/env/db-resource-setting-dialog.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <TsDialog
+      v-bind="dialogSetting"
+      :title="isNewData? $t('dialog.title.addtarget', {target: $t('page.database')}): $t('dialog.title.edittarget', {target: $t('page.database')})"
+      @on-ok="okDialog"
+      @on-close="closeDialog"
+    >
+      <template v-slot>
+        <div>
+          <loading :loadingShow="loadingShow" type="fix"></loading>
+          <TsForm
+            v-if="!loadingShow"
+            ref="form"
+            v-model="formValue"
+            :item-list="formList"
+          ></TsForm>
+        </div>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
+  },
+  props: {
+    isNewData: { // 是否新增数据
+      type: Boolean,
+      default: false
+    },
+    dbResourceData: Object,
+    params: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    }
+  },
+  data() {
+    return {
+      loadingShow: false,
+      dialogSetting: {
+        isShow: true,
+        type: 'modal',
+        width: 'medium'
+      },
+      formValue: {
+        ciId: null,
+        name: null,
+        ip: null,
+        port: null
+      },
+      formList: [
+        {
+          name: 'ciId',
+          type: 'select',
+          label: this.$t('term.deploy.configurationmodel'),
+          validateList: ['required'],
+          multiple: false,
+          transfer: true,
+          disabled: !this.isNewData,
+          dataList: []
+        },
+        {
+          name: 'name',
+          type: 'text',
+          label: this.$t('page.name'),
+          maxlength: 50,
+          validateList: ['name-special']
+        },
+        {
+          name: 'ip',
+          type: 'text',
+          label: 'IP',
+          validateList: ['ip']
+        },
+        {
+          name: 'port',
+          type: 'number',
+          label: this.$t('page.port'),
+          validateList: ['port']
+        }
+      ],
+      ciId: null,
+      attrNameList: ['name', 'ip', 'port']
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.initData();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    async initData() {
+      this.loadingShow = true;
+      await this.getResourceEntityByCiId();
+      await this.getAppInstanceCiAttrList(this.ciId);
+      this.getCiList();
+      if (!this.isNewData && !this.$utils.isEmpty(this.dbResourceData)) {
+        this.$set(this.formValue, 'ciId', this.dbResourceData.typeId);
+        this.$set(this.formValue, 'name', this.dbResourceData.name);
+        this.$set(this.formValue, 'ip', this.dbResourceData.ip);
+        this.$set(this.formValue, 'port', this.dbResourceData.port);
+      }
+      this.$nextTick(() => {
+        this.loadingShow = false;
+      });
+    },
+    getAppInstanceCiAttrList(ciId) {
+      if (!this.ciId) {
+        return false; 
+      }
+      let params = {
+        isAll: 0,
+        attrNameList: this.attrNameList,
+        ciId: ciId
+      };
+      return this.$api.deploy.applicationConfig.getAppInstanceCiAttrList(params).then((res) => {
+        if (res.Status == 'OK') {
+          const attrObj = res.Return || {};
+          const validMap = {
+            name: ['name-special'],
+            ip: ['ip'],
+            port: ['port']
+          };
+          this.formList.forEach((item) => {
+            if (attrObj[item.name]) {
+              const attr = attrObj[item.name];
+              let validateList = validMap[item.name] || [];
+              if (attr.isRequired && attr.isRequired == 1) {
+                validateList.push('required');
+              } 
+              this.$set(item, 'validateList', validateList);
+            }
+          });
+        }
+      });
+    },
+    getResourceEntityByCiId() {
+      return this.$api.cmdb.applicationManage.getResourceEntityByName('scence_database_ip_port_env_appmodule').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.ciId = res.Return.ciId;
+        }
+      });
+    },
+    getCiList() {
+      if (!this.ciId) {
+        return false;
+      }
+      this.$api.cmdb.ci.getCiList({idList: [this.ciId], needChildren: 1, isAbstract: 0}).then((res) => {
+        if (res && res.Status == 'OK') {
+          this.formList.forEach((item) => {
+            if (item.name == 'ciId') {
+              item.dataList = res.Return || [];
+            }
+          });
+        }
+      });
+    },
+    okDialog() {
+      if (!this.$refs.form.valid()) {
+        return false; 
+      }
+      let data = {
+        appSystemId: this.params.appSystemId,
+        appModuleId: this.params.appModuleId,
+        envId: this.params.envId,
+        ciId: this.formValue.ciId,
+        name: this.formValue.name,
+        ip: this.formValue.ip,
+        port: this.formValue.port
+      };
+      if (!this.$utils.isEmpty(this.dbResourceData)) {
+        data.id = this.dbResourceData.id;
+      }
+      this.$api.deploy.env.saveEnvDbResource(data).then((res) => {
+        if (res && res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          const id = res.Return.id;
+          this.closeDialog(id);
+        }
+      });
+    },
+    closeDialog(id) {
+      this.$emit('close', id);
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
index 8b9976272e03090997d08851c346190a8d9e54fa..a701335437a3c25a9a91fe1c06763cb231568e7f 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
@@ -17,30 +17,50 @@
             v-model="formValue"
             :item-list="formItemList"
           >
+            <template v-slot:dbResourceId>
+              <TsFormItem :label="$t('page.database')" :required="true">
+                <div class="flex-start">
+                  <TsFormSelect
+                    ref="formSelect"
+                    v-model="formValue.dbResourceId"
+                    v-bind="dbResourceSetting"
+                    style="flex: 1;"
+                    @first="addDbResource"
+                  >
+                  </TsFormSelect>
+                  <div v-if="formValue.dbResourceId">
+                    <span class="tsfont-edit text-tip-active pl-md" @click="editDbResource()"></span>
+                  </div>
+                </div>
+              </TsFormItem>
+            </template>
             <template v-slot:accountId>
-              <div class="action-icon text-right">
-                <template v-if="getDisabled">
-                  <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
-                    <span class="tsfont-rotate-right text-tip-active" :class="getDisabledClassName"></span>
-                  </Tooltip>
-                  <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
-                    <span class="tsfont-edit text-tip-active pl-md" :class="getDisabledClassName"></span>
-                  </Tooltip>
-                </template>
-                <template v-else>
-                  <span class="tsfont-rotate-right text-tip-active" @click="refreshAccountList"></span>
-                  <span class="tsfont-edit text-tip-active pl-md" :class="getDisabledClassName" @click="toAssetManageEditAccount"></span>
-                </template>
-              </div>
               <TsFormItem :label="$t('page.account')" :required="true">
-                <TsFormSelect
-                  ref="formSelect"
-                  v-model="formValue.accountId"
-                  v-bind="accountSetting"
-                  @first="toAssetManageEditAccount"
-                  @searchCallback="refreshSuccess()"
-                >
-                </TsFormSelect>
+                <div class="flex-start">
+                  <TsFormSelect
+                    ref="formSelect"
+                    v-model="formValue.accountId"
+                    v-bind="accountSetting"
+                    style="flex: 1;"
+                    @first="editAccount"
+                    @searchCallback="refreshSuccess()"
+                  >
+                  </TsFormSelect>
+                  <div class="pl-sm">
+                    <template v-if="getDisabled">
+                      <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
+                        <span class="tsfont-rotate-right text-tip-active" :class="getDisabledClassName"></span>
+                      </Tooltip>
+                      <Tooltip :content="$t('term.deploy.pleasechoosedatabase')" transfer>
+                        <span class="tsfont-edit text-tip-active pl-sm" :class="getDisabledClassName"></span>
+                      </Tooltip>
+                    </template>
+                    <template v-else>
+                      <span class="tsfont-rotate-right text-tip-active" @click="refreshAccountList"></span>
+                      <span class="tsfont-edit text-tip-active pl-sm" :class="getDisabledClassName" @click="editAccount"></span>
+                    </template>
+                  </div>
+                </div>
               </TsFormItem>
             </template>
           </TsForm>
@@ -52,6 +72,14 @@
         </div>
       </template>
     </TsDialog>
+    <DbResourceSettingDialog
+      v-if="isShowDbResourceDialog"
+      :isNewData="isAddDbResource"
+      :dbResourceData="dbResourceData"
+      :params="params"
+      @close="closeDbResourceSettingDialog"
+    ></DbResourceSettingDialog>
+    <AccountEditDialog v-if="isShowAccountEditDialog" :resourceId="resourceId" @close="closeAccountEditDialog"></AccountEditDialog>
   </div>
 </template>
 <script>
@@ -60,7 +88,9 @@ export default {
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
     TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
-    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    DbResourceSettingDialog: () => import('./db-resource-setting-dialog.vue'),
+    AccountEditDialog: () => import('@/views/pages/cmdb/asset/components/account-edit-dialog')
   },
   props: {
     id: {
@@ -101,7 +131,6 @@ export default {
         validateList: ['required'],
         firstSelect: false
       },
-
       config: {},
       hasConfig: false,
       databaseList: [],
@@ -142,31 +171,9 @@ export default {
         },
         {
           name: 'dbResourceId',
-          type: 'select',
-          label: this.$t('page.database'),
-          validateList: ['required'],
-          dynamicUrl: '/api/rest/deploy/app/config/env/database/search',
-          params: {...this.params},
-          rootName: 'tbodyList',
-          firstSelect: false,
-          dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList); },
-          onChange: (dbResourceId) => {
-            this.getDBList(null);
-            if (dbResourceId) {
-              this.handleSpecialFields(dbResourceId);
-              this.dbResourceId = dbResourceId;
-              this.$set(this.accountSetting, 'disabled', false);
-              this.$set(this.accountSetting, 'disabledHoverTitle', '');
-              this.$set(this.accountSetting.params, 'resourceId', dbResourceId);
-              this.getAccountList();
-            } else {
-              this.dbResourceId = null;
-              this.$set(this.accountSetting, 'disabled', true);
-              this.$set(this.accountSetting, 'disabledHoverTitle', this.$t('form.placeholder.pleaseselect', {target: this.$t('page.database')}));
-              this.$set(this.accountSetting.params, 'resourceId', null);
-              this.$set(this.formValue, 'accountId', null); // 清空账号
-            }
-          }
+          type: 'slot',
+          label: '',
+          labelWidth: 1
         },
         {
           name: 'accountId',
@@ -283,7 +290,26 @@ export default {
           label: 'db2ProcTerminator',
           maxlength: 256
         }
-      ]
+      ],
+      dbResourceSetting: {
+        validateList: ['required'],
+        dynamicUrl: '/api/rest/deploy/app/config/env/database/search',
+        params: {...this.params},
+        rootName: 'tbodyList',
+        firstSelect: false,
+        firstLi: true,
+        firstText: this.$t('page.database'),
+        transfer: true,
+        dealDataByUrl: (nodeList) => { return this.dealDataByUrl(nodeList); },
+        onChange: (dbResourceId, item, selectItem) => {
+          this.changeDbResourceId(dbResourceId, selectItem);
+        }
+      },
+      dbResourceData: null,
+      isAddDbResource: false,
+      isShowDbResourceDialog: false,
+      isShowAccountEditDialog: false,
+      resourceId: null
     };
   },
   beforeCreate() {},
@@ -325,10 +351,14 @@ export default {
       if (nodeList && nodeList.length > 0) {
         nodeList.forEach(item => {
           databaseList.push({
+            ...item,
             text: this.getText(item),
             value: item.id
           });
         });
+        if (!this.dbResourceData && this.dbResourceId) {
+          this.dbResourceData = nodeList.find(item => item.id == this.dbResourceId);
+        }
       }
       return databaseList;
     },
@@ -438,12 +468,13 @@ export default {
     closeDialog(needRefresh = false) {
       this.$emit('close', needRefresh);
     },
-    toAssetManageEditAccount() {
-      // 跳转到资产清单页面，打开单个账号管理弹窗
+    editAccount() {
+      // 资产清单，打开单个账号管理弹窗
       if (this.getDisabled) {
         return false;
       }
-      window.open(HOME + '/cmdb.html#/asset-manage?resourceId=' + this.dbResourceId, '_blank');
+      this.resourceId = this.dbResourceId;
+      this.isShowAccountEditDialog = true;
     },
     refreshAccountList() {
       if (this.getDisabled) {
@@ -459,6 +490,51 @@ export default {
       if (this.accountSetting.params && this.accountSetting.params.hasOwnProperty('refreshUuid')) {
         delete this.accountSetting.params.refreshUuid;
       }
+    },
+    changeDbResourceId(dbResourceId, selectItem) {
+      this.getDBList(null);
+      if (dbResourceId) {
+        this.handleSpecialFields(dbResourceId);
+        this.dbResourceId = dbResourceId;
+        this.$set(this.accountSetting, 'disabled', false);
+        this.$set(this.accountSetting, 'disabledHoverTitle', '');
+        this.$set(this.accountSetting.params, 'resourceId', dbResourceId);
+        this.getAccountList();
+        this.dbResourceData = selectItem;
+      } else {
+        this.dbResourceId = null;
+        this.$set(this.accountSetting, 'disabled', true);
+        this.$set(this.accountSetting, 'disabledHoverTitle', this.$t('form.placeholder.pleaseselect', {target: this.$t('page.database')}));
+        this.$set(this.accountSetting.params, 'resourceId', null);
+        this.$set(this.formValue, 'accountId', null); // 清空账号
+        this.dbResourceData = null;
+      }
+    },
+    addDbResource() {
+      this.isAddDbResource = true;
+      this.isShowDbResourceDialog = true;
+    },
+    editDbResource() {
+      this.isAddDbResource = false;
+      this.isShowDbResourceDialog = true;
+    },
+    closeDbResourceSettingDialog(id) {
+      this.isLoading = true;
+      if (id && !this.dbResourceId) {
+        this.$set(this.formValue, 'dbResourceId', id);
+        this.changeDbResourceId(id);
+      }
+      this.isShowDbResourceDialog = false;
+      this.$nextTick(() => {
+        this.isLoading = false;
+      });
+    },
+    closeAccountEditDialog(needFresh) {
+      this.resourceId = null;
+      this.isShowAccountEditDialog = false;
+      if (needFresh) {
+        this.refreshAccountList();
+      }
     }
   },
   filter: {},
diff --git a/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue b/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
index b297b05fa6e899226a119df11713659152db2774..6fa4cc959d870e2e682253ea44177e2d5f43ed7a 100644
--- a/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-instance-edit.vue
@@ -91,8 +91,6 @@ export default {
           validateList: ['required'],
           multiple: false,
           transfer: true,
-          textName: 'label',
-          valueName: 'id',
           disabled: this.isEdit,
           dataList: []
         }
@@ -110,7 +108,8 @@ export default {
           dynamicUrl: 'api/rest/deploy/app/config/instance/search',
           dealDataByUrl: (list) => this.dealDataByUrl(list)
         }
-      ]
+      ],
+      ciId: null
     };
   },
   beforeCreate() {},
@@ -118,6 +117,7 @@ export default {
   beforeMount() {},
   async mounted() {
     await this.getAppInstanceCiAttrList();
+    await this.getResourceEntityByCiId();
     this.formList = this.exampleList.concat(this.addformList);
     this.$set(this.formValue, 'instance', 1);
     if (this.isEdit == true && this.instanceData) {
@@ -176,12 +176,22 @@ export default {
       }
       return dataList;
     },
+    getResourceEntityByCiId() {
+      return this.$api.cmdb.applicationManage.getResourceEntityByName('scence_appinstance_env_appmodule_appsystem').then(res => {
+        if (res.Return && res.Return.ciId) {
+          this.ciId = res.Return.ciId;
+        }
+      });
+    },
     getCiList() {
-      this.$api.common.updateCmdbMenu({ciNameList: ['AppIns'], isAbstract: 0}).then((res) => {
+      if (!this.ciId) {
+        return false;
+      }
+      this.$api.cmdb.ci.getCiList({idList: [this.ciId], needChildren: 1, isAbstract: 0}).then((res) => {
         if (res && res.Status == 'OK') {
           this.addformList.forEach((item) => {
             if (item.name == 'ciId') {
-              item.dataList = res.Return ? res.Return[0]['ciList'] : [];
+              item.dataList = res.Return || [];
             }
           });
         }