diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js
index f0918bb5f..dc89ba70c 100644
--- a/nezha-fronted/config/index.js
+++ b/nezha-fronted/config/index.js
@@ -48,7 +48,7 @@ module.exports = {
 
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
+    assetsSubDirectory: 'nezha',
     assetsPublicPath: '/',
 
     /**
diff --git a/nezha-fronted/index.html b/nezha-fronted/index.html
index 88fc3b6a8..34aa639e3 100644
--- a/nezha-fronted/index.html
+++ b/nezha-fronted/index.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="/static/logo14_14.png" type="image/x-icon"/>
+  <link rel="icon" href="./nezha/logo14_14.png" type="image/x-icon"/>
 
   <title>Nezha</title>
   <style>
diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index b79ffeb03..d2cc28ccf 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -816,12 +816,28 @@ li{
   to {right: -870px}
 }
 @keyframes slide-in-from-right {
-  from {right: -550px}
-  to {right: 0px}
+  /*from {right: -550px}
+  to {right: 0px}*/
+  from {
+    transform: scaleX(0);
+    transform-origin: right;
+  }
+  to {
+    transform: scaleX(1);
+    transform-origin: right;
+  }
 }
 @keyframes slide-out-to-right {
-  from {right: 0px}
-  to {right: -550px}
+  /*from {right: 0px}
+  to {right: -550px}*/
+  from {
+    transform: scaleX(1);
+    transform-origin: right;
+  }
+  to {
+    transform: scaleX(0);
+    transform-origin: right;
+  }
 }
 .right-box-enter-active {
   animation: slide-in-from-right 0.4s;
diff --git a/nezha-fronted/src/components/cli/console.vue b/nezha-fronted/src/components/cli/console.vue
index 0048b58e8..f5b977c47 100644
--- a/nezha-fronted/src/components/cli/console.vue
+++ b/nezha-fronted/src/components/cli/console.vue
@@ -190,9 +190,13 @@ export default {
       this.term.open(terminalContainer);
       this.term.focus();
       let token = sessionStorage.getItem('nz-token');
-      let baseUrl = this.$axios.defaults.baseURL.replace('http','ws');
+      let baseUrl = this.$axios.defaults.baseURL;
+      if (baseUrl.startsWith("/")) {
+        baseUrl = "ws://" + window.location.host + ":" + window.location.port + baseUrl;
+      } else {
+        baseUrl = baseUrl.replace("http://", "ws://").replace("https://", "ws://");
+      }
       let url = baseUrl+"/terminal.ws?width="+this.terminal.width+"&height="+this.terminal.height+"&cols="+this.terminal.cols+"&rows="+this.terminal.rows+"&token="+token+"&assetId="+this.terminal.assetId+"&accountId="+this.terminal.accountId+"&uuid="+this.terminal.uuid;
-
       this.terminalSocket = new WebSocket(url);
       //连接成功
       this.terminalSocket.onopen = () =>{
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index ad6a1ed33..28769993b 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <transition name="right-box-840">
+  <transition name="right-box">
     <div class="right-box right-box-add-endpoint" :class="{'right-box-add-endpoint-snmp': currentModuleCopy.type && currentModuleCopy.type.toLowerCase() == 'snmp'}" v-if="rightBox.show" @mousedown="showEditParamBox(false)" v-clickoutside="clickos">
       <!-- begin--顶部按钮-->
       <div class="right-box-top-btns">
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index d0f155ead..a52c051e5 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <transition name="right-box-580">
+  <transition name="right-box">
     <div class="right-box right-box-add-asset" v-if="editUnitShow" @click="editQuit" id="asset-edit-quit" v-clickoutside="clickos">
       <!--顶部按钮-->
       <div class="right-box-top-btns">
@@ -142,7 +142,7 @@
           <div class="line-100 right-box-line"></div>
           <!------------------------------------------IDC---------------------------------------------->
           <el-form-item :label="$t('asset.createAssetTab.location')" prop="locationInfo" :rules="[{validator:locationValidator,trigger:'blur'}]">
-            <location-cascader :disabled="assetData.modelId !=''?false:true" :default-model-u-size="modelSize" @change="setLocationData" :init-data="initLocationData" ref="locationCascader"></location-cascader>
+            <location-cascader :disabled="assetData.modelId !=''?false:true" :default-model-u-size="modelSize" @change="setLocationData" :init-data="initLocationData" ref="locationCascader" :idc-option="IDCOptionData"></location-cascader>
           </el-form-item>
           <!--<el-form-item :label="$t('asset.createAssetTab.dcName')" class="right-box-form-content" prop="idcId">
             <template v-if="!tabView">
@@ -243,7 +243,7 @@
         </button>
       </div>
       <module-box :module="module" @reload="refreshTabData" ref="moduleBox"></module-box>
-      <model-box ref="modelBox" :model="model" @reload="getAllModelOptionData"></model-box>
+      <model-box v-if="firstShowModel" ref="modelBox" :model="model" @reload="getAllModelOptionData"></model-box>
     </div>
   </transition>
 </template>
@@ -262,6 +262,7 @@
     },
     data() {
       return {
+        firstShowModel: false,
         visible: '',
         vendorModelData: '',
         assetData: {
@@ -484,7 +485,7 @@
           if (newVal) {
             this.getConnectData();
             if (this.pageObj.id != '') {
-              this.assetData.modelId = [this.obj.model.vendor.code, this.obj.model.id]
+              this.assetData.modelId = [this.obj.model.vendor.code, this.obj.model.id];
             }
           }
         }
@@ -598,7 +599,53 @@
         this.modelSize=model.usize;
       },
       getAssetData(data) {
-        if (data) {
+        this.$nextTick(() => {
+          if (data) {
+            this.pageObj.id = data.id;
+            this.obj = JSON.parse(JSON.stringify(data));
+            this.assetViewData.assetType = this.obj.model.type.value
+            this.assetViewData.vendor = this.obj.model.vendor.value
+            this.assetViewData.model = this.obj.model.name
+            this.modelSize=this.obj.model.usize;
+            this.assetViewData.idcName = this.obj.idc.name
+            this.assetViewData.cabinetName = this.obj.cabinet == null ? '' : this.obj.cabinet.name
+            let initLocationData={
+              idc:this.obj.idc,
+              cabinet:this.obj.cabinet,
+              u:[this.obj.cabinetStart,this.obj.cabinetEnd]
+            }
+            this.$refs.locationCascader.initComponet(initLocationData)
+            this.assetViewData.moduleNum = this.obj.moduleNum
+            this.assetViewData.alertNum = this.obj.alertNum
+            this.assetViewData.cabinetName = this.obj.cabinet == null ? '' : this.obj.cabinet.name
+            this.getCabinetOptionData(this.obj.idc.id)
+            this.assetType = this.obj.model.type.code
+            this.assetData.impi=this.obj.impi?this.obj.impi:{host:'',port:''};
+            this.assetData.sn = this.obj.sn
+            this.assetData.host = this.obj.host
+            this.assetData.state = this.obj.state
+            this.assetData.idcId = this.obj.idc.id
+            this.assetData.cabinetId = this.obj.cabinet == null ? '' : this.obj.cabinet.id
+            this.assetData.purchaseDate = this.obj.purchaseDate;
+            // this.assetData.accounts[0].id = this.obj.accounts[0].id
+            // this.assetData.accounts[0].authType = this.obj.accounts[0].authType
+            // this.assetData.accounts[0].user = this.obj.accounts[0].user
+            // this.assetData.accounts[0].pwd = this.obj.accounts[0].pwd
+            // this.assetData.accounts[0].port = this.obj.accounts[0].port
+            // this.assetData.accounts[0].cert = this.obj.accounts[0].privateKey
+            this.assetData.accounts=this.obj.accounts[0]?this.obj.accounts:[];
+            this.accountSwitch=this.assetData.accounts.length>0;
+            this.idcSelectedData.location = this.obj.idc.location
+            this.idcSelectedData.principal = this.obj.idc.principal
+            this.idcSelectedData.tel = this.obj.idc.tel
+            this.cabinetSelectedData.uSize = this.obj.cabinet == null ? '' : this.obj.cabinet.uSize
+            this.cabinetSelectedData.remark = this.obj.cabinet == null ? '' : this.obj.cabinet.remark
+            this.getAllModelOptionData(this.assetType);
+          } else {
+            this.resetAsset();
+          }
+        });
+        /*if (data) {
           this.pageObj.id = data;
           this.$get('asset', this.pageObj).then(response => {
             if (response.code === 200) {
@@ -645,7 +692,7 @@
           })
         } else {
           this.resetAsset();
-        }
+        }*/
       },
       openModuleBox(module) {
         this.module = module;
@@ -664,13 +711,15 @@
           }
         });
       },
-      getIDCOptionData() {
+      getIDCOptionData(isUpdate) {
         this.$get('idc').then(response => {
           if (response.code === 200) {
             this.IDCOptionData = response.data.list;
             this.markOptionData(this.IDCOptionData);
-            this.$store.commit('assetDcListChange');
-            this.$emit('refreshData');
+            if (isUpdate) {
+              this.$store.commit('assetDcListChange');
+              this.$emit('refreshData');
+            }
           }
         })
       },
@@ -745,7 +794,11 @@
             }
           }
         }
