diff --git a/src/resources/components/CombineSearcher/CombineSearcher.vue b/src/resources/components/CombineSearcher/CombineSearcher.vue
index 95b7fd648d4fe09e63c30e728c3ecf18d3943d70..0ff463ab4085e4d6affffb2c2ee31d87c3afd01b 100644
--- a/src/resources/components/CombineSearcher/CombineSearcher.vue
+++ b/src/resources/components/CombineSearcher/CombineSearcher.vue
@@ -119,7 +119,10 @@
                 </template>
               </TsForm>
             </li>
-            <li v-if="searchList && searchList.length && isShowButton" style="padding: 6px 10px 6px 4px;">
+            <li v-if="searchList && searchList.length && isShowButton" style="padding: 6px 10px 6px 4px;" :class="isShowAdvanceMode ? 'flex-between' : ''">
+              <div v-if="isShowAdvanceMode" class="text-left">
+                <span class="tsfont-left text-action" @click="switchMode">{{ $t('page.advancedmode') }}</span>
+              </div>
               <div class="text-right">
                 <!-- 自定义底部操作按钮 -->
                 <div v-if="$slots['action']">
@@ -219,6 +222,11 @@ export default {
     searchMode: {
       type: String, // 搜索模式可选：实时搜索(realtimeSearch)，非实时搜索(clickBtnSearch)
       default: 'realtimeSearch' // 默认实时搜索
+    },
+    isShowAdvanceMode: {
+      // 底部是否显示高级模式文案
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -270,6 +278,9 @@ export default {
         this.isCloseAutomaticSearch = true; // 关闭实时搜索
       }
     },
+    switchMode() {
+      this.$emit('switchMode');
+    },
     initWidth() {
       this.$el && (this.width = this.$el.getBoundingClientRect().width);
     },
diff --git a/src/views/pages/autoexec/components/common/addTarget/add-filters.vue b/src/views/pages/autoexec/components/common/addTarget/add-filters.vue
index 66abadb416c0f4e2d7b94008d7333b6c265d93ea..f1b48e9f3bf17a9f486751747a7f74d191fb1cf0 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-filters.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-filters.vue
@@ -63,12 +63,12 @@ export default {
     },
     valid() {
       let data = this.save();
-      let complexModeSearch = this.getComplexModeSearchValue();
-      if (this.$utils.isEmpty(data) && this.$utils.isEmptyObj(complexModeSearch)) {
+      let advancedModeSearch = this.getComplexModeSearchValue();
+      if (this.$utils.isEmpty(data) && this.$utils.isEmptyObj(advancedModeSearch)) {
         this.isValid = false;
-      } else if (this.$utils.isEmpty(data) && !this.$utils.isEmptyObj(complexModeSearch)) {
+      } else if (this.$utils.isEmpty(data) && !this.$utils.isEmptyObj(advancedModeSearch)) {
         this.isValid = true;
-      } else if (!this.$utils.isEmpty(data) && this.$utils.isEmptyObj(complexModeSearch)) {
+      } else if (!this.$utils.isEmpty(data) && this.$utils.isEmptyObj(advancedModeSearch)) {
         this.isValid = true;
       } else {
         this.isValid = true;
diff --git a/src/views/pages/autoexec/components/common/addTarget/add-node.vue b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
index 748acc3e4dd77b20b5243ec5435c29c59615e033..8370d2f31f9ee347f8655e28a5e5eb32f89681b2 100644
--- a/src/views/pages/autoexec/components/common/addTarget/add-node.vue
+++ b/src/views/pages/autoexec/components/common/addTarget/add-node.vue
@@ -29,6 +29,7 @@
               :defaultValue="defaultSearchValue"
               :defaultSearchValue="defaultSearchValue"
               @changeValue="changeValue"
+              @advancedModeSearch="advancedModeSearch"
             ></FilterSearch>
           </div>
           <template v-if="!loadingShow">
@@ -228,6 +229,18 @@ export default {
     changeValue(val) {
       this.searchVal = this.$utils.deepClone(val);
       this.getDataList('currentPage', 1);
+    },
+    advancedModeSearch(searchVal) {
+      // 复杂模式搜索
+      let params = Object.assign({currentPage: 1, pageSize: 10}, searchVal);
+      this.loadingShow = true;
+      this.$api.autoexec.action.searchResourceCustomList(params).then(res => {
+        if (res.Status == 'OK') {
+          this.tableData = res.Return;
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
     }
   },
   computed: {
diff --git a/src/views/pages/autoexec/components/common/executionMode/filters.vue b/src/views/pages/autoexec/components/common/executionMode/filters.vue
index 364aa234de1c1c245541971451fbdfb068887908..119525488a5a8f914309bd9ab9d078972f088b99 100644
--- a/src/views/pages/autoexec/components/common/executionMode/filters.vue
+++ b/src/views/pages/autoexec/components/common/executionMode/filters.vue
@@ -30,7 +30,7 @@
           :defaultValue="defaultValue"
           :defaultSearchValue="defaultSearchValue"
           @changeValue="changeValue"
-          @complexModeSearch="complexModeSearch"
+          @advancedModeSearch="advancedModeSearch"
         ></FilterSearch>
         <div v-if="tipText" class="text-tip tips padding-top">{{ tipText }}</div>
       </TsFormItem>
@@ -175,7 +175,7 @@ export default {
       };
       if (this.complexModeSearchValue && !this.$utils.isEmptyObj(this.complexModeSearchValue)) {
         // 复杂模式搜索
-        this.complexModeSearch({...this.complexModeSearchValue, ...param});
+        this.advancedModeSearch({...this.complexModeSearchValue, ...param});
       } else {
         param = Object.assign(param, this.searchVal);
         this.searchNodeList(param);
@@ -186,7 +186,7 @@ export default {
       this.searchVal = this.$utils.deepClone(val);
       this.getDataList('currentPage', 1);
     },
-    complexModeSearch(searchVal) {
+    advancedModeSearch(searchVal) {
       // 复杂模式搜索
       let params = Object.assign({currentPage: 1, pageSize: 10}, searchVal);
       this.complexModeSearchValue = searchVal;
@@ -207,10 +207,10 @@ export default {
       handler(val) {
         if (val) {
           if (val && val.hasOwnProperty('conditionGroupList')) {
-            this.complexModeSearch(val); // 复杂模式值回显搜索
+            this.advancedModeSearch(val); // 复杂模式值回显搜索
           } else {
             if (this.$utils.isEmptyObj(val) && this.defaultSearchValue && this.defaultSearchValue.hasOwnProperty('conditionGroupList')) {
-              this.complexModeSearch(this.defaultSearchValue); // 复杂模式值回显搜索
+              this.advancedModeSearch(this.defaultSearchValue); // 复杂模式值回显搜索
             } else {
               this.searchVal = this.$utils.deepClone(val);
               this.searchNodeList(val);
diff --git a/src/views/pages/autoexec/components/common/filter-search.vue b/src/views/pages/autoexec/components/common/filter-search.vue
index b493baabeec13981d27b7dd1f694726b442d1a2b..bc6af66fc97da4254310c735a0f92bd107106042 100644
--- a/src/views/pages/autoexec/components/common/filter-search.vue
+++ b/src/views/pages/autoexec/components/common/filter-search.vue
@@ -33,49 +33,30 @@
       :showSearchNumber="showSearchNumber"
       @confirm="simpleModeSearch"
     >
-      <template slot="action">
-        <div style="position:relative;">
-          <span
-            v-if="!defaultSearchValue"
-            class="tsfont-left cursor text-action"
-            style="position: absolute;left: 10px;top:9px;"
-            @click.stop="switchComplexMode"
-          >{{ $t('page.advancedmode') }}</span>
-          <div class="action-group">
-            <div class="action-item">
-              <Button @click="closeCombineSearch">{{ $t('page.cancel') }}</Button>
-            </div>
-            <div class="action-item">
-              <Button type="primary" @click="searchCombineSearcher">{{ $t('page.search') }}</Button>
-            </div>
-          </div>
-        </div>
-      </template>
     </CombineSearcher>
-    <ComplexSearch
+    <AdvancedModeSearch
       v-show="!isSimpleMode"
-      ref="complexSearch"
+      ref="advancedModeSearch"
       v-model="complexSearchVal"
       :readonly="readonly"
+      :searchList="searchList"
       :disabledUuidList="disabledUuidList"
       :disabledGroupUuidList="disabledGroupUuidList"
-      @search="complexModeSearch"
+      @search="advancedModeSearch"
       @click="switchToSimpleMode"
       @clickMoreBtn="() => $emit('clickMoreBtn')"
     >
-    </ComplexSearch>
+    </AdvancedModeSearch>
   </div>
 </template>
 <script>
-import CombineSearcher from '@/resources/components/CombineSearcher/CombineSearcher.vue';
 export default {
   name: '',
   components: {
-    CombineSearcher,
-    ComplexSearch: resolve => require(['./complex-search'], resolve)
-  },
-  filters: {
+    CombineSearcher: resolve => require(['@/resources/components/CombineSearcher/CombineSearcher.vue'], resolve),
+    AdvancedModeSearch: resolve => require(['@/views/pages/cmdb/asset/advanced-mode-search'], resolve)
   },
+  filters: {},
   props: {
     defaultValue: {//搜索条件
       type: Object,
@@ -223,7 +204,214 @@ export default {
       },
       disabledList: [], //不可更改的搜索条件
       disabledUuidList: [], // 复杂模式，禁用的搜索条件
-      disabledGroupUuidList: []
+      disabledGroupUuidList: [],
+      searchList: [
+        {
+          name: 'typeIdList',
+          type: 'tree',
+          label: this.$t('term.cmdb.citype'),
+          search: true,
+          transfer: true,
+          multiple: true,
+          textName: 'label',
+          valueName: 'id',
+          url: '/api/rest/resourcecenter/resourcetype/tree',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'appSystemIdList',
+          type: 'select',
+          label: this.$t('page.apply'),
+          search: true,
+          transfer: true,
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dealDataByUrl: 'getAppForselect',
+          dynamicUrl: '/api/rest/resourcecenter/appsystem/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'appModuleIdList',
+          type: 'select',
+          label: this.$t('page.module'),
+          search: true,
+          transfer: true,
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dealDataByUrl: 'getAppForselect',
+          dynamicUrl: '/api/rest/resourcecenter/appmodule/list',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'envIdList',
+          type: 'select',
+          label: this.$t('page.environment'),
+          search: true,
+          textName: 'name',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          className: 'block-span',
+          url: '/api/rest/resourcecenter/appenv/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'protocolIdList',
+          type: 'select',
+          label: this.$t('page.protocol'),
+          search: true,
+          transfer: true,
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dealDataByUrl: 'getProtocolDataList',
+          className: 'block-span',
+          dynamicUrl: '/api/rest/resourcecenter/account/protocol/search',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'tagIdList',
+          type: 'select',
+          label: this.$t('page.tag'),
+          search: true,
+          textName: 'name',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dynamicUrl: '/api/rest/resourcecenter/tag/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'stateIdList',
+          type: 'select',
+          label: this.$t('term.autoexec.assetstatus'),
+          search: true,
+          textName: 'description',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          className: 'block-span',
+          params: {
+            'needPage': false
+          },
+          url: '/api/rest/resourcecenter/state/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'vendorIdList',
+          type: 'select',
+          label: this.$t('page.manufacturer'),
+          search: true,
+          textName: 'description',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dynamicUrl: '/api/rest/resourcecenter/vendor/list/forselect',
+          params: {
+            needPage: false
+          },
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'inspectStatusList',
+          type: 'select',
+          label: this.$t('term.autoexec.inspectstatus'),
+          search: true,
+          transfer: true,
+          defaultValue: [],
+          multiple: true,
+          className: 'block-span',
+          params: {
+            'enumClass': 'neatlogic.framework.common.constvalue.InspectStatus'
+          },
+          url: '/api/rest/universal/enum/get',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'port',
+          type: 'input',
+          label: this.$t('page.port'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
+        },
+        {
+          name: 'ip',
+          type: 'input',
+          label: this.$t('page.ip'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
+        },
+        {
+          name: 'name',
+          type: 'input',
+          label: this.$t('page.name'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
+        },
+        {
+          name: 'description',
+          type: 'input',
+          label: this.$t('page.description'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
+        },
+        {
+          name: 'networkArea',
+          type: 'input',
+          label: this.$t('page.networkarea'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
+        },
+        {
+          name: 'maintenanceWindow',
+          type: 'datetimerange',
+          label: this.$t('term.autoexec.maintenanceperiod'),
+          format: 'yyyy-MM-dd HH:mm',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'ownerList',
+          type: 'select',
+          label: this.$t('page.owner'),
+          search: true,
+          transfer: true,
+          multiple: true,
+          dynamicUrl: '/api/rest/user/search/forselect',
+          rootName: 'tbodyList',
+          textName: 'userName',
+          valueName: 'uuid',
+          params: {
+            needPage: true
+          },
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'bgList',
+          type: 'select',
+          label: this.$t('term.autoexec.subordinatedepartment'),
+          search: true,
+          transfer: true,
+          multiple: true,
+          dynamicUrl: '/api/rest/team/search',
+          rootName: 'teamList',
+          textName: 'name',
+          valueName: 'uuid',
+          params: {
+            needPage: true,
+            level: 'department'
+          },
+          validateList: [{name: 'required', message: ''}]
+        }]
     };
   },
   beforeCreate() {},
@@ -284,12 +472,12 @@ export default {
     switchComplexMode() {
       // 切换到复杂模式
       this.isSimpleMode = !this.isSimpleMode;
-      this.$refs.complexSearch && this.$refs.complexSearch.openDropdown();
+      this.$refs.advancedModeSearch && this.$refs.advancedModeSearch.openDropdown();
     },
     switchToSimpleMode() {
       // 切换到简单模式
       this.isSimpleMode = !this.isSimpleMode;
-      this.$refs.complexSearch && this.$refs.complexSearch.openDropdown(); // 切换到简单模式，把高级模式关闭
+      this.$refs.advancedModeSearch && this.$refs.advancedModeSearch.openDropdown(); // 切换到简单模式，把高级模式关闭
       this.$nextTick(() => {
         this.$refs.combineSearcher && this.$refs.combineSearcher.handleToggleOpen(); // 打开简单模式面板
       });
@@ -298,22 +486,9 @@ export default {
       // 简单模式搜索
       this.$emit('changeValue', searchVal);
     },
-    closeCombineSearch() {
-      if (this.$refs && this.$refs.combineSearcher) {
-        this.$refs.combineSearcher.handleToggleOpen(); // 关闭面板
-      }
-    },
-    searchCombineSearcher() {
-      if (this.$refs.combineSearcher) {
-        this.$refs.combineSearcher.refreshTextConfig();
-        this.$refs.combineSearcher.handleToggleOpen(); // 关闭面板
-      }
-      this.complexSearchVal = {}; // 清空复杂模式值
-      this.simpleModeSearch(this.searchVal);
-    },
-    complexModeSearch(searchVal) {
+    advancedModeSearch(searchVal) {
       this.searchVal = {}; // 清空简单模式的值
-      this.$emit('complexModeSearch', searchVal);
+      this.$emit('advancedModeSearch', searchVal);
     }
   },
   computed: {},
diff --git a/src/views/pages/autoexec/components/common/complex-search.vue b/src/views/pages/cmdb/asset/advanced-mode-search.vue
similarity index 78%
rename from src/views/pages/autoexec/components/common/complex-search.vue
rename to src/views/pages/cmdb/asset/advanced-mode-search.vue
index cf4608c4e2f1d80e36805bc8214d42bb65a9fecc..87e35d28574e232fda5ae1fa46fe83fefe6c360d 100644
--- a/src/views/pages/autoexec/components/common/complex-search.vue
+++ b/src/views/pages/cmdb/asset/advanced-mode-search.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="complex-search-wrap">
+  <div class="advanced-search-wrap">
     <div v-if="readonly">
       <div ref="tagDiv" class="pl-sm tag-item">
         <span v-for="(v, index) in searchConditionList" :key="index">
@@ -132,7 +132,7 @@
                           <span class="action-item tsfont-plus" :title="$t('dialog.title.addtarget', {target: $t('page.combinedcondition')})" @click.stop="addChildCondition(tIndex)"></span>
                           <span
                             v-if="(tIndex == 0 && index == 0 ? false : true) && !disabledUuidList.includes(item.uuid)"
-                            class="action-item tsfont-trash-s"
+                            class="tsfont-trash-s"
                             :title="$t('dialog.title.deletetarget', {target: $t('page.combinedcondition')})"
                             @click.stop="delCondition(tIndex, index)"
                           ></span>
@@ -199,7 +199,7 @@
         </Dropdown>
       </div>
       <span v-if="isShowDeleteAllBtn && (disabledUuidList.length == 0)" class="btn-remove tsfont-close-o" @click="deleteAllCondition"></span>
-      <span class="btn-filter tsfont-filter" @click="openDropdown"></span>
+      <span class="btn-filter tsfont-filter cursor" @click="openDropdown"></span>
     </div>
   </div>
 </template>
@@ -212,6 +212,10 @@ export default {
     TsFormTree: resolve => require(['@/resources/plugins/TsForm/TsFormTree'], resolve),
     TsFormDatePicker: resolve => require(['@/resources/plugins/TsForm/TsFormDatePicker'], resolve)
   },
+  model: {
+    prop: 'value',
+    event: 'search'
+  },
   props: {
     value: {
       type: Object,
@@ -236,6 +240,11 @@ export default {
       default: function() {
         return [];
       }
+    },
+    searchList: {
+      // 搜索条件列表
+      type: Array,
+      default: () => { return []; }
     }
   },
   data() {
@@ -299,318 +308,7 @@ export default {
         {
           expression: 'is-not-null',
           expressionName: this.$t('term.expression.notempty')
-        }],
-      defaultConditionList: [
-        {
-          name: 'attributeKey',
-          placeholder: this.$t('form.placeholder.pleaseselect', {target: this.$t('page.attribute')}),
-          label: this.$t('page.attribute'),
-          multiple: false,
-          textName: 'handlerName',
-          valueName: 'handler',
-          search: true,
-          transfer: true,
-          value: '',
-          dataList: [
-            {
-              handler: 'typeIdList',
-              conditionModel: 'select',
-              handlerName: this.$t('term.cmdb.citype'),
-              config: {
-                search: true,
-                transfer: true,
-                multiple: true,
-                textName: 'label',
-                valueName: 'id',
-                type: 'tree',
-                url: '/api/rest/resourcecenter/resourcetype/tree',
-                validateList: [{name: 'required', message: ''}]
-              }
-            },
-            {
-              handler: 'appSystemIdList',
-              defaultExpression: 'include',
-              conditionModel: 'select',
-              handlerName: this.$t('page.apply'),
-              config: {
-                search: true,
-                transfer: true,
-                defaultValue: [],
-                rootName: 'tbodyList',
-                multiple: true,
-                dealDataByUrl: 'getAppForselect',
-                type: 'select',
-                dynamicUrl: '/api/rest/resourcecenter/appsystem/list/forselect',
-                validateList: [{name: 'required', message: ' '}]
-
-              }
-            },
-            {
-              handler: 'appModuleIdList',
-              defaultExpression: 'include',
-              conditionModel: 'select',
-              handlerName: this.$t('page.module'),
-              config: {
-                search: true,
-                transfer: true,
-                defaultValue: [],
-                rootName: 'tbodyList',
-                multiple: true,
-                dealDataByUrl: 'getAppForselect',
-                type: 'select',
-                dynamicUrl: '/api/rest/resourcecenter/appmodule/list',
-                validateList: [{name: 'required', message: ' '}]
-              }
-            },
-            {
-              handler: 'envIdList',
-              conditionModel: 'select',
-              handlerName: this.$t('page.environment'),
-              config: {
-                search: true,
-                textName: 'name',
-                transfer: true,
-                valueName: 'id',
-                defaultValue: [],
-                rootName: 'tbodyList',
-                multiple: true,
-                className: 'block-span',
-                type: 'select',
-                url: '/api/rest/resourcecenter/appenv/list/forselect',
-                validateList: [{name: 'required', message: ' '}]
-
-              }
-            },
-            {
-              handler: 'protocolIdList',
-              conditionModel: 'select',
-              handlerName: this.$t('page.protocol'),
-              config: {
-                search: true,
-                transfer: true,
-                defaultValue: [],
-                rootName: 'tbodyList',
-                multiple: true,
-                dealDataByUrl: 'getProtocolDataList',
-                className: 'block-span',
-                type: 'select',
-                dynamicUrl: '/api/rest/resourcecenter/account/protocol/search',
-                validateList: [{name: 'required', message: ' '}]
-              }
-            },
-            {
-              handler: 'tagIdList',
-              conditionModel: 'select',
-              handlerName: this.$t('page.tag'),
-              config: {
-                search: true,
-                textName: 'name',
-                transfer: true,
-                valueName: 'id',
-                defaultValue: [],
-                rootName: 'tbodyList',
-                multiple: true,
-                type: 'select',
-                dynamicUrl: '/api/rest/resourcecenter/tag/list/forselect',
-                validateList: [{name: 'required', message: ''}]
-              }
-            },
-            {
-              handler: 'stateIdList',
-              conditionModel: 'select',
-              handlerName: this.$t('term.autoexec.assetstatus'),
-              config: {
-                search: true,
-                textName: 'description',
-                transfer: true,
-                valueName: 'id',
-                defaultValue: [],
-                rootName: 'tbodyList',
-                multiple: true,
-                className: 'block-span',
-                type: 'select',
-                params: {
-                  'needPage': false
-                },
-                url: '/api/rest/resourcecenter/state/list/forselect',
-                validateList: [{name: 'required', message: ' '}]
-              }
-            },
-            {
-              handler: 'vendorIdList',
-              conditionModel: 'select',
-              handlerName: this.$t('page.manufacturer'),
-              config: {
-                search: true,
-                textName: 'description',
-                transfer: true,
-                valueName: 'id',
-                defaultValue: [],
-                rootName: 'tbodyList',
-                multiple: true,
-                type: 'select',
-                dynamicUrl: '/api/rest/resourcecenter/vendor/list/forselect',
-                params: {
-                  needPage: false
-                },
-                validateList: [{name: 'required', message: ' '}]
-              }
-            },
-            {
-              handler: 'inspectStatusList',
-              conditionModel: 'select',
-              handlerName: this.$t('term.autoexec.inspectstatus'),
-              config: {
-                search: true,
-                transfer: true,
-                defaultValue: [],
-                multiple: true,
-                className: 'block-span',
-                type: 'select',
-                params: {
-                  'enumClass': 'neatlogic.framework.common.constvalue.InspectStatus'
-                },
-                url: '/api/rest/universal/enum/get',
-                validateList: [{name: 'required', message: ' '}]
-              }
-            },
-            {
-              handler: 'port',
-              conditionModel: 'input',
-              handlerName: this.$t('page.port'),
-              config: {
-                type: 'input',
-                validateList: [{name: 'required', message: ' '}],
-                maxlength: 256
-              }
-            },
-            {
-              handler: 'ip',
-              conditionModel: 'input',
-              handlerName: this.$t('page.ip'),
-              config: {
-                type: 'input',
-                validateList: [{name: 'required', message: ' '}],
-                maxlength: 256
-              }
-            },
-            {
-              handler: 'name',
-              conditionModel: 'input',
-              handlerName: this.$t('page.name'),
-              config: {
-                type: 'input',
-                validateList: [{name: 'required', message: ' '}],
-                maxlength: 256
-              }
-            },
-            {
-              handler: 'description',
-              conditionModel: 'input',
-              handlerName: this.$t('page.description'),
-              config: {
-                type: 'input',
-                validateList: [{name: 'required', message: ' '}],
-                maxlength: 256
-              }
-            },
-            {
-              handler: 'networkArea',
-              conditionModel: 'input',
-              handlerName: this.$t('page.networkarea'),
-              config: {
-                type: 'input',
-                validateList: [{name: 'required', message: ' '}],
-                maxlength: 256
-              }
-            },
-            {
-              handler: 'maintenanceWindow',
-              conditionModel: 'date',
-              handlerName: this.$t('term.autoexec.maintenanceperiod'),
-              config: {
-                type: 'datetimerange',
-                format: 'yyyy-MM-dd HH:mm',
-                validateList: [{name: 'required', message: ' '}]
-              }
-            },
-            {
-              handler: 'ownerList',
-              conditionModel: 'select',
-              handlerName: this.$t('page.owner'),
-              config: {
-                search: true,
-                transfer: true,
-                multiple: true,
-                type: 'select',
-                dynamicUrl: '/api/rest/user/search/forselect',
-                rootName: 'tbodyList',
-                textName: 'userName',
-                valueName: 'uuid',
-                params: {
-                  needPage: true
-                },
-                validateList: [{name: 'required', message: ' '}]
-              }
-            },
-            {
-              handler: 'bgList',
-              conditionModel: 'select',
-              handlerName: this.$t('term.autoexec.subordinatedepartment'),
-              config: {
-                search: true,
-                transfer: true,
-                multiple: true,
-                type: 'select',
-                dynamicUrl: '/api/rest/team/search',
-                rootName: 'teamList',
-                textName: 'name',
-                valueName: 'uuid',
-                params: {
-                  needPage: true,
-                  level: 'department'
-                },
-                validateList: [{name: 'required', message: ' '}]
-
-              }
-            }]
-        }, {
-          name: 'expression',
-          placeholder: this.$t('form.placeholder.pleaseselect', {target: this.$t('page.condition')}),
-          multiple: false,
-          textName: 'expressionName',
-          valueName: 'expression',
-          search: true,
-          transfer: true,
-          value: '',
-          validateList: [{name: 'required', message: ' '}],
-          dataList: [
-            {
-              expression: 'include',
-              expressionName: this.$t('term.expression.like')
-            },
-            {
-              expression: 'exclude',
-              expressionName: this.$t('term.expression.notlike')
-            },
-            {
-              expression: 'is-null',
-              expressionName: this.$t('term.expression.empty')
-            },
-            {
-              expression: 'is-not-null',
-              expressionName: this.$t('term.expression.notempty')
-            }]
-        },
-        {
-          name: 'attributeValue',
-          placeholder: this.$t('form.placeholder.pleaseselect', {target: ''}),
-          transfer: true,
-          multiple: true,
-          value: '',
-          validateList: [{name: 'required', message: ''}]
-        }
-      ]
+        }]
     };
   },
   beforeCreate() {},
@@ -746,7 +444,7 @@ export default {
       this.conditionList[tIndex].conditionList.push({conditionList: this.$utils.deepClone(this.defaultConditionList), joinType: 'or', uuid: this.$utils.setUuid()});
     },
     switchMode() {
-      this.$emit('click');
+      this.$emit('switchMode');
     },
     searchConditionBtn() {
       // 搜索放大镜图标,点击搜索放大镜图标，把关键字拿出来
@@ -997,7 +695,7 @@ export default {
                       vv.value = vv.name == 'attributeKey' ? item.name : (vv.name == 'expression' ? item.expression : (vv.name == 'attributeValue' ? (hasInput ? item.valueList.join() : item.valueList) : ''));
                       vv.labelName = vv.name == 'attributeValue' ? item.text : item.label;
                       if (vv.name == 'attributeKey') {
-                        this.attributeChange(vv.name, conditionList[conditionList.length - 1]['conditionList'], item.valueList, vv.dataList && vv.dataList.find((n) => n.handler == item.name), true);
+                        this.attributeChange(vv.name, conditionList[conditionList.length - 1]['conditionList'], item.valueList, vv.dataList && vv.dataList.find((n) => n.name == item.name), true);
                       } else if (vv.name == 'expression') {
                         if (item.expression == 'is-null' || item.expression == 'is-not-null') {
                           conditionList[conditionList.length - 1]['conditionList'].forEach((v) => {
@@ -1056,6 +754,17 @@ export default {
         }
       });
       this.isShowMoreBtn = spanWidth > tagClientWidth;
+    },
+    filterNameLabelFields(obj) {
+      // 过滤不用的字段
+      let config = this.$utils.deepClone(obj);
+      let removeFiledsList = ['name', 'label'];
+      for (let key in config) {
+        if (removeFiledsList.includes(key)) {
+          delete config[key];
+        }
+      }
+      return config;
     }
   },
   filter: {},
@@ -1068,12 +777,83 @@ export default {
         }
       });
       return hasDeleteTag;
+    },
+    defaultConditionList() {
+      let searchList = [
+        {
+          name: 'attributeKey',
+          placeholder: this.$t('form.placeholder.pleaseselect', {target: this.$t('page.attribute')}),
+          label: this.$t('page.attribute'),
+          multiple: false,
+          textName: 'label',
+          valueName: 'name',
+          search: true,
+          transfer: true,
+          value: '',
+          dataList: []
+        }, {
+          name: 'expression',
+          placeholder: this.$t('form.placeholder.pleaseselect', {target: this.$t('page.condition')}),
+          multiple: false,
+          textName: 'expressionName',
+          valueName: 'expression',
+          search: true,
+          transfer: true,
+          value: '',
+          validateList: [{name: 'required', message: ' '}],
+          dataList: [
+            {
+              expression: 'include',
+              expressionName: this.$t('term.expression.like')
+            },
+            {
+              expression: 'exclude',
+              expressionName: this.$t('term.expression.notlike')
+            },
+            {
+              expression: 'is-null',
+              expressionName: this.$t('term.expression.empty')
+            },
+            {
+              expression: 'is-not-null',
+              expressionName: this.$t('term.expression.notempty')
+            }]
+        },
+        {
+          name: 'attributeValue',
+          placeholder: this.$t('form.placeholder.pleaseselect', {target: ''}),
+          transfer: true,
+          multiple: true,
+          value: '',
+          validateList: [{name: 'required', message: ''}]
+        }
+      ];
+      let conditionList = [];
+      this.searchList?.forEach((item) => {
+        // 构造数据解构是[{label: '应用', name: 'appsSystemIdList',type: 'select' {config: 剩余的字段，除了label和name}}]
+        if (item) {
+          conditionList.push({
+            name: item.name,
+            label: item.label,
+            type: item.type,
+            config: {
+              ...this.filterNameLabelFields(item)
+            }
+          });
+        }
+      });
+      searchList.forEach((item) => {
+        if (item && item.name == 'attributeKey') {
+          this.$set(item, 'dataList', conditionList);
+        }
+      });
+      return searchList;
     }
   },
   watch: {
     value: {
       handler(val) {
-        if (val && val.conditionGroupList && !this.$utils.isEmpty(val.conditionGroupList)) {
+        if (val?.conditionGroupList && !this.$utils.isEmpty(val.conditionGroupList)) {
           // 搜索条件回显
           this.getConditionList();
         } else {
@@ -1097,7 +877,7 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.complex-search-wrap {
+.advanced-search-wrap {
   position: relative;
   .searcher-inputer {
     display: inline-block;
@@ -1116,22 +896,21 @@ export default {
   }
   .btn-filter {
     position: absolute;
-    top: 2px;
+    top: 1px;
     right: 10px;
-    cursor: pointer;
   }
-   .tag-item-sperate{
-      text-align: center;
-      opacity: .4;
-      margin-left: 2px;
-      margin-right: 2px;
-    }
-.dropdown-box {
-  max-height: 450px;
-  overflow-y:scroll;
-  overflow-x: hidden;
-  white-space: pre-wrap;
-}
+  .tag-item-sperate{
+    text-align: center;
+    opacity: .4;
+    margin-left: 2px;
+    margin-right: 2px;
+  }
+  .dropdown-box {
+    max-height: 450px;
+    overflow-y:scroll;
+    overflow-x: hidden;
+    white-space: pre-wrap;
+  }
   .tag-item{
     display:inline-block;
     width: 96%;
@@ -1157,5 +936,4 @@ export default {
   }
  }
 }
-
 </style>
diff --git a/src/views/pages/cmdb/asset/asset-manage.vue b/src/views/pages/cmdb/asset/asset-manage.vue
index 60d2859e00a8e549710f9502f781a0ed00d093f1..889eb27b70ff18115c39646cd5600f283ffc23f1 100644
--- a/src/views/pages/cmdb/asset/asset-manage.vue
+++ b/src/views/pages/cmdb/asset/asset-manage.vue
@@ -45,12 +45,15 @@
       <template v-slot:topRight>
         <div>
           <CombineSearcher
+            v-show="isSimpleMode"
+            ref="combineSearcher"
             v-model="searchVal"
             v-bind="searchConfig"
-            @change="changeCombineSearcher"
+            @confirm="changeCombineSearcher"
             @change-label="changeLabelCombineSearcher"
+            @switchMode="switchMode"
           >
-            <template v-slot:batchSearchList="{ valueConfig, textConfig }">
+            <template v-slot:batchSearchList="{ valueConfig }">
               <div>
                 <TsFormItem :label="$t('page.batchsearch')" :tooltip="$t('term.cmdb.resourcebatchsearchtooltip')" labelPosition="left">
                   <TsFormRadio v-model="valueConfig.searchField" :dataList="searchFieldRadioDataList"></TsFormRadio>
@@ -61,16 +64,20 @@
                     type="textarea"
                     :placeholder="'192.168.0.1\n192.168.0.2\n192.168.0.*'"
                     :autoSize="{ minRows: 4 }"
-                    @change="
-                      val => {
-                        changeBatchSearchList(val, textConfig);
-                      }
-                    "
                   ></TsFormInput>
                 </TsFormItem>
               </div>
             </template>
           </CombineSearcher>
+          <AdvancedModeSearch
+            v-show="!isSimpleMode"
+            ref="advancedModeSearch"
+            v-model="searchVal"
+            :searchList="searchList"
+            @search="advancedModeSearch"
+            @switchMode="switchMode"
+          >
+          </AdvancedModeSearch>
         </div>
       </template>
       <template v-slot:sider>
@@ -88,13 +95,14 @@
           v-if="!loadingShow"
           v-model="selectList"
           v-bind="tableConfig"
+          :theadList="theadList"
           :multiple="true"
           :selectedRemain="selectedRemain"
           :loading="loading"
           :hideAction="hasResourceCenterAuth"
           @getSelected="getSelected"
-          @changeCurrent="getData"
-          @changePageSize="getData(1, ...arguments)"
+          @changeCurrent="changeCurrent"
+          @changePageSize="changePageSize"
         >
           <template v-slot:ip="{ row }">
             <span class="text-href" @click.stop="gotoDetails(row)">
@@ -125,12 +133,6 @@
               <span>-</span>
             </span>
           </template>
-          <!-- <template v-slot:taskStatus="{ row }">
-                  <span :style="fonts(row)" @click="taskJob(row)">
-                    <span v-if="row.jobPhaseNodeVo"><span :class="{'tsfont-warning-o': row.jobPhaseNodeVo.value== 'FATAL'}"></span>{{ row.jobPhaseNodeVo.statusVo.text }}</span>
-                    <span v-else>-</span>
-                  </span>
-                </template> -->
           <template v-slot:inspectTime="{ row }">
             <!-- 巡检状态 -->
             <span v-if="row.inspectStatusJson && row.inspectTime" :title="row.inspectTime | formatDate">
@@ -138,7 +140,6 @@
                 <span :class="[row.inspectStatusJson.cssClass, { 'background-FATAL': row.inspectStatusJson.value == 'FATAL' }]" class="vertical">{{ row.inspectStatusJson.text }}</span>
                 <span class="text-title">{{ formatTime(row.inspectTime) | formatTimeCost({ unitNumber: 1, language: 'zh', unit: 'minute' }) }} {{ $t('page.before') }}</span>
               </span>
-              <!-- 'cursor':'pointer','color': row.jobPhaseNodeVo.statusVo.color -->
             </span>
 
             <span v-else>
@@ -173,7 +174,6 @@
         </TsTable>
       </template>
     </TsContain>
-
     <TagEdit
       v-if="isMangeShow"
       :operateType="operateType"
@@ -228,23 +228,25 @@
 export default {
   name: '',
   components: {
+    CombineSearcher: resolve => require(['@/resources/components/CombineSearcher/CombineSearcher.vue'], resolve),
+    GroupList: resolve => require(['@/resources/components/GroupList/GroupList.vue'], resolve),
     TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve),
+    TsFormInput: resolve => require(['@/resources/plugins/TsForm/TsFormInput'], resolve),
+    TsFormItem: resolve => require(['@/resources/plugins/TsForm/TsFormItem'], resolve),
+    TsFormRadio: resolve => require(['@/resources/plugins/TsForm/TsFormRadio'], resolve),
     AcountEdit: resolve => require(['./components/acount-edit'], resolve),
     DeleteCiEntityDialog: resolve => require(['../cientity/cientity-delete-dialog.vue'], resolve),
     AssetEdit: resolve => require(['./asset-edit-dialog.vue'], resolve),
     TagEdit: resolve => require(['./components/tag-edit'], resolve),
     TreeEdit: resolve => require(['./components/tree-edit'], resolve),
-    CombineSearcher: resolve => require(['@/resources/components/CombineSearcher/CombineSearcher.vue'], resolve),
-    GroupList: resolve => require(['@/resources/components/GroupList/GroupList.vue'], resolve),
     ExportAsset: resolve => require(['./export-asset-dialog.vue'], resolve),
     AccountEditDialog: resolve => require(['./components/account-edit-dialog'], resolve),
-    TsFormInput: resolve => require(['@/resources/plugins/TsForm/TsFormInput'], resolve),
-    TsFormItem: resolve => require(['@/resources/plugins/TsForm/TsFormItem'], resolve),
-    TsFormRadio: resolve => require(['@/resources/plugins/TsForm/TsFormRadio'], resolve)
+    AdvancedModeSearch: resolve => require(['./advanced-mode-search'], resolve) // 高级模式搜索
   },
   filters: {},
   data() {
     return {
+      isSimpleMode: true,
       isShowAccountEditDialog: false,
       loadingShow: true,
       selectedRemain: true,
@@ -270,7 +272,6 @@ export default {
         isShow: false,
         width: 'medium'
       },
-      id: null,
       resourceId: 0,
       resourceIdList: [],
       tagList: [],
@@ -293,6 +294,8 @@ export default {
         searchField: 'ip'
       },
       searchConfig: {
+        isShowAdvanceMode: true,
+        searchMode: 'clickBtnSearch',
         placeholder: this.$t('term.inspect.inputargetnameip'),
         searchList: [
           {
@@ -318,7 +321,7 @@ export default {
                 this.$nextTick(() => {
                   if (this.searchVal && this.searchVal.appModuleIdList) {
                     this.$delete(this.searchVal, 'appModuleIdList');
-                    this.getData(1);
+                    this.changeCurrent();
                   }
                 });
               }
@@ -416,96 +419,95 @@ export default {
           }
         ]
       },
+      theadList: [
+        {
+          key: 'selection',
+          title: ''
+        },
+        {
+          title: this.$t('page.ipaddress'),
+          key: 'ip'
+        },
+        {
+          title: this.$t('page.type'),
+          key: 'typeLabel'
+        },
+        {
+          title: this.$t('page.name'),
+          key: 'name'
+        },
+        {
+          title: this.$t('term.inspect.monitoringstate'),
+          key: 'monitorTime'
+        },
+        {
+          title: this.$t('term.autoexec.inspectstatus'),
+          key: 'inspectTime'
+        },
+        // {
+        //   title: '巡检作业状态', // 需求变更，屏蔽
+        //   key: 'taskStatus'
+        // },
+        {
+          title: this.$t('page.module'),
+          key: 'appModuleName'
+        },
+        {
+          title: this.$t('page.apply'),
+          key: 'appSystemName'
+        },
+        {
+          title: this.$t('term.inspect.iplist'),
+          key: 'allIp',
+          type: 'tag',
+          valueKey: 'ip'
+        },
+        {
+          title: this.$t('term.autoexec.subordinatedepartment'),
+          key: 'bgList',
+          type: 'tag',
+          valueKey: 'bgName'
+        },
+        {
+          title: this.$t('page.owner'),
+          key: 'ownerList',
+          type: 'usercards'
+        },
+        {
+          title: this.$t('term.autoexec.assetstatus'),
+          key: 'stateName'
+        },
+        {
+          title: this.$t('page.networkarea'),
+          key: 'networkArea'
+        },
+        {
+          title: this.$t('page.tag'),
+          key: 'tagList',
+          type: 'tag'
+        },
+        {
+          title: this.$t('term.deploy.maintenancewindow'),
+          key: 'maintenanceWindow'
+        },
+        {
+          title: this.$t('page.account'),
+          key: 'accountList'
+        },
+        {
+          title: this.$t('page.description'),
+          key: 'description'
+        },
+        {
+          title: '',
+          key: 'action'
+        }
+      ],
       tableConfig: {
         keyName: 'id',
-        value: [],
-        theadList: [
-          {
-            key: 'selection',
-            title: ''
-          },
-          {
-            title: this.$t('page.ipaddress'),
-            key: 'ip'
-          },
-          {
-            title: this.$t('page.type'),
-            key: 'typeLabel'
-          },
-          {
-            title: this.$t('page.name'),
-            key: 'name'
-          },
-          {
-            title: this.$t('term.inspect.monitoringstate'),
-            key: 'monitorTime'
-          },
-          {
-            title: this.$t('term.autoexec.inspectstatus'),
-            key: 'inspectTime'
-          },
-          // {
-          //   title: '巡检作业状态', // 需求变更，屏蔽
-          //   key: 'taskStatus'
-          // },
-          {
-            title: this.$t('page.module'),
-            key: 'appModuleName'
-          },
-          {
-            title: this.$t('page.apply'),
-            key: 'appSystemName'
-          },
-          {
-            title: this.$t('term.inspect.iplist'),
-            key: 'allIp',
-            type: 'tag',
-            valueKey: 'ip'
-          },
-          {
-            title: this.$t('term.autoexec.subordinatedepartment'),
-            key: 'bgList',
-            type: 'tag',
-            valueKey: 'bgName'
-          },
-          {
-            title: this.$t('page.owner'),
-            key: 'ownerList',
-            type: 'usercards'
-          },
-          {
-            title: this.$t('term.autoexec.assetstatus'),
-            key: 'stateName'
-          },
-          {
-            title: this.$t('page.networkarea'),
-            key: 'networkArea'
-          },
-          {
-            title: this.$t('page.tag'),
-            key: 'tagList',
-            type: 'tag'
-          },
-          {
-            title: this.$t('term.deploy.maintenancewindow'),
-            key: 'maintenanceWindow'
-          },
-          {
-            title: this.$t('page.account'),
-            key: 'accountList'
-          },
-          {
-            title: this.$t('page.description'),
-            key: 'description'
-          },
-          {
-            title: '',
-            key: 'action'
-          }
-        ],
         tbodyList: [],
-        pageSize: 20,
-        currentPage: 1
+        currentPage: 1,
+        pageSize: 20
       },
       settingConfig: {
         tagList: []
@@ -530,39 +532,162 @@ export default {
           validateList: [{ name: 'required', message: this.$t('form.placeholder.pleaseselect', { target: this.$t('page.tag') }) }, 'name-special']
         }
       },
-      dynamicUrl: '',
       implementName: '',
-      contentHeight: '100',
       isExportAssetDialog: false,
       defaultValue: [],
       isShowTreeEdit: false,
-      treeTypeRootCiId: null
+      treeTypeRootCiId: null,
+      searchList: [
+        {
+          name: 'appSystemIdList',
+          type: 'select',
+          label: this.$t('page.apply'),
+          search: true,
+          transfer: true,
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dealDataByUrl: 'getAppForselect',
+          dynamicUrl: '/api/rest/resourcecenter/appsystem/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'appModuleIdList',
+          type: 'select',
+          label: this.$t('page.module'),
+          search: true,
+          transfer: true,
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dealDataByUrl: 'getAppForselect',
+          dynamicUrl: '/api/rest/resourcecenter/appmodule/list',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'envIdList',
+          type: 'select',
+          label: this.$t('page.environment'),
+          search: true,
+          textName: 'name',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          className: 'block-span',
+          url: '/api/rest/resourcecenter/appenv/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          type: 'checkbox',
+          name: 'inspectStatusList',
+          label: this.$t('term.autoexec.inspectstatus'),
+          url: '/api/rest/universal/enum/get',
+          params: { enumClass: 'neatlogic.framework.common.constvalue.InspectStatus' },
+          multiple: true,
+          className: 'block-span'
+        },
+        {
+          name: 'ip',
+          type: 'input',
+          label: this.$t('page.ip'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
+        },
+        {
+          name: 'name',
+          type: 'input',
+          label: this.$t('page.name'),
+          validateList: [{name: 'required', message: ''}],
+          maxlength: 256
+        },
+        {
+          name: 'vendorIdList',
+          type: 'select',
+          label: this.$t('page.manufacturer'),
+          search: true,
+          textName: 'description',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dynamicUrl: '/api/rest/resourcecenter/vendor/list/forselect',
+          params: {
+            needPage: false
+          },
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'tagIdList',
+          type: 'select',
+          label: this.$t('page.tag'),
+          search: true,
+          textName: 'name',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dynamicUrl: '/api/rest/resourcecenter/tag/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'protocolIdList',
+          type: 'select',
+          label: this.$t('page.protocol'),
+          search: true,
+          transfer: true,
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          dealDataByUrl: 'getProtocolDataList',
+          className: 'block-span',
+          dynamicUrl: '/api/rest/resourcecenter/account/protocol/search',
+          validateList: [{name: 'required', message: ''}]
+        },
+        {
+          name: 'stateIdList',
+          type: 'select',
+          label: this.$t('term.autoexec.assetstatus'),
+          search: true,
+          textName: 'description',
+          transfer: true,
+          valueName: 'id',
+          defaultValue: [],
+          rootName: 'tbodyList',
+          multiple: true,
+          className: 'block-span',
+          params: {
+            'needPage': false
+          },
+          url: '/api/rest/resourcecenter/state/list/forselect',
+          validateList: [{name: 'required', message: ''}]
+        }]
     };
   },
   beforeCreate() {},
   created() {},
   beforeMount() {},
   async mounted() {
-    let query = this.$route.query;
-    this.defaultValue = query && query.resourceId ? [parseInt(query.resourceId)] : [];
+    let {resourceId = ''} = this.$route.query || {};
+    this.defaultValue = resourceId ? [parseInt(resourceId)] : [];
     await this.getTreeType();
-    await this.init();
-    if (query && query.resourceId) {
-      this.editAccount({ id: parseInt(query.resourceId) });
+    await this.initData();
+    if (resourceId) {
+      this.editAccount({ id: parseInt(resourceId) });
     }
   },
   beforeUpdate() {},
   updated() {},
   activated() {},
   deactivated() {},
-  beforeDestroy() {
-    this.setTimeGetData && clearTimeout(this.setTimeGetData);
-  },
+  beforeDestroy() {},
   destroyed() {},
   methods: {
-    async init() {
-      // this.tableConfig.theadList.splice(0, 1);
-      await this.getData(null, null);
+    async initData() {
+      await this.searchAssetData();
       await this.listForselect();
       await this.listAccount();
       if (this.$route.query && this.$route.query.isAddAccountShow) {
@@ -577,6 +702,15 @@ export default {
         }
       }
     },
+    changeCurrent(currentPage = 1) {
+      this.tableConfig.currentPage = currentPage;
+      this.searchAssetData();
+    },
+    changePageSize(pageSize) {
+      this.tableConfig.currentPage = 1;
+      this.tableConfig.pageSize = pageSize;
+      this.searchAssetData();
+    },
     formatTime(time) {
       let data = '-';
       if (time) {
@@ -605,16 +739,14 @@ export default {
         this.loadingShow = false;
       });
     },
-    verticals() {
-      this.isSiderHide = !this.isSiderHide;
-    },
     closeDeleteDialog(needRefresh) {
       this.isDeleteDialogShow = false;
       this.selectedCiEntityList = [];
       this.ciEntityList = [];
       this.selectList = [];
       if (needRefresh) {
-        this.getData(1, null, true);
+        this.tableConfig.currentPage = 1;
+        this.searchAssetData(true);
       }
     },
     getTreeType() {
@@ -658,21 +790,20 @@ export default {
         this.setTreeDataExpand(data._parent);
       }
     },
-    getData(currentPage, pageSize, isEmptySelected) {
+    searchAssetData(isEmptySelected) {
       //获取表格数据
       if (!this.selectType.typeId) {
         return;
       }
-      this.CancelToken && this.CancelToken.cancel();
-      this.CancelToken = this.$https.CancelToken.source();
-      // this.loading = true;
-      let params = { ...this.searchVal, ...this.selectType };
-      params.currentPage = currentPage || this.tableConfig.currentPage;
-      params.pageSize = pageSize || this.tableConfig.pageSize;
+      let params = {
+        batchSearchList: [],
+        currentPage: this.tableConfig.currentPage,
+        pageSize: this.tableConfig.pageSize,
+        ...this.searchVal,
+        ...this.selectType
+      };
       if (!this.$utils.isEmpty(params.batchSearchList)) {
         params.batchSearchList = params.batchSearchList.split('\n');
-      } else {
-        params.batchSearchList = [];
       }
       if (this.defaultValue && this.defaultValue.length > 0) {
         params.defaultValue = this.defaultValue;
@@ -683,15 +814,14 @@ export default {
       this.$addHistoryData('currentPage', params.currentPage);
       this.$addHistoryData('pageSize', params.pageSize);
       return this.$api.cmdb.asset
-        .getResourceList(params, { cancelAxios: this.CancelToken.token })
+        .getResourceList(params)
         .then(res => {
-          this.CancelToken = null;
           if (isEmptySelected) {
             this.selectedRemain = false;
           }
           this.tableConfig = Object.assign(this.tableConfig, res.Return);
         })
-        .finally(res => {
+        .finally(() => {
           this.loading = false;
           this.selectedCiEntityList = [];
         });
@@ -714,7 +844,7 @@ export default {
       //检查当前模型是否抽象模型，非抽象模型才显示添加资产按钮
       this.getCiById(node.id);
       //查询资源数据
-      this.getData(1, null);
+      this.changeCurrent();
     },
     getCiById(ciId) {
       this.$api.cmdb.ci.getCiById(ciId).then(res => {
@@ -727,7 +857,6 @@ export default {
       this.selectedRemain = true;
     },
     tagEdit(row) {
-      // this.resourceId = row.id;
       this.resourceIdList = [row.id];
       this.batchAction(this.$t('page.tagmanage'), 'tagEdit');
       this.settingConfig.tagList = row.tagList;
@@ -742,7 +871,7 @@ export default {
       this.resourceId = null;
       this.isShowAccountEditDialog = false;
       if (needFresh) {
-        this.getData();
+        this.searchAssetData();
       }
     },
     addAsset() {
@@ -760,7 +889,7 @@ export default {
       this.ciId = null;
       this.isEditAssetDialogShow = false;
       if (needRefresh) {
-        this.getData();
+        this.searchAssetData();
       }
     },
     deleteAsset(row) {
@@ -778,7 +907,7 @@ export default {
       this.isDeleteDialogShow = true;
     },
     async success(msg) {
-      await this.getData(null, null, true);
+      await this.searchAssetData(true);
       this.$Message.success(msg);
       this.resourceIdList = [];
       this.selectList = [];
@@ -835,7 +964,7 @@ export default {
     closeAddAccount(needFresh) {
       this.isAddAccountShow = false;
       if (needFresh) {
-        this.getData(null, null);
+        this.searchAssetData();
       }
     },
     // 巡检功能
@@ -884,18 +1013,11 @@ export default {
     openExportDialog() {
       this.isExportAssetDialog = true;
     },
-    changeBatchSearchList(val, textConfig) {
-      if (this.$utils.isEmpty(val)) {
-        this.$delete(textConfig, 'batchSearchList');
-      } else {
-        this.$set(textConfig, 'batchSearchList', val.split('\n'));
-      }
-    },
     changeCombineSearcher(val) {
       if (this.$utils.isEmpty(val)) {
         this.$set(this.searchVal, 'searchField', 'ip');
       }
-      this.getData(1);
+      this.changeCurrent();
     },
     changeLabelCombineSearcher(val) {
       if (!this.$utils.isEmpty(this.searchVal.batchSearchList)) {
@@ -911,8 +1033,33 @@ export default {
         this.treeTypeRootCiId = null;
         this.selectType.typeId = null;
         await this.getTreeType();
-        await this.init();
+        await this.initData();
       }
+    },
+    switchMode() {
+      // 切换模式
+      this.isSimpleMode = !this.isSimpleMode;
+      this.$refs.advancedModeSearch && this.$refs.advancedModeSearch.openDropdown(); // 切换到简单模式，把高级模式关闭
+      this.$nextTick(() => {
+        this.$refs.combineSearcher && this.$refs.combineSearcher.handleToggleOpen(); // 打开简单模式面板
+      });
+    },
+    advancedModeSearch(searchVal) {
+      // 复杂模式搜索
+      let params = {
+        currentPage: 1,
+        pageSize: 20,
+        typeId: this.selectType.typeId,
+        ...searchVal
+      };
+      this.loadingShow = true;
+      this.$api.autoexec.action.searchResourceCustomList(params).then(res => {
+        if (res.Status == 'OK') {
+          this.tableConfig = Object.assign(this.tableConfig, res.Return || {});
+        }
+      }).finally(() => {
+        this.loadingShow = false;
+      });
     }
   },
   computed: {