-        this.$refs.modelBox.show(true, true);
+        this.firstShowModel = true;
+        this.$nextTick(() => {
+          this.$refs.modelBox.show(true, true);
+        });
+
       },
       resetAsset() {
         this.pageObj.id = '';
@@ -799,11 +852,11 @@
           principal: '',
           tel: ''
         };
-        let tempModelId = this.assetData.modelId;
+
         if (data === 'asset') {
-          if (this.assetData.modelId) {
+          /*if (this.assetData.modelId) {
             this.assetData.modelId = this.assetData.modelId.join(',').split(',')[1];
-          }
+          }*/
           if(this.locationInfo){
             if(this.locationInfo.idc){
               this.assetData.idcId=this.locationInfo.idc.id;
@@ -847,12 +900,16 @@
           if(this.$refs.accountConfigBox&&this.$refs.accountConfigBox.length>0){
             this.$refs.accountConfigBox[0].validateAccount();
           }
+
           this.$refs.assetEditForm.validate((valid) => {
             if (valid&&this.accountValideResult) {
               if (this.pageObj.id) {
                 this.assetData.id=this.pageObj.id;
-                //console.log(JSON.stringify(this.assetData));
-                this.$put('asset', this.assetData).then(res => {
+                let reqData = JSON.parse(JSON.stringify(this.assetData));
+                if (reqData.modelId) {
+                  reqData.modelId = reqData.modelId.join(',').split(',')[1];
+                }
+                this.$put('asset', reqData).then(res => {
                   const h = this.$createElement;
                   if (res.code === 200) {
                     this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")});
@@ -860,7 +917,7 @@
                     this.$emit('refreshData', 'true');
                     this.sendStateData('close');
                   } else {
-                    this.assetData.modelId = tempModelId;
+                    //this.assetData.modelId = tempModelId;
                     this.$message.error(res.msg);
                   }
                 });
@@ -967,7 +1024,7 @@
           this.$put(data, item).then(res => {
             if (res.code === 200) {
               this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")});
-              this.getIDCOptionData();
+              this.getIDCOptionData(true);
               if (data === 'cabinet') {
                 this.getCabinetOptionData(item.idcId);
               }
@@ -1076,7 +1133,7 @@
             if (response.code === 200) {
               this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")});
               this.getAssetData();
-              this.getIDCOptionData();
+              this.getIDCOptionData(true);
               this.getVendorOptionData();
               this.getCabinetOptionData(this.assetData.idcId);
               this.getAllModelOptionData(this.assetType);
diff --git a/nezha-fronted/src/components/common/rightBox/locationCascader.vue b/nezha-fronted/src/components/common/rightBox/locationCascader.vue
index 00823370e..243785b56 100644
--- a/nezha-fronted/src/components/common/rightBox/locationCascader.vue
+++ b/nezha-fronted/src/components/common/rightBox/locationCascader.vue
@@ -59,7 +59,8 @@
     props:{
       defaultModelUSize:{default:1},
       value:{default:null},
-      disabled:{type:Boolean}
+      disabled:{type:Boolean},
+      idcOption: {type: Array}
     },
     data(){
       return {
@@ -104,14 +105,15 @@
         }
       },
       queryIdcInfos:function(){
-        this.idcInfos=[];
-        this.$get('idc?pageSize=-1').then(response=>{
+        this.idcInfos = this.idcOption;
+        /*this.$get('idc?pageSize=-1').then(response=>{
+          console.info(2)
           if(response.code == 200){
               this.idcInfos=response.data.list;
           }else{
             console.error(response.msg);
           }
-        })
+        })*/
       },
       loadCabinetInfos:function(idc){
         if(!idc){
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 951b6e874..7e80c7fde 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -216,7 +216,7 @@
                   class="el-icon-view"></i>
                 </span>
                 &nbsp;
-                <span :title="$t('overall.edit')" @click.stop="tagShow('showEdit',scope.row.id)" class="content-right-option" :id="'asset-edit-'+scope.row.id"><i
+                <span :title="$t('overall.edit')" @click.stop="tagShow('showEdit',scope.row)" class="content-right-option" :id="'asset-edit-'+scope.row.id"><i
                   class="nz-icon nz-icon-edit"></i>
                 </span>
                 &nbsp;
@@ -972,9 +972,7 @@
     },
     created() {
       this.getUserData();
-      this.getIDCOptionData();
-      this.getAssetTypeData();
-      this.getVendorData();
+      this.flushData();
       this.getPingData();
     },
     mounted() {